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 -}
