gentoo auto-resync : 14:11:2024 - 03:02:32

5 files changed, 84 insertions, 2 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9623802ad989..0c4472267d49 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,9 @@
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-21.09.0-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956
 AUX poppler-23.10.0-qt-deps.patch 2020 BLAKE2B e9f022a7ddbc0e2533554c3263e0f22e62da8c28881a4f6a5bef18b1f85c5db9e6a4c3b312d5e1b0fbeec6f265716d376fe2036b9ae3d0e5396fc6cc1510d1ac SHA512 7ab6f92cc9f019b9f01b6f4cb4bfe7f8f269fd172ac46379b212ae623452265bbbb223e840897fb6c483c65919f3573a9bd79814b719b115cabd97950a202c7a
+AUX poppler-24.11.0-readd-SplashFont.patch 672 BLAKE2B 39d3d22cac3600ca71e803eb0fab6396d67bfd9a054c7a79480bfaadfbff3a5cfb10450f88025df9f1779903d3e16f94a0e614bdb5141a7bb33c8700e13bc533 SHA512 6774e05bae26819220ed207ac171ff422807bfc206c2a23a11ed6612b4c5e28c1bfda4b75c3bc827ecc37e92383ebed64d5cc6a60862e03feda69eaddca0aaae
+AUX poppler-24.11.0-readd-StructTreeRoot.patch 698 BLAKE2B 08171ca524a1005a923624f2d849295df8a06ed9872fd3e0b0bf961076290069803c34cadc3cab36e3199fdb615325ad6d365f31da85cfd9e711bb1efc962a67 SHA512 b0d786601770a9ea73bd7a8dfc3a91eff086090e599cb335cd9e7bc9719d9752256a1a487d446f8affb68d52f5cf13a71ab17f7c583c66809948e5ec26ba1bf2
+AUX poppler-24.11.0-readd-ViewerPreferences.patch 719 BLAKE2B bd3e34a65493b7b76e0cfef98f6ef91ef62bf98aed0250a0d1ca16c0d7ff4babe112513746368c8506d9c844491d1f3d8f1b2986f5c4b8d71bcc7d2102a85f32 SHA512 9b68c2b826b73523f94d5c2264b636ea2962d9d3574185ea913b8387b1ad584a2c42792f648a9093f25a5599b3c53228b9215c37eaf966ed7ad800c551ad5e79
 DIST poppler-24.08.0.tar.xz 1912592 BLAKE2B f76ccb8d596909d671df34f6c028e6161ad734d31b460bc7b3578d08a75ad146d6d2c1e4108acb33d08fd518fee014cc84e23d2e04ea92ad152702af614c5ca2 SHA512 47309b75746d5bc309ae98da9280e5178c81505c8873e849ece6923eb0ae0df6f271dab1e38b3aac1dbd5d05518284ad237ea78ba40d90420c6fc53ae1c3b400
 DIST poppler-24.08.0.tar.xz.sig 833 BLAKE2B d257fc092c8541daf2e88a852655827470fb4890316f0a9b334b18c736ea33500e52c3b6b238047e8e3ded6a155b4466dcfa3afabfede11ed89b3fa17553577e SHA512 5e5c0185db2f3c1e1639e1eead93cf9e282db403edb91750d8ec325ca69f4bfb026345f2e9a8a18ed23a5a02b308163f9b4a8d6a75f9e760414cd709681a25a7
 DIST poppler-24.10.0.tar.xz 1920580 BLAKE2B 5eee232c64f18083fa189b1839a7757c34f31a8711c4f173bfe0ded7c08d96618c9276fade85b3802cc79e31ca4b22f425904102f52a42985c9506f9cefbcf9f SHA512 5515b4c439cd2e92119aedcb8960dd82e6f78a1ffd82543d3649bedb3e0e8e97689ea592f4df347cc3c97d5d90c8518c13859f80be25f157b9aea78e62a31502
@@ -10,6 +13,6 @@ DIST poppler-24.11.0.tar.xz.sig 833 BLAKE2B 7ef6e5bd5659c91dc5924367b7875a394611
 DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
 EBUILD poppler-24.08.0.ebuild 4447 BLAKE2B f88e585dd3992006527baac658f55d778cda382ee76fe3fea904ce890625d3d0c03453b5c8c4d7e3b1df204039b8f2563349ad4ffa386161cdf6c1cd288c949c SHA512 9f35693e28a92d3e5f8cf3f710a67f028571b38814ea2126713b19ab8b229738d89cd7808117323563ad779053ce375b68fc1ed03d62cbec53770be3f06f29d2
 EBUILD poppler-24.10.0.ebuild 4455 BLAKE2B e80ab3bcf12fe79a4d6ed9bd4b4876245c9ca5a7a4cfbb94facad8f10c07599afd0b363aaf1a9a7ec030a13e89d73e4bd5e64f511cedce3e93bdebf71b4b3eae SHA512 935a8e4f1e2b0f376ab8145381469da1c00792bd550005ecee2897ac132cbd770908b6f170bf67172b69bd6e67aff019e8195456a09b9c9a8f5c0439e4fb7438
-EBUILD poppler-24.11.0.ebuild 4456 BLAKE2B 28ff323c722d7da896e04236859966e2bd5ee148baf0cc69383e256de35588a5a3db52444f8c52c4df24639b712c501bed038a79dec21eb86e3969c06044662b SHA512 20de416f33870bd70015018696ee8155348815f6f902b099a8751edcd8fb4cd743f9224ef36fc915b758ca6528e314f6d2d1216dd2ad24e5da4b713ac7bb9267
+EBUILD poppler-24.11.0-r1.ebuild 4609 BLAKE2B 5780609e7252c5d09a76b5eaa9ee9cd75fca3452c273add127c3f9124833e6ab3419b333b6b4e0ca10f5923ffcc0308972d469de61f8e6e8b9ce0de492767c63 SHA512 e8cbf60fbda57d9968539526b86604897044248abcf0e6a80f4dd6e3cbade67352df9813dc143950ed82a8244147d62ff10605eb1666152f87698b41fa4a0b92
 EBUILD poppler-9999.ebuild 4455 BLAKE2B e03e1ba798e681c3426cefe2c5da396e3884060ddcbbc6bb109a38e16b715fb0f2e6c02c05848fa25c1f3166112145c51698fba36db1d834b7fb9baf8c79e572 SHA512 e9bef5746dd9fa1a77a2f4ce7adcea4034aba009cd2a309a906f5a96b8cf2d7b9db55359dc0b0229771f434cd3bc7ccad3adbcafd4d405c55a9abdc8ab501987
 MISC metadata.xml 1230 BLAKE2B e537b88babbb0c4ef5355c57c226d1c27b8b058e85c437962afe3610cf7dcdd4fea4a7694e508314cc5111d7bf09dc67881f0268a5cc8c2ce1e569a6f8c7699d SHA512 92b0a2fb9bf788eab1187657485698322cec7623da7b861ed5134089d0f3fc05f42138f734aa78bb811679203af2c6bf0dad7e78a091d5a51ba16a2aac60a227
diff --git a/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch b/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch
new file mode 100644
index 000000000000..35daf33c7c6f
--- /dev/null
+++ b/app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch
@@ -0,0 +1,25 @@
+From 6a87cf2157e6ce5b1f98288727e8fc2a2caf0220 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Nov 2024 21:15:55 +0100
+Subject: [PATCH] Install SplashFont again
+
+I failed realizing it was usable
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a5c8b7610..ef0dc236a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -756,6 +756,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
+     splash/SplashBitmap.h
+     splash/SplashClip.h
+     splash/SplashErrorCodes.h
++    splash/SplashFont.h
+     splash/SplashFontEngine.h
+     splash/SplashFontFile.h
+     splash/SplashFontFileID.h
+-- 
+GitLab
+
diff --git a/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch b/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch
new file mode 100644
index 000000000000..9b0a5211abd0
--- /dev/null
+++ b/app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch
@@ -0,0 +1,25 @@
+From 2d7188a3a3679a359e3eb49beb9657027a16b3bd Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 13 Nov 2024 22:06:46 +0100
+Subject: [PATCH] Install StructTreeRoot.h again
+
+I didn't realize it was usable without being exported
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef0dc236a..574b50deb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -713,6 +713,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
+     poppler/Stream-CCITT.h
+     poppler/Stream.h
+     poppler/StructElement.h
++    poppler/StructTreeRoot.h
+     poppler/UnicodeMap.h
+     poppler/UnicodeMapFuncs.h
+     poppler/UnicodeMapTables.h
+-- 
+GitLab
+
diff --git a/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch b/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch
new file mode 100644
index 000000000000..9787e6f3a80d
--- /dev/null
+++ b/app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch
@@ -0,0 +1,25 @@
+From b9620f70a41e878b7f4e615ced4bd7ecf9fe7233 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 10 Nov 2024 23:47:18 +0100
+Subject: [PATCH] Install ViewerPreferences again
+
+I failed realizing it was usable given it's all inline functions
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bb1c73a05..a5c8b7610 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -720,6 +720,7 @@ if(ENABLE_UNSTABLE_API_ABI_HEADERS)
+     poppler/UnicodeCClassTables.h
+     poppler/UnicodeCompTables.h
+     poppler/UnicodeDecompTables.h
++    poppler/ViewerPreferences.h
+     poppler/XRef.h
+     poppler/CharTypes.h
+     poppler/ErrorCodes.h
+-- 
+GitLab
+
diff --git a/app-text/poppler/poppler-24.11.0.ebuild b/app-text/poppler/poppler-24.11.0-r1.ebuild
index 054f0ab434e4..f432eea6736d 100644
--- a/app-text/poppler/poppler-24.11.0.ebuild
+++ b/app-text/poppler/poppler-24.11.0-r1.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
 	SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
-#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	SLOT="0/143"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -80,6 +80,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
 	"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	# git master
+	"${FILESDIR}/${P}-readd-ViewerPreferences.patch"
+	"${FILESDIR}/${P}-readd-SplashFont.patch"
+	"${FILESDIR}/${P}-readd-StructTreeRoot.patch"
 )
 
 src_unpack() {