Hi, On Mon, Jan 30, 2012 at 03:04:59PM -0500, Peng Huang wrote: > Hi, > > I would like to release ibus 1.4.1 in this week. It will include recent > fixes. If you are working on some patches, and wish include them in this > release, please let me know. Thanks.
Here are patches used in Debian. Some are typo others are related to Debian/Ubuntu moving to multiarch and requiring a bit stricter usage of directory variables. Patches has been updated for the git remotes/origin/devel. I did not touch .spec file. I hope these changes are compatible with Fedora. Cheers, Osamu
From 9dd0eec88f5a4e81bb14731b4ffaf085c75d8a99 Mon Sep 17 00:00:00 2001 From: Osamu Aoki <[email protected]> Date: Tue, 31 Jan 2012 22:24:00 +0900 Subject: [PATCH 1/4] Fix typo and cosmetic issues specifying encoding in desktop file is deprecated --- bus/ibus.desktop.in | 1 - client/x11/main.c | 4 ++-- setup/ibus-setup.desktop.in | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bus/ibus.desktop.in b/bus/ibus.desktop.in index 9212d5a..9784f11 100644 --- a/bus/ibus.desktop.in +++ b/bus/ibus.desktop.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=IBus _GenericName=Input Method Framework _Comment=Start IBus Input Method Framework diff --git a/client/x11/main.c b/client/x11/main.c index 58069fc..65451ab 100644 --- a/client/x11/main.c +++ b/client/x11/main.c @@ -303,7 +303,7 @@ _xim_store_ic_values (X11IC *x11ic, IMChangeICStruct *call_data) } for (i=0; i< (int) call_data->status_attr_num; ++i, ++sts_attr) { - LOG (1, "Unkown status attribute: %s", sts_attr->name); + LOG (1, "Unknown status attribute: %s", sts_attr->name); } return attrs; @@ -774,7 +774,7 @@ ims_protocol_handler (XIMS xims, IMProtocol *call_data) LOG (1, "XIM_SYNC_REPLY"); return 0; default: - LOG (1, "Unkown (%d)", call_data->major_code); + LOG (1, "Unknown (%d)", call_data->major_code); return 0; } } diff --git a/setup/ibus-setup.desktop.in b/setup/ibus-setup.desktop.in index 940a84d..864b026 100644 --- a/setup/ibus-setup.desktop.in +++ b/setup/ibus-setup.desktop.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=IBus Preferences _Comment=Set IBus Preferences Exec=ibus-setup -- 1.7.8.3
From b75c4f6f06a396a54373786560269c90ff1a7c97 Mon Sep 17 00:00:00 2001 From: Osamu Aoki <[email protected]> Date: Tue, 31 Jan 2012 21:41:48 +0900 Subject: [PATCH 2/4] Multi-arch build script backport from Ubuntu This includes both an upstream patch, fixing the configure script to always install the gtk module to *gtk's* configured library path instead of the one passed to ./configure; and changes to the Debian packaging to always build against the multiarch-enabled version of gtk. Author: Steve Langasek <[email protected]> --- configure.ac | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 74f6d93..964ca26 100644 --- a/configure.ac +++ b/configure.ac @@ -187,7 +187,8 @@ fi if test x"$enable_gtk2" = x"yes"; then # check for gdk2 gtk2_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` - GTK2_IM_MODULEDIR="$libdir"/gtk-2.0/$gtk2_binary_version/immodules + gtk2_libdir=`$PKG_CONFIG --variable=libdir gtk+-2.0` + GTK2_IM_MODULEDIR="$gtk2_libdir"/gtk-2.0/$gtk2_binary_version/immodules PKG_CHECK_MODULES(GDK2, [ gdk-2.0 @@ -203,7 +204,8 @@ if test x"$enable_gtk3" = x"yes"; then ]) gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` - GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules + gtk3_libdir=`$PKG_CONFIG --variable=libdir gtk+-3.0` + GTK3_IM_MODULEDIR="$gtk3_libdir"/gtk-3.0/$gtk3_binary_version/immodules PKG_CHECK_MODULES(GDK3, [ gdk-3.0 -- 1.7.8.3
From e246ff15857aed0242cd3d4f8344b4ee9ee9d99c Mon Sep 17 00:00:00 2001 From: Osamu Aoki <[email protected]> Date: Tue, 31 Jan 2012 22:17:24 +0900 Subject: [PATCH 3/4] Debian multiarch support patch The upstream build was not expecting the triplet in the libexec directory, so the pkglibexec directory wasn't being used for executables when moving libdir for Multi-Arch. Author: Kees Cook <[email protected]> Above patch adopted to the latest 1.4.1 candidate code. Further analogus changes were also made. ibus.spec.in and comment in src/ibuscomponent.h are untouched. Author: Osamu Aoki <[email protected]> --- bus/Makefile.am | 2 +- bus/main.c | 2 +- client/x11/Makefile.am | 2 +- conf/dconf/Makefile.am | 4 ++-- conf/dconf/dconf.xml.in.in | 2 +- conf/gconf/Makefile.am | 4 ++-- conf/gconf/gconf.xml.in.in | 2 +- conf/memconf/Makefile.am | 4 ++-- conf/memconf/memconf.xml.in.in | 2 +- engine/Makefile.am | 6 +++--- engine/gensimple.py | 2 +- engine/simple.xml.in.in | 2 +- setup/ibus-setup.in | 4 ++-- setup/main.py | 4 ++-- tools/Makefile.am | 2 +- ui/gtk2/Makefile.am | 4 ++-- ui/gtk2/gtkpanel.xml.in.in | 2 +- ui/gtk3/Makefile.am | 6 +++--- ui/gtk3/gtkpanel.xml.in.in | 2 +- 19 files changed, 29 insertions(+), 29 deletions(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index 2b619ed..7ec3fe4 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -35,7 +35,7 @@ AM_CFLAGS = \ @GTHREAD2_CFLAGS@ \ -DG_LOG_DOMAIN=\"IBUS\" \ -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ + -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ -DBINDIR=\"@bindir@\" \ -DIBUS_DISABLE_DEPRECATED \ $(INCLUDES) \ diff --git a/bus/main.c b/bus/main.c index d59b5b7..ace4a44 100644 --- a/bus/main.c +++ b/bus/main.c @@ -276,7 +276,7 @@ main (gint argc, gchar **argv) /* execute ibus xim server */ if (xim) { - if (!execute_cmdline (LIBEXECDIR "/ibus-x11 --kill-daemon")) + if (!execute_cmdline (PKGLIBEXECDIR "/ibus-x11 --kill-daemon")) exit (-1); } diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index 91d97dd..6046a15 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -24,7 +24,7 @@ libIMdkit = $(top_builddir)/util/IMdkit/libIMdkit.la libibus = $(top_builddir)/src/libibus-@[email protected] -libexec_PROGRAMS = ibus-x11 +pkglibexec_PROGRAMS = ibus-x11 ibus_x11_SOURCES = \ main.c \ diff --git a/conf/dconf/Makefile.am b/conf/dconf/Makefile.am index 148ba62..b9b9888 100644 --- a/conf/dconf/Makefile.am +++ b/conf/dconf/Makefile.am @@ -22,7 +22,7 @@ libibus = $(top_builddir)/src/libibus-@[email protected] -libexec_PROGRAMS = \ +pkglibexec_PROGRAMS = \ ibus-dconf \ $(NULL) @@ -72,7 +72,7 @@ EXTRA_DIST = \ dconf.xml: dconf.xml.in $(AM_V_GEN) \ ( \ - libexecdir=${libexecdir}; \ + pkglibexecdir=${pkglibexecdir}; \ s=`cat $<`; \ eval "echo \"$${s}\""; \ ) > $@ diff --git a/conf/dconf/dconf.xml.in.in b/conf/dconf/dconf.xml.in.in index 0367008..3e7f761 100644 --- a/conf/dconf/dconf.xml.in.in +++ b/conf/dconf/dconf.xml.in.in @@ -3,7 +3,7 @@ <component> <name>org.freedesktop.IBus.Config</name> <description>Dconf Config Component</description> - <exec>${libexecdir}/ibus-dconf</exec> + <exec>${pkglibexecdir}/ibus-dconf</exec> <version>@VERSION@</version> <author>Daiki Ueno <[email protected]></author> <license>GPL</license> diff --git a/conf/gconf/Makefile.am b/conf/gconf/Makefile.am index cf74a4a..de07fae 100644 --- a/conf/gconf/Makefile.am +++ b/conf/gconf/Makefile.am @@ -22,7 +22,7 @@ libibus = $(top_builddir)/src/libibus-@[email protected] -libexec_PROGRAMS = \ +pkglibexec_PROGRAMS = \ ibus-gconf \ $(NULL) @@ -68,7 +68,7 @@ EXTRA_DIST = \ gconf.xml: gconf.xml.in $(AM_V_GEN) \ ( \ - libexecdir=${libexecdir}; \ + pkglibexecdir=${pkglibexecdir}; \ s=`cat $<`; \ eval "echo \"$${s}\""; \ ) > $@ diff --git a/conf/gconf/gconf.xml.in.in b/conf/gconf/gconf.xml.in.in index 0644d7e..84b7735 100644 --- a/conf/gconf/gconf.xml.in.in +++ b/conf/gconf/gconf.xml.in.in @@ -3,7 +3,7 @@ <component> <name>org.freedesktop.IBus.Config</name> <description>GConf Config Component</description> - <exec>${libexecdir}/ibus-gconf</exec> + <exec>${pkglibexecdir}/ibus-gconf</exec> <version>@VERSION@</version> <author>Peng Huang <[email protected]></author> <license>GPL</license> diff --git a/conf/memconf/Makefile.am b/conf/memconf/Makefile.am index f5f5c08..e370641 100644 --- a/conf/memconf/Makefile.am +++ b/conf/memconf/Makefile.am @@ -22,7 +22,7 @@ libibus = $(top_builddir)/src/libibus-@[email protected] -libexec_PROGRAMS = \ +pkglibexec_PROGRAMS = \ ibus-memconf \ $(NULL) @@ -65,7 +65,7 @@ EXTRA_DIST = \ memconf.xml: memconf.xml.in $(AM_V_GEN) \ ( \ - libexecdir=${libexecdir}; \ + pkglibexecdir=${pkglibexecdir}; \ s=`cat $<`; \ eval "echo \"$${s}\""; \ ) > $@ diff --git a/conf/memconf/memconf.xml.in.in b/conf/memconf/memconf.xml.in.in index b60dbf2..f0207de 100644 --- a/conf/memconf/memconf.xml.in.in +++ b/conf/memconf/memconf.xml.in.in @@ -2,7 +2,7 @@ <component> <name>org.freedesktop.IBus.Config</name> <description>On-memory Config Component</description> - <exec>${libexecdir}/ibus-memconf</exec> + <exec>${pkglibexecdir}/ibus-memconf</exec> <version>@VERSION@</version> <author>Peng Huang <[email protected]>, modified by the Chromium OS Authors</author> <license>GPL</license> diff --git a/engine/Makefile.am b/engine/Makefile.am index b3b46be..cf313d4 100644 --- a/engine/Makefile.am +++ b/engine/Makefile.am @@ -34,7 +34,7 @@ AM_CFLAGS = \ $(INCLUDES) \ -DG_LOG_DOMAIN=\"IBUS\" \ -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ + -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ -DBINDIR=\"@bindir@\" \ -DIBUS_DISABLE_DEPRECATED \ -Wno-unused-variable \ @@ -55,7 +55,7 @@ AM_VALAFLAGS = \ --pkg=ibus-1.0 \ $(NULL) -libexec_PROGRAMS = \ +pkglibexec_PROGRAMS = \ ibus-engine-simple \ $(NULL) @@ -89,7 +89,7 @@ EXTRA_DIST = \ simple.xml: simple.xml.in $(AM_V_GEN) \ ( \ - libexecdir=${libexecdir}; \ + pkglibexecdir=${pkglibexecdir}; \ s=`cat $<`; \ eval "echo \"$${s}\""; \ ) > $@ diff --git a/engine/gensimple.py b/engine/gensimple.py index 9664fa3..77ea133 100644 --- a/engine/gensimple.py +++ b/engine/gensimple.py @@ -66,7 +66,7 @@ def gen_xml(): header = u"""<component> <name>org.freedesktop.IBus.Simple</name> <description>A table based simple engine</description> - <exec>${libexecdir}/ibus-engine-simple</exec> + <exec>${pkglibexecdir}/ibus-engine-simple</exec> <version>@VERSION@</version> <author>Peng Huang <[email protected]></author> <license>GPL</license> diff --git a/engine/simple.xml.in.in b/engine/simple.xml.in.in index 9ad7dcb..6f90c29 100644 --- a/engine/simple.xml.in.in +++ b/engine/simple.xml.in.in @@ -1,7 +1,7 @@ <component> <name>org.freedesktop.IBus.Simple</name> <description>A table based simple engine</description> - <exec>${libexecdir}/ibus-engine-simple</exec> + <exec>${pkglibexecdir}/ibus-engine-simple</exec> <version>@VERSION@</version> <author>Peng Huang <[email protected]></author> <license>GPL</license> diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in index f3c3730..3f800d1 100644 --- a/setup/ibus-setup.in +++ b/setup/ibus-setup.in @@ -23,10 +23,10 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ datarootdir=@datarootdir@ -libexecdir=@libexecdir@ +pkglibexecdir=@pkglibexecdir@ export IBUS_PREFIX=@prefix@ export IBUS_DATAROOTDIR=@datarootdir@ export IBUS_LOCALEDIR=@localedir@ -export IBUS_LIBEXECDIR=${libexecdir} +export IBUS_PKGLIBEXECDIR=${pkglibexecdir} exec @PYTHON@ @prefix@/share/ibus/setup/main.py $@ diff --git a/setup/main.py b/setup/main.py index 7cd3e37..0b07c9b 100644 --- a/setup/main.py +++ b/setup/main.py @@ -255,8 +255,8 @@ class Setup(object): args.insert(1, path.basename(args[0])) return args name = str(engine.name) - libexecdir = os.environ['IBUS_LIBEXECDIR'] - setup_path = (libexecdir + '/' + 'ibus-setup-' if libexecdir != None \ + pkglibexecdir = os.environ['IBUS_PKGLIBEXECDIR'] + setup_path = (pkglibexecdir + '/' + 'ibus-setup-' if pkglibexecdir != None \ else 'ibus-setup-') + name.split(':')[0] if path.exists(setup_path): args.append(setup_path) diff --git a/tools/Makefile.am b/tools/Makefile.am index cd53255..b03fe48 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,7 +36,7 @@ AM_CFLAGS = \ $(INCLUDES) \ -DG_LOG_DOMAIN=\"IBUS\" \ -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ + -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ -DBINDIR=\"@bindir@\" \ -DIBUS_DISABLE_DEPRECATED \ -Wno-unused-variable \ diff --git a/ui/gtk2/Makefile.am b/ui/gtk2/Makefile.am index 1f19748..b484f91 100644 --- a/ui/gtk2/Makefile.am +++ b/ui/gtk2/Makefile.am @@ -36,7 +36,7 @@ ui_gtk_PYTHON = \ $(NULL) ui_gtkdir = $(pkgdatadir)/ui/gtk -libexec_SCRIPTS = \ +pkglibexec_SCRIPTS = \ ibus-ui-gtk \ $(NULL) @@ -58,7 +58,7 @@ EXTRA_DIST = \ gtkpanel.xml: gtkpanel.xml.in $(AM_V_GEN) \ ( \ - libexecdir=${libexecdir}; \ + pkglibexecdir=${pkglibexecdir}; \ s=`cat $<`; \ eval "echo \"$${s}\""; \ ) > $@ diff --git a/ui/gtk2/gtkpanel.xml.in.in b/ui/gtk2/gtkpanel.xml.in.in index edeed1c..51cf8db 100644 --- a/ui/gtk2/gtkpanel.xml.in.in +++ b/ui/gtk2/gtkpanel.xml.in.in @@ -3,7 +3,7 @@ <component> <name>org.freedesktop.IBus.Panel</name> <description>Gtk Panel Component</description> - <exec>${libexecdir}/ibus-ui-gtk</exec> + <exec>${pkglibexecdir}/ibus-ui-gtk</exec> <version>@VERSION@</version> <author>Peng Huang <[email protected]></author> <license>GPL</license> diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am index 0fb9d3c..9f504d0 100644 --- a/ui/gtk3/Makefile.am +++ b/ui/gtk3/Makefile.am @@ -32,7 +32,7 @@ componentdir = $(pkgdatadir)/component gtkpanel.xml: gtkpanel.xml.in $(AM_V_GEN) \ ( \ - libexecdir=${libexecdir}; \ + pkglibexecdir=${pkglibexecdir}; \ s=`cat $<`; \ eval "echo \"$${s}\""; \ ) > $@ @@ -52,7 +52,7 @@ AM_CFLAGS = \ -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \ -DG_LOG_DOMAIN=\"IBUS\" \ -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ + -DPKGLIBEXECDIR=\"$(pkglibexecdir)\" \ -DBINDIR=\"@bindir@\" \ -DIBUS_DISABLE_DEPRECATED \ -DIBUS_VERSION=\"@IBUS_VERSION@\" \ @@ -80,7 +80,7 @@ AM_VALAFLAGS = \ --pkg=ibus-1.0 \ $(NULL) -libexec_PROGRAMS = ibus-ui-gtk3 +pkglibexec_PROGRAMS = ibus-ui-gtk3 ibus_ui_gtk3_SOURCES = \ application.vala \ diff --git a/ui/gtk3/gtkpanel.xml.in.in b/ui/gtk3/gtkpanel.xml.in.in index c480bcd..fa52a79 100644 --- a/ui/gtk3/gtkpanel.xml.in.in +++ b/ui/gtk3/gtkpanel.xml.in.in @@ -3,7 +3,7 @@ <component> <name>org.freedesktop.IBus.Panel</name> <description>Gtk Panel Component</description> - <exec>${libexecdir}/ibus-ui-gtk3</exec> + <exec>${pkglibexecdir}/ibus-ui-gtk3</exec> <version>@VERSION@</version> <author>Peng Huang <[email protected]></author> <license>GPL</license> -- 1.7.8.3
From 4596434fb3f63eb3ef906620a6b92984cff76481 Mon Sep 17 00:00:00 2001 From: Osamu Aoki <[email protected]> Date: Tue, 31 Jan 2012 23:02:00 +0900 Subject: [PATCH 4/4] Workaround for the automake1.11-2 bug This works around the automake bug in the automake1.11-2 which does not recognize the prefix/primary combination `pkglibexec_SCRIPTS' as valid. This bug was fixed in the automake1.11-2b release. Author: Aron Xu <[email protected]>, Daiki Ueno <[email protected]>, Osamu Aoki <[email protected]> --- ui/gtk2/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ui/gtk2/Makefile.am b/ui/gtk2/Makefile.am index b484f91..26217e5 100644 --- a/ui/gtk2/Makefile.am +++ b/ui/gtk2/Makefile.am @@ -36,7 +36,8 @@ ui_gtk_PYTHON = \ $(NULL) ui_gtkdir = $(pkgdatadir)/ui/gtk -pkglibexec_SCRIPTS = \ +ibusuigtkdir = $(pkglibexecdir) +dist_ibusuigtk_SCRIPTS = \ ibus-ui-gtk \ $(NULL) -- 1.7.8.3
signature.asc
Description: Digital signature
