diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-03-06 04:43:12 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-03-06 04:43:12 +0000 |
commit | 4e8c641bde824cba83af37f7cd5636c5e13b9d5b (patch) | |
tree | 4cdf6a36cce87a373899e506da796b9ba9bc3cfb /app-emulation/wine | |
parent | new diff for vmail.cgi to fully fix bug #111836. (diff) | |
download | historical-4e8c641bde824cba83af37f7cd5636c5e13b9d5b.tar.gz historical-4e8c641bde824cba83af37f7cd5636c5e13b9d5b.tar.bz2 historical-4e8c641bde824cba83af37f7cd5636c5e13b9d5b.zip |
Fix build errors with newer flex #124084.
Package-Manager: portage-2.1_pre5-r4
Diffstat (limited to 'app-emulation/wine')
-rw-r--r-- | app-emulation/wine/ChangeLog | 6 | ||||
-rw-r--r-- | app-emulation/wine/Manifest | 27 | ||||
-rw-r--r-- | app-emulation/wine/files/wine-0.9.9-flex.patch | 185 | ||||
-rw-r--r-- | app-emulation/wine/wine-0.9.8-r1.ebuild | 32 | ||||
-rw-r--r-- | app-emulation/wine/wine-0.9.9.ebuild | 32 |
5 files changed, 237 insertions, 45 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index cf753ad3ca3b..2dbcd84ed6e2 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.132 2006/03/03 01:02:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.133 2006/03/06 04:43:12 vapier Exp $ + + 06 Mar 2006; Mike Frysinger <vapier@gentoo.org> + +files/wine-0.9.9-flex.patch, wine-0.9.8-r1.ebuild, wine-0.9.9.ebuild: + Fix build errors with newer flex #124084. *wine-0.9.9 (03 Mar 2006) diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest index 1ca9c77b5cd5..8eaaceef41f4 100644 --- a/app-emulation/wine/Manifest +++ b/app-emulation/wine/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 0582daf2c393ab077cf9193ffdc8b689 ChangeLog 24379 -RMD160 3be6717dd383825fd6acca5f6297c1edff18ee4c ChangeLog 24379 -SHA256 352b7d8ce3e0118a396c0a8dab89255ca9510107a8110e037821cfa8167d1c21 ChangeLog 24379 +MD5 eac0d810880c290d36e77b778beb498b ChangeLog 24547 +RMD160 342b120079f2322cb91c57fc35c63bf8eba423f3 ChangeLog 24547 +SHA256 e557ed92726a06fbb816628b20001dc068864c4f15fcb2816dbdea0e77133e47 ChangeLog 24547 MD5 fb8724a36ec3bef0ad3a3c36376b786a files/digest-wine-0.9 63 RMD160 e2e2e9e410345effc5472930c8dff010b8cb1116 files/digest-wine-0.9 63 SHA256 05a0841e1f0afa0af868b58819bc9a64e00cab9e6817034a5c93dc4c273b161d files/digest-wine-0.9 63 @@ -73,6 +73,9 @@ SHA256 1de54bb6eb8cc3c3f15ea42f916605fa151a5c33ef8c0cdb3412c0d81bbf9dab files/wi MD5 125d70d60f356673616cf1effa73d5d1 files/wine-0.9.6-force-ddraw-gamma.patch 862 RMD160 b3b31b54251bbd45a910ab0ab135ce3b013cdeda files/wine-0.9.6-force-ddraw-gamma.patch 862 SHA256 02455f96d853283e0b69799e246c17afd396ffa9d4b91fb3a96abaf6ae7d59e7 files/wine-0.9.6-force-ddraw-gamma.patch 862 +MD5 28a00ff84f8818bc5e8f2d5d22214ff5 files/wine-0.9.9-flex.patch 6258 +RMD160 7e26073d80aee60aaa69e324ffe881ea0edf5ae7 files/wine-0.9.9-flex.patch 6258 +SHA256 7ee01f25ed6e64110b453cc6a21c0b083d77b0b24c6efb289da534942e40fbcd files/wine-0.9.9-flex.patch 6258 MD5 138d22e6669e8997cdf4dc6292db748d files/wine-20041019-alsa-headers.patch 448 RMD160 9a8c6fee2f6b25f3e1181af52fc4282275f08b46 files/wine-20041019-alsa-headers.patch 448 SHA256 5e13950d88746b9b73eaba1b631be97311ecb3982d10fa4fede00f85791bd468 files/wine-20041019-alsa-headers.patch 448 @@ -139,12 +142,12 @@ SHA256 5acbcb07e3ce111d5c7a2ce47c577159821e3a8117b10b4c8ebf581956ba5f17 wine-0.9 MD5 6f649066bd329ec4923bc07147e8d507 wine-0.9.7.ebuild 3758 RMD160 be240eb9d8b1f3aa94a42138bea9ed06eec2a3e1 wine-0.9.7.ebuild 3758 SHA256 8eeaf83845252cd8cbd2655b2a52f556f21d1c319ae9011374b1a121441aa40b wine-0.9.7.ebuild 3758 -MD5 2780b75986c652693ab96d33f5571043 wine-0.9.8-r1.ebuild 3530 -RMD160 22e7857c0867779377243a861e7390dd79008df4 wine-0.9.8-r1.ebuild 3530 -SHA256 f41d68569896f9d9b3f076c042f5a718dd601ca41496812fc71eb6b11523de82 wine-0.9.8-r1.ebuild 3530 -MD5 a2c3ffe02337ae2e5a7905df4bdbc8ff wine-0.9.9.ebuild 3529 -RMD160 fdc5dbf026121c485d23bcb3e5e7fe37c998c6c7 wine-0.9.9.ebuild 3529 -SHA256 a066aa46f29c0ac00680e49c3c7527fa811d6cb5c6e08a6c4fe9b02941b24ed4 wine-0.9.9.ebuild 3529 +MD5 5cfe21964d33a3c046d25e6034386d1c wine-0.9.8-r1.ebuild 3512 +RMD160 d093e9a44599d14223733ca2a74166075aace1ab wine-0.9.8-r1.ebuild 3512 +SHA256 55b10ae75c8f44072dd8efab2dde6428afb09da593b675d27f23d255c437e781 wine-0.9.8-r1.ebuild 3512 +MD5 f0266778fbb95e030914d854a9523c16 wine-0.9.9.ebuild 3511 +RMD160 f8220e0d64701067aa399db0a27862c951fd68b0 wine-0.9.9.ebuild 3511 +SHA256 cabd5f81358bee9840dfd01d1341705d36239d2a080accf0b0df8224bcb03114 wine-0.9.9.ebuild 3511 MD5 1cf19e432ad168a882560c21744498a8 wine-0.9.ebuild 4141 RMD160 c0bd4dd3dba1b333240682479982deab4ce4d743 wine-0.9.ebuild 4141 SHA256 00c8d90cc43ecb7be21562f9b0628f31b84dcadae4235ba882866102d1e79733 wine-0.9.ebuild 4141 @@ -184,7 +187,7 @@ SHA256 3c59733857447827122179ce0cbad4471e0141d9b62ffa53d5fadd2165b7b666 wine-999 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFEB54U2+ySkm8kpY0RAm0AAJ9x+cWO5Wox5c6i5d7IgP/Y+4krcwCfbduf -XQFxKpFtTCkgEnk/B5wqi0w= -=NvnX +iD8DBQFEC74o2+ySkm8kpY0RArltAJ9BtF4QEPpwCm1qrY6mOkqb2vfVEwCffWqr +W7ii3dr5XtEb+5lbQJKvv6A= +=MZRE -----END PGP SIGNATURE----- diff --git a/app-emulation/wine/files/wine-0.9.9-flex.patch b/app-emulation/wine/files/wine-0.9.9-flex.patch new file mode 100644 index 000000000000..b07d732ed59e --- /dev/null +++ b/app-emulation/wine/files/wine-0.9.9-flex.patch @@ -0,0 +1,185 @@ +--- a/tools/wrc/parser.l ++++ b/tools/wrc/parser.l +@@ -68,11 +68,11 @@ + */ + + /* Exclusive string handling */ +-%x yystr ++%x tkstr + /* Exclusive unicode string handling */ +-%x yylstr ++%x tklstr + /* Exclusive rcdata single quoted data handling */ +-%x yyrcd ++%x tkrcd + /* Exclusive comment eating... */ + %x comment + /* Set when stripping c-junk */ +@@ -428,102 +428,102 @@ static struct keyword *iskeyword(char *k + * Wide string scanning + */ + L\" { +- yy_push_state(yylstr); ++ yy_push_state(tklstr); + wbufidx = 0; + if(!win32) + yywarning("16bit resource contains unicode strings\n"); + } +-<yylstr>\"{ws}+ | +-<yylstr>\" { ++<tklstr>\"{ws}+ | ++<tklstr>\" { + yy_pop_state(); + yylval.str = get_buffered_wstring(); + return tSTRING; + } +-<yylstr>\\[0-7]{1,6} { /* octal escape sequence */ ++<tklstr>\\[0-7]{1,6} { /* octal escape sequence */ + unsigned int result; + result = strtoul(yytext+1, 0, 8); + if ( result > 0xffff ) + yyerror("Character constant out of range"); + addwchar((WCHAR)result); + } +-<yylstr>\\x[0-9a-fA-F]{4} { /* hex escape sequence */ ++<tklstr>\\x[0-9a-fA-F]{4} { /* hex escape sequence */ + unsigned int result; + result = strtoul(yytext+2, 0, 16); + addwchar((WCHAR)result); + } +-<yylstr>\\x[0-9a-fA-F]{1,3} { yyerror("Invalid hex escape sequence '%s'", yytext); } ++<tklstr>\\x[0-9a-fA-F]{1,3} { yyerror("Invalid hex escape sequence '%s'", yytext); } + +-<yylstr>\\[0-9]+ yyerror("Bad escape sequence"); +-<yylstr>\\\n{ws}* line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ +-<yylstr>\\a addwchar('\a'); +-<yylstr>\\b addwchar('\b'); +-<yylstr>\\f addwchar('\f'); +-<yylstr>\\n addwchar('\n'); +-<yylstr>\\r addwchar('\r'); +-<yylstr>\\t addwchar('\t'); +-<yylstr>\\v addwchar('\v'); +-<yylstr>\\. addwchar(yytext[1]); +-<yylstr>\\\r\n addwchar(yytext[2]); line_number++; char_number = 1; +-<yylstr>\"\" addwchar('\"'); /* "bla""bla" -> "bla\"bla" */ +-<yylstr>\\\"\" addwchar('\"'); /* "bla\""bla" -> "bla\"bla" */ +-<yylstr>\"{ws}+\" ; /* "bla" "bla" -> "blabla" */ +-<yylstr>[^\\\n\"]+ { ++<tklstr>\\[0-9]+ yyerror("Bad escape sequence"); ++<tklstr>\\\n{ws}* line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ ++<tklstr>\\a addwchar('\a'); ++<tklstr>\\b addwchar('\b'); ++<tklstr>\\f addwchar('\f'); ++<tklstr>\\n addwchar('\n'); ++<tklstr>\\r addwchar('\r'); ++<tklstr>\\t addwchar('\t'); ++<tklstr>\\v addwchar('\v'); ++<tklstr>\\. addwchar(yytext[1]); ++<tklstr>\\\r\n addwchar(yytext[2]); line_number++; char_number = 1; ++<tklstr>\"\" addwchar('\"'); /* "bla""bla" -> "bla\"bla" */ ++<tklstr>\\\"\" addwchar('\"'); /* "bla\""bla" -> "bla\"bla" */ ++<tklstr>\"{ws}+\" ; /* "bla" "bla" -> "blabla" */ ++<tklstr>[^\\\n\"]+ { + char *yptr = yytext; + while(*yptr) /* FIXME: codepage translation */ + addwchar(*yptr++ & 0xff); + } +-<yylstr>\n yyerror("Unterminated string"); ++<tklstr>\n yyerror("Unterminated string"); + + /* + * Normal string scanning + */ +-\" yy_push_state(yystr); cbufidx = 0; +-<yystr>\"{ws}+ | +-<yystr>\" { ++\" yy_push_state(tkstr); cbufidx = 0; ++<tkstr>\"{ws}+ | ++<tkstr>\" { + yy_pop_state(); + yylval.str = get_buffered_cstring(); + return tSTRING; + } +-<yystr>\\[0-7]{1,3} { /* octal escape sequence */ ++<tkstr>\\[0-7]{1,3} { /* octal escape sequence */ + int result; + result = strtol(yytext+1, 0, 8); + if ( result > 0xff ) + yyerror("Character constant out of range"); + addcchar((char)result); + } +-<yystr>\\x[0-9a-fA-F]{2} { /* hex escape sequence */ ++<tkstr>\\x[0-9a-fA-F]{2} { /* hex escape sequence */ + int result; + result = strtol(yytext+2, 0, 16); + addcchar((char)result); + } +-<yystr>\\x[0-9a-fA-F] { yyerror("Invalid hex escape sequence '%s'", yytext); } ++<tkstr>\\x[0-9a-fA-F] { yyerror("Invalid hex escape sequence '%s'", yytext); } + +-<yystr>\\[0-9]+ yyerror("Bad escape sequence"); +-<yystr>\\\n{ws}* line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ +-<yystr>\\a addcchar('\a'); +-<yystr>\\b addcchar('\b'); +-<yystr>\\f addcchar('\f'); +-<yystr>\\n addcchar('\n'); +-<yystr>\\r addcchar('\r'); +-<yystr>\\t addcchar('\t'); +-<yystr>\\v addcchar('\v'); +-<yystr>\\. addcchar(yytext[1]); +-<yystr>\\\r\n addcchar(yytext[2]); line_number++; char_number = 1; +-<yystr>[^\\\n\"]+ { ++<tkstr>\\[0-9]+ yyerror("Bad escape sequence"); ++<tkstr>\\\n{ws}* line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */ ++<tkstr>\\a addcchar('\a'); ++<tkstr>\\b addcchar('\b'); ++<tkstr>\\f addcchar('\f'); ++<tkstr>\\n addcchar('\n'); ++<tkstr>\\r addcchar('\r'); ++<tkstr>\\t addcchar('\t'); ++<tkstr>\\v addcchar('\v'); ++<tkstr>\\. addcchar(yytext[1]); ++<tkstr>\\\r\n addcchar(yytext[2]); line_number++; char_number = 1; ++<tkstr>[^\\\n\"]+ { + char *yptr = yytext; + while(*yptr) + addcchar(*yptr++); + } +-<yystr>\"\" addcchar('\"'); /* "bla""bla" -> "bla\"bla" */ +-<yystr>\\\"\" addcchar('\"'); /* "bla\""bla" -> "bla\"bla" */ +-<yystr>\"{ws}+\" ; /* "bla" "bla" -> "blabla" */ +-<yystr>\n yyerror("Unterminated string"); ++<tkstr>\"\" addcchar('\"'); /* "bla""bla" -> "bla\"bla" */ ++<tkstr>\\\"\" addcchar('\"'); /* "bla\""bla" -> "bla\"bla" */ ++<tkstr>\"{ws}+\" ; /* "bla" "bla" -> "blabla" */ ++<tkstr>\n yyerror("Unterminated string"); + + /* + * Raw data scanning + */ +-\' yy_push_state(yyrcd); cbufidx = 0; +-<yyrcd>\' { ++\' yy_push_state(tkrcd); cbufidx = 0; ++<tkrcd>\' { + yy_pop_state(); + yylval.raw = new_raw_data(); + yylval.raw->size = cbufidx; +@@ -531,14 +531,14 @@ L\" { + memcpy(yylval.raw->data, cbuffer, yylval.raw->size); + return tRAWDATA; + } +-<yyrcd>[0-9a-fA-F]{2} { ++<tkrcd>[0-9a-fA-F]{2} { + int result; + result = strtol(yytext, 0, 16); + addcchar((char)result); + } +-<yyrcd>{ws}+ ; /* Ignore space */ +-<yyrcd>\n line_number++; char_number = 1; +-<yyrcd>. yyerror("Malformed data-line"); ++<tkrcd>{ws}+ ; /* Ignore space */ ++<tkrcd>\n line_number++; char_number = 1; ++<tkrcd>. yyerror("Malformed data-line"); + + /* + * Comment stripping diff --git a/app-emulation/wine/wine-0.9.8-r1.ebuild b/app-emulation/wine/wine-0.9.8-r1.ebuild index 3241eb4de94d..dccfc0128452 100644 --- a/app-emulation/wine/wine-0.9.8-r1.ebuild +++ b/app-emulation/wine/wine-0.9.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.4 2006/03/03 01:01:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.5 2006/03/06 04:43:12 vapier Exp $ inherit eutils flag-o-matic multilib @@ -70,6 +70,7 @@ src_unpack() { sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002 sed -i '/^MimeType/d' tools/wine.desktop || die #117785 + epatch "${FILESDIR}"/wine-0.9.9-flex.patch #124084 } config_cache() { @@ -86,24 +87,23 @@ config_cache() { src_compile() { export LDCONFIG=/bin/true -# use arts || export ARTSCCONFIG="" -# use esd || export ESDCONFIG="" -# use scanner || export sane_devel="no" -# config_cache jack jack/jack.h -# config_cache cups cups/cups.h -# config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open -# config_cache nas audio/audiolib.h audio/soundlib.h -# config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h -# config_cache ldap ldap.h lber.h -# config_cache gif gif_lib.h -# config_cache glut glut:glutMainLoop -# config_cache jpeg jpeglib.h -# config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h -# config_cache lcms lcms.h + use arts || export ARTSCCONFIG="" + use esd || export ESDCONFIG="" + use scanner || export sane_devel="no" + config_cache jack jack/jack.h + config_cache cups cups/cups.h + config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open + config_cache nas audio/audiolib.h audio/soundlib.h + config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h + config_cache ldap ldap.h lber.h + config_cache gif gif_lib.h + config_cache glut glut:glutMainLoop + config_cache jpeg jpeglib.h + config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h + config_cache lcms lcms.h use x86 && config_cache truetype freetype:FT_Init_FreeType strip-flags -# use lcms && append-flags -I"${ROOT}"/usr/include/lcms # $(use_enable amd64 win64) econf \ diff --git a/app-emulation/wine/wine-0.9.9.ebuild b/app-emulation/wine/wine-0.9.9.ebuild index f997449264c3..7aed45d3f2b7 100644 --- a/app-emulation/wine/wine-0.9.9.ebuild +++ b/app-emulation/wine/wine-0.9.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.9.ebuild,v 1.1 2006/03/03 01:02:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.9.ebuild,v 1.2 2006/03/06 04:43:12 vapier Exp $ inherit eutils flag-o-matic multilib @@ -70,6 +70,7 @@ src_unpack() { sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002 sed -i '/^MimeType/d' tools/wine.desktop || die #117785 + epatch "${FILESDIR}"/wine-0.9.9-flex.patch #124084 } config_cache() { @@ -86,24 +87,23 @@ config_cache() { src_compile() { export LDCONFIG=/bin/true -# use arts || export ARTSCCONFIG="" -# use esd || export ESDCONFIG="" -# use scanner || export sane_devel="no" -# config_cache jack jack/jack.h -# config_cache cups cups/cups.h -# config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open -# config_cache nas audio/audiolib.h audio/soundlib.h -# config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h -# config_cache ldap ldap.h lber.h -# config_cache gif gif_lib.h -# config_cache glut glut:glutMainLoop -# config_cache jpeg jpeglib.h -# config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h -# config_cache lcms lcms.h + use arts || export ARTSCCONFIG="" + use esd || export ESDCONFIG="" + use scanner || export sane_devel="no" + config_cache jack jack/jack.h + config_cache cups cups/cups.h + config_cache alsa alsa/asoundlib.h sys/asoundlib.h asound:snd_pcm_open + config_cache nas audio/audiolib.h audio/soundlib.h + config_cache xml2 libxml/parser.h libxslt/pattern.h libxslt/transform.h + config_cache ldap ldap.h lber.h + config_cache gif gif_lib.h + config_cache glut glut:glutMainLoop + config_cache jpeg jpeglib.h + config_cache oss sys/soundcard.h machine/soundcard.h soundcard.h + config_cache lcms lcms.h use x86 && config_cache truetype freetype:FT_Init_FreeType strip-flags -# use lcms && append-flags -I"${ROOT}"/usr/include/lcms # $(use_enable amd64 win64) econf \ |