diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2004-03-25 15:42:11 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2004-03-25 15:42:11 +0000 |
| commit | 972f6d016396f76d23871896615abc219db0a545 (patch) | |
| tree | d35f2fc814f6ab999bafe073b6588330a2061e9f /japanese | |
| parent | e1726ff240e7e9cb31c13b91c92f6d4bcfe25186 (diff) | |
| download | ports-972f6d016396f76d23871896615abc219db0a545.tar.gz ports-972f6d016396f76d23871896615abc219db0a545.zip | |
Fix build on 4.x by eliminating some C99 constructs (declarations after
statements).
Submitted by: ume
Notes
Notes:
svn path=/head/; revision=105239
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/im-ja/Makefile | 4 | ||||
| -rw-r--r-- | japanese/im-ja/files/patch-src%xim-handler.c | 15 | ||||
| -rw-r--r-- | japanese/im-ja/files/patch-src%xim-ic.c | 16 |
3 files changed, 31 insertions, 4 deletions
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile index b3db17cd9d4a..2952d511a3d4 100644 --- a/japanese/im-ja/Makefile +++ b/japanese/im-ja/Makefile @@ -41,10 +41,6 @@ MAN1= im-ja-conf.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -BROKEN= "Does not compile on 4.x" -.endif - post-install: ${X11BASE}/bin/gtk-query-immodules-2.0 > \ ${X11BASE}/etc/gtk-2.0/gtk.immodules diff --git a/japanese/im-ja/files/patch-src%xim-handler.c b/japanese/im-ja/files/patch-src%xim-handler.c new file mode 100644 index 000000000000..81aa04fd2f02 --- /dev/null +++ b/japanese/im-ja/files/patch-src%xim-handler.c @@ -0,0 +1,15 @@ +Index: src/xim-handler.c +diff -u -p src/xim-handler.c.orig src/xim-handler.c +--- src/xim-handler.c.orig Wed Dec 17 13:17:26 2003 ++++ src/xim-handler.c Wed Mar 24 21:10:11 2004 +@@ -214,8 +214,9 @@ static Bool im_ja_xim_handler_destroy_ic + static Bool im_ja_xim_handler_set_ic_values(XIMS ims, IMProtocol *call_data) { + IMChangeICStruct *data = (IMChangeICStruct *)call_data; + +- IM_JA_DEBUG("im_ja_xim_handler_set_ic_values\n"); + IMJAContext *ic = im_ja_xim_server_get_ic(data->icid); ++ ++ IM_JA_DEBUG("im_ja_xim_handler_set_ic_values\n"); + + if (ic != NULL) im_ja_xim_ic_set_values(ic, data); + diff --git a/japanese/im-ja/files/patch-src%xim-ic.c b/japanese/im-ja/files/patch-src%xim-ic.c new file mode 100644 index 000000000000..6cb073ebd263 --- /dev/null +++ b/japanese/im-ja/files/patch-src%xim-ic.c @@ -0,0 +1,16 @@ +Index: src/xim-ic.c +diff -u -p src/xim-ic.c.orig src/xim-ic.c +--- src/xim-ic.c.orig Wed Dec 17 13:17:26 2003 ++++ src/xim-ic.c Wed Mar 24 21:12:11 2004 +@@ -572,9 +572,9 @@ static void im_ja_xim_ic_set_preedit_bac + + + static void im_ja_xim_ic_load_preedit_fontset(IMJAContext *ic, char *font_name) { +- IM_JA_DEBUG("im_ja_xim_ic_load_preedit_fontset\n"); +- + IMJAXimFontSet *fontset; ++ ++ IM_JA_DEBUG("im_ja_xim_ic_load_preedit_fontset\n"); + + if (ic->preedit.base_font != NULL && strcmp(ic->preedit.base_font, font_name) == 0) { + // same font, do not create fontset |