diff options
| author | miwi <miwi@FreeBSD.org> | 2007-12-16 02:18:28 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2007-12-16 02:18:28 +0800 |
| commit | 4d437080012f79f5a087ef2afedabd8df60495de (patch) | |
| tree | ca0a7eec7e3f6bb3b0a3050612534e724a00c1a4 /japanese | |
| parent | 6aee5cbdbcc877e80e392c411b1d7369516fb882 (diff) | |
| download | freebsd-ports-gnome-4d437080012f79f5a087ef2afedabd8df60495de.tar.gz freebsd-ports-gnome-4d437080012f79f5a087ef2afedabd8df60495de.tar.zst freebsd-ports-gnome-4d437080012f79f5a087ef2afedabd8df60495de.zip | |
- Fix build with gcc 4.2
PR: 118526
Submitted by: Yoshihiro Ota <ota@j.email.ne.jp>
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/onew-freewnn/Makefile | 4 | ||||
| -rw-r--r-- | japanese/onew-freewnn/files/patch-gcc42 | 50 | ||||
| -rw-r--r-- | japanese/onew/Makefile | 4 | ||||
| -rw-r--r-- | japanese/onew/files/patch-gcc42 | 50 |
4 files changed, 100 insertions, 8 deletions
diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile index 307238f4064f..d069458e4e11 100644 --- a/japanese/onew-freewnn/Makefile +++ b/japanese/onew-freewnn/Makefile @@ -61,10 +61,6 @@ PORT_DOCDIR= ${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD} .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - post-patch: ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ -e 's,%X11BASE%,${X11BASE},g' \ diff --git a/japanese/onew-freewnn/files/patch-gcc42 b/japanese/onew-freewnn/files/patch-gcc42 new file mode 100644 index 000000000000..689f21801f51 --- /dev/null +++ b/japanese/onew-freewnn/files/patch-gcc42 @@ -0,0 +1,50 @@ +--- engine.orig/Canna.c 1995-06-28 11:13:26.000000000 -0500 ++++ engine/Canna.c 2007-11-12 21:30:29.000000000 -0500 +@@ -33,6 +33,7 @@ + static int ready; + static int CID; + static int nbunsetsu; ++static disp_kanji_buf(); + int ONEW_CannarcDone; + + static ONEWkanakan_ready() +@@ -102,7 +103,6 @@ + int comch; + int rcode; + char yomibuf[1024]; +- static disp_kanji_buf(); + + Onew_setupYomistr(startch,yomi,yomibuf); + yomi = yomibuf; +--- onewlib.c.orig 1995-07-02 02:55:41.000000000 -0500 ++++ onewlib.c 2007-11-12 21:28:01.000000000 -0500 +@@ -50,6 +50,11 @@ + int ONEW_I_SYNC_CHAR = 0xFF; + int ONEW_KK_OPDICT = 'x'; + ++static definedKanamode(); ++static romkan_modesw(); ++static thru_char1(); ++static Onew_kakuteiInRomkan(); ++ + #define MODE_SWITCHER ONEW_MODE_SWITCHER + #define ZENKAKU_TOGGLE ONEW_ZENKAKU_TOGGLE + #define KANA_TOGGLE ONEW_KANA_TOGGLE +@@ -116,9 +121,6 @@ + } + ONEW_getch1(){ + int ch; +- static definedKanamode(); +- static romkan_modesw(); +- static thru_char1(); + + for(;;){ + ch = ONEW_getch0(ONEW_getch_asis); +@@ -313,7 +315,6 @@ + + kget_char1(){ + unsigned int kc; +- static Onew_kakuteiInRomkan(); + + if( !Onew_RK_init() ){ + kc = OnewGetchar(); diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile index 307238f4064f..d069458e4e11 100644 --- a/japanese/onew/Makefile +++ b/japanese/onew/Makefile @@ -61,10 +61,6 @@ PORT_DOCDIR= ${LOCALBASE}/share/doc/ja-onew${INPUT_METHOD} .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 700042 -BROKEN= Broken with gcc 4.2 -.endif - post-patch: ${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \ -e 's,%X11BASE%,${X11BASE},g' \ diff --git a/japanese/onew/files/patch-gcc42 b/japanese/onew/files/patch-gcc42 new file mode 100644 index 000000000000..689f21801f51 --- /dev/null +++ b/japanese/onew/files/patch-gcc42 @@ -0,0 +1,50 @@ +--- engine.orig/Canna.c 1995-06-28 11:13:26.000000000 -0500 ++++ engine/Canna.c 2007-11-12 21:30:29.000000000 -0500 +@@ -33,6 +33,7 @@ + static int ready; + static int CID; + static int nbunsetsu; ++static disp_kanji_buf(); + int ONEW_CannarcDone; + + static ONEWkanakan_ready() +@@ -102,7 +103,6 @@ + int comch; + int rcode; + char yomibuf[1024]; +- static disp_kanji_buf(); + + Onew_setupYomistr(startch,yomi,yomibuf); + yomi = yomibuf; +--- onewlib.c.orig 1995-07-02 02:55:41.000000000 -0500 ++++ onewlib.c 2007-11-12 21:28:01.000000000 -0500 +@@ -50,6 +50,11 @@ + int ONEW_I_SYNC_CHAR = 0xFF; + int ONEW_KK_OPDICT = 'x'; + ++static definedKanamode(); ++static romkan_modesw(); ++static thru_char1(); ++static Onew_kakuteiInRomkan(); ++ + #define MODE_SWITCHER ONEW_MODE_SWITCHER + #define ZENKAKU_TOGGLE ONEW_ZENKAKU_TOGGLE + #define KANA_TOGGLE ONEW_KANA_TOGGLE +@@ -116,9 +121,6 @@ + } + ONEW_getch1(){ + int ch; +- static definedKanamode(); +- static romkan_modesw(); +- static thru_char1(); + + for(;;){ + ch = ONEW_getch0(ONEW_getch_asis); +@@ -313,7 +315,6 @@ + + kget_char1(){ + unsigned int kc; +- static Onew_kakuteiInRomkan(); + + if( !Onew_RK_init() ){ + kc = OnewGetchar(); |