Tested with ibus-anthy and ibus-skk on amd64. OK? f.-
Index: Makefile =================================================================== RCS file: /cvs/ports/inputmethods/ibus/Makefile,v retrieving revision 1.35 diff -u -u -p -r1.35 Makefile --- Makefile 16 Apr 2013 10:21:58 -0000 1.35 +++ Makefile 4 May 2013 12:50:35 -0000 @@ -4,10 +4,9 @@ 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 <fgsch # 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" Index: distinfo =================================================================== RCS file: /cvs/ports/inputmethods/ibus/distinfo,v retrieving revision 1.6 diff -u -u -p -r1.6 distinfo --- distinfo 17 Jan 2013 23:31:41 -0000 1.6 +++ distinfo 4 May 2013 12:50:35 -0000 @@ -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 Index: patches/patch-client_gtk2_ibusimcontext_c =================================================================== RCS file: patches/patch-client_gtk2_ibusimcontext_c diff -N patches/patch-client_gtk2_ibusimcontext_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-client_gtk2_ibusimcontext_c 4 May 2013 12:50:35 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ +--- 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; + } + Index: patches/patch-client_gtk3_ibusimcontext_c =================================================================== RCS file: patches/patch-client_gtk3_ibusimcontext_c diff -N patches/patch-client_gtk3_ibusimcontext_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-client_gtk3_ibusimcontext_c 4 May 2013 12:50:35 -0000 @@ -0,0 +1,25 @@ +$OpenBSD$ +--- 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; + } + Index: patches/patch-engine_Makefile_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-engine_Makefile_in,v retrieving revision 1.1 diff -u -u -p -r1.1 patch-engine_Makefile_in --- patches/patch-engine_Makefile_in 17 Jan 2013 23:31:41 -0000 1.1 +++ patches/patch-engine_Makefile_in 4 May 2013 12:50:35 -0000 @@ -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 = \ +--- 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 \ Index: patches/patch-src_ibusshare_c =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-src_ibusshare_c,v retrieving revision 1.2 diff -u -u -p -r1.2 patch-src_ibusshare_c --- patches/patch-src_ibusshare_c 17 Jan 2013 23:31:41 -0000 1.2 +++ patches/patch-src_ibusshare_c 4 May 2013 12:50:35 -0000 @@ -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) +--- 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 20 &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)) { Index: patches/patch-tools_Makefile_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-tools_Makefile_in,v retrieving revision 1.1 diff -u -u -p -r1.1 patch-tools_Makefile_in --- patches/patch-tools_Makefile_in 17 Jan 2013 23:31:41 -0000 1.1 +++ patches/patch-tools_Makefile_in 4 May 2013 12:50:35 -0000 @@ -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 = \ +--- 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 \ Index: patches/patch-ui_gtk3_Makefile_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in,v retrieving revision 1.1 diff -u -u -p -r1.1 patch-ui_gtk3_Makefile_in --- patches/patch-ui_gtk3_Makefile_in 17 Jan 2013 23:31:42 -0000 1.1 +++ patches/patch-ui_gtk3_Makefile_in 4 May 2013 12:50:36 -0000 @@ -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 = \ +--- 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 \ Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/inputmethods/ibus/pkg/PLIST,v retrieving revision 1.14 diff -u -u -p -r1.14 PLIST --- pkg/PLIST 23 Jan 2013 18:05:57 -0000 1.14 +++ pkg/PLIST 4 May 2013 12:50:36 -0000 @@ -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
