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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E820C158089 for ; Sun, 8 Oct 2023 14:37:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 325532BC014; Sun, 8 Oct 2023 14:37:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 193AA2BC014 for ; Sun, 8 Oct 2023 14:37:58 +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 5CC73335C8E for ; Sun, 8 Oct 2023 14:37:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D48F99EE for ; Sun, 8 Oct 2023 14:37:55 +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: <1696775850.d287b1a65a0ed788efcae019678214f2877ec840.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/poppler/Manifest app-text/poppler/files/poppler-23.10.0-qt-deps.patch app-text/poppler/poppler-23.10.0.ebuild app-text/poppler/poppler-9999.ebuild X-VCS-Directories: app-text/poppler/ app-text/poppler/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d287b1a65a0ed788efcae019678214f2877ec840 X-VCS-Branch: master Date: Sun, 8 Oct 2023 14:37:55 +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: 1266418c-6440-4bfa-bbed-f025c65974dd X-Archives-Hash: eb00c3e57f3ad310b8df0c1fd8d7c68e commit: d287b1a65a0ed788efcae019678214f2877ec840 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 8 09:59:57 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 8 14:37:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d287b1a6 app-text/poppler: add 23.10.0, bump subslot, update cmake args Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 2 + .../poppler/files/poppler-23.10.0-qt-deps.patch | 61 ++++++++++++++++++++++ ...{poppler-9999.ebuild => poppler-23.10.0.ebuild} | 14 ++--- app-text/poppler/poppler-9999.ebuild | 14 ++--- 4 files changed, 77 insertions(+), 14 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index c1a5a1c7ea3f..114a0ea8feec 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -2,4 +2,6 @@ DIST poppler-23.08.0.tar.xz 1883408 BLAKE2B a35e44cc590e34991b27e53caf650dedf4d4 DIST poppler-23.08.0.tar.xz.sig 833 BLAKE2B afab91ff9f799cc6c5864275bebf580098449ca070fa5eca47ff54007e94eef4a33f3762390a509d21471af81f9d731951bdbc1ff4adc162763bf54e7dd84408 SHA512 896905f056265388872de552aac94c64abc29f82062ecb2a5137288e4594ca87cb7372807bfe4c30fbc08a3d3922ce84bbbe7260a35e19d438f6bc88d230429f DIST poppler-23.09.0.tar.xz 1888836 BLAKE2B 910bd83a94268673c348f554114cbefd02186ed70f8cf9bbe83e4754758f585e74ed418e711b883f8bc39fb680372583229f7196c847a4b749c04018c1ab7407 SHA512 8657845ec02fca6fe9791823ebeed6c44971c524edc56cb945501dfefb3dc72a6d86fff751bfb708a862a7862cfdcc57bf7b3f825e2bafe25a1e6679c7171a4c DIST poppler-23.09.0.tar.xz.sig 833 BLAKE2B 3d8277e8e9779b655003bb73637f2e763f82388f58a25010ed5af0078199a75e1c0872f00ee8b0893660a6912b558a5c69bd11309204493d9dbb6e2cbefd41ba SHA512 2b091e2f96d6ed1737e2c208228c969196e3d6f927664759f259a04f0e35b79d2b00ee0da5882f622d0269eea7ab470014f30e6d55659fd1e8fb9cdc23db68a6 +DIST poppler-23.10.0.tar.xz 1892152 BLAKE2B ce1b42d316e1d55567384fc5374af1a177f95cc045490bc3040b454106681f10959e192d961603443d3df2efe30350f70ab0bd2755ed099c70ab50019c2abdf3 SHA512 b945662746c5fc58df6ec05c637cfa0792702f49f589f1eef69a3aa06823274babd0d604cb8671cabc1341c3bfede1814b5d400fb2a9efe711bf04bd177cea03 +DIST poppler-23.10.0.tar.xz.sig 833 BLAKE2B 74bdf5548afae23cf17037f3810765afd82a8d7f2a908e49144733adaae5f2eff0adce97aaa0945a40a324b293cb5f7f88b996e783390b26f7c360886c6bb41c SHA512 3c02270febea589d72d60e3fd0ffff2cb0be84ffcf5c8c66fd4461e64827614e08d9351176a6880d64558247cd722adc42343a7a5774eb331e55141bfb8f661c DIST poppler-test-e3cdc82782941a8d7b8112f83b4a81b3d334601a.tar.bz2 5199251 BLAKE2B 6431b2aa4c60dec6202c737b4cfbbd4bf03808772c0adc6568454a04e713a2e869702f5c318e7799e7b1374252b5a956471b7cf6c9e2d6c8da5236e31a110f35 SHA512 bf5442601f453e601e0b368cc576bf0d5ca5509e9eecd8c7f0476802346834e9a9d3e0f32130c18d21807cd69a55e8168bca1cdb0292ad0215590a881a923c04 diff --git a/app-text/poppler/files/poppler-23.10.0-qt-deps.patch b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch new file mode 100644 index 000000000000..348f56d5e0b4 --- /dev/null +++ b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch @@ -0,0 +1,61 @@ +From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 9 Dec 2020 01:28:25 +0100 +Subject: [PATCH] Move Qt test dependencies into test dir + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 8 ++++---- + qt5/CMakeLists.txt | 7 +++++-- + qt6/CMakeLists.txt | 6 ++++-- + 3 files changed, 13 insertions(+), 8 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -212,15 +212,15 @@ + find_soft_mandatory_package(ENABLE_QT5 Qt5Core ${QT5_VERSION}) + find_soft_mandatory_package(ENABLE_QT5 Qt5Gui ${QT5_VERSION}) + find_soft_mandatory_package(ENABLE_QT5 Qt5Xml ${QT5_VERSION}) +-find_soft_mandatory_package(ENABLE_QT5 Qt5Widgets ${QT5_VERSION}) +-find_soft_mandatory_package(ENABLE_QT5 Qt5Test ${QT5_VERSION}) ++find_soft_mandatory_package(BUILD_QT5_TESTS Qt5Widgets ${QT5_VERSION}) ++find_soft_mandatory_package(BUILD_QT5_TESTS Qt5Test ${QT5_VERSION}) + + set(QT6_VERSION "6.2") + SET(QT_NO_CREATE_VERSIONLESS_TARGETS ON) + find_soft_mandatory_package(ENABLE_QT6 Qt6Core ${QT6_VERSION}) + find_soft_mandatory_package(ENABLE_QT6 Qt6Gui ${QT6_VERSION}) +-find_soft_mandatory_package(ENABLE_QT6 Qt6Widgets ${QT6_VERSION}) +-find_soft_mandatory_package(ENABLE_QT6 Qt6Test ${QT6_VERSION}) ++find_soft_mandatory_package(ENABLE_QT6_TESTS Qt6Widgets ${QT6_VERSION}) ++find_soft_mandatory_package(ENABLE_QT6_TESTS Qt6Test ${QT6_VERSION}) + + # Check for Cairo rendering backend + macro_optional_find_package(Cairo ${CAIRO_VERSION}) +--- a/qt5/CMakeLists.txt ++++ b/qt5/CMakeLists.txt +@@ -9,5 +9,8 @@ + add_definitions(-DQT_NO_DEPRECATED_WARNINGS) + + add_subdirectory(src) +-add_subdirectory(tests) +-add_subdirectory(demos) ++ ++if(BUILD_QT5_TESTS) ++ add_subdirectory(tests) ++ add_subdirectory(demos) ++endif() +--- a/qt6/CMakeLists.txt ++++ b/qt6/CMakeLists.txt +@@ -7,5 +7,7 @@ + + add_subdirectory(src) + +-add_subdirectory(tests) +-add_subdirectory(demos) ++if(BUILD_QT5_TESTS) ++ add_subdirectory(tests) ++ add_subdirectory(demos) ++endif() +-- +2.29.2 diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-23.10.0.ebuild similarity index 93% copy from app-text/poppler/poppler-9999.ebuild copy to app-text/poppler/poppler-23.10.0.ebuild index d33daa61e4b9..eb8379739663 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-23.10.0.ebuild @@ -18,7 +18,7 @@ else 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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - SLOT="0/131" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/132" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -73,7 +73,7 @@ fi DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" + "${FILESDIR}/${P}-qt-deps.patch" "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) @@ -123,15 +123,15 @@ src_configure() { -DWITH_Cairo=$(usex cairo) -DENABLE_LIBCURL=$(usex curl) -DENABLE_CPP=$(usex cxx) - -DWITH_Gpgmepp=$(usex gpgme) + -DENABLE_GPGME=$(usex gpgme) -DWITH_JPEG=$(usex jpeg) -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) - -DENABLE_CMS=$(usex lcms lcms2 none) - -DWITH_NSS3=$(usex nss) + -DENABLE_LCMS=$(usex lcms) + -DENABLE_NSS3=$(usex nss) -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) + -DENABLE_QT5=$(usex qt5) + -DENABLE_LIBTIFF=$(usex tiff) -DENABLE_UTILS=$(usex utils) -DENABLE_QT6=OFF ) diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index d33daa61e4b9..d9408aba46c1 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -18,7 +18,7 @@ else 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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - SLOT="0/131" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/132" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -73,7 +73,7 @@ fi DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( - "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" + "${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" ) @@ -123,15 +123,15 @@ src_configure() { -DWITH_Cairo=$(usex cairo) -DENABLE_LIBCURL=$(usex curl) -DENABLE_CPP=$(usex cxx) - -DWITH_Gpgmepp=$(usex gpgme) + -DENABLE_GPGME=$(usex gpgme) -DWITH_JPEG=$(usex jpeg) -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) - -DENABLE_CMS=$(usex lcms lcms2 none) - -DWITH_NSS3=$(usex nss) + -DENABLE_LCMS=$(usex lcms) + -DENABLE_NSS3=$(usex nss) -DWITH_PNG=$(usex png) - $(cmake_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) + -DENABLE_QT5=$(usex qt5) + -DENABLE_LIBTIFF=$(usex tiff) -DENABLE_UTILS=$(usex utils) -DENABLE_QT6=OFF )