app-text/xpdf: Fix build with libpaper-2.

Pointless backward-incompatible function signature changes cause
dumb build errors that need to be fixed.

And add the needed slot operator to allow automatic rebuilds after
soname change.

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 9443512397a7623345f1c24b3395c448abca8929..cb52522487315598223c26b538df0b688ab44fd2 100644 (file)
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,5 +1,6 @@
 AUX xpdf-Add-Gentoo-font-path.patch 1981 BLAKE2B 05652a65e0b8c128f229517586a823cd4d96e0984286af7337849b3d5d3e73167b884f8864f24a1bd3206004838234cfa6cb25a0d9cb20ae2bb6630804f43167 SHA512 8d3c91954f141ebe67b340448b557412089e558d99df5c24afb7758756d8ad24c9a4655ce8ea68f5271b4becb14af3c461a6ec596bd7f52056ab0f3f14cf7e19
 AUX xpdf-cve-2022-38171.patch 750 BLAKE2B 09452d7755347226d51abe6cab5871d619b5d8fa71492b0a99eaba18091b5a4b845c76e5cd718ca05510f57e387cce0feee29f8fbd430aeda6d61a7ce7555ba1 SHA512 10c37ce15daec5cb73ec0a0217986b29ea09593738eefce8bf1620d00129f4d808ea7bcc817ee7a76655a3621f280f4b1f572ed51909b6518209659a0e6b2747
+AUX xpdf-libpaper2.patch 442 BLAKE2B 074d31eea4c2913920ccba9e6e1fd20e52781848e8b4d5d9f19ff988056c380b1a37a5f1573607b2e9299b9404760bb1c51a986b36489313cfad0e9d5b778ed9 SHA512 b07cee97793eef4c7013526ab3d5c8a0741abf2af07f9f1ae28201681ab12ad36a1abc6095aa6d17b9e63d790de69e7e12d229fbd9b3e0ba54022633ce012cd1
 AUX xpdf.desktop 2892 BLAKE2B bfd17519f46f9686612ad3d4c1890aad8cafa373013ca12b585e17054f2b5ab2b6b6c7f3da744ae4cf0493e098a7b393e9467a4dda063b9ee16897d836fcbfe3 SHA512 320d34f0a5f73da571140fe450f5bd2d473def70781920b702714933aaab8d4d735cc3ea252b2b13355b639158eecd9a7ec48d4de53946f1675fc2230b012f4d
 DIST xpdf-3.04.tar.gz 825519 BLAKE2B 69e6f75e64b9b76f08a1b5e2d738042b1b263bf2222245bf051eb137f104d022ccbe58902626173b6a14c54aeef843bfcb93bed07f717df49462ab92f94194a2 SHA512 3fb3c380fdbd13d937449ae3f7d7a163815cc85296d30be7b9907687884385d6171bb48ee5d5c13368d6bba87740b678f491bdcf61b38d130809e9afa260f6cf
-EBUILD xpdf-3.04-r3.ebuild 1117 BLAKE2B 8d8082763f63cbd314d5d35c991b2156830d7b0d8db5b8b94658776f73fbe2695262ff2c0ca7aadd5e875c9d2ce0cf5d188db2cbb7a5fd32dcdc3586e96551a6 SHA512 74757e0192c59e54be05deb412cda5a750b7f44aad27cc9de83ed18107afc5db8e430a787be7281007969a10951db099f501bd9b4ed4696777b457c305208c44
+EBUILD xpdf-3.04-r4.ebuild 1153 BLAKE2B 7102754b6078888502ccd3031dc30f8e9ddb0bcb9f31782afceb54cc80f1ef6d4aa59f8f2d8b02ee9b691f4b62f40a2aa6a62efe90287ac7c554e0cf071715e5 SHA512 1cfd275f239a34334fe4ef79aea3ea6f35e68d4bc5e27d1bc317954ec0a55f60270de35d2747bc77fef010d08c12fe86a771ea941fcb5dba9b8810cc583ceef2

diff --git a/app-text/xpdf/files/xpdf-libpaper2.patch b/app-text/xpdf/files/xpdf-libpaper2.patch
new file mode 100644 (file)
index 0000000..4191d55
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-libpaper2.patch
@@ -0,0 +1,13 @@
+diff --git a/xpdf/GlobalParams.cc b/xpdf/GlobalParams.cc
+index ea7e9fd..06229e9 100644
+--- a/xpdf/GlobalParams.cc
++++ b/xpdf/GlobalParams.cc
+@@ -690,7 +690,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-3.04-r3.ebuild b/app-text/xpdf/xpdf-3.04-r4.ebuild
similarity index 95%
rename from app-text/xpdf/xpdf-3.04-r3.ebuild
rename to app-text/xpdf/xpdf-3.04-r4.ebuild
index a0dca42658747365d096aa9787df0939b4cb6340..d41736f04281e180df7a8c5c807341e925044e1a 100644 (file)
--- a/app-text/xpdf/xpdf-3.04-r3.ebuild
+++ b/app-text/xpdf/xpdf-3.04-r4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"
 
 DEPEND=">=x11-libs/motif-2.3:0
        media-libs/freetype:2
-       app-text/libpaper
+       app-text/libpaper:=
        x11-libs/libX11
        x11-libs/libXpm"
 RDEPEND="$DEPEND
@@ -26,6 +26,7 @@ RDEPEND="$DEPEND
 PATCHES=(
        "$FILESDIR/xpdf-Add-Gentoo-font-path.patch"
        "$FILESDIR/xpdf-cve-2022-38171.patch"
+       "$FILESDIR/xpdf-libpaper2.patch"
 )
 
 src_configure() {