From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8EFB0158042 for ; Wed, 13 Nov 2024 22:45:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF75AE0805; Wed, 13 Nov 2024 22:45:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93AE0E0805 for ; Wed, 13 Nov 2024 22:45:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5A28335C2E for ; Wed, 13 Nov 2024 22:45:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BC3D1915 for ; Wed, 13 Nov 2024 22:45:02 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1731537889.8a8ecbe7da9813b9549ad78bf6e6a15357147738.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/files/poppler-24.11.0-readd-SplashFont.patch app-text/poppler/files/poppler-24.11.0-readd-StructTreeRoot.patch app-text/poppler/files/poppler-24.11.0-readd-ViewerPreferences.patch app-text/poppler/poppler-24.11.0-r1.ebuild app-text/poppler/poppler-24.11.0.ebuild X-VCS-Directories: app-text/poppler/files/ app-text/poppler/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8a8ecbe7da9813b9549ad78bf6e6a15357147738 X-VCS-Branch: master Date: Wed, 13 Nov 2024 22:45:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1f6c93ca-c297-427b-837b-8a5b8e0a1de5 X-Archives-Hash: c8b74d8fb3db4a24df8bcc10936bf769 commit: 8a8ecbe7da9813b9549ad78bf6e6a15357147738 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 12 22:57:41 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 13 22:44:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8ecbe7 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 gentoo.org> .../files/poppler-24.11.0-readd-SplashFont.patch | 25 ++++++++++++++++++++++ .../poppler-24.11.0-readd-StructTreeRoot.patch | 25 ++++++++++++++++++++++ .../poppler-24.11.0-readd-ViewerPreferences.patch | 25 ++++++++++++++++++++++ ...er-24.11.0.ebuild => poppler-24.11.0-r1.ebuild} | 6 +++++- 4 files changed, 80 insertions(+), 1 deletion(-) 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 +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 +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 +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 similarity index 93% rename from app-text/poppler/poppler-24.11.0.ebuild rename to 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() {