Hello community,
here is the log from the commit of package gcin for openSUSE:Factory checked in
at 2014-01-15 16:24:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gcin (Old)
and /work/SRC/openSUSE:Factory/.gcin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gcin/gcin.changes 2013-11-28
16:50:53.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2014-01-15
16:24:58.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Jan 13 06:37:22 UTC 2014 - g...@suse.com
+
+- Add gcin-bnc858193-fixes-frozen-gnome-shell.patch to fix the
+ deadlock between gnome-shell (bnc#858193)
+- Add gcin-keep-debug-symbols.patch to keep the debug symbols
+- Add gcin-parallel-compiling.patch to fix the Makefile dependency
+ for parallel compiling
+
+-------------------------------------------------------------------
New:
----
gcin-bnc858193-fixes-frozen-gnome-shell.patch
gcin-keep-debug-symbols.patch
gcin-parallel-compiling.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gcin.spec ++++++
--- /var/tmp/diff_new_pack.4dMtC8/_old 2014-01-15 16:24:59.000000000 +0100
+++ /var/tmp/diff_new_pack.4dMtC8/_new 2014-01-15 16:24:59.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gcin
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,12 @@
Patch3: gcin-2.8.1-gtk_immodules_path.patch
# PATCH-FIX-UPSTREAM swy...@opensuse.org - fix doc path (used to open doc from
gcin-tools)
Patch4: doc_dir.diff
+# PATCH-FIX-UPSTREAM g...@suse.com - keep the debug symbols
+Patch5: gcin-keep-debug-symbols.patch
+# PATCH-FIX-UPSTREAM bnc#858193 g...@suse.com - fix the deadlock between
gnome-shell
+Patch6: gcin-bnc858193-fixes-frozen-gnome-shell.patch
+# PATCH-FIX-UPSTREAM g...@suse.com - fix the Makefile dependency for parallel
compiling
+Patch7: gcin-parallel-compiling.patch
BuildRequires: anthy-devel
BuildRequires: fdupes
BuildRequires: gtk2-devel
@@ -118,6 +124,9 @@
%patch2 -p1
%patch3 -p1
%patch4
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .
++++++ gcin-bnc858193-fixes-frozen-gnome-shell.patch ++++++
diff --git a/eve.cpp b/eve.cpp
index 7a37666..510bd2c 100755
--- a/eve.cpp
+++ b/eve.cpp
@@ -1486,24 +1486,6 @@ int xim_ForwardEventHandler(IMForwardEventStruct
*call_data)
void gcin_reset();
-#if UNIX
-gboolean is_tip_window(Window inpwin)
-{
- // Dirty fix for chrome, doesn't work well.
- if (!inpwin)
- return FALSE;
- XWindowAttributes att;
- XGetWindowAttributes(dpy, inpwin, &att);
-
- dbg("%d, %d\n", att.width, att.height);
-// chrome window is override_redirect
-// if (att.override_redirect)
-// return;
-
- return att.override_redirect && att.height < 24;
-}
-#endif
-
int gcin_FocusIn(ClientState *cs)
{
dbg("gcin_FocusIn %p\n", cs);
@@ -1517,11 +1499,7 @@ int gcin_FocusIn(ClientState *cs)
Window win = cs->client_win;
if (!win)
return FALSE;
-#if UNIX
- if (is_tip_window(win)) {
- return FALSE;
- }
-#endif
+
reset_current_in_win_xy();
if (cs) {
@@ -1615,13 +1593,6 @@ int gcin_FocusOut(ClientState *cs)
if (!cs->client_win)
return FALSE;
-#if UNIX
- if (is_tip_window(cs->client_win)) {
- return FALSE;
- }
-#endif
-
-
if (t - last_focus_out_time < 100000) {
last_focus_out_time = t;
return FALSE;
++++++ gcin-keep-debug-symbols.patch ++++++
diff --git a/Makefile b/Makefile
index f6ab8ca..e173adc 100644
--- a/Makefile
+++ b/Makefile
@@ -236,7 +236,7 @@ install:
else \
install -d $(DOC_DIR_i); \
install -m 644 README.html Changelog.html $(DOC_DIR_i); \
- install -s $(PROGS) $(bindir); \
+ install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
rm -f $(bindir)/ts-contribute; ln -sf ts-edit
$(bindir)/ts-contribute; \
fi
++++++ gcin-parallel-compiling.patch ++++++
diff --git a/Makefile b/Makefile
index e173adc..949268c 100644
--- a/Makefile
+++ b/Makefile
@@ -108,19 +108,19 @@ all: $(PROGS) trad2sim $(GCIN_SO) $(DATA)
$(PROGS_CV) gcin.spec gcin-fedora.spec
#gcc_ld_run_path=-Wl,-rpath,$(gcin_ld_run_path)
-gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
+gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) im-client/libgcin-im-client.so
$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB)
$(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.* vgcore.*
ln -sf $@ $@.test
-gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
+gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) im-client/libgcin-im-client.so
$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS)
$(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
rm -f core.*
-tslearn: $(OBJS_TSLEARN)
+tslearn: $(OBJS_TSLEARN) im-client/libgcin-im-client.so
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TSLEARN) -L./im-client
-lgcin-im-client $(LDFLAGS)
-ts-edit: $(OBJS_TS_EDIT)
+ts-edit: $(OBJS_TS_EDIT) im-client/libgcin-im-client.so
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_TS_EDIT) -L./im-client
-lgcin-im-client $(LDFLAGS)
ts-contribute: ts-edit
@@ -164,16 +164,16 @@ gtab-merge: $(OBJS_gtab_merge)
kbmcv: $(OBJS_kbmcv)
$(CCLD) -o $@ $(OBJS_kbmcv) $(LDFLAGS)
-gcin-gb-toggle: $(OBJS_gcin_gb_toggle)
+gcin-gb-toggle: $(OBJS_gcin_gb_toggle) im-client/libgcin-im-client.so
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_gb_toggle) -L./im-client
-lgcin-im-client $(LDFLAGS)
-gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle)
+gcin-kbm-toggle: $(OBJS_gcin_kbm_toggle) im-client/libgcin-im-client.so
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_kbm_toggle) -L./im-client
-lgcin-im-client $(LDFLAGS)
-gcin-exit: $(OBJS_gcin_exit)
+gcin-exit: $(OBJS_gcin_exit) im-client/libgcin-im-client.so
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_exit) -L./im-client
-lgcin-im-client $(LDFLAGS)
-gcin-message: $(OBJS_gcin_message)
+gcin-message: $(OBJS_gcin_message) im-client/libgcin-im-client.so
$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client
-lgcin-im-client $(LDFLAGS)
pin-juyin: $(OBJS_pin_juyin)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
