From fbda87924e6faa7a1919f1a2b4182490bde5ec5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 3 Sep 2021 20:56:28 +0100 Subject: gentoo resync : 03.09.2021 --- app-text/poppler/Manifest | 3 +- .../files/poppler-9999-respect-cflags.patch | 116 +++++++++++++++++++++ app-text/poppler/poppler-9999.ebuild | 4 +- 3 files changed, 120 insertions(+), 3 deletions(-) create mode 100644 app-text/poppler/files/poppler-9999-respect-cflags.patch (limited to 'app-text/poppler') diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index ae84213a48b9..573a90c8c7c4 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,9 +1,10 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537 AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b +AUX poppler-9999-respect-cflags.patch 5473 BLAKE2B 78f12a2f5f582c369ac72b5203cdc5391dfbe8f48ab00e2684f58386147d2e35b33a93882535227031d52ae298dcd14f4e584b8ec248f83c463ce3169479822f SHA512 f18ac99639f8278c8eef622a98f42ca39e9612ddc1d701d8684e170fa7c300b9f73b80eb35c68a18cf413a9beabeb8610901fa3fabf92d0c6521f4020c971956 DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8 DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211 EBUILD poppler-21.07.0.ebuild 3339 BLAKE2B fa5a0f1aee4edc405149d5573b917320eb8748054687222ba9dab6c61105af7286022bfc7d7b685aff174966a7d0db1274dddf9464343fd4e35a4dd6d5c53921 SHA512 c0f8caf6a63c76024c668e8f98cdb67ddd5ff3a0798cd54d1276a1aecae54324dcbbd291e308a4e322eefa61ff13a34027fe86bbd9f464a8fc9873da6a41af48 EBUILD poppler-21.08.0.ebuild 3347 BLAKE2B 700214c4ab1e71cc530bb084915ffdae2dbb4b56a30eed2ae599c0bf8f71fc03f5357ab105c41123c075397743ee86b0cc920b0356c642ca7e4ad1ccc663e293 SHA512 2964d203250ad578b09895582fdf02e855b2355944bc318384db76d39701582233382c436f9d2f22e643a88db98dc891070edabe3a11c94614ace4fc224cfb95 -EBUILD poppler-9999.ebuild 3347 BLAKE2B 700214c4ab1e71cc530bb084915ffdae2dbb4b56a30eed2ae599c0bf8f71fc03f5357ab105c41123c075397743ee86b0cc920b0356c642ca7e4ad1ccc663e293 SHA512 2964d203250ad578b09895582fdf02e855b2355944bc318384db76d39701582233382c436f9d2f22e643a88db98dc891070edabe3a11c94614ace4fc224cfb95 +EBUILD poppler-9999.ebuild 3335 BLAKE2B 83ef2335947c97d172e5e26e46cbf6ffab1759d0a40960ecd2fb1ac2f1ad67328b5ed92179adea80ad49ab0b06f69dfe48620e6eab586d45b798ab2453201ca1 SHA512 60cefdca9a7825cc60d5fc6a4180f58e9c649d7a08441d60f994118956daee2d08b12a3c3c65f0fd0042a9946751121179fd7cb365ceba784ebb7cb15fcbc9d2 MISC metadata.xml 1077 BLAKE2B c49251ca6f1d793da24746e5161d43b01550c560fb942d64298c19a889c531f4c5fab967cde87f7063ecb4789a6586e40ca519b196633912ccb55ed568a650cf SHA512 c09156d438acc9cf85e77fd1f57262596c28f305559d9635d4a457189f88e56e0689e102ad60d2be998b9e286c36ed45227e95ae5e9ce6a247662331d44f2076 diff --git a/app-text/poppler/files/poppler-9999-respect-cflags.patch b/app-text/poppler/files/poppler-9999-respect-cflags.patch new file mode 100644 index 000000000000..08eb5beed26b --- /dev/null +++ b/app-text/poppler/files/poppler-9999-respect-cflags.patch @@ -0,0 +1,116 @@ +This can be renamed on the next version after 21.08.0. User wanted to test +some patches committed upstream so ended up needing to rebase this patch. + +From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001 +From: Theo Anderson +Date: Wed, 14 Apr 2021 10:16:11 +1200 +Subject: [PATCH] build: respect cflags + +[Rebased by: Stefan Radermacher ] +Signed-off-by: Theo Anderson +--- a/cmake/modules/PopplerMacros.cmake ++++ b/cmake/modules/PopplerMacros.cmake +@@ -87,20 +87,15 @@ 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}") + + if(CMAKE_COMPILER_IS_GNUCXX) +- # set the default compile warnings + set(_warn "-Wall -Wextra -Wpedantic") + set(_warn "${_warn} -Wno-unused-parameter") + 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") +@@ -116,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") +@@ -139,56 +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} -Wno-unused-parameter") +- 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.33.0 + diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index be72663ad68d..2013baa8c3f7 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -61,7 +61,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" + "${FILESDIR}/${PN}-9999-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) @@ -70,7 +70,7 @@ src_prepare() { # Clang doesn't grok this flag, the configure nicely tests that, but # cmake just uses it, so remove it if we use clang - if [[ ${CC} == clang ]] ; then + if tc-is-clang ; then sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die fi -- cgit v1.2.3