app-text/poppler: Re-add several headers, re-add KEYWORDS

Fixes (only part of) Scribus build errors.

See also:
https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/1639

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 80 insertions, 1 deletions

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() {