From 11b9dee85ee191994166732f574dca9b96688973 Mon Sep 17 00:00:00 2001 From: fgsch Date: Tue, 7 May 2013 07:59:25 +0000 Subject: [PATCH] update to ibus 1.5.2. ajacoutot@ ok --- inputmethods/ibus/Makefile | 27 +++++++++---------- inputmethods/ibus/distinfo | 4 +-- .../patches/patch-client_gtk2_ibusimcontext_c | 25 +++++++++++++++++ .../patches/patch-client_gtk3_ibusimcontext_c | 25 +++++++++++++++++ .../ibus/patches/patch-engine_Makefile_in | 8 +++--- .../ibus/patches/patch-src_ibusshare_c | 11 ++++---- .../ibus/patches/patch-tools_Makefile_in | 8 +++--- .../ibus/patches/patch-ui_gtk3_Makefile_in | 8 +++--- inputmethods/ibus/pkg/PLIST | 4 +-- 9 files changed, 82 insertions(+), 38 deletions(-) create mode 100644 inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c create mode 100644 inputmethods/ibus/patches/patch-client_gtk3_ibusimcontext_c diff --git a/inputmethods/ibus/Makefile b/inputmethods/ibus/Makefile index 29cf24324e4..94a943d550b 100644 --- a/inputmethods/ibus/Makefile +++ b/inputmethods/ibus/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.35 2013/04/16 10:21:58 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.36 2013/05/07 07:59:25 fgsch Exp $ SHARED_ONLY = Yes COMMENT = intelligent input bus framework -DISTNAME = ibus-1.5.1 -REVISION = 3 +DISTNAME = ibus-1.5.2 -SHARED_LIBS = ibus-1.0 2.0 +SHARED_LIBS = ibus-1.0 3.0 CATEGORIES = inputmethods chinese japanese korean @@ -18,15 +17,14 @@ MAINTAINER = Federico G. Schwindt # LGPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB = GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ - Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 \ - atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 dconf \ - expat ffi fontconfig freetype gdk-3 gdk-x11-2.0 \ - gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \ - gthread-2.0 gtk-3 gtk-x11-2.0 harfbuzz icudata icule \ - icuuc m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \ - pixman-1 png pthread pthread-stubs xcb xcb-render \ - xcb-shm z +WANTLIB = ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \ + Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi \ + c cairo cairo-gobject dbus-1 dconf expat ffi fontconfig \ + freetype gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \ + gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3 \ + gtk-x11-2.0 harfbuzz icudata icule icuuc m pango-1.0 \ + pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread \ + pthread-stubs xcb xcb-render xcb-shm z MASTER_SITES = http://ibus.googlecode.com/files/ @@ -54,8 +52,7 @@ LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --disable-gtk-doc-html \ --enable-introspection \ - --enable-vala \ - --enable-dconf + --enable-vala CONFIGURE_ENV = CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/inputmethods/ibus/distinfo b/inputmethods/ibus/distinfo index 9c4539589c8..18034c39fbb 100644 --- a/inputmethods/ibus/distinfo +++ b/inputmethods/ibus/distinfo @@ -1,2 +1,2 @@ -SHA256 (ibus-1.5.1.tar.gz) = YCOAnO0nlLdfrQfrGx1iiBVLNzkg7NzVFYKkzeTg0Bc= -SIZE (ibus-1.5.1.tar.gz) = 1888861 +SHA256 (ibus-1.5.2.tar.gz) = OU9WU+M2xrwCywVbjqyfDJsqM31YKyeOPoJejPPwIw0= +SIZE (ibus-1.5.2.tar.gz) = 1882764 diff --git a/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c b/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c new file mode 100644 index 00000000000..c08a15ab89a --- /dev/null +++ b/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c @@ -0,0 +1,25 @@ +$OpenBSD: patch-client_gtk2_ibusimcontext_c,v 1.1 2013/05/07 07:59:25 fgsch Exp $ +--- client/gtk2/ibusimcontext.c.orig Fri May 3 10:01:09 2013 ++++ client/gtk2/ibusimcontext.c Fri May 3 10:02:45 2013 +@@ -563,10 +563,7 @@ ibus_im_context_class_init (IBusIMContextClass *class) + + /* always install snooper */ + if (_key_snooper_id == 0) { +-#pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL); +-#pragma GCC diagnostic pop + } + + _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, +@@ -583,10 +580,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class) + { + if (_key_snooper_id != 0) { + IDEBUG ("snooper is terminated."); +-#pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + gtk_key_snooper_remove (_key_snooper_id); +-#pragma GCC diagnostic pop + _key_snooper_id = 0; + } + diff --git a/inputmethods/ibus/patches/patch-client_gtk3_ibusimcontext_c b/inputmethods/ibus/patches/patch-client_gtk3_ibusimcontext_c new file mode 100644 index 00000000000..81651e1170c --- /dev/null +++ b/inputmethods/ibus/patches/patch-client_gtk3_ibusimcontext_c @@ -0,0 +1,25 @@ +$OpenBSD: patch-client_gtk3_ibusimcontext_c,v 1.1 2013/05/07 07:59:25 fgsch Exp $ +--- client/gtk3/ibusimcontext.c.orig Fri May 3 10:02:03 2013 ++++ client/gtk3/ibusimcontext.c Fri May 3 10:02:14 2013 +@@ -563,10 +563,7 @@ ibus_im_context_class_init (IBusIMContextClass *class) + + /* always install snooper */ + if (_key_snooper_id == 0) { +-#pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL); +-#pragma GCC diagnostic pop + } + + _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, +@@ -583,10 +580,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class) + { + if (_key_snooper_id != 0) { + IDEBUG ("snooper is terminated."); +-#pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + gtk_key_snooper_remove (_key_snooper_id); +-#pragma GCC diagnostic pop + _key_snooper_id = 0; + } + diff --git a/inputmethods/ibus/patches/patch-engine_Makefile_in b/inputmethods/ibus/patches/patch-engine_Makefile_in index 6975dee62a4..7d81a344daa 100644 --- a/inputmethods/ibus/patches/patch-engine_Makefile_in +++ b/inputmethods/ibus/patches/patch-engine_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-engine_Makefile_in,v 1.1 2013/01/17 23:31:41 fgsch Exp $ ---- engine/Makefile.in.orig Mon Jan 7 09:34:31 2013 -+++ engine/Makefile.in Mon Jan 7 09:34:33 2013 -@@ -441,7 +441,6 @@ AM_CFLAGS = \ +$OpenBSD: patch-engine_Makefile_in,v 1.2 2013/05/07 07:59:25 fgsch Exp $ +--- engine/Makefile.in.orig Wed Apr 17 02:31:37 2013 ++++ engine/Makefile.in Fri May 3 09:57:54 2013 +@@ -456,7 +456,6 @@ AM_CFLAGS = \ -DBINDIR=\"@bindir@\" \ -DIBUS_DISABLE_DEPRECATED \ -Wno-unused-variable \ diff --git a/inputmethods/ibus/patches/patch-src_ibusshare_c b/inputmethods/ibus/patches/patch-src_ibusshare_c index b37ff99c277..a5962345854 100644 --- a/inputmethods/ibus/patches/patch-src_ibusshare_c +++ b/inputmethods/ibus/patches/patch-src_ibusshare_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_ibusshare_c,v 1.2 2013/01/17 23:31:41 fgsch Exp $ ---- src/ibusshare.c.orig Thu Jan 10 23:07:00 2013 -+++ src/ibusshare.c Thu Jan 10 23:07:14 2013 -@@ -41,15 +41,15 @@ ibus_get_local_machine_id (void) +$OpenBSD: patch-src_ibusshare_c,v 1.3 2013/05/07 07:59:25 fgsch Exp $ +--- src/ibusshare.c.orig Wed Apr 17 02:31:01 2013 ++++ src/ibusshare.c Fri May 3 09:57:54 2013 +@@ -41,7 +41,7 @@ ibus_get_local_machine_id (void) if (machine_id == NULL) { GError *error = NULL; @@ -10,8 +10,7 @@ $OpenBSD: patch-src_ibusshare_c,v 1.2 2013/01/17 23:31:41 fgsch Exp $ &machine_id, NULL, &error) && -- !g_file_get_contents ("/etc/machine-id", -+ !g_file_get_contents ("${SYSCONFDIR}/machine-id", +@@ -49,7 +49,7 @@ ibus_get_local_machine_id (void) &machine_id, NULL, NULL)) { diff --git a/inputmethods/ibus/patches/patch-tools_Makefile_in b/inputmethods/ibus/patches/patch-tools_Makefile_in index a08300c13f9..6aa7115275d 100644 --- a/inputmethods/ibus/patches/patch-tools_Makefile_in +++ b/inputmethods/ibus/patches/patch-tools_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-tools_Makefile_in,v 1.1 2013/01/17 23:31:41 fgsch Exp $ ---- tools/Makefile.in.orig Tue Dec 11 13:48:16 2012 -+++ tools/Makefile.in Mon Jan 7 11:05:03 2013 -@@ -440,7 +440,6 @@ AM_CFLAGS = \ +$OpenBSD: patch-tools_Makefile_in,v 1.2 2013/05/07 07:59:25 fgsch Exp $ +--- tools/Makefile.in.orig Wed Apr 17 02:31:37 2013 ++++ tools/Makefile.in Fri May 3 09:57:54 2013 +@@ -456,7 +456,6 @@ AM_CFLAGS = \ -DG_LOG_DOMAIN=\"IBUS\" \ -DIBUS_DISABLE_DEPRECATED \ -Wno-unused-variable \ diff --git a/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in b/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in index fe8abf09f33..4ba91a34ac1 100644 --- a/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in +++ b/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-ui_gtk3_Makefile_in,v 1.1 2013/01/17 23:31:42 fgsch Exp $ ---- ui/gtk3/Makefile.in.orig Mon Jan 7 09:34:01 2013 -+++ ui/gtk3/Makefile.in Mon Jan 7 09:34:03 2013 -@@ -459,7 +459,6 @@ AM_CFLAGS = \ +$OpenBSD: patch-ui_gtk3_Makefile_in,v 1.2 2013/05/07 07:59:25 fgsch Exp $ +--- ui/gtk3/Makefile.in.orig Wed Apr 17 02:31:37 2013 ++++ ui/gtk3/Makefile.in Fri May 3 09:57:54 2013 +@@ -475,7 +475,6 @@ AM_CFLAGS = \ -DIBUS_DISABLE_DEPRECATED \ -DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \ -Wno-unused-variable \ diff --git a/inputmethods/ibus/pkg/PLIST b/inputmethods/ibus/pkg/PLIST index 61199fa742d..9605e43f209 100644 --- a/inputmethods/ibus/pkg/PLIST +++ b/inputmethods/ibus/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.14 2013/01/23 18:05:57 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.15 2013/05/07 07:59:25 fgsch Exp $ @bin bin/ibus @bin bin/ibus-daemon bin/ibus-setup @@ -208,8 +208,6 @@ share/locale/sr/LC_MESSAGES/ibus10.mo share/locale/sr@latin/LC_MESSAGES/ibus10.mo share/locale/ta/LC_MESSAGES/ibus10.mo share/locale/te/LC_MESSAGES/ibus10.mo -share/locale/tg/ -share/locale/tg/LC_MESSAGES/ share/locale/tg/LC_MESSAGES/ibus10.mo share/locale/uk/LC_MESSAGES/ibus10.mo share/locale/vi/LC_MESSAGES/ibus10.mo