Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -1,18 +1,13 @@
# $NetBSD: Makefile,v 1.28 2013/06/06 12:54:36 wiz Exp $
#
# $NetBSD: Makefile,v 1.35.2.1 2014/04/08 19:49:59 tron Exp $
DISTNAME= ibus-1.4.2
PKGREVISION= 9
CATEGORIES= inputmethod
MASTER_SITES= http://ibus.googlecode.com/files/
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.5.4
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://code.google.com/p/ibus/
.include "Makefile.common"
PKGREVISION= 1
COMMENT= Intelligent Input Bus
LICENSE= gnu-lgpl-v2.1
DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
DEPENDS+= ${PYPKGPREFIX}-notify-python>=0.1.1nb3:../../sysutils/py-notify-python
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -25,9 +20,12 @@ PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ARGS+= --enable-dconf
CONFIGURE_ARGS+= --enable-gconf
CONFIGURE_ARGS+= --enable-gtk2
CONFIGURE_ARGS+= --disable-gtk3
CONFIGURE_ARGS+= --enable-gtk3
CONFIGURE_ARGS+= --enable-surrounding-text
CONFIGURE_ARGS+= --enable-introspection=yes
SUBST_CLASSES+= dbus
SUBST_STAGE.dbus= post-configure
@@ -35,21 +33,39 @@ SUBST_FILES.dbus= src/ibusshare.c
SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/db/dbus/machine-id,g'
BUILD_DEFS+= PKG_SYSCONFBASE VARBASE
MANCOMPRESSED= yes
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/ibus
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/db/ibus.d
MAKE_DIRS+= ${PKG_SYSCONFDIR}/dconf/profile
CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/db/ibus.d/00-upstream-settings \
${PKG_SYSCONFDIR}/dconf/db/ibus.d/00-upstream-settings
CONF_FILES+= ${PREFIX}/share/examples/ibus/dconf/profile/ibus \
${PKG_SYSCONFDIR}/dconf/profile/ibus
.include "../../mk/compiler.mk"
.if !empty(CC_VERSION:Mgcc-4.1.[0-9]*)
BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable
.endif
BUILDLINK_API_DEPENDS.GConf+= GConf>=2.12
.include "../../devel/GConf/schemas.mk"
.include "../../devel/glib2/schemas.mk"
.include "../../devel/dconf/buildlink3.mk"
BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.6
BUILDLINK_DEPMETHOD.gobject-introspection+= build
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
PY_PATCHPLIST= yes
.include "../../lang/python/extension.mk"
BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.83.0
.include "../../sysutils/py-dbus/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
GTK2_IMMODULES= yes
.include "../../x11/gtk2/modules.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
GTK3_IMMODULES= yes
.include "../../x11/gtk3/modules.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"

View File

@@ -0,0 +1,15 @@
# $NetBSD: Makefile.common,v 1.2 2014/01/16 11:04:26 obache Exp $
#
# used by inputmethod/ibus/Makefile
# used by inputmethod/ibus-python/Makefile
DISTNAME= ibus-1.5.5
CATEGORIES= inputmethod
MASTER_SITES= http://ibus.googlecode.com/files/
DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo
PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://code.google.com/p/ibus/
LICENSE= gnu-lgpl-v2.1

View File

@@ -1,4 +1,5 @@
@comment $NetBSD: PLIST,v 1.2 2012/04/22 13:57:30 obache Exp $
@comment $NetBSD: PLIST,v 1.4 2014/01/16 11:04:26 obache Exp $
bin/ibus
bin/ibus-daemon
bin/ibus-setup
include/ibus-1.0/ibus.h
@@ -11,6 +12,7 @@ include/ibus-1.0/ibusconfigservice.h
include/ibus-1.0/ibusdebug.h
include/ibus-1.0/ibusengine.h
include/ibus-1.0/ibusenginedesc.h
include/ibus-1.0/ibusenginesimple.h
include/ibus-1.0/ibusenumtypes.h
include/ibus-1.0/ibuserror.h
include/ibus-1.0/ibusfactory.h
@@ -18,6 +20,7 @@ include/ibus-1.0/ibushotkey.h
include/ibus-1.0/ibusinputcontext.h
include/ibus-1.0/ibuskeymap.h
include/ibus-1.0/ibuskeys.h
include/ibus-1.0/ibuskeysyms-compat.h
include/ibus-1.0/ibuskeysyms.h
include/ibus-1.0/ibuslookuptable.h
include/ibus-1.0/ibusobject.h
@@ -26,6 +29,7 @@ include/ibus-1.0/ibuspanelservice.h
include/ibus-1.0/ibusproperty.h
include/ibus-1.0/ibusproplist.h
include/ibus-1.0/ibusproxy.h
include/ibus-1.0/ibusregistry.h
include/ibus-1.0/ibusserializable.h
include/ibus-1.0/ibusservice.h
include/ibus-1.0/ibusshare.h
@@ -34,120 +38,27 @@ include/ibus-1.0/ibustypes.h
include/ibus-1.0/ibusutil.h
include/ibus-1.0/ibusversion.h
include/ibus-1.0/ibusxml.h
lib/girepository-1.0/IBus-1.0.typelib
lib/gtk-2.0/2.10.0/immodules/im-ibus.la
lib/gtk-3.0/3.0.0/immodules/im-ibus.la
lib/libibus-1.0.la
lib/pkgconfig/ibus-1.0.pc
${PYSITELIB}/ibus/__init__.py
${PYSITELIB}/ibus/__init__.pyc
${PYSITELIB}/ibus/__init__.pyo
${PYSITELIB}/ibus/_config.py
${PYSITELIB}/ibus/_config.pyc
${PYSITELIB}/ibus/_config.pyo
${PYSITELIB}/ibus/_gtk.py
${PYSITELIB}/ibus/_gtk.pyc
${PYSITELIB}/ibus/_gtk.pyo
${PYSITELIB}/ibus/application.py
${PYSITELIB}/ibus/application.pyc
${PYSITELIB}/ibus/application.pyo
${PYSITELIB}/ibus/ascii.py
${PYSITELIB}/ibus/ascii.pyc
${PYSITELIB}/ibus/ascii.pyo
${PYSITELIB}/ibus/attribute.py
${PYSITELIB}/ibus/attribute.pyc
${PYSITELIB}/ibus/attribute.pyo
${PYSITELIB}/ibus/bus.py
${PYSITELIB}/ibus/bus.pyc
${PYSITELIB}/ibus/bus.pyo
${PYSITELIB}/ibus/common.py
${PYSITELIB}/ibus/common.pyc
${PYSITELIB}/ibus/common.pyo
${PYSITELIB}/ibus/component.py
${PYSITELIB}/ibus/component.pyc
${PYSITELIB}/ibus/component.pyo
${PYSITELIB}/ibus/config.py
${PYSITELIB}/ibus/config.pyc
${PYSITELIB}/ibus/config.pyo
${PYSITELIB}/ibus/engine.py
${PYSITELIB}/ibus/engine.pyc
${PYSITELIB}/ibus/engine.pyo
${PYSITELIB}/ibus/enginedesc.py
${PYSITELIB}/ibus/enginedesc.pyc
${PYSITELIB}/ibus/enginedesc.pyo
${PYSITELIB}/ibus/exception.py
${PYSITELIB}/ibus/exception.pyc
${PYSITELIB}/ibus/exception.pyo
${PYSITELIB}/ibus/factory.py
${PYSITELIB}/ibus/factory.pyc
${PYSITELIB}/ibus/factory.pyo
${PYSITELIB}/ibus/inputcontext.py
${PYSITELIB}/ibus/inputcontext.pyc
${PYSITELIB}/ibus/inputcontext.pyo
${PYSITELIB}/ibus/interface/__init__.py
${PYSITELIB}/ibus/interface/__init__.pyc
${PYSITELIB}/ibus/interface/__init__.pyo
${PYSITELIB}/ibus/interface/iconfig.py
${PYSITELIB}/ibus/interface/iconfig.pyc
${PYSITELIB}/ibus/interface/iconfig.pyo
${PYSITELIB}/ibus/interface/iengine.py
${PYSITELIB}/ibus/interface/iengine.pyc
${PYSITELIB}/ibus/interface/iengine.pyo
${PYSITELIB}/ibus/interface/ienginefactory.py
${PYSITELIB}/ibus/interface/ienginefactory.pyc
${PYSITELIB}/ibus/interface/ienginefactory.pyo
${PYSITELIB}/ibus/interface/iibus.py
${PYSITELIB}/ibus/interface/iibus.pyc
${PYSITELIB}/ibus/interface/iibus.pyo
${PYSITELIB}/ibus/interface/iinputcontext.py
${PYSITELIB}/ibus/interface/iinputcontext.pyc
${PYSITELIB}/ibus/interface/iinputcontext.pyo
${PYSITELIB}/ibus/interface/inotifications.py
${PYSITELIB}/ibus/interface/inotifications.pyc
${PYSITELIB}/ibus/interface/inotifications.pyo
${PYSITELIB}/ibus/interface/ipanel.py
${PYSITELIB}/ibus/interface/ipanel.pyc
${PYSITELIB}/ibus/interface/ipanel.pyo
${PYSITELIB}/ibus/keysyms.py
${PYSITELIB}/ibus/keysyms.pyc
${PYSITELIB}/ibus/keysyms.pyo
${PYSITELIB}/ibus/lang.py
${PYSITELIB}/ibus/lang.pyc
${PYSITELIB}/ibus/lang.pyo
${PYSITELIB}/ibus/lookuptable.py
${PYSITELIB}/ibus/lookuptable.pyc
${PYSITELIB}/ibus/lookuptable.pyo
${PYSITELIB}/ibus/modifier.py
${PYSITELIB}/ibus/modifier.pyc
${PYSITELIB}/ibus/modifier.pyo
${PYSITELIB}/ibus/notifications.py
${PYSITELIB}/ibus/notifications.pyc
${PYSITELIB}/ibus/notifications.pyo
${PYSITELIB}/ibus/object.py
${PYSITELIB}/ibus/object.pyc
${PYSITELIB}/ibus/object.pyo
${PYSITELIB}/ibus/observedpath.py
${PYSITELIB}/ibus/observedpath.pyc
${PYSITELIB}/ibus/observedpath.pyo
${PYSITELIB}/ibus/panel.py
${PYSITELIB}/ibus/panel.pyc
${PYSITELIB}/ibus/panel.pyo
${PYSITELIB}/ibus/property.py
${PYSITELIB}/ibus/property.pyc
${PYSITELIB}/ibus/property.pyo
${PYSITELIB}/ibus/serializable.py
${PYSITELIB}/ibus/serializable.pyc
${PYSITELIB}/ibus/serializable.pyo
${PYSITELIB}/ibus/text.py
${PYSITELIB}/ibus/text.pyc
${PYSITELIB}/ibus/text.pyo
${PYSITELIB}/ibus/utility.py
${PYSITELIB}/ibus/utility.pyc
${PYSITELIB}/ibus/utility.pyo
libexec/ibus-dconf
libexec/ibus-engine-simple
libexec/ibus-gconf
libexec/ibus-ui-gtk
libexec/ibus-ui-gtk3
libexec/ibus-x11
man/man1/ibus-daemon.1
man/man1/ibus-setup.1
man/man1/ibus.1
share/GConf/gsettings/ibus.convert
share/applications/ibus-setup.desktop
share/applications/ibus.desktop
share/bash-completion/completions/ibus.bash
share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
share/examples/ibus/dconf/profile/ibus
share/gconf/schemas/ibus.schemas
share/gir-1.0/IBus-1.0.gir
share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
share/gtk-doc/html/ibus/IBusAttrList.html
share/gtk-doc/html/ibus/IBusAttribute.html
share/gtk-doc/html/ibus/IBusBus.html
@@ -167,9 +78,13 @@ share/gtk-doc/html/ibus/IBusPanelService.html
share/gtk-doc/html/ibus/IBusPropList.html
share/gtk-doc/html/ibus/IBusProperty.html
share/gtk-doc/html/ibus/IBusProxy.html
share/gtk-doc/html/ibus/IBusRegistry.html
share/gtk-doc/html/ibus/IBusSerializable.html
share/gtk-doc/html/ibus/IBusService.html
share/gtk-doc/html/ibus/IBusText.html
share/gtk-doc/html/ibus/annotation-glossary.html
share/gtk-doc/html/ibus/api-index-deprecated.html
share/gtk-doc/html/ibus/api-index-full.html
share/gtk-doc/html/ibus/ch01.html
share/gtk-doc/html/ibus/ch02.html
share/gtk-doc/html/ibus/ch03.html
@@ -177,11 +92,15 @@ share/gtk-doc/html/ibus/ch04.html
share/gtk-doc/html/ibus/ch05.html
share/gtk-doc/html/ibus/ch06.html
share/gtk-doc/html/ibus/home.png
share/gtk-doc/html/ibus/ibus-IBusEngineSimple.html
share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
share/gtk-doc/html/ibus/ibus-ibusdebug.html
share/gtk-doc/html/ibus/ibus-ibuserror.html
share/gtk-doc/html/ibus/ibus-ibuskeys.html
share/gtk-doc/html/ibus/ibus-ibuskeysyms-compat.html
share/gtk-doc/html/ibus/ibus-ibusshare.html
share/gtk-doc/html/ibus/ibus-ibustypes.html
share/gtk-doc/html/ibus/ibus-ibusutil.html
share/gtk-doc/html/ibus/ibus-ibusversion.html
share/gtk-doc/html/ibus/ibus-ibusxml.html
share/gtk-doc/html/ibus/ibus.devhelp2
@@ -191,8 +110,10 @@ share/gtk-doc/html/ibus/left.png
share/gtk-doc/html/ibus/right.png
share/gtk-doc/html/ibus/style.css
share/gtk-doc/html/ibus/up.png
share/ibus/component/dconf.xml
share/ibus/component/gconf.xml
share/ibus/component/gtkpanel.xml
share/ibus/component/simple.xml
share/ibus/keymaps/common
share/ibus/keymaps/in
share/ibus/keymaps/jp
@@ -221,42 +142,6 @@ share/ibus/setup/main.py
share/ibus/setup/main.pyc
share/ibus/setup/main.pyo
share/ibus/setup/setup.ui
share/ibus/ui/gtk/candidatepanel.py
share/ibus/ui/gtk/candidatepanel.pyc
share/ibus/ui/gtk/candidatepanel.pyo
share/ibus/ui/gtk/engineabout.py
share/ibus/ui/gtk/engineabout.pyc
share/ibus/ui/gtk/engineabout.pyo
share/ibus/ui/gtk/handle.py
share/ibus/ui/gtk/handle.pyc
share/ibus/ui/gtk/handle.pyo
share/ibus/ui/gtk/i18n.py
share/ibus/ui/gtk/i18n.pyc
share/ibus/ui/gtk/i18n.pyo
share/ibus/ui/gtk/icon.py
share/ibus/ui/gtk/icon.pyc
share/ibus/ui/gtk/icon.pyo
share/ibus/ui/gtk/languagebar.py
share/ibus/ui/gtk/languagebar.pyc
share/ibus/ui/gtk/languagebar.pyo
share/ibus/ui/gtk/main.py
share/ibus/ui/gtk/main.pyc
share/ibus/ui/gtk/main.pyo
share/ibus/ui/gtk/menu.py
share/ibus/ui/gtk/menu.pyc
share/ibus/ui/gtk/menu.pyo
share/ibus/ui/gtk/notifications.py
share/ibus/ui/gtk/notifications.pyc
share/ibus/ui/gtk/notifications.pyo
share/ibus/ui/gtk/panel.py
share/ibus/ui/gtk/panel.pyc
share/ibus/ui/gtk/panel.pyo
share/ibus/ui/gtk/propitem.py
share/ibus/ui/gtk/propitem.pyc
share/ibus/ui/gtk/propitem.pyo
share/ibus/ui/gtk/toolitem.py
share/ibus/ui/gtk/toolitem.pyc
share/ibus/ui/gtk/toolitem.pyo
share/icons/hicolor/16x16/apps/ibus-keyboard.png
share/icons/hicolor/22x22/apps/ibus-keyboard.png
share/icons/hicolor/24x24/apps/ibus-keyboard.png
@@ -268,17 +153,22 @@ share/icons/hicolor/scalable/apps/ibus-setup.svg
share/icons/hicolor/scalable/apps/ibus.svg
share/locale/ar/LC_MESSAGES/ibus10.mo
share/locale/as/LC_MESSAGES/ibus10.mo
share/locale/bg/LC_MESSAGES/ibus10.mo
share/locale/bn/LC_MESSAGES/ibus10.mo
share/locale/bn_IN/LC_MESSAGES/ibus10.mo
share/locale/ca/LC_MESSAGES/ibus10.mo
share/locale/da/LC_MESSAGES/ibus10.mo
share/locale/de/LC_MESSAGES/ibus10.mo
share/locale/en_GB/LC_MESSAGES/ibus10.mo
share/locale/es/LC_MESSAGES/ibus10.mo
share/locale/et/LC_MESSAGES/ibus10.mo
share/locale/eu/LC_MESSAGES/ibus10.mo
share/locale/fa/LC_MESSAGES/ibus10.mo
share/locale/fr/LC_MESSAGES/ibus10.mo
share/locale/gu/LC_MESSAGES/ibus10.mo
share/locale/hi/LC_MESSAGES/ibus10.mo
share/locale/hu/LC_MESSAGES/ibus10.mo
share/locale/ia/LC_MESSAGES/ibus10.mo
share/locale/it/LC_MESSAGES/ibus10.mo
share/locale/ja/LC_MESSAGES/ibus10.mo
share/locale/kn/LC_MESSAGES/ibus10.mo
@@ -286,6 +176,7 @@ share/locale/ko/LC_MESSAGES/ibus10.mo
share/locale/lv/LC_MESSAGES/ibus10.mo
share/locale/ml/LC_MESSAGES/ibus10.mo
share/locale/mr/LC_MESSAGES/ibus10.mo
share/locale/nb/LC_MESSAGES/ibus10.mo
share/locale/nl/LC_MESSAGES/ibus10.mo
share/locale/or/LC_MESSAGES/ibus10.mo
share/locale/pa/LC_MESSAGES/ibus10.mo
@@ -302,8 +193,4 @@ share/locale/vi/LC_MESSAGES/ibus10.mo
share/locale/zh_CN/LC_MESSAGES/ibus10.mo
share/locale/zh_HK/LC_MESSAGES/ibus10.mo
share/locale/zh_TW/LC_MESSAGES/ibus10.mo
share/vala/vapi/ibus-1.0.deps
share/vala/vapi/ibus-1.0.vapi
@pkgdir share/pixmaps
@pkgdir share/ibus/icons
@pkgdir share/ibus/engine

View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.6 2012/09/15 10:05:11 obache Exp $
# $NetBSD: buildlink3.mk,v 1.7 2013/10/23 11:50:04 obache Exp $
#
BUILDLINK_TREE+= ibus
@@ -6,8 +6,7 @@ BUILDLINK_TREE+= ibus
.if !defined(IBUS_BUILDLINK3_MK)
IBUS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ibus+= ibus>=1.4.0
BUILDLINK_ABI_DEPENDS.ibus?= ibus>=1.4.2nb2
BUILDLINK_API_DEPENDS.ibus+= ibus>=1.5.0
BUILDLINK_PKGSRCDIR.ibus?= ../../inputmethod/ibus
.include "../../devel/glib2/buildlink3.mk"

View File

@@ -1,5 +1,7 @@
$NetBSD: distinfo,v 1.7 2012/08/23 12:34:14 obache Exp $
$NetBSD: distinfo,v 1.10 2014/01/16 11:04:26 obache Exp $
SHA1 (ibus-1.4.2.tar.gz) = a2d11d8bb64761691df918e9e50f0b35c711760d
RMD160 (ibus-1.4.2.tar.gz) = 88e143fcae7da6bf44b3c9459e0845a104895432
Size (ibus-1.4.2.tar.gz) = 1489482 bytes
SHA1 (ibus-1.5.5.tar.gz) = 5671fe504e65aaf396c1d779032d7526c161b64b
RMD160 (ibus-1.5.5.tar.gz) = d3941dd044886e3946da92b4576b94581a3f8797
Size (ibus-1.5.5.tar.gz) = 2063794 bytes
SHA1 (patch-client_gtk2_ibusimcontext.c) = 31e72d06884858476097f04591004ce46b6074c1
SHA1 (patch-client_gtk3_ibusimcontext.c) = 543192191d14d61ae3e193de6ffda7b099969a1a

View File

@@ -0,0 +1,54 @@
$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.1 2013/11/12 02:57:43 dholland Exp $
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
--- client/gtk2/ibusimcontext.c~ 2013-09-20 03:15:51.000000000 +0000
+++ client/gtk2/ibusimcontext.c
@@ -509,6 +509,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
@@ -593,10 +596,7 @@ ibus_im_context_class_init (IBusIMContex
/* 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,
@@ -607,21 +607,22 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
+#pragma GCC diagnostic pop
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
static void
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;
}
g_bus_unwatch_name (_daemon_name_watch_id);
}
+#pragma GCC diagnostic pop
/* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
* Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */

View File

@@ -0,0 +1,54 @@
$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.1 2013/11/12 02:57:43 dholland Exp $
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
--- client/gtk3/ibusimcontext.c~ 2013-09-20 03:15:51.000000000 +0000
+++ client/gtk3/ibusimcontext.c
@@ -509,6 +509,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
@@ -593,10 +596,7 @@ ibus_im_context_class_init (IBusIMContex
/* 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,
@@ -607,21 +607,22 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
+#pragma GCC diagnostic pop
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
static void
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;
}
g_bus_unwatch_name (_daemon_name_watch_id);
}
+#pragma GCC diagnostic pop
/* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
* Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */