From b2e558e9595abb6d0969c2a329897d36b09f4fee Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Tue, 9 Feb 2021 11:07:56 -0500 Subject: app-text/diff-pdf: new revision to build against unstable poppler. Upstream already had a patch for this, easy. Closes: https://bugs.gentoo.org/761835 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Michael Orlitzky --- app-text/diff-pdf/diff-pdf-0.4.1-r1.ebuild | 39 ------------------ app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild | 46 ++++++++++++++++++++++ .../diff-pdf-0.4.1-no-poppler-cairo-check.patch | 24 +++++++++++ 3 files changed, 70 insertions(+), 39 deletions(-) delete mode 100644 app-text/diff-pdf/diff-pdf-0.4.1-r1.ebuild create mode 100644 app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild create mode 100644 app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch (limited to 'app-text') diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r1.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r1.ebuild deleted file mode 100644 index f5b10815eafe..000000000000 --- a/app-text/diff-pdf/diff-pdf-0.4.1-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# No EAPI=7 support in wxwidgets.eclass. -EAPI=7 - -inherit wxwidgets - -DESCRIPTION="A simple tool for visually comparing two PDF files" -HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/" -SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz" - -# The COPYING.icons file states that two icons were taken from -# version 2.16.5 of GTK+, which is licensed LGPL-2+. -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -# The build system checks for "poppler-glib", which is provided only -# when app-text/poppler is built with USE=cairo. Moreover the glib ABI -# of poppler is relatively stable, and I can only assume that diff-pdf -# uses that rather than the low-level libpoppler.so API. Since the -# subslot on app-text/poppler is ONLY for the low-level API, we -# therefore don't need a subslot dependency on app-text/poppler. -# -# Since diff-pdf.cpp includes glib.h directly, I've included -# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo. -DEPEND="app-text/poppler[cairo] - dev-libs/glib - x11-libs/cairo - x11-libs/wxGTK:3.0-gtk3[X]" -RDEPEND="${DEPEND}" - -src_configure() { - WX_GTK_VER="3.0-gtk3" - setup-wxwidgets - default -} diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild new file mode 100644 index 000000000000..992e9b377978 --- /dev/null +++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# No EAPI=7 support in wxwidgets.eclass. +EAPI=7 + +inherit autotools wxwidgets + +DESCRIPTION="A simple tool for visually comparing two PDF files" +HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/" +SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz" + +# The COPYING.icons file states that two icons were taken from +# version 2.16.5 of GTK+, which is licensed LGPL-2+. +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +# The build system checks for "poppler-glib", which is provided only +# when app-text/poppler is built with USE=cairo. Moreover the glib ABI +# of poppler is relatively stable, and I can only assume that diff-pdf +# uses that rather than the low-level libpoppler.so API. Since the +# subslot on app-text/poppler is ONLY for the low-level API, we +# therefore don't need a subslot dependency on app-text/poppler. +# +# Since diff-pdf.cpp includes glib.h directly, I've included +# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo. +DEPEND="app-text/poppler[cairo] + dev-libs/glib + x11-libs/cairo + x11-libs/wxGTK:3.0-gtk3[X]" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + WX_GTK_VER="3.0-gtk3" + setup-wxwidgets + default +} diff --git a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch new file mode 100644 index 000000000000..ecef020a998a --- /dev/null +++ b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch @@ -0,0 +1,24 @@ +From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001 +From: FX Coudert +Date: Sat, 12 Dec 2020 16:18:59 +0100 +Subject: [PATCH] Remove legacy poppler-cairo dependency (#69) + +poppler-glib already depended on it, so this is non-breaking, +and it is removed in poppler 0.18.1. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 382e220..2e9b6e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,7 +41,7 @@ AC_LANG(C++) + dnl === Library checks === + + PKG_CHECK_MODULES(POPPLER, +- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf]) ++ [poppler-glib >= 0.10 cairo-pdf]) + + AM_OPTIONS_WXCONFIG + AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base]) -- cgit v1.2.3-65-gdbad