Correct

   error: #pragma GCC diagnostic not allowed inside functions
errors seen in NetBSD-current.

3 files changed, 111 insertions, 1 deletions

diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo
index a7a2f0e94d2..aa71fdb5b5b 100644
--- a/inputmethod/ibus/distinfo
+++ b/inputmethod/ibus/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.8 2013/10/23 11:50:04 obache Exp $
+$NetBSD: distinfo,v 1.9 2013/11/12 02:57:43 dholland Exp $
 
 SHA1 (ibus-1.5.4.tar.gz) = 2ce4b4d728a4685fd77360d0097b0e568f920c7b
 RMD160 (ibus-1.5.4.tar.gz) = cba23cf9b3a76d4303b36f624627c971f0e2ee2d
 Size (ibus-1.5.4.tar.gz) = 2026656 bytes
 SHA1 (patch-bus_Makefile.in) = ff3e7bd794db625021474f00b6776a1ac13c30f7
+SHA1 (patch-client_gtk2_ibusimcontext.c) = 31e72d06884858476097f04591004ce46b6074c1
+SHA1 (patch-client_gtk3_ibusimcontext.c) = 543192191d14d61ae3e193de6ffda7b099969a1a
 SHA1 (patch-setup_Makefile.in) = ba7267525b5410d5081c33cff0e1c8f28b5ad4b2
 SHA1 (patch-tools_Makefile.in) = 0a9275a58e6819b569706dfb58ad5a5f4a976d62
diff --git a/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c b/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c
new file mode 100644
index 00000000000..98581a62b28
--- /dev/null
+++ b/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c
@@ -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. */
diff --git a/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c b/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
new file mode 100644
index 00000000000..d1ba74e7a33
--- /dev/null
+++ b/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
@@ -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. */