cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix build with gcc 4.2

Browse Source 
PR:		118526
Submitted by:	Yoshihiro Ota <ota@j.email.ne.jp>
This commit is contained in:
Martin Wilke 2007-12-15 18:18:28 +00:00
parent c5347d62d6
commit 7804df1d4d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=203756
4 changed files with 100 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
japanese/onew-freewnn/Makefile
View File

@ -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' \

50
japanese/onew-freewnn/files/patch-gcc42 Normal file
View File

@ -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();

4
japanese/onew/Makefile
View File

@ -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' \

50
japanese/onew/files/patch-gcc42 Normal file
View File

@ -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();