summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-04-12 23:05:19 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-12 23:42:16 +0200
commit8229ed70e5c6e38069ff0947a6dc093a5fcb4ed2 (patch)
tree337431810472ddf376d28776d2a99ba042273737
parentx11-libs/qwtpolar: Drop 1.1.1-r1 (diff)
downloadgentoo-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
-rw-r--r--dev-util/xxdiff/Manifest2
-rw-r--r--dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch100
-rw-r--r--dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch24
-rw-r--r--dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild62
-rw-r--r--dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild65
5 files changed, 0 insertions, 253 deletions
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 0ed1757f2f3..78775a12eb4 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,3 +1 @@
-DIST xxdiff-4.0.1.tar.bz2 1981869 BLAKE2B 637066e213327b7e79361f78d3ed7004023b282230b6ac077785519c93cb5c04a1192c06ec8a8ee86dc9db6c9e01fc5465edb13128e257b0409b11a43e4fe3cf SHA512 bcc2b528a0ebf273677d74aa3a971feb9052a01a8187a5d8abe3bce744520a3fa61bd842a9d4ba465abbf00f6da62868a1f18adeb7d8eccee6f76df4a1e4db3a
DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
-DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 BLAKE2B 00c052c92cc0eb01f3072f4381e4fb18ebc0760c9a212a05573d958e3f444a02f07b856c6c326c234c82a8c7e315ac23f14d1bc3f53764983cd6c836accfeeed SHA512 d0be7a5775ed90aa1ac73320144aa24947c1bcc305bbb8f95c64009990dc44b96fd05abd7dc3f69c3a74fb93632099f4a40c76029ed29949854c5f3d7a890097
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 fba71996b21..00000000000
--- 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 2dcea00bcba..00000000000
--- 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
-
diff --git a/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
deleted file mode 100644
index 253a5704bce..00000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils qt4-r2
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
- virtual/yacc"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-throw-in-dtor.patch
- pushd src >/dev/null
- sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
- qt4-r2_src_prepare
- popd
-
- distutils-r1_src_prepare
-}
-
-src_configure() {
- pushd src >/dev/null
- qt4-r2_src_configure
- cat Makefile.extra >> Makefile
- popd
-
- distutils-r1_src_configure
-}
-
-src_compile() {
- pushd src >/dev/null
- qt4-r2_src_compile
- popd
-
- distutils-r1_src_compile
-}
-
-src_install() {
- dobin bin/xxdiff
-
- distutils-r1_src_install
-
- dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
- dohtml doc/*.{png,html} src/doc.html
-
- # example tools, use these to build your own ones
- insinto /usr/share/doc/${PF}
- doins -r tools
-}
diff --git a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
deleted file mode 100644
index ead20c6c329..00000000000
--- a/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils qt4-r2
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
- virtual/yacc"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gcc47.patch \
- "${FILESDIR}"/${P}-bison3.patch
-
- pushd src >/dev/null
- sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
- qt4-r2_src_prepare
- popd
-
- distutils-r1_src_prepare
-}
-
-src_configure() {
- pushd src >/dev/null
- qt4-r2_src_configure
- cat Makefile.extra >> Makefile
- popd
-
- distutils-r1_src_configure
-}
-
-src_compile() {
- pushd src >/dev/null
- qt4-r2_src_compile
- popd
-
- distutils-r1_src_compile
-}
-
-src_install() {
- dobin bin/xxdiff
-
- distutils-r1_src_install
-
- dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
- dohtml doc/*.{png,html} src/doc.html
-
- # example tools, use these to build your own ones
- insinto /usr/share/doc/${PF}
- doins -r tools
-}