diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-01-18 17:42:34 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-01-18 17:45:22 +0100 |
| commit | ae2df115e030308761fdbeb6c78bfd3e0f34667d (patch) | |
| tree | a85a8b2dfc0141fb89e90b1f3050edfe54687693 /app-text/poppler | |
| parent | gui-apps/xwaylandvideobridge: add 0.4.0 (diff) | |
| download | gentoo-ae2df115e030308761fdbeb6c78bfd3e0f34667d.tar.gz gentoo-ae2df115e030308761fdbeb6c78bfd3e0f34667d.tar.bz2 gentoo-ae2df115e030308761fdbeb6c78bfd3e0f34667d.zip | |
app-text/poppler: Fix 23.10.0-qt-deps.patch and IUSE=qt5,qt6,test
Closes: https://bugs.gentoo.org/921391
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-text/poppler')
| -rw-r--r-- | app-text/poppler/files/poppler-23.10.0-qt-deps.patch | 6 | ||||
| -rw-r--r-- | app-text/poppler/poppler-23.12.0.ebuild | 1 | ||||
| -rw-r--r-- | app-text/poppler/poppler-24.01.0.ebuild | 1 | ||||
| -rw-r--r-- | app-text/poppler/poppler-9999.ebuild | 3 |
4 files changed, 7 insertions, 4 deletions
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 index 348f56d5e0b4..f906e335717d 100644 --- a/app-text/poppler/files/poppler-23.10.0-qt-deps.patch +++ b/app-text/poppler/files/poppler-23.10.0-qt-deps.patch @@ -27,8 +27,8 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> 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}) ++find_soft_mandatory_package(BUILD_QT6_TESTS Qt6Widgets ${QT6_VERSION}) ++find_soft_mandatory_package(BUILD_QT6_TESTS Qt6Test ${QT6_VERSION}) # Check for Cairo rendering backend macro_optional_find_package(Cairo ${CAIRO_VERSION}) @@ -53,7 +53,7 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> -add_subdirectory(tests) -add_subdirectory(demos) -+if(BUILD_QT5_TESTS) ++if(BUILD_QT6_TESTS) + add_subdirectory(tests) + add_subdirectory(demos) +endif() diff --git a/app-text/poppler/poppler-23.12.0.ebuild b/app-text/poppler/poppler-23.12.0.ebuild index fb48cbc0360f..6f415d22e32f 100644 --- a/app-text/poppler/poppler-23.12.0.ebuild +++ b/app-text/poppler/poppler-23.12.0.ebuild @@ -116,6 +116,7 @@ src_configure() { local mycmakeargs=( -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) -DBUILD_CPP_TESTS=$(usex test) -DBUILD_MANUAL_TESTS=$(usex test) -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} diff --git a/app-text/poppler/poppler-24.01.0.ebuild b/app-text/poppler/poppler-24.01.0.ebuild index 46153b840887..89d10798980c 100644 --- a/app-text/poppler/poppler-24.01.0.ebuild +++ b/app-text/poppler/poppler-24.01.0.ebuild @@ -116,6 +116,7 @@ src_configure() { local mycmakeargs=( -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) -DBUILD_CPP_TESTS=$(usex test) -DBUILD_MANUAL_TESTS=$(usex test) -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index 08d879782a73..89d10798980c 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2005-2023 Gentoo Authors +# Copyright 2005-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -116,6 +116,7 @@ src_configure() { local mycmakeargs=( -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=$(usex test $(usex qt5)) + -DBUILD_QT6_TESTS=$(usex test $(usex qt6)) -DBUILD_CPP_TESTS=$(usex test) -DBUILD_MANUAL_TESTS=$(usex test) -DTESTDATADIR="${WORKDIR}"/test-${TEST_COMMIT} |