| 1 |
commit: b2e558e9595abb6d0969c2a329897d36b09f4fee |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 9 16:07:56 2021 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 9 16:08:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e558e9 |
| 7 |
|
| 8 |
app-text/diff-pdf: new revision to build against unstable poppler. |
| 9 |
|
| 10 |
Upstream already had a patch for this, easy. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/761835 |
| 13 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
| 14 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 15 |
|
| 16 |
...df-0.4.1-r1.ebuild => diff-pdf-0.4.1-r2.ebuild} | 9 +++++++- |
| 17 |
.../diff-pdf-0.4.1-no-poppler-cairo-check.patch | 24 ++++++++++++++++++++++ |
| 18 |
2 files changed, 32 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r1.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild |
| 21 |
similarity index 90% |
| 22 |
rename from app-text/diff-pdf/diff-pdf-0.4.1-r1.ebuild |
| 23 |
rename to app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild |
| 24 |
index f5b10815eaf..992e9b37797 100644 |
| 25 |
--- a/app-text/diff-pdf/diff-pdf-0.4.1-r1.ebuild |
| 26 |
+++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild |
| 27 |
@@ -4,7 +4,7 @@ |
| 28 |
# No EAPI=7 support in wxwidgets.eclass. |
| 29 |
EAPI=7 |
| 30 |
|
| 31 |
-inherit wxwidgets |
| 32 |
+inherit autotools wxwidgets |
| 33 |
|
| 34 |
DESCRIPTION="A simple tool for visually comparing two PDF files" |
| 35 |
HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/" |
| 36 |
@@ -32,6 +32,13 @@ DEPEND="app-text/poppler[cairo] |
| 37 |
x11-libs/wxGTK:3.0-gtk3[X]" |
| 38 |
RDEPEND="${DEPEND}" |
| 39 |
|
| 40 |
+PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" ) |
| 41 |
+ |
| 42 |
+src_prepare() { |
| 43 |
+ default |
| 44 |
+ eautoreconf |
| 45 |
+} |
| 46 |
+ |
| 47 |
src_configure() { |
| 48 |
WX_GTK_VER="3.0-gtk3" |
| 49 |
setup-wxwidgets |
| 50 |
|
| 51 |
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 |
| 52 |
new file mode 100644 |
| 53 |
index 00000000000..ecef020a998 |
| 54 |
--- /dev/null |
| 55 |
+++ b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch |
| 56 |
@@ -0,0 +1,24 @@ |
| 57 |
+From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001 |
| 58 |
+From: FX Coudert <fxcoudert@×××××.com> |
| 59 |
+Date: Sat, 12 Dec 2020 16:18:59 +0100 |
| 60 |
+Subject: [PATCH] Remove legacy poppler-cairo dependency (#69) |
| 61 |
+ |
| 62 |
+poppler-glib already depended on it, so this is non-breaking, |
| 63 |
+and it is removed in poppler 0.18.1. |
| 64 |
+--- |
| 65 |
+ configure.ac | 2 +- |
| 66 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 67 |
+ |
| 68 |
+diff --git a/configure.ac b/configure.ac |
| 69 |
+index 382e220..2e9b6e5 100644 |
| 70 |
+--- a/configure.ac |
| 71 |
++++ b/configure.ac |
| 72 |
+@@ -41,7 +41,7 @@ AC_LANG(C++) |
| 73 |
+ dnl === Library checks === |
| 74 |
+ |
| 75 |
+ PKG_CHECK_MODULES(POPPLER, |
| 76 |
+- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf]) |
| 77 |
++ [poppler-glib >= 0.10 cairo-pdf]) |
| 78 |
+ |
| 79 |
+ AM_OPTIONS_WXCONFIG |
| 80 |
+ AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base]) |
Archives