diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-12 23:05:19 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-12 23:42:16 +0200 |
commit | 8229ed70e5c6e38069ff0947a6dc093a5fcb4ed2 (patch) | |
tree | 337431810472ddf376d28776d2a99ba042273737 /dev-util/xxdiff/files | |
parent | x11-libs/qwtpolar: Drop 1.1.1-r1 (diff) | |
download | gentoo-8229ed70e5c6e38069ff0947a6dc093a5fcb4ed2.tar.gz gentoo-8229ed70e5c6e38069ff0947a6dc093a5fcb4ed2.tar.bz2 gentoo-8229ed70e5c6e38069ff0947a6dc093a5fcb4ed2.zip |
dev-util/xxdiff: Drop old Qt4-based
Bug: https://bugs.gentoo.org/644380
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Diffstat (limited to 'dev-util/xxdiff/files')
-rw-r--r-- | dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch | 100 | ||||
-rw-r--r-- | dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch | 24 |
2 files changed, 0 insertions, 124 deletions
diff --git a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch deleted file mode 100644 index fba71996b217..000000000000 --- a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch +++ /dev/null @@ -1,100 +0,0 @@ -http://bugs.gentoo.org/511560 - -Description: Fix compilation with Bison 3 -YYPARSE_PARAM was deprecated in Bison 1.875 and removed in Bison 3; -%parse-param can be used instead. Also fix a warning about %pure_parser -Author: Florian Schlichting <fsfs@debian.org> - ---- a/src/resParser.y -+++ b/src/resParser.y -@@ -39,12 +39,11 @@ - - // The parser input is the resources object to fill in. - #define RESOURCES ( static_cast<XxResources*>(resources) ) --#define YYPARSE_PARAM resources - - // Declare lexer from other compilation unit. - int resParserlex( YYSTYPE* yylval ); - --void resParsererror( const char* msg ); -+void resParsererror( void *resources, const char* msg ); - - // Declare some parser functions and data defined in resParser.cpp - namespace XxResParserNS { -@@ -58,6 +57,9 @@ - - %} - -+/* The parser input is the resources object to fill in. */ -+%parse-param { void *resources } -+ - /* generate header file */ - %defines - -@@ -144,7 +146,7 @@ - %type <num> boolkwd - - %start xxdiffrc --%pure_parser -+%pure-parser - - %% - xxdiffrc : stmts -@@ -188,7 +190,7 @@ - RESOURCES->setPreferredGeometry( geometry ); - } - else { -- yyerror( "Bad geometry specification." ); -+ yyerror( resources, "Bad geometry specification." ); - // Should never happen, the lexer regexp should be tough - // enough. - } -@@ -212,7 +214,7 @@ - QString err = QString( "Requested style key does not exist." ); - err += QString( "\nValid styles are: " ); - err += styles.join( ", " ); -- yyerror( err.toLatin1().constData() ); -+ yyerror( resources, err.toLatin1().constData() ); - } - } - ; -@@ -224,7 +226,7 @@ - char buf[2048]; - ::snprintf( buf, 2048, - "Unrecognized accelerator: %s\n", $5 ); -- yyerror( buf ); -+ yyerror( resources, buf ); - } - } - ; ---- a/src/resParser.l -+++ b/src/resParser.l -@@ -298,7 +298,7 @@ - QString os; - QTextOStream oss( &os ); - oss << "ignoring char: " << yytext << flush; -- yyerror( os.latin1() ); -+ yyerror( resources, os.latin1() ); - */ - } - } ---- a/src/resParser.cpp -+++ b/src/resParser.cpp -@@ -73,7 +73,7 @@ - - //------------------------------------------------------------------------------ - // --void resParsererror( const char* msg ) -+void resParsererror( void* resources __attribute__((__unused__)), const char* msg ) - { - // Send errors to stdout so we can filter out the debug info shmeglu while - // debugging parser. -@@ -794,7 +794,7 @@ - QString os; - QTextStream oss( &os ); - oss << "Unknown " << errmsg << ": " << name << flush; -- resParsererror( os.toLatin1().constData() ); -+ resParsererror( NULL, os.toLatin1().constData() ); - } - num = ERROR_TOKEN; - return ERROR_TOKEN; diff --git a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch deleted file mode 100644 index 2dcea00bcba2..000000000000 --- a/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=442302 - -# HG changeset patch -# User Martin Blais <mblais@marketfactory.com> -# Date 1339464558 14400 -# Node ID 00d868ea5f4a92f4b5c7e2665403eb18c7390aca -# Parent fdc247a7d9e51ca71b284f592be33f0465140f6b -Fixed compile error that only shows up in FC17 with gcc-4.7. - -diff -r fdc247a7d9e5 -r 00d868ea5f4a src/main.h ---- a/src/main.h Mon Feb 20 10:46:22 2012 -0500 -+++ b/src/main.h Mon Jun 11 21:29:18 2012 -0400 -@@ -35,6 +35,10 @@ - * PUBLIC DECLARATIONS - *============================================================================*/ - -+extern "C" { -+ - extern char** environ; - -+} -+ - #endif - |