aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-12-12 01:56:04 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-12-12 01:56:04 -0300
commitafc41e6503945e528940fa6db07799104d9a7c0f (patch)
tree1c522ed776b26fa02debba59b0ef12a2a2893c68
parent1c89e61710bdc50e9f40766bc5474cb99e672cdf (diff)
downloadaports-afc41e6503945e528940fa6db07799104d9a7c0f.tar.gz
aports-afc41e6503945e528940fa6db07799104d9a7c0f.tar.bz2
aports-afc41e6503945e528940fa6db07799104d9a7c0f.tar.xz
community/diff-pdf: fix build with poppler >= 0.18.1
-rw-r--r--community/diff-pdf/APKBUILD7
-rw-r--r--community/diff-pdf/poppler-cairo.patch16
2 files changed, 21 insertions, 2 deletions
diff --git a/community/diff-pdf/APKBUILD b/community/diff-pdf/APKBUILD
index 24afbe103f..545959c8ec 100644
--- a/community/diff-pdf/APKBUILD
+++ b/community/diff-pdf/APKBUILD
@@ -11,7 +11,9 @@ arch="all"
license="GPL-2.0-or-later"
options="!check" # upstream doesn't have a test suite
makedepends="autoconf automake cairo-dev poppler-dev wxgtk-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/vslavik/diff-pdf/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/vslavik/diff-pdf/archive/v$pkgver.tar.gz
+ poppler-cairo.patch
+ "
prepare() {
default_prepare
@@ -31,4 +33,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="8ba5dfee0b5222c79c8d6a3215c2e7df977ad02de5afeeb497c3d9e861ee312b3e1234c57132e0ea4cf6931cfdbdebd508ecfb6c2335cbe161121be6bbb343dc diff-pdf-0.4.1.tar.gz"
+sha512sums="8ba5dfee0b5222c79c8d6a3215c2e7df977ad02de5afeeb497c3d9e861ee312b3e1234c57132e0ea4cf6931cfdbdebd508ecfb6c2335cbe161121be6bbb343dc diff-pdf-0.4.1.tar.gz
+c450073624c7ad919a016817461c61e8d608d1069ba64123595361e9f783179fa1fb2e9bc549e1e694cdd928592bd468b3ffc8e5a698ebc9ad357746a66c4ee4 poppler-cairo.patch"
diff --git a/community/diff-pdf/poppler-cairo.patch b/community/diff-pdf/poppler-cairo.patch
new file mode 100644
index 0000000000..c731527ac5
--- /dev/null
+++ b/community/diff-pdf/poppler-cairo.patch
@@ -0,0 +1,16 @@
+Upstream: https://github.com/vslavik/diff-pdf/pull/69
+Reason: Poppler Cairo was removed from Poppler and is not required anymore
+
+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])