summaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-06-17 15:36:32 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-06-17 15:36:32 +0800
commit83fe6ebf2cb983e46f7ffd13d503ef938ce28780 (patch)
tree5b8d479f7da0b29268d688199d8e30798a833e4e /textproc
parentbf43eda91a534031546fd3faba9cd8ab69515bb2 (diff)
downloadmarcuscom-ports-83fe6ebf2cb983e46f7ffd13d503ef938ce28780.tar
marcuscom-ports-83fe6ebf2cb983e46f7ffd13d503ef938ce28780.tar.gz
marcuscom-ports-83fe6ebf2cb983e46f7ffd13d503ef938ce28780.tar.bz2
marcuscom-ports-83fe6ebf2cb983e46f7ffd13d503ef938ce28780.tar.lz
marcuscom-ports-83fe6ebf2cb983e46f7ffd13d503ef938ce28780.tar.xz
marcuscom-ports-83fe6ebf2cb983e46f7ffd13d503ef938ce28780.tar.zst
marcuscom-ports-83fe6ebf2cb983e46f7ffd13d503ef938ce28780.zip
Fix build on 9.x and 8.x. Our old gcc can't grok some things.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18538 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'textproc')
-rw-r--r--textproc/ibus/Makefile3
-rw-r--r--textproc/ibus/files/patch-client_gtk2_ibusimcontext.c30
-rw-r--r--textproc/ibus/files/patch-client_gtk3_ibusimcontext.c30
3 files changed, 63 insertions, 0 deletions
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 705721cf3..4b81a3ecd 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -87,6 +87,9 @@ post-patch:
# @${REINPLACE_CMD} -e 's|import locale|import gettext|g' ${WRKSRC}/ui/gtk/main.py
@${REINPLACE_CMD} -e 's|setpgrp ()|setpgrp (0,0)|g' ${WRKSRC}/bus/main.c
@${REINPLACE_CMD} -e 's|/var/lib/dbus|/var/db/dbus|g' ${WRKSRC}/src/ibusshare.c #devel/dbus/files/dbus.in
+ @${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
+ ${WRKSRC}/engine/Makefile.in ${WRKSRC}/tools/Makefile.in \
+ ${WRKSRC}/ui/gtk3/Makefile.in
post-install:
@${MKDIR} ${PREFIX}/etc/xdg/autostart
diff --git a/textproc/ibus/files/patch-client_gtk2_ibusimcontext.c b/textproc/ibus/files/patch-client_gtk2_ibusimcontext.c
new file mode 100644
index 000000000..fb6e8477a
--- /dev/null
+++ b/textproc/ibus/files/patch-client_gtk2_ibusimcontext.c
@@ -0,0 +1,30 @@
+--- client/gtk2/ibusimcontext.c.orig 2013-06-17 07:23:04.000000000 +0000
++++ client/gtk2/ibusimcontext.c 2013-06-17 07:23:32.000000000 +0000
+@@ -563,10 +563,10 @@
+
+ /* always install snooper */
+ if (_key_snooper_id == 0) {
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#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
++//#pragma GCC diagnostic pop
+ }
+
+ _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+@@ -583,10 +583,10 @@
+ {
+ if (_key_snooper_id != 0) {
+ IDEBUG ("snooper is terminated.");
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic push
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ gtk_key_snooper_remove (_key_snooper_id);
+-#pragma GCC diagnostic pop
++//#pragma GCC diagnostic pop
+ _key_snooper_id = 0;
+ }
+
diff --git a/textproc/ibus/files/patch-client_gtk3_ibusimcontext.c b/textproc/ibus/files/patch-client_gtk3_ibusimcontext.c
new file mode 100644
index 000000000..9da2574c3
--- /dev/null
+++ b/textproc/ibus/files/patch-client_gtk3_ibusimcontext.c
@@ -0,0 +1,30 @@
+--- client/gtk3/ibusimcontext.c.orig 2013-04-17 01:31:01.000000000 +0000
++++ client/gtk3/ibusimcontext.c 2013-06-17 07:23:44.000000000 +0000
+@@ -563,10 +563,10 @@
+
+ /* always install snooper */
+ if (_key_snooper_id == 0) {
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#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
++//#pragma GCC diagnostic pop
+ }
+
+ _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+@@ -583,10 +583,10 @@
+ {
+ if (_key_snooper_id != 0) {
+ IDEBUG ("snooper is terminated.");
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
++//#pragma GCC diagnostic push
++//#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ gtk_key_snooper_remove (_key_snooper_id);
+-#pragma GCC diagnostic pop
++//#pragma GCC diagnostic pop
+ _key_snooper_id = 0;
+ }
+