diff options
Diffstat (limited to 'app-text/poppler')
-rw-r--r-- | app-text/poppler/Manifest | 16 | ||||
-rw-r--r-- | app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch | 23 | ||||
-rw-r--r-- | app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch | 29 | ||||
-rw-r--r-- | app-text/poppler/files/poppler-0.61.0-respect-cflags.patch | 55 | ||||
-rw-r--r-- | app-text/poppler/files/poppler-20.11.0-respect-cflags.patch | 64 | ||||
-rw-r--r-- | app-text/poppler/files/poppler-21.04.0-respect-cflags.patch (renamed from app-text/poppler/files/poppler-20.12.0-respect-cflags.patch) | 45 | ||||
-rw-r--r-- | app-text/poppler/poppler-21.02.0.ebuild | 2 | ||||
-rw-r--r-- | app-text/poppler/poppler-21.03.0.ebuild | 2 | ||||
-rw-r--r-- | app-text/poppler/poppler-21.04.0.ebuild (renamed from app-text/poppler/poppler-20.11.0.ebuild) | 10 | ||||
-rw-r--r-- | app-text/poppler/poppler-9999.ebuild | 4 |
10 files changed, 41 insertions, 209 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 22bb8dc4e474..5a4eac92a8f7 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,15 +1,11 @@ -AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80d4839f61beb22ba8ede9d594d4978c1311219268c3c97f8f9b6e939e2d0870acf6406a01ceafcbd982dcf93ee738a6451b86f7f48d270ec9 SHA512 fc12ae5a484bd231a10bd31860f07d773899ba034cb43f55bc53da7701dc8a3d8ce86885330cdad1a4d32fd8ce712105d3c8b984855857fabd4d4e92bb54dfed AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee -AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c -AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d -AUX poppler-20.11.0-respect-cflags.patch 2797 BLAKE2B 8c37ed086fa823eac8d04e47c04f79afc76c0e6caa6d921b21bb5d99928be9c9bc683126e42e249aa8ccd96470d7ecf9eb1b0d8e749bd85bf4a455bb5d513e01 SHA512 421760c08f351449b7c899e4a04c3d93a26cf914326c58427031d4398f7cd4d2ed68d5ab42f930d663aa4f918fa11534e310ae6a9c005bdb3c9a191a497e6386 -AUX poppler-20.12.0-respect-cflags.patch 5494 BLAKE2B 8107bd3cb374694aea1dbd66cb95258ec568bea0bd00ff02ce9cd074e23dd8f399543d2055578654cdf7db09b46bd051346a596538305af883f9eb45c0916e47 SHA512 700233376a3254e3e5667719f95d00f828850476e3156856068c8b7faeff8c438c494606aa39f5551e998e02dd58aaca63eaaa5faff606f75d9a272631bdbc8a AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537 -DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335 +AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035 DIST poppler-21.03.0.tar.xz 1690848 BLAKE2B 60aef92bdfdc603b38dfb2a1aebd59c9085e6d51a2e22864edb3b0fd535421f47fb8041241e321d44cd8539538b61c6e19fe2d99a8a2d21fd85c3757ccadb5d2 SHA512 0eea1b5f32d79c3a497351a6491b5f617b089bef0a9a446723e87185acadba535e3146c0c141f4c2165ced1aa6fa853b54760a322d0932cfe3049c0ad94d64fa -EBUILD poppler-20.11.0.ebuild 3364 BLAKE2B 0bed70002e75a2ef80c1504057f77c6fc89b0729d219352d534f6cec73a117d718364773520ed5fddc6e9f339e275a9ac2278e1755b01d6099fa8bd27fdb8d0d SHA512 674e487dee7bd6cb117de9c4eac0e0c7602e397b0c20224a90edd848ba373364d6d270f51fbbd49ada7528b26675e41179ed03cc6e608abc070e4aaeaa9252b1 -EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B c586ed066559ded8afac18d7d85cb24d34164b42503f8c87a5c6c791f4faee990237abed528432b02a5f66bf6feac598807177b498a1c1ca53e740481ad6d183 SHA512 c0514348aa20d7f80b13a3f7343548b7c0dd0f3e1f4f4f777f8df1779c30df70bfe642d14293e31af07ca80e7590f5ad32a890692ddab80dc9dc40d7416c41e2 -EBUILD poppler-21.03.0.ebuild 3256 BLAKE2B 785cf6a6d91167077ab0a8b441e4f879b8cc82b6c789d4632d2270438099c006589dbbc6d5137540cd38c3397ae728efbc3e69eaa67def9b3d1302713f3fbe3e SHA512 34244bb699446c2ebd406e12fafe59ab8dddc0578b2437515732bf7d2c7d0043c6c3d0eab8a7a7d667439b36532cb5198e941f384cd11d72c2fbea3466b7dda2 -EBUILD poppler-9999.ebuild 3256 BLAKE2B 785cf6a6d91167077ab0a8b441e4f879b8cc82b6c789d4632d2270438099c006589dbbc6d5137540cd38c3397ae728efbc3e69eaa67def9b3d1302713f3fbe3e SHA512 34244bb699446c2ebd406e12fafe59ab8dddc0578b2437515732bf7d2c7d0043c6c3d0eab8a7a7d667439b36532cb5198e941f384cd11d72c2fbea3466b7dda2 +DIST poppler-21.04.0.tar.xz 1694132 BLAKE2B 759a22b175ca8b64fa666d61e394cb7b6baa34a3dbc9c6cceb24c7ad4b0892ee34faea90278d9889d72d7b9558fc9abf52ab74fd739dc12e7314c3a755661350 SHA512 c3391787456e8a4a3bd6e57f96faa25051bb5e15ae7eeb7072ad6fbc25e3f8a34818945cc49d90a0e6ebc3d38dd4e70d3c60ba0a5cb42c4000bd8c15c947e5bc +EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B 6eea98c0df7d157fedf39f8ed52f1305542f888b19c8a5adf741bd85df6fc7d5724c8ec03ad88ee9bec30bda82aa30e3fca370d407a6234a4f97aa5d4b3f76ce SHA512 2657dd6d87197953c09ab1ed4852f07e33475e1ceeadea0dcd0627f771500f13057eee927b8341286ba25820c4f2ce6b3f8d6b00d0b75510b27b3b9740585375 +EBUILD poppler-21.03.0.ebuild 3256 BLAKE2B 392e3cb27b1e618b9eb23bc7bbc6702e3be28bb3ead308a0b086791d737b991a8a4dfb63aecee92ff6151a45a28e0e839f6cf4fe6105b2ce0ab158c6ecdc0c82 SHA512 c379804521b46abd8bb0d2185e7a6b34f1e278e8d40f9474b8474ede37c5b1000d0d0e566a9266b088fef098dd6b7af0e1d6802a06621c29195e05cb43895d30 +EBUILD poppler-21.04.0.ebuild 3256 BLAKE2B 46cf4d6288aee53437e58c698110a58da3a395cc4ee078dd7c2d5c2e3b06a56c69e773f8ba7c33280efb67fd61000c943c10715bf46661835efad7c970270dc0 SHA512 c090442121d2c2275b1c82c67ad2ce24358d0b55f0cb9e3a509aeb60191423a984a126c6233332477a92d1d09f8d266e4d94c135b40e3c6f699108ba613e4068 +EBUILD poppler-9999.ebuild 3256 BLAKE2B 46cf4d6288aee53437e58c698110a58da3a395cc4ee078dd7c2d5c2e3b06a56c69e773f8ba7c33280efb67fd61000c943c10715bf46661835efad7c970270dc0 SHA512 c090442121d2c2275b1c82c67ad2ce24358d0b55f0cb9e3a509aeb60191423a984a126c6233332477a92d1d09f8d266e4d94c135b40e3c6f699108ba613e4068 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c diff --git a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch deleted file mode 100644 index f0a8d3c7eb4a..000000000000 --- a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7178d25..934f38f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -119,6 +119,18 @@ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSIO - message("-- CMake >= 2.8.8 is needed to enable Qt5") - endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) - -+# -+# Ugly workaround: Manually patch library paths for Qt4 and Qt5: -+# -+IF( "${CMAKE_CXX_FLAGS}" MATCHES "-m32") -+ GET_CMAKE_PROPERTY(_res VARIABLES) -+ FOREACH(_var ${_res}) -+ IF(_var MATCHES "^QT" AND ${_var} MATCHES "lib64") -+ STRING(REPLACE "lib64" "lib32" ${_var} "${${_var}}") -+ ENDIF() -+ ENDFOREACH() -+ENDIF() -+ - macro_optional_find_package(Cairo ${CAIRO_VERSION}) - if(CAIRO_FOUND) - set(HAVE_CAIRO ${CAIRO_FOUND}) diff --git a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch deleted file mode 100644 index 259be15c6631..000000000000 --- a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch +++ /dev/null @@ -1,29 +0,0 @@ -From af70882d85999b1912f9909f506ee7d22cc58ca7 Mon Sep 17 00:00:00 2001 -From: Johannes Huber <johu@gentoo.org> -Date: Fri, 6 Oct 2017 08:52:10 +0200 -Subject: [PATCH] [Qt5] Drop unused dependencies - ---- - CMakeLists.txt | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7485b2ad..04327568 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,10 +147,8 @@ if (ENABLE_QT5) - find_package(Qt5Core) - find_package(Qt5Gui) - find_package(Qt5Xml) -- find_package(Qt5Widgets) -- find_package(Qt5Test) -- if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)) -- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") -+ if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND)) -+ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found") - set(ENABLE_QT5 OFF) - endif() - endif() --- -2.14.2 - diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch deleted file mode 100644 index a75b84b482f5..000000000000 --- a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- poppler-0.61.0/cmake/modules/PopplerMacros.cmake -+++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake -@@ -98,8 +98,6 @@ - set(CMAKE_BUILD_TYPE RelWithDebInfo) - endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - --if(CMAKE_COMPILER_IS_GNUCXX) -- # set the default compile warnings - set(_warn "-Wall -Wextra -Wpedantic") - set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers") - set(_warn "${_warn} -Wcast-align") -@@ -124,39 +122,6 @@ - set(DEFAULT_COMPILE_WARNINGS "${_warn}") - set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - -- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") -- set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") -- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") -- -- 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") -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") -- endif(GCC_HAS_AS_NEEDED) --endif (CMAKE_COMPILER_IS_GNUCXX) -- --if(CMAKE_C_COMPILER MATCHES "icc") -- set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}") -- set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}") --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") -+ -\ Kein Zeilenumbruch am Dateiende. diff --git a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch deleted file mode 100644 index 9845c0970174..000000000000 --- a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 083bc159ce35e21ab5bb942e91e98a95ce1f8f99 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Mon, 2 Nov 2020 14:30:22 +0100 -Subject: [PATCH] build: respect cflags - ---- - cmake/modules/PopplerMacros.cmake | 41 ------------------------------- - 1 file changed, 41 deletions(-) - -diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake -index 6e5f0050..1a3d0f9f 100644 ---- a/cmake/modules/PopplerMacros.cmake -+++ b/cmake/modules/PopplerMacros.cmake -@@ -145,47 +145,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) - endif(GCC_HAS_AS_NEEDED) - 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(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") -- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -- set(CMAKE_CXX_FLAGS_DEBUG "-g ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") -- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") -- set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") -- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -- set(CMAKE_C_FLAGS_DEBUG "-g ${_save_cflags}") -- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") -- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") -- --endif() -- - if(CMAKE_C_COMPILER MATCHES "icc") - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") --- -2.29.2 - diff --git a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch index 4b389faa7d61..8781bbec5bbc 100644 --- a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch +++ b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch @@ -1,17 +1,18 @@ -From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Wed, 2 Dec 2020 09:29:33 +0100 +From a9f54d7c37b2b738767d757517466768a9f5a8fe 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 +Signed-off-by: Theo Anderson <telans@posteo.de> --- - cmake/modules/PopplerMacros.cmake | 81 +------------------------------ - 1 file changed, 2 insertions(+), 79 deletions(-) + cmake/modules/PopplerMacros.cmake | 77 ++----------------------------- + 1 file changed, 4 insertions(+), 73 deletions(-) diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake -index 707e7497..882cf11b 100644 +index fe1182da..b77eaa3e 100644 --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) +@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) set(CMAKE_BUILD_TYPE RelWithDebInfo) endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) @@ -20,10 +21,17 @@ index 707e7497..882cf11b 100644 set(_warn "-Wall -Wextra -Wpedantic") set(_warn "${_warn} -Wno-unused-parameter") set(_warn "${_warn} -Wcast-align") -@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX) + 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") +@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEFAULT_COMPILE_WARNINGS "${_warn}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - +- - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") @@ -39,14 +47,15 @@ index 707e7497..882cf11b 100644 - set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}") - set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}") - -- 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") -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed") -- endif(GCC_HAS_AS_NEEDED) --endif (CMAKE_COMPILER_IS_GNUCXX) -- ++ ++if(CMAKE_COMPILER_IS_GNUCXX) + 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") +@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX) + endif(GCC_HAS_AS_NEEDED) + endif (CMAKE_COMPILER_IS_GNUCXX) + -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -# set the default compile warnings - set(_warn "-Wall -Wextra -Wpedantic") @@ -104,5 +113,5 @@ index 707e7497..882cf11b 100644 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") -- -2.29.2 +2.31.1 diff --git a/app-text/poppler/poppler-21.02.0.ebuild b/app-text/poppler/poppler-21.02.0.ebuild index d24ddd8550fb..05b6d08ed7b3 100644 --- a/app-text/poppler/poppler-21.02.0.ebuild +++ b/app-text/poppler/poppler-21.02.0.ebuild @@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch" + "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) diff --git a/app-text/poppler/poppler-21.03.0.ebuild b/app-text/poppler/poppler-21.03.0.ebuild index 8c97e95774bf..a412059ff2a5 100644 --- a/app-text/poppler/poppler-21.03.0.ebuild +++ b/app-text/poppler/poppler-21.03.0.ebuild @@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch" + "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) diff --git a/app-text/poppler/poppler-20.11.0.ebuild b/app-text/poppler/poppler-21.04.0.ebuild index 975d1342c8b4..e3bf1e313d86 100644 --- a/app-text/poppler/poppler-20.11.0.ebuild +++ b/app-text/poppler/poppler-21.04.0.ebuild @@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then SLOT="0/9999" else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/104" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/109" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -57,10 +57,8 @@ RDEPEND="${DEPEND} DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( - "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" - "${FILESDIR}/${PN}-20.11.0-respect-cflags.patch" - "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" + "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" + "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index 8c97e95774bf..e3bf1e313d86 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/108" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/109" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch" + "${FILESDIR}/${PN}-21.04.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) |