* [gentoo-commits] repo/gentoo:master commit in: dev-util/xxdiff/files/, dev-util/xxdiff/
@ 2016-11-27 18:46 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2016-11-27 18:46 UTC (permalink / raw
To: gentoo-commits
commit: a10f8631861e9885de8394d83260506d425318bf
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 18:46:09 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 18:46:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10f8631
dev-util/xxdiff: fix CXXFLAGS=-Werror=terminate build failure, bug #601018
Patch drops exception-throwing assert from destructor.
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/601018
Package-Manager: portage-2.3.2
.../files/xxdiff-4.0.1-no-throw-in-dtor.patch | 16 ++++++
dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild | 63 ++++++++++++++++++++++
2 files changed, 79 insertions(+)
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 00000000..93162cc
--- /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/xxdiff-4.0.1-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
new file mode 100644
index 00000000..7bce1f0
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/xxdiff/files/, dev-util/xxdiff/
@ 2018-03-10 11:04 Sergei Trofimovich
0 siblings, 0 replies; 3+ messages in thread
From: Sergei Trofimovich @ 2018-03-10 11:04 UTC (permalink / raw
To: gentoo-commits
commit: 6c7e3acab4f3d340e7007ca2d96562ec88c4dbc0
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 10:40:32 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 11:04:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7e3aca
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
dev-util/xxdiff/Manifest | 1 +
.../files/xxdiff-4.0.1_p20170622-cxx11.patch | 11 ++++
dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild | 67 ++++++++++++++++++++++
3 files changed, 79 insertions(+)
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 05efa2516d4..0ed1757f2f3 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 00000000000..b16a7c4072f
--- /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 00000000000..2a1d15e737b
--- /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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/xxdiff/files/, dev-util/xxdiff/
@ 2025-02-09 11:06 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-02-09 11:06 UTC (permalink / raw
To: gentoo-commits
commit: c800de491a9c6eb8697380dd748fd890624a8749
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 11:06:10 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 11:06:19 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c800de49
dev-util/xxdiff: drop 4.0.1_p20170622-r1, destabilising pkg
Closes: https://bugs.gentoo.org/941199
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/xxdiff/Manifest | 1 -
.../files/xxdiff-4.0.1-no-throw-in-dtor.patch | 16 ------
.../files/xxdiff-4.0.1_p20170622-cxx11.patch | 11 ----
dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild | 59 ----------------------
4 files changed, 87 deletions(-)
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index a292f45a1e29..45ff6d7f67e1 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,2 +1 @@
-DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
DIST xxdiff-5.1_p20241118.tar.gz 2057170 BLAKE2B f4d4baff11482a161e74b7722222e5653fe0f9a8be006469e50dff818c59b1bb64811e0cc73e07c4d6a4601dc323604b31ec48ebc250f3061340281044f8f874 SHA512 6518fcc0bd568783f4c3929e9bd1f484372267714046da671a328ab5206d04551123d8d9d26c64ff20187fe383e44b6f18943212204ceb9d0cc164fcec0a995b
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
deleted file mode 100644
index 93162cc615b4..000000000000
--- a/dev-util/xxdiff/files/xxdiff-4.0.1-no-throw-in-dtor.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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.1_p20170622-cxx11.patch b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
deleted file mode 100644
index b16a7c4072f9..000000000000
--- a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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-r1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
deleted file mode 100644
index dbacf92afcba..000000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~sam/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}
- app-alternatives/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
-}
-
-src_compile() {
- emake -C src MAKEDIR=.
-
- HTML_DOCS+=(
- doc/*.{png,html}
- src/doc.html
- )
-}
-
-src_install() {
- dobin bin/xxdiff
-
- dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
- # example tools, use these to build your own ones
- dodoc -r tools
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-09 11:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-27 18:46 [gentoo-commits] repo/gentoo:master commit in: dev-util/xxdiff/files/, dev-util/xxdiff/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2018-03-10 11:04 Sergei Trofimovich
2025-02-09 11:06 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox