summaryrefslogtreecommitdiff
path: root/dev-util/xxdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/xxdiff')
-rw-r--r--dev-util/xxdiff/Manifest11
-rw-r--r--dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch16
-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/metadata.xml15
-rw-r--r--dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild62
-rw-r--r--dev-util/xxdiff/xxdiff-4.0.1.ebuild61
-rw-r--r--dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild65
8 files changed, 354 insertions, 0 deletions
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
new file mode 100644
index 000000000000..8eb80179e3d4
--- /dev/null
+++ b/dev-util/xxdiff/Manifest
@@ -0,0 +1,11 @@
+AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 SHA256 a8d57065b7955602323e3dcd639012b2451a9e0b7e6bd902c8ab1e61b4e20340 SHA512 254961c7a3baced5f9dafdb71583145de4d8fccbc49ffb13568bf7414326ee3811389f38b1ac290f67867eebf0b724f5cdd776deab8b3f850847e1783bbf085f WHIRLPOOL ad5e9ddc5da2affacc531c7722c8e118f256ebc192c50d61d1323b83d39a95cb62f15b22d18e7fbf11c4df8c530414f20bb998cbf54eaf42480130c5aa3e5fdb
+AUX xxdiff-4.0_beta1_p20110426-bison3.patch 3243 SHA256 210ecb4f22ab81320ff121a92feecc4013a08e4530d1c129f00173542c3712d4 SHA512 179b57f579cc0ef20d3b391b9120726c44549c363fb6a0d88528a6e0bcf256d144fce99d44bbd5510fc42c5a8aea8b4a9ffea6aeb0a667a15b89af0e51893832 WHIRLPOOL 0a1df0b0d1c05392ee350e177988ac162b7a4b768d6a7196a592ce60098e307ec2f9d0b25a3e06966c1b1c975518318f22fff9ccb62f37b7d8a7509c9fdb1af7
+AUX xxdiff-4.0_beta1_p20110426-gcc47.patch 631 SHA256 1393715259ef607f6f56d1117751620e02d600a7dea5aa99cb04c8157dc63b99 SHA512 df3a4362d160cabdf3fb590965258b69d854ae3becef19d754932851e47d98d93869d666c41c11743d49cdc84222b2f0e819b119e2af8f7a3679e714bda13885 WHIRLPOOL 0b7e19d8e8af099569e888bd4e77acb56289bf84ee82118a1649e63e7a9d26e1c86847a0c135b88ad5878b5b50f7a70e26a8d3637bc8574d1d36dbe807f02174
+DIST xxdiff-4.0.1.tar.bz2 1981869 SHA256 bf58ddda9d7a887f4f5cae20070ed5f2e0d65f575af20860738c6e2742c3a000 SHA512 bcc2b528a0ebf273677d74aa3a971feb9052a01a8187a5d8abe3bce744520a3fa61bd842a9d4ba465abbf00f6da62868a1f18adeb7d8eccee6f76df4a1e4db3a WHIRLPOOL f85bc19e982744194d2c3eab726adb9865a805e00fae9c6d286ad8025f23334da33fbafb87b149f1b3723c7511b49322ba04cbe6292be9948b65670db3fc1dcb
+DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 SHA256 70718eeb26e8880e2cda06d7ff6fe2e3fa9ea407086086f70ec1eb0e32301afe SHA512 d0be7a5775ed90aa1ac73320144aa24947c1bcc305bbb8f95c64009990dc44b96fd05abd7dc3f69c3a74fb93632099f4a40c76029ed29949854c5f3d7a890097 WHIRLPOOL 05048f3594d042f0130f0da20951bb124867ebfea55902bcabead5c8ba097fa4eb1f834b1f19b1ba7d36536f53240942414d143b3c4b6e0678909a5c4a5c6855
+EBUILD xxdiff-4.0.1-r1.ebuild 1137 SHA256 37b328dd9f02a88742ebe11f453d40bbc671147118e91b67924b474db854350d SHA512 af5bfc98af1cfe73327718b352335379e0e07c20c8814a6e13b3009a590a6cb9b5bfd395da0a1e51ec2793c13a05c8ac31ed5c3d5b9c3cdcf4e89de87387fbe3 WHIRLPOOL 3acbb647a6d7eeee65d77447ada8bf5caba486b097cdeeac815352898d93e36575271fcc2aaaf4573c9564c250de8afb4ae210fc4acc251a7eb7f447e7347dad
+EBUILD xxdiff-4.0.1.ebuild 1087 SHA256 405572bf3f0609e1ea3f6a0e5ecd95913737e3354ec42039e7dc3fa925b9afa1 SHA512 a1478abaf30230b1a36af7bf2a7d09f23ec0a8fa06f25f74abdd3ecce4c5b682d5380b89f45cef80a2051c10ca36abb2697219c4dbfc4d3aa5cd1b4600d12a34 WHIRLPOOL f6f0a00cbb5432c98c13b1d96cd4fc71f2821862addd2c9a96aec89b9622ff9e4bc1c5ed89162756dda8ce0817bb6f1ee6c57dccee4bda09d4e7e94490d39295
+EBUILD xxdiff-4.0_beta1_p20110426-r1.ebuild 1154 SHA256 b5539b0720807be19d14920c89073c4c1be9d96a1411c29a3d7360b4d90abbd4 SHA512 2f538add6f3e640a6b329f57ebd6dba113acd6792c935f6bf8907a8a23b3934f623d4c05d12f6305b668637e84d10b34fec847735e0743e4991d1de9ae911964 WHIRLPOOL 3ea3de110a6f9cc534a62c69e3ef36903d74106b9b65f6b7390bf6300ae36ccd3a1671e054608b947b5a56d807b1387cf2ca7fd0603db1901d115aa0e00297e5
+MISC ChangeLog 3924 SHA256 8b98adf92c647d4ce75f18757ddc515e954dab43491533bfd24460f63c1ba312 SHA512 e867541249dc4d2fcb5603fa0df7b36b971984351c32b1b02a7d20c9fc71f19d6a4c9dbb79bdf8aa6dcd0453b5fd0715fe4bdcb9008db119d971bb72179f7e5f WHIRLPOOL 4f5a2965b495f03a2a673834a7cd55a0db60ee75b893acc3c4f12501726441806f2863db3eee7f843dd94d29773e72e43ec1b2f8e05e3cd8aa548863d2aedf76
+MISC ChangeLog-2015 1937 SHA256 dea0a92901333f83cde5da633771935da9abfe189411c929c4079a3478864d0d SHA512 74c48e7f4d934d41c63591750e5a8b1470cf1ee3e3ca8ebf6b5e19a43cc9bcc6064a100a04e92f4e37988aaa3b2352b7508145173793e28574bd73656a959869 WHIRLPOOL 93d5f854703fc91bddaaafe019e8a86b4cbd99a25dbce150ce7ffba70f8a1e5f51c9513d54f34cef41bc95f829424845986933af825529ca52fc3d5dcc5d1c4e
+MISC metadata.xml 435 SHA256 ff3a95aefc918b55d6172fb2b7e6ff3747f2694cfad811e72993b1c56f8f9458 SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed WHIRLPOOL 255005f52212b0227228f17cb58da59dcbdc271fb8d5dcecb5240eda0cf713211ea2c77fc4c27551e2b3871b1427d37650d9430dacebc73deb79a97bd5bf40f8
diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch b/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch
new file mode 100644
index 000000000000..93162cc615b4
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch
@@ -0,0 +1,16 @@
+Build failure triggers on CXXFLAGS=-Werror=terminate
+
+ cmdline.cpp: In destructor ‘virtual XxCmdline::~XxCmdline()’:
+ ./defs.h:121:43: error: throw will always call terminate() [-Werror=terminate]
+ { throw XxInternalError( XX_EXC_PARAMS ); } ^
+ cmdline.cpp:369:7: note: in expansion of macro ‘XX_ASSERT’
+
+https://bugs.gentoo.org/601018
+diff --git a/src/cmdline.cpp b/src/cmdline.cpp
+index 8cb0ac9..174b9a4 100644
+--- a/src/cmdline.cpp
++++ b/src/cmdline.cpp
+@@ -368,3 +368,2 @@ XxCmdline::~XxCmdline()
+ for ( int ii = 0; ii < _nbQtOptions; ++ii ) {
+- XX_ASSERT( _qtOptions[ii] != 0 );
+ #ifndef WINDOWS
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
new file mode 100644
index 000000000000..fba71996b217
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-bison3.patch
@@ -0,0 +1,100 @@
+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
new file mode 100644
index 000000000000..2dcea00bcba2
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-4.0_beta1_p20110426-gcc47.patch
@@ -0,0 +1,24 @@
+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/metadata.xml b/dev-util/xxdiff/metadata.xml
new file mode 100644
index 000000000000..95131383c5a8
--- /dev/null
+++ b/dev-util/xxdiff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>slyfox@gentoo.org</email>
+ <name>Sergei Trofimovich</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">xxdiff</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..253a5704bce6
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1.ebuild
new file mode 100644
index 000000000000..9ba26ac0ea35
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0.1.ebuild
@@ -0,0 +1,61 @@
+# 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() {
+ 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
new file mode 100644
index 000000000000..ead20c6c3297
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0_beta1_p20110426-r1.ebuild
@@ -0,0 +1,65 @@
+# 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
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 02:01:05 +0000