summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-03-10 10:40:32 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2018-03-10 11:04:35 +0000
commit6c7e3acab4f3d340e7007ca2d96562ec88c4dbc0 (patch)
tree7c51464729b38e1864ba131683b9c7ed596912c7 /dev-util/xxdiff
parentsys-apps/portage: stable 2.3.24-r1 for ia64, bug #650060 (diff)
downloadgentoo-6c7e3acab4f3d340e7007ca2d96562ec88c4dbc0.tar.gz
gentoo-6c7e3acab4f3d340e7007ca2d96562ec88c4dbc0.tar.bz2
gentoo-6c7e3acab4f3d340e7007ca2d96562ec88c4dbc0.zip
dev-util/xxdiff: grab 4.0.1_p20170622 qt5-compatibe snapshot, bug #644380
Tarball is a snapshot of upstream tip at https://bitbucket.org/blais/xxdiff/commits/5e5f885dfc43559549a81c59e9e8c9525306356a (see ebuild comment on how to generate a tarball). Reported-by: Andreas Sturmlechner Closes: https://bugs.gentoo.org/644380 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-util/xxdiff')
-rw-r--r--dev-util/xxdiff/Manifest1
-rw-r--r--dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch11
-rw-r--r--dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild67
3 files changed, 79 insertions, 0 deletions
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 05efa2516d4b..0ed1757f2f3c 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,2 +1,3 @@
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.1_p20170622-cxx11.patch b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
new file mode 100644
index 000000000000..b16a7c4072f9
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
@@ -0,0 +1,11 @@
+In gentoo qt5 already requires c++11 features:
+
+diff --git a/src/xxdiff.pro b/src/xxdiff.pro
+index 32b106b..16fcd1f 100644
+--- a/src/xxdiff.pro
++++ b/src/xxdiff.pro
+@@ -113,3 +113,3 @@ irix-n32:QMAKE_CFLAGS_RELEASE += -OPT:Olimit=4000
+ # auto_ptr deprecated in C++11, removed in C++17
+-linux: QMAKE_CXXFLAGS += -std=c++03
++linux: QMAKE_CXXFLAGS += -std=c++11
+
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
new file mode 100644
index 000000000000..2a1d15e737b0
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 qmake-utils
+
+DESCRIPTION="A graphical file and directories comparator and merge tool"
+HOMEPAGE="http://furius.ca/xxdiff/"
+# generated as 'hg archive xxdiff-${P}.tar'
+# from https://bitbucket.org/blais/xxdiff tree
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/yacc
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.1-no-throw-in-dtor.patch
+ "${FILESDIR}"/${P}-cxx11.patch
+)
+
+src_configure() {
+ pushd src >/dev/null || die
+ # mimic src/Makefile.bootstrap
+ eqmake5
+ cat Makefile.extra >> Makefile || die
+ popd
+
+ distutils-r1_src_configure
+}
+
+src_compile() {
+ emake -C src MAKEDIR=.
+
+ distutils-r1_src_compile
+ HTML_DOCS+=(
+ doc/*.{png,html}
+ src/doc.html
+ )
+}
+
+src_install() {
+ dobin bin/xxdiff
+
+ distutils-r1_src_install
+
+ dodoc CHANGES README* TODO doc/*.txt src/doc.txt
+
+ # example tools, use these to build your own ones
+ insinto /usr/share/doc/${PF}
+ doins -r tools
+}