gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-text/poppler: 9999: Drop IUSE qt5, rebase patches, bump subslot

Browse Source 
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2026-01-07 21:07:50 +01:00
parent 0b698a85c8
commit 4e331bbfd3
3 changed files with 195 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
app-text/poppler/files/poppler-26.01.0-qt-deps.patch Normal file
View File

@@ -0,0 +1,71 @@
Source: https://gitlab.freedesktop.org/poppler/poppler/-/merge_requests/2013
From 1fccd6fefd96b2934a886ebd12bc27da0afc70bc Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 9 Dec 2020 01:28:25 +0100
Subject: [PATCH] Move Qt test dependencies into test dir
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
---
CMakeLists.txt | 8 ++++----
qt5/CMakeLists.txt | 7 +++++--
qt6/CMakeLists.txt | 6 ++++--
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48033dce..4785f2b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,15 +216,15 @@ set(QT5_VERSION "5.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(BUILD_QT6_TESTS Qt6Widgets ${QT6_VERSION})
+find_soft_mandatory_package(BUILD_QT6_TESTS Qt6Test ${QT6_VERSION})
add_definitions(-DQT_NO_CAST_FROM_ASCII)
add_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
index 431d2d35..bd4194e5 100644
--- a/qt5/CMakeLists.txt
+++ b/qt5/CMakeLists.txt
@@ -9,5 +9,8 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050E00)
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()
diff --git a/qt6/CMakeLists.txt b/qt6/CMakeLists.txt
index 89e612d1..23b39d72 100644
--- a/qt6/CMakeLists.txt
+++ b/qt6/CMakeLists.txt
@@ -7,5 +7,7 @@ endif()
add_subdirectory(src)
-add_subdirectory(tests)
-add_subdirectory(demos)
+if(BUILD_QT6_TESTS)
+ add_subdirectory(tests)
+ add_subdirectory(demos)
+endif()
--
2.52.0

116
app-text/poppler/files/poppler-26.01.0-respect-cflags.patch Normal file
View File

@@ -0,0 +1,116 @@
From f15f298518f03fa8f661f8fd1b1ce5f7449abc3d Mon Sep 17 00:00:00 2001
From: Theo Anderson <telans@posteo.de>
Date: Wed, 14 Apr 2021 10:16:11 +1200
Subject: [PATCH] build: respect cflags
[Rebased by: Stefan Radermacher <gentoo@zaister.de>]
Signed-off-by: Theo Anderson <telans@posteo.de>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
cmake/modules/PopplerMacros.cmake | 69 +------------------------------
1 file changed, 2 insertions(+), 67 deletions(-)
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index 4fa44dfd..17645e3f 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -87,9 +87,6 @@ set(_known_build_types RELWITHDEBINFO;RELEASE;DEBUG;DEBUGFULL;PROFILE)
# CMake toolchain file). To avoid surprising compilation errors, we emit an
# error in that case, so that the user can handle the passed CMAKE_BUILD_TYPE
# in the compiler flags logic below.
-if (NOT "${_CMAKE_BUILD_TYPE_UPPER}" IN_LIST _known_build_types)
- message(FATAL_ERROR "Unsupported CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
-endif()
set(_save_cflags "${CMAKE_C_FLAGS}")
set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
@@ -99,7 +96,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(_warn "${_warn} -Wcast-align")
set(_warn "${_warn} -Wformat-security")
set(_warn "${_warn} -Wframe-larger-than=65536")
- set(_warn "${_warn} -Wlogical-op")
set(_warn "${_warn} -Wmissing-format-attribute")
set(_warn "${_warn} -Wnon-virtual-dtor")
set(_warn "${_warn} -Woverloaded-virtual")
@@ -115,20 +111,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(DEFAULT_COMPILE_WARNINGS "${_warn}")
set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-
poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
if(GCC_HAS_AS_NEEDED)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
@@ -138,55 +120,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(_compiler_flags_changed 1)
endif (CMAKE_COMPILER_IS_GNUCXX)
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-# set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
- set(_warn "${_warn} -Wcast-align")
- set(_warn "${_warn} -Wformat-security")
- set(_warn "${_warn} -Wframe-larger-than=65536")
- set(_warn "${_warn} -Wmissing-format-attribute")
- set(_warn "${_warn} -Wnon-virtual-dtor")
- set(_warn "${_warn} -Woverloaded-virtual")
- set(_warn "${_warn} -Wmissing-declarations")
- set(_warn "${_warn} -Wundef")
- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
- set(_warn "${_warn} -Wshadow")
- set(_warn "${_warn} -Wweak-vtables")
-
- # set extra warnings
- set(_warnx "${_warnx} -Wconversion")
-
- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
- set(CMAKE_CXX_FLAGS_DEBUG "-g")
- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
- set(CMAKE_C_FLAGS_DEBUG "-g")
- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
- set(_compiler_flags_changed 1)
-endif()
-
-if(CMAKE_C_COMPILER MATCHES "icc")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign")
- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign")
- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign")
- set(_compiler_flags_changed 1)
-endif(CMAKE_C_COMPILER MATCHES "icc")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
if(_compiler_flags_changed)
# Ensure that the previous CMAKE_{C,CXX}_FLAGS are included in the current configuration flags.
--
2.52.0

27
app-text/poppler/poppler-9999.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 2005-2025 Gentoo Authors
# Copyright 2005-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,14 +18,14 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
SLOT="0/155" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
SLOT="0/156" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
HOMEPAGE="https://poppler.freedesktop.org/"
LICENSE="GPL-2"
IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt5 qt6 test tiff +utils"
IUSE="boost cairo cjk curl +cxx debug doc gpgme +introspection +jpeg +jpeg2k +lcms nss png qt6 test tiff +utils"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
@@ -44,11 +44,6 @@ COMMON_DEPEND="
lcms? ( media-libs/lcms:2 )
nss? ( >=dev-libs/nss-3.49 )
png? ( media-libs/libpng:0= )
qt5? (
>=dev-qt/qtcore-5.15.2:5
>=dev-qt/qtgui-5.15.2:5
>=dev-qt/qtxml-5.15.2:5
)
qt6? ( dev-qt/qtbase:6[gui,xml] )
tiff? ( media-libs/tiff:= )
"
@@ -57,13 +52,7 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
boost? ( >=dev-libs/boost-1.74 )
test? (
qt5? (
>=dev-qt/qttest-5.15.2:5
>=dev-qt/qtwidgets-5.15.2:5
)
qt6? ( dev-qt/qtbase:6[widgets] )
)
test? ( qt6? ( dev-qt/qtbase:6[widgets] ) )
"
BDEPEND="
>=dev-util/glib-utils-2.64
@@ -77,8 +66,8 @@ fi
DOCS=( AUTHORS NEWS README.md README-XPDF )
PATCHES=(
"${FILESDIR}/${PN}-23.10.0-qt-deps.patch"
"${FILESDIR}/${PN}-21.09.0-respect-cflags.patch"
"${FILESDIR}/${PN}-26.01.0-qt-deps.patch"
"${FILESDIR}/${PN}-26.01.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
)
@@ -108,7 +97,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
-DBUILD_QT5_TESTS=$(usex test $(usex qt5))
-DBUILD_QT5_TESTS=OFF
-DBUILD_QT6_TESTS=$(usex test $(usex qt6))
-DBUILD_CPP_TESTS=$(usex test)
-DBUILD_MANUAL_TESTS=$(usex test)
@@ -128,7 +117,7 @@ src_configure() {
-DENABLE_LCMS=$(usex lcms)
-DENABLE_NSS3=$(usex nss)
-DWITH_PNG=$(usex png)
-DENABLE_QT5=$(usex qt5)
-DENABLE_QT5=OFF
-DENABLE_QT6=$(usex qt6)
-DENABLE_LIBTIFF=$(usex tiff)
-DENABLE_UTILS=$(usex utils)