summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-01-09 10:16:02 +0000
committerSam James <sam@gentoo.org>2023-01-09 10:16:27 +0000
commit7e33adc640a4a1bf32892d9144ec060f9080b2e5 (patch)
treebf6a7894d87b8bd91224ca5420ac4f140b1a8cfb /app-text/xpdf
parentdev-db/tokyocabinet: revbump, update EAPI 7 -> 8, close #718660 (diff)
downloadgentoo-7e33adc640a4a1bf32892d9144ec060f9080b2e5.tar.gz
gentoo-7e33adc640a4a1bf32892d9144ec060f9080b2e5.tar.bz2
gentoo-7e33adc640a4a1bf32892d9144ec060f9080b2e5.zip
app-text/xpdf: fix build w/ libpaper-2
Closes: https://bugs.gentoo.org/870217 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-text/xpdf')
-rw-r--r--app-text/xpdf/files/xpdf-4.04-libpaper-2.patch14
-rw-r--r--app-text/xpdf/xpdf-4.04-r1.ebuild3
2 files changed, 16 insertions, 1 deletions
diff --git a/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch
new file mode 100644
index 000000000000..d6f3df150baf
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-4.04-libpaper-2.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/870217
+https://forum.xpdfreader.com/viewtopic.php?t=42367
+https://github.com/rrthomas/libpaper/issues/29
+--- a/xpdf/GlobalParams.cc
++++ b/xpdf/GlobalParams.cc
+@@ -655,7 +655,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
+ base14SysFonts = new GHash(gTrue);
+ sysFonts = new SysFontList();
+ #if HAVE_PAPER_H
+- char *paperName;
++ const char *paperName;
+ const struct paper *paperType;
+ paperinit();
+ if ((paperName = systempapername())) {
diff --git a/app-text/xpdf/xpdf-4.04-r1.ebuild b/app-text/xpdf/xpdf-4.04-r1.ebuild
index 9d39323e7d04..41d271c193ad 100644
--- a/app-text/xpdf/xpdf-4.04-r1.ebuild
+++ b/app-text/xpdf/xpdf-4.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -55,6 +55,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-automagic.patch
"${FILESDIR}"/${PN}-visibility.patch
"${FILESDIR}"/${PN}-shared-libs.patch
+ "${FILESDIR}"/${PN}-4.04-libpaper-2.patch
)
DOCS=( ANNOUNCE CHANGES README )