[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: aa1dbc09c176db2ba49a90d105f306fc8ead2ebc Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 25 09:53:09 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 26 20:46:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1dbc09 app-text/poppler: drop 23.09.0, 23.11.0 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 4 - .../poppler/files/poppler-20.12.1-qt5-deps.patch | 49 --- app-text/poppler/poppler-23.09.0.ebuild| 152 - app-text/poppler/poppler-23.11.0.ebuild| 152 - 4 files changed, 357 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 8682f0739976..e26d11f2bbf9 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,7 +1,3 @@ -DIST poppler-23.09.0.tar.xz 136 BLAKE2B 910bd83a94268673c348f554114cbefd02186ed70f8cf9bbe83e4754758f585e74ed418e711b883f8bc39fb680372583229f7196c847a4b749c04018c1ab7407 SHA512 8657845ec02fca6fe9791823ebeed6c44971c524edc56cb945501dfefb3dc72a6d86fff751bfb708a862a7862cfdcc57bf7b3f825e2bafe25a1e6679c7171a4c -DIST poppler-23.09.0.tar.xz.sig 833 BLAKE2B 3d8277e8e9779b655003bb73637f2e763f82388f58a25010ed5af0078199a75e1c0872f00ee8b0893660a6912b558a5c69bd11309204493d9dbb6e2cbefd41ba SHA512 2b091e2f96d6ed1737e2c208228c969196e3d6f927664759f259a04f0e35b79d2b00ee0da5882f622d0269eea7ab470014f30e6d55659fd1e8fb9cdc23db68a6 -DIST poppler-23.11.0.tar.xz 1894712 BLAKE2B a5083e30c6d0e5494541f5fb7282390647fedf738bccbc99c246649fdee13166638507f314fd7b069af6aca5829319840883bd8d8f50fd4685c54c7ac6fe3b6b SHA512 0312472ff80c10aaec0c06e6bfd3f74257672c2001301db4d44e28051387ad5ddd8126d45e82c75ff4585cfde8e34a68bcab2d979aa58c904c60dc3efb1b6f3d -DIST poppler-23.11.0.tar.xz.sig 833 BLAKE2B 50b0de45f56370aa493ba2929d5aaf6355ea8fd1a4fc3dc10e1fe6e58ba688d03d9867736814f6d5c6d452df820e2fb081e250fcda00255f533661022e75d887 SHA512 f3f743ff614b839f270ee1113ed728b0f1d390e2c2e53828b0a42573040b6e6b4edbcec2c6b3b198088474a89a24e3af9ccb8717bf37734222436dd8049a8d6e DIST poppler-23.12.0.tar.xz 1895580 BLAKE2B c63699d4ba62fd739b49cd94fd9510abedf9accc2f07cf2cd361da5fb561ce4289c3537343341defe3fb4fb31587a39b3967324e1f357799dc8b140f8c9eedbf SHA512 f28962f6842091a68edfb18e5f76e29fdf65d2a7cca6cb4be4202a35bab3e80a2dbe10b86ab8bc4fff7e555a077a41314b9892e19d0d7d89724b9ebb3db93852 DIST poppler-23.12.0.tar.xz.sig 833 BLAKE2B b8dbbde8d6324fd65e583ad5eda04ae531ab364e3afd925c082ac102e6a00368b5c966a890e1b84089845f866b4afb324383d6d47e3d509356e2a5a857f4cdf9 SHA512 817ac3210a191535b037ebac78ebf4d67d3ac055cc54be2a0614ddaf757f6fa4aa5de4f1aecfd1a26a2290c190e14830a925fd83d102aca7afdd6e8fb1e98281 DIST poppler-24.01.0.tar.xz 1895736 BLAKE2B 16c87a4338c73fcccfac3ac477807a7f96c8e95e68efff484d9d544da10815972f20d40f71091c6092913d82b205ca0d1bd25acbaba79277e1a1bf19ba397e6d SHA512 ddfd924f6559e482daa6c87b4201f8a318038bdf654f7449e33aec296c393438a3f1c6dc9ede5956c7f1d9ef02e3aaedf3031dff15fbb0a762587ec00caa diff --git a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch deleted file mode 100644 index 234be8222146.. --- a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Wed, 9 Dec 2020 01:28:25 +0100 -Subject: [PATCH] Move Qt5 test dependencies into test dir - -Signed-off-by: Andreas Sturmlechner - CMakeLists.txt | 6 ++ - qt5/CMakeLists.txt | 10 -- - 2 files changed, 10 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1573249a..ab91d537 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -157,10 +157,8 @@ if (ENABLE_QT5) - find_package(Qt5Core 5.5) # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this - 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() -diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt -index 58b42f5e..e3b26cc2 100644 a/qt5/CMakeLists.txt -+++ b/qt5/CMakeLists.txt -@@ -9,5 +9,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500) - add_definitions(-DQT_NO_DEPRECATED_WARNINGS) - - add_subdirectory(src) --add_subdirectory(tests) --add_subdirectory(demos) -+ -+if(BUILD_QT5_TESTS) -+ find_package(Qt5Widgets REQUIRED) -+ find_package(Qt5Test REQUIRED) -+ -+ add_subdirectory(tests) -+ add_subdirectory(demos) -+endif() -
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: d287b1a65a0ed788efcae019678214f2877ec840 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 8 09:59:57 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 8 14:37:30 2023 + 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-.ebuild => poppler-23.10.0.ebuild} | 14 ++--- app-text/poppler/poppler-.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 136 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 3c02270febea589d72d60e3fd02cb0be84ffcf5c8c66fd4461e64827614e08d9351176a6880d64558247cd722adc42343a7a5774eb331e55141bfb8f661c 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 ..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/C
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 6c0f2c9b8d116c7c018b283d06a12866532b10fd Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Aug 15 10:33:43 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Aug 15 10:33:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0f2c9b app-text/poppler: drop 22.05.0, 22.06.0 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 3 - .../files/poppler-22.05.0-missing-include.patch| 18 --- app-text/poppler/poppler-22.05.0.ebuild| 127 --- app-text/poppler/poppler-22.06.0.ebuild| 134 - 4 files changed, 282 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index a0ca23a9227e..4da7706e3fe7 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,6 +1,3 @@ -DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737 -DIST poppler-22.06.0.tar.xz 1834980 BLAKE2B 6988480dc30f5fe67be0170f8f006bdb4d3e6b0e0ad8643aa6cbf4fe017d52d8747f108267a30aee5ec4567aa5d2fcc9ce9824fc4dac45a1d37291fa668c2dfe SHA512 79e1a1440a0903ea6238dcc7afc4ecdf1f8cc53af94ec5649f631fca568711d48a7ec4046fccb8520818420dc21e4ad1aaf602c22b13f9ce22f4d06edc83c8a3 -DIST poppler-22.06.0.tar.xz.sig 833 BLAKE2B e2a842fac83b5c42713aa45072d8ea1de5219cbbc35d04142a902f569fc7c558cbda9a2379fde6f9f933b701fabe98f93de71a0676837b2a21104f919a097bc8 SHA512 b61f706e52c57209bb180fbe5a65e366e2a841743ac2c24fc0828dc4bab8ae52da12330e4694e8dade1e1963112fc7b01c0c1b30141be2b7c8c0cf2aaab059c5 DIST poppler-22.07.0.tar.xz 1838796 BLAKE2B 401573c3bd1e4801ee331e97a3787c88c0c3f0a10ca59f234622cee22760cd18a566c952f94a1e7263294d6f43c34c861cf53bde59b4bd92f806efe136f92197 SHA512 d3d8a0f50ddcf2020bbbc3c21c6fcdd6f31b431d984622c2a4ae4986b82a14d79969d7113588ba5d9a672babe4dc01fe2f5e8d9ce73a9fbce14685220d914f02 DIST poppler-22.07.0.tar.xz.sig 833 BLAKE2B a73cc36e0c1c20c4f55e4896ae8d880d62d458a0d256022cdac50e48c7993fbf617e9c4de704958d103fae1ccb619d6122a06d2b51e0389f15338d67e34cefdb SHA512 252c34d4f8b7b43255ea5371c35348ac2d3044860d850fd510213a4785c633e230f61aab06b706b173e8e3482c7028a433fccae982adc18681f0da2b6e2bed3d DIST poppler-22.08.0.tar.xz 1840700 BLAKE2B 7e27eb1e41afb83633288d2d923a58e94590780f6f558e403928582de11c742781a12df11dcd7d9aadbfcbdae2662c83ae23f683552fba9e1984d3a0c4577f53 SHA512 bbff6d51eaafe58891357069c83e43ea25b4077755fa715a17b38660cd3cd546fa21d2e17a272d9b375f7e440e6e3661e84a20f18d445e0f28d06971abc04666 diff --git a/app-text/poppler/files/poppler-22.05.0-missing-include.patch b/app-text/poppler/files/poppler-22.05.0-missing-include.patch deleted file mode 100644 index 9dfdcfa12406.. --- a/app-text/poppler/files/poppler-22.05.0-missing-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://github.com/freedesktop/poppler/commit/5d543e801d304e4cdbe12506f62c340d509f12f3 - -From: "Tobias C. Berner" -Date: Thu, 5 May 2022 04:59:42 + -Subject: [PATCH] Fix c_time usage - -In 2656d986d01da5aea4f51c75e4deee569ca88064 the time type was switched -to time_t, without including the necessary ctime header. a/cpp/poppler-global.h -+++ b/cpp/poppler-global.h -@@ -25,6 +25,7 @@ - - #include "poppler_cpp_export.h" - -+#include - #include - #include - #include diff --git a/app-text/poppler/poppler-22.05.0.ebuild b/app-text/poppler/poppler-22.05.0.ebuild deleted file mode 100644 index 6bd8c9f87f88.. --- a/app-text/poppler/poppler-22.05.0.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 2005-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs xdg-utils - -if [[ ${PV} == ** ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; - SLOT="0/" -else - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/121" # 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 +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -DEPEND=" - media-libs/fontconfig - >=media-libs/freetype-2.8 - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspe
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: bc6f26f3a5f8e1bf549fa072dd6cf78445634e0c Author: Sam James gentoo org> AuthorDate: Sat May 7 20:59:42 2022 + Commit: Sam James gentoo org> CommitDate: Sat May 7 21:00:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6f26f3 app-text/poppler: add 22.05.0 Bug: https://bugs.gentoo.org/843149 Signed-off-by: Sam James gentoo.org> app-text/poppler/Manifest | 1 + .../files/poppler-22.05.0-missing-include.patch| 18 ++ .../{poppler-.ebuild => poppler-22.05.0.ebuild}| 5 +++-- app-text/poppler/poppler-.ebuild | 4 ++-- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index b2044a054a9b..82e20c9de2d5 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,4 @@ DIST poppler-22.01.0.tar.xz 1801984 BLAKE2B f238636a0b1f07e0b70de99d8f0b3afcb7e2424c9dee4a044edaa5bd34753061e58a7c530792264ffb5a520cb4dc7dc52de17573fda350de97bef6346048fb76 SHA512 c6ea908a9188483ca588ac81d3e92dd15a405f90d36cc7059e618c8a7e3e9faeda82717aba5df34adb4a0a94e2fbecd472acec44972272349cc8d5a57b7405d1 DIST poppler-22.02.0.tar.xz 1807024 BLAKE2B 97d27fb6d31535b5fce0aa518d00ab9da218a8d49dcb45dbaa5ab3cc669d8ffc75e07bd617b5fe9842c8b7b8ac843e9aa07ee0d31504f1e2b6c4f89b2177add6 SHA512 61867241d6d076dae554d654a8ad3b1a073079bad31f45170516b886fabb4c238ff2d49705924da219e128eb4052ac6337121967347600e54f61790dd0eed487 DIST poppler-22.03.0.tar.xz 1809940 BLAKE2B 0307e9225645b289105fe5a55a712ab821a0961a5dd53467b7db41432d74ec763e9ab0494f6b4d1bed94f7b0c2a74cb849878ad5f0c877fa4df0888f97a10ef6 SHA512 f87bbff4f394f192095da0c00bdf8b5c70b7eb864941225aad2025e91283c3c42a0016a772e7e9ea73a86746251928fc64500f923e8fd841adae1c6e67d72569 +DIST poppler-22.05.0.tar.xz 1828628 BLAKE2B d1757893c841d35cbdeda493afea92046c447dfa0d519ab9a872a75fdb7edbb06bbde78b2e7d41757f5bbff8d1f46c81f7314dff8386d4d686ded4d2cc85d65e SHA512 629098793050f7a901c2a2cf1efcad83c58d26164cf94f4aa3985465f016a8875c62be4fb8ab8005ca00ef061402962e6d6c14eb611ce29f2d71d3ae83f24737 diff --git a/app-text/poppler/files/poppler-22.05.0-missing-include.patch b/app-text/poppler/files/poppler-22.05.0-missing-include.patch new file mode 100644 index ..9dfdcfa12406 --- /dev/null +++ b/app-text/poppler/files/poppler-22.05.0-missing-include.patch @@ -0,0 +1,18 @@ +https://github.com/freedesktop/poppler/commit/5d543e801d304e4cdbe12506f62c340d509f12f3 + +From: "Tobias C. Berner" +Date: Thu, 5 May 2022 04:59:42 + +Subject: [PATCH] Fix c_time usage + +In 2656d986d01da5aea4f51c75e4deee569ca88064 the time type was switched +to time_t, without including the necessary ctime header. +--- a/cpp/poppler-global.h b/cpp/poppler-global.h +@@ -25,6 +25,7 @@ + + #include "poppler_cpp_export.h" + ++#include + #include + #include + #include diff --git a/app-text/poppler/poppler-.ebuild b/app-text/poppler/poppler-22.05.0.ebuild similarity index 95% copy from app-text/poppler/poppler-.ebuild copy to app-text/poppler/poppler-22.05.0.ebuild index 68361e6ea96e..5d80bacd8b0c 100644 --- a/app-text/poppler/poppler-.ebuild +++ b/app-text/poppler/poppler-22.05.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]] ; then else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/120" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/121" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -34,7 +34,7 @@ DEPEND=" introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) @@ -63,6 +63,7 @@ PATCHES=( "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" + "${FILESDIR}/${P}-missing-include.patch" ) src_prepare() { diff --git a/app-text/poppler/poppler-.ebuild b/app-text/poppler/poppler-.ebuild index 68361e6ea96e..945267131b33 100644 --- a/app-text/poppler/poppler-.ebuild +++ b/app-text/poppler/poppler-.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]] ; then else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-sol
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 2e7a5fa03fce6ccfe5574b0f5d1870b155c21016 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 6 09:46:59 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 6 15:41:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7a5fa0 app-text/poppler: Drop 21.07.0 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 1 - .../files/poppler-21.04.0-respect-cflags.patch | 117 --- app-text/poppler/poppler-21.07.0.ebuild| 126 - 3 files changed, 244 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 09d278d38b3b..12e1f59b8d14 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,2 +1 @@ -DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8 DIST poppler-21.11.0.tar.xz 1783592 BLAKE2B b0448ae0456ffda29c18732e6dd94cb285af67cf4adbaded05a4abe2e465cb63a17e0041240c82c83c89b313ec8c7bf9d68fc8d727b7d41c1ee70722529ce45d SHA512 354d6372093e7ecedf95c43e8d203e9b2781ff7ecd81cd3920cb8c72a37463b47423ce7ab3c8233c0f031f2c024ac1ba5c8d442c80e6643722192fb9638e5d3a diff --git a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch deleted file mode 100644 index 8781bbec5bbc.. --- a/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch +++ /dev/null @@ -1,117 +0,0 @@ -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 - -Signed-off-by: Theo Anderson - 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 fe1182da..b77eaa3e 100644 a/cmake/modules/PopplerMacros.cmake -+++ b/cmake/modules/PopplerMacros.cmake -@@ -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) - --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") -@@ -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}") -- 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}") -- -+ -+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") -- 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-f
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 7a153724d6ecf57c02bbef51bf0084c9b71cb88e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 4 18:44:55 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 4 20:58:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a153724 app-text/poppler: 21.09.0 version bump Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest| 1 + ...ect-cflags.patch => poppler-21.09.0-respect-cflags.patch} | 0 .../poppler/{poppler-.ebuild => poppler-21.09.0.ebuild} | 12 ++-- app-text/poppler/poppler-.ebuild | 12 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 9046ecee66d..a8210d6bd51 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,2 +1,3 @@ DIST poppler-21.07.0.tar.xz 1709664 BLAKE2B 22c411c44a7f61344a0ea747fd435ad2b0180979d8117425167338b7f5cf963eefac19d38b5630df03b4ef978a113c9f031966d3bd8b0c1d86a5bdecd526d191 SHA512 ce1d8a5dd4a300a24aa71aea4919262e108ce1717dee04863da41de0962e4c0067e9c703c190386bd66d9c4ef54d04513cc8509f4beaf76e996576912d2583e8 DIST poppler-21.08.0.tar.xz 1717372 BLAKE2B f617b41ebacee183730f20233273a2cc773c12b6c9d045850f8e738985b9079338c0e86b66d598a5dd4fd0227f70989604164a38fd45150b239e603c4da7e42f SHA512 266583279fb5c6b5300d23f8ba5b9da3e1f475fe21341a82ed7350dd9e321e243f3ef051944006c4f242c2d63a8c46bcda565a56017eb3a68caa5680ce719211 +DIST poppler-21.09.0.tar.xz 1722828 BLAKE2B 02bb35a051fadccd6e6d071b74f169fa8aca0f83aa27aac420fdb7998537b42747134efe6562ee2a09598761c55494e30dabf5785f70f84029c5662bbd7311a2 SHA512 e63181b98cbcb71e5b1beefce3aa7c196f69a7adc4304c8ced70eac7ab8a7edf918988faeb2a23727ecaafd6f4a809f561fa1c86f1fda0ab7e5e2dc882a5ab55 diff --git a/app-text/poppler/files/poppler--respect-cflags.patch b/app-text/poppler/files/poppler-21.09.0-respect-cflags.patch similarity index 100% rename from app-text/poppler/files/poppler--respect-cflags.patch rename to app-text/poppler/files/poppler-21.09.0-respect-cflags.patch diff --git a/app-text/poppler/poppler-.ebuild b/app-text/poppler/poppler-21.09.0.ebuild similarity index 96% copy from app-text/poppler/poppler-.ebuild copy to app-text/poppler/poppler-21.09.0.ebuild index 2013baa8c3f..20065b9bb13 100644 --- a/app-text/poppler/poppler-.ebuild +++ b/app-text/poppler/poppler-21.09.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]] ; then else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/112" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/113" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -24,10 +24,6 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss # No test data provided RESTRICT="test" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" DEPEND=" media-libs/fontconfig media-libs/freetype @@ -56,12 +52,16 @@ RDEPEND="${DEPEND} DEPEND+=" boost? ( dev-libs/boost ) " +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig +" DOCS=( AUTHORS NEWS README.md README-XPDF ) PATCHES=( "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch" - "${FILESDIR}/${PN}--respect-cflags.patch" + "${FILESDIR}/${PN}-21.09.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" ) diff --git a/app-text/poppler/poppler-.ebuild b/app-text/poppler/poppler-.ebuild index 2013baa8c3f..20065b9bb13 100644 --- a/app-text/poppler/poppler-.ebuild +++ b/app-text/poppler/poppler-.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ** ]] ; then else SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/112" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/113" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -24,10 +24,6 @@ IUSE="boost cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss # No test data provided RESTRICT="test" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" DEPEND=" media-libs/fontconfig media-libs/freetype @@ -56,12 +52,16 @@ RDEPEND="${DEPEND} DEPEND+=" boost? ( dev-libs/
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: f92f6660713e02e31793193364beadfa9cf62a47 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 11 01:17:06 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 11 19:23:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92f6660 app-text/poppler: 20.12.1 version bump Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 1 + .../poppler/files/poppler-20.12.1-qt5-deps.patch | 49 + app-text/poppler/poppler-20.12.1.ebuild| 122 + 3 files changed, 172 insertions(+) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 20f58da4096..0693f2d1cf2 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,2 +1,3 @@ DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335 DIST poppler-20.12.0.tar.xz 1659844 BLAKE2B 48e35f092ef29b5e9e2e20f1ade3759b0cdbb13ea843adacaf076407654fa52bcc2f42f8f89e72e7d8c717fde72771d43a6a855b0204d52ce450f2593899d3d5 SHA512 8c035847cf5a0763f02ccea45a8f1f563d94847620354c3c1621b05081600a99e207eadbc87398ed40e0d105c5439826130eb49058fed3abb60f5e4642321a0e +DIST poppler-20.12.1.tar.xz 1660164 BLAKE2B b96198be824dad6bde3ed89cbd05ebae001914c253d1b95321088ee209c73134efbb7f0044aa5d20c07d35b2460f5d17171810f36b873d2542e4bc93f423273f SHA512 a7ede8b11ce73c724fc54bc1e522ecfedaff65a08265c5faee4645765f1d6670a35abf67e57bdebacfd01b2071f1c532a04b9e302939a500fea9185f6e8226d0 diff --git a/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch new file mode 100644 index 000..234be822214 --- /dev/null +++ b/app-text/poppler/files/poppler-20.12.1-qt5-deps.patch @@ -0,0 +1,49 @@ +From e5927c7250afd6b715a9de520851b26e41b7f422 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 9 Dec 2020 01:28:25 +0100 +Subject: [PATCH] Move Qt5 test dependencies into test dir + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 6 ++ + qt5/CMakeLists.txt | 10 -- + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1573249a..ab91d537 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -157,10 +157,8 @@ if (ENABLE_QT5) + find_package(Qt5Core 5.5) # Update QT_DISABLE_DEPRECATED_BEFORE in qt5/CMakeLists.txt when increasing this + 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() +diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt +index 58b42f5e..e3b26cc2 100644 +--- a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt +@@ -9,5 +9,11 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500) + add_definitions(-DQT_NO_DEPRECATED_WARNINGS) + + add_subdirectory(src) +-add_subdirectory(tests) +-add_subdirectory(demos) ++ ++if(BUILD_QT5_TESTS) ++ find_package(Qt5Widgets REQUIRED) ++ find_package(Qt5Test REQUIRED) ++ ++ add_subdirectory(tests) ++ add_subdirectory(demos) ++endif() +-- +2.29.2 + diff --git a/app-text/poppler/poppler-20.12.1.ebuild b/app-text/poppler/poppler-20.12.1.ebuild new file mode 100644 index 000..9a3ae26fd3c --- /dev/null +++ b/app-text/poppler/poppler-20.12.1.ebuild @@ -0,0 +1,122 @@ +# Copyright 2005-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake toolchain-funcs xdg-utils + +if [[ ${PV} == ** ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; + SLOT="0/" +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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/105" # 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="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" + +# No test data provided +RESTRICT="test" + +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig +" +DEPEND=" +
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 60afd5b4cd1f499b5d4f1acfb637bf8962c712f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 24 19:30:19 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 24 19:58:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60afd5b4 app-text/poppler: Drop 0.90.1 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 1 - .../files/poppler-0.82.0-respect-cflags.patch | 49 app-text/poppler/poppler-0.90.1.ebuild | 124 - 3 files changed, 174 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index beb4ac565e2..0884a6cbdcf 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,2 +1 @@ -DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34 DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335 diff --git a/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch deleted file mode 100644 index 6f7b2a7c175..000 --- a/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch +++ /dev/null @@ -1,49 +0,0 @@ poppler-0.82.0/cmake/modules/PopplerMacros.cmake -+++ poppler-0.82.0/cmake/modules/PopplerMacros.cmake -@@ -145,46 +145,6 @@ - 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 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}") diff --git a/app-text/poppler/poppler-0.90.1.ebuild b/app-text/poppler/poppler-0.90.1.ebuild deleted file mode 100644 index 46e8ad792b9..000 --- a/app-text/poppler/poppler-0.90.1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 2005-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs xdg-utils - -if [[ ${PV} == ** ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; - SLOT="0/" -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/101" # CHEC
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 885f5da062560e20a0754b0d17bd4f681c4b2f18 Author: Lars Wendler gentoo org> AuthorDate: Mon Nov 2 14:04:13 2020 + Commit: Lars Wendler gentoo org> CommitDate: Mon Nov 2 14:07:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=885f5da0 app-text/poppler: Bump to version 20.11.0 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> app-text/poppler/Manifest | 1 + .../files/poppler-20.11.0-respect-cflags.patch | 64 +++ app-text/poppler/poppler-20.11.0.ebuild| 124 + 3 files changed, 189 insertions(+) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index d0cb619887c..0deb36ba3fe 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,4 @@ DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34 DIST poppler-20.09.0.tar.xz 1642932 BLAKE2B be61275560bf57c639f185b5ebbd8b37b99fd008412f49890ed644e95f4d8f2c4ca865b081eea99f2604d44fa1c0c31bd551339340f03cb43ab7f5a03992f760 SHA512 fbd57dd0754279d4b0a20ccbdbfb06abc5a5d84e63915676353fd42d5b80318904cf7e6ae462db445ed6c6e011fc24675dccbb8bd3597fc6532657a4ea23406a DIST poppler-20.10.0.tar.xz 1644528 BLAKE2B ce38491805ff8ecb45eea45c44c93ec85404cb310ed6da49d7ce752a4e572abfbd7f5740448d6fb0c0958aa5661ebf87a3a2988bf51b0d0f0b1ea102110952b9 SHA512 edbcd53a06df9a5911a58fd05066e44dc8ab9a1dbc6da852b40bbc5627b9c0fcb35d97f46e3fcd78f7d08f86cba37e2ab3ff81b9a18fad300571df2bf1ef91a9 +DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335 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 new file mode 100644 index 000..9845c097017 --- /dev/null +++ b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch @@ -0,0 +1,64 @@ +From 083bc159ce35e21ab5bb942e91e98a95ce1f8f99 Mon Sep 17 00:00:00 2001 +From: Lars Wendler +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-in
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: ae9f21b12f97226a2e57440907e7a1c89c683e63 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 19 20:33:16 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 19 20:39:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae9f21b1 app-text/poppler: Drop 0.88.0-r1 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 1 - .../files/poppler-0.88.0-pdfsig-crash.patch| 30 - app-text/poppler/poppler-0.88.0-r1.ebuild | 124 - 3 files changed, 155 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 3b29834e61e..c043ab287ab 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,2 @@ -DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880 DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34 DIST poppler-20.09.0.tar.xz 1642932 BLAKE2B be61275560bf57c639f185b5ebbd8b37b99fd008412f49890ed644e95f4d8f2c4ca865b081eea99f2604d44fa1c0c31bd551339340f03cb43ab7f5a03992f760 SHA512 fbd57dd0754279d4b0a20ccbdbfb06abc5a5d84e63915676353fd42d5b80318904cf7e6ae462db445ed6c6e011fc24675dccbb8bd3597fc6532657a4ea23406a diff --git a/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch deleted file mode 100644 index 4f29727b6fc..000 --- a/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5cdb78fde50e3dc16006070b0884dfb6b23d964c Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Thu, 14 May 2020 00:22:33 +0200 -Subject: [PATCH] Fix crash in PDFDoc::getSignatureFields when there's no Forms - at all - - poppler/PDFDoc.cc | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc -index 572c77be..4b5621fc 100644 a/poppler/PDFDoc.cc -+++ b/poppler/PDFDoc.cc -@@ -613,10 +613,12 @@ static void addSignatureFieldsToVector(FormField *ff, std::vector PDFDoc::getSignatureFields() - { --// const int num_pages = getNumPages(); - std::vector res; - - const Form *f = catalog->getForm(); -+ if (!f) -+ return res; -+ - const int nRootFields = f->getNumFields(); - for (int i = 0; i < nRootFields; ++i) { - FormField *ff = f->getRootField(i); --- -2.26.2 diff --git a/app-text/poppler/poppler-0.88.0-r1.ebuild b/app-text/poppler/poppler-0.88.0-r1.ebuild deleted file mode 100644 index f8ff933be71..000 --- a/app-text/poppler/poppler-0.88.0-r1.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 2005-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake toolchain-funcs xdg-utils - -if [[ ${PV} == ** ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; - SLOT="0/" -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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/99" # 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="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" -DEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - cjk? ( app-text/poppler-data ) -" - -DOCS=( AUTHORS NEWS README.md README-XPDF ) - -PATCHES=( - "${FILESDIR}/${PN}-0.60.
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 8783027e928808066d3fa4c88a4e5665661e1a3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 28 16:00:47 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 28 16:09:53 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8783027e app-text/poppler: Drop 0.79.0-r1 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 1 - .../files/poppler-0.78.0-respect-cflags.patch | 31 - app-text/poppler/poppler-0.79.0-r1.ebuild | 127 - 3 files changed, 159 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 13e16601467..45d4ec9453b 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,2 @@ -DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9 DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2 DIST poppler-0.83.0.tar.xz 1555456 BLAKE2B 4ab24a85e879d0ddbf24cf7bab5b1da7c15fc026e88b4076dc2b8cd34d69a5bcc0113df20fabda6915afea880480613ba34be6e23b5b0d79a3c6197c92af7853 SHA512 bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713 diff --git a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch deleted file mode 100644 index 137af0dedc4..000 --- a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch +++ /dev/null @@ -1,31 +0,0 @@ poppler-0.78.0/cmake/modules/PopplerMacros.cmake -+++ poppler-0.78.0/cmake/modules/PopplerMacros.cmake -@@ -145,28 +145,6 @@ - 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 extra warnings -- set(_warnx "${_warnx} -Wconversion") -- -- set(DEFAULT_COMPILE_WARNINGS "${_warn}") -- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") --endif() -- - if(CMAKE_C_COMPILER MATCHES "icc") - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") diff --git a/app-text/poppler/poppler-0.79.0-r1.ebuild b/app-text/poppler/poppler-0.79.0-r1.ebuild deleted file mode 100644 index 7043b939f9b..000 --- a/app-text/poppler/poppler-0.79.0-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils - -if [[ ${PV} == ** ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; - SLOT="0/" -else - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/89" # 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="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" -DEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png?
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: ce66fab85ee3a00823432a3354917cc87d30c374 Author: Lars Wendler gentoo org> AuthorDate: Sat Oct 26 12:47:24 2019 + Commit: Lars Wendler gentoo org> CommitDate: Sat Oct 26 12:48:37 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce66fab8 app-text/poppler: Bump to version 0.82.0 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> app-text/poppler/Manifest | 1 + .../files/poppler-0.82.0-respect-cflags.patch | 49 + app-text/poppler/poppler-0.82.0.ebuild | 122 + 3 files changed, 172 insertions(+) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 1a7757e4572..399498bfc9c 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,4 @@ DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9 DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f DIST poppler-0.81.0.tar.xz 1548944 BLAKE2B 23b460d50b22d8b42690c28156398fa3cf299ac24ea883dc8c79044c44aebc126388cab2f31e69c76c50750ef86bd5203958efbb1c353c582c0337e6e0486a85 SHA512 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b +DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2 diff --git a/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch new file mode 100644 index 000..6f7b2a7c175 --- /dev/null +++ b/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch @@ -0,0 +1,49 @@ +--- poppler-0.82.0/cmake/modules/PopplerMacros.cmake poppler-0.82.0/cmake/modules/PopplerMacros.cmake +@@ -145,46 +145,6 @@ + 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 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}") diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild new file mode 100644 index 000..a5c4e4a699c --- /dev/null +++ b/app-text/poppler/poppler-0.82.0.ebuild @@ -0,0 +1,122 @@ +# Copyright
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: e0f5295b0f3dd0e338a8c36ed72c63f1ddf08664 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 20 18:14:22 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 20 19:29:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f5295b app-text/poppler: Drop 0.78.0-r1 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 1 - .../files/poppler-0.78.0-fix-text-selection.patch | 28 - app-text/poppler/poppler-0.78.0-r1.ebuild | 128 - 3 files changed, 157 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 3683ac48c74..81c062d105d 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,2 @@ DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040 -DIST poppler-0.78.0.tar.xz 1540264 BLAKE2B ab3c598667c6169a1c4ff5f7592fa957b5a7d3d4c4a01fcea42b59a8c16f29ca137920e84731b430c5bd3c07d5c7326a371cc45c4f6c9749cce30aadb62b88bd SHA512 738916916be1d94d90b0201c6b225c51c1ae5a93421e8c52e799d8443fbdfcda80c8088ab5f04a9319bc3a2fa1c361d4e781efe585da5bf4cd47b80fe20465ac DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9 diff --git a/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch b/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch deleted file mode 100644 index 8a9c3a760f3..000 --- a/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2d191b49ea074cc69ba4c68a572f26c8bdb55abd Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Wed, 10 Jul 2019 01:10:22 +0200 -Subject: [PATCH] Fix mistake on 093531cd0d0878b892d92ebc56c26936e5de3712 - -These i should have been j too - poppler/TextOutputDev.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc -index e62e088c..645e38fd 100644 a/poppler/TextOutputDev.cc -+++ b/poppler/TextOutputDev.cc -@@ -4791,8 +4791,8 @@ void TextSelectionPainter::endPage() - if (j != begin && sel->word->charPos[j] == sel->word->charPos[j - 1]) - continue; - -- out->drawChar(state, sel->word->textMat[i].m[4], sel->word->textMat[i].m[5], 0, 0, 0, 0, --sel->word->charcode[i], 1, nullptr, 0); -+ out->drawChar(state, sel->word->textMat[j].m[4], sel->word->textMat[j].m[5], 0, 0, 0, 0, -+sel->word->charcode[j], 1, nullptr, 0); - } - out->endString(state); - delete string; --- -2.21.0 - diff --git a/app-text/poppler/poppler-0.78.0-r1.ebuild b/app-text/poppler/poppler-0.78.0-r1.ebuild deleted file mode 100644 index b71b9d45772..000 --- a/app-text/poppler/poppler-0.78.0-r1.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils - -if [[ ${PV} == ** ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; - SLOT="0/" -else - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/89" # 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="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" -DEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - x11-libs/cairo - introspection? ( dev-libs/gobject-introspection:= ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt5? ( - dev-
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 40d84fce43cf0279ccfbd7aba08d43f6cd9be79f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jul 15 18:16:14 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jul 15 18:17:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d84fce app-text/poppler: Fix text selection on some revdeps Closes: https://bugs.gentoo.org/689660 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/poppler-0.78.0-fix-text-selection.patch | 28 + app-text/poppler/poppler-0.78.0-r1.ebuild | 128 + 2 files changed, 156 insertions(+) diff --git a/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch b/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch new file mode 100644 index 000..8a9c3a760f3 --- /dev/null +++ b/app-text/poppler/files/poppler-0.78.0-fix-text-selection.patch @@ -0,0 +1,28 @@ +From 2d191b49ea074cc69ba4c68a572f26c8bdb55abd Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 10 Jul 2019 01:10:22 +0200 +Subject: [PATCH] Fix mistake on 093531cd0d0878b892d92ebc56c26936e5de3712 + +These i should have been j too +--- + poppler/TextOutputDev.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc +index e62e088c..645e38fd 100644 +--- a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc +@@ -4791,8 +4791,8 @@ void TextSelectionPainter::endPage() + if (j != begin && sel->word->charPos[j] == sel->word->charPos[j - 1]) + continue; + +- out->drawChar(state, sel->word->textMat[i].m[4], sel->word->textMat[i].m[5], 0, 0, 0, 0, +-sel->word->charcode[i], 1, nullptr, 0); ++ out->drawChar(state, sel->word->textMat[j].m[4], sel->word->textMat[j].m[5], 0, 0, 0, 0, ++sel->word->charcode[j], 1, nullptr, 0); + } + out->endString(state); + delete string; +-- +2.21.0 + diff --git a/app-text/poppler/poppler-0.78.0-r1.ebuild b/app-text/poppler/poppler-0.78.0-r1.ebuild new file mode 100644 index 000..b71b9d45772 --- /dev/null +++ b/app-text/poppler/poppler-0.78.0-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils + +if [[ ${PV} == ** ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; + SLOT="0/" +else + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/89" # 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="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" + +# No test data provided +RESTRICT="test" + +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig +" +DEPEND=" + media-libs/fontconfig + media-libs/freetype + sys-libs/zlib + cairo? ( + dev-libs/glib:2 + x11-libs/cairo + introspection? ( dev-libs/gobject-introspection:= ) + ) + curl? ( net-misc/curl ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) + lcms? ( media-libs/lcms:2 ) + nss? ( >=dev-libs/nss-3.19:0 ) + png? ( media-libs/libpng:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtxml:5 + ) + tiff? ( media-libs/tiff:0 ) +" +RDEPEND="${DEPEND} + cjk? ( app-text/poppler-data ) +" + +DOCS=( AUTHORS NEWS README README-XPDF ) + +PATCHES=( + "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" + "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" + "${FILESDIR}/${PN}-0.78.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" + "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" + "${FILESDIR}/${PN}-0.78.0-fix-text-selection.patch" # bug 689660 +) + +src_prepare() { + cmake-utils_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 + sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die + fi + + if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then + sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ +
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 1f97b37e2efa9e9e6ef9897f11998bbee21dab87 Author: Lars Wendler gentoo org> AuthorDate: Thu Jun 27 09:29:39 2019 + Commit: Lars Wendler gentoo org> CommitDate: Thu Jun 27 09:30:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f97b37e app-text/poppler: Bump to version 0.78.0 Package-Manager: Portage-2.3.67, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> app-text/poppler/Manifest | 1 + .../files/poppler-0.78.0-respect-cflags.patch | 31 + app-text/poppler/poppler-0.78.0.ebuild | 127 + 3 files changed, 159 insertions(+) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index f4c999fd676..e2a76fa1983 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1 +1,2 @@ DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040 +DIST poppler-0.78.0.tar.xz 1540264 BLAKE2B ab3c598667c6169a1c4ff5f7592fa957b5a7d3d4c4a01fcea42b59a8c16f29ca137920e84731b430c5bd3c07d5c7326a371cc45c4f6c9749cce30aadb62b88bd SHA512 738916916be1d94d90b0201c6b225c51c1ae5a93421e8c52e799d8443fbdfcda80c8088ab5f04a9319bc3a2fa1c361d4e781efe585da5bf4cd47b80fe20465ac diff --git a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch new file mode 100644 index 000..137af0dedc4 --- /dev/null +++ b/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch @@ -0,0 +1,31 @@ +--- poppler-0.78.0/cmake/modules/PopplerMacros.cmake poppler-0.78.0/cmake/modules/PopplerMacros.cmake +@@ -145,28 +145,6 @@ + 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 extra warnings +- set(_warnx "${_warnx} -Wconversion") +- +- set(DEFAULT_COMPILE_WARNINGS "${_warn}") +- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") +-endif() +- + if(CMAKE_C_COMPILER MATCHES "icc") + set(_save_cxxflags "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") diff --git a/app-text/poppler/poppler-0.78.0.ebuild b/app-text/poppler/poppler-0.78.0.ebuild new file mode 100644 index 000..43e1d1cf946 --- /dev/null +++ b/app-text/poppler/poppler-0.78.0.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils + +if [[ ${PV} == ** ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; + SLOT="0/" +else + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/89" # 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="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" + +# No test data provided +RESTRICT="test" + +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig +" +DEPEND=" + media-libs/fontconfig + media-libs/freetype + sys-libs/zlib + cairo? ( + dev-libs/glib:2 + x11-libs/cairo + introspection? ( dev-libs/gobject-introspection:= ) + ) + curl? ( net-misc/curl ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) + lcms? ( media-libs/lcms:2 ) + nss? ( >=dev-libs/nss-3.19:0 ) + png? ( media-libs/libpng:0= ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtxml:5 + ) + tiff? ( media-libs/tiff:0 ) +" +RDEPEND="${DEPEND} + cjk? ( app-text/poppler-data ) +" + +DOCS=( AUTHORS NEWS README README-XPDF ) + +PATCHES=( + "$
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 645f5890750786bb8d3853c2746d9955a92096e5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 2 20:21:08 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 2 20:21:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645f5890 app-text/poppler: Security cleanup Bug: https://bugs.gentoo.org/674666 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest| 4 - app-text/poppler/files/poppler-0.68.0-bool.patch | 36 --- app-text/poppler/poppler-0.68.0.ebuild | 127 --- app-text/poppler/poppler-0.71.0.ebuild | 127 --- app-text/poppler/poppler-0.72.0.ebuild | 127 --- app-text/poppler/poppler-0.73.0.ebuild | 127 --- 6 files changed, 548 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index a79b002abed..02fdfba0686 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,5 +1 @@ -DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a -DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c7aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e -DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145 -DIST poppler-0.73.0.tar.xz 1507068 BLAKE2B d88a7595d0d8b779d623b56d8dc25c753f2cfc6f015092ec9d254a2b2d701d0e760a069324a15d3a03c65c9c85c3398ad142d7f8cc259e5455f53b4d391596d3 SHA512 6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a DIST poppler-0.74.0.tar.xz 1514044 BLAKE2B af3821d5a5c68a3f2541cd9468fd7318ad0182cda66cea068dc42208fef6c2af78a401e50a6a5906cdc943de7339620937ddc6f69f0d8d1b15082aabc6cc3482 SHA512 4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66 diff --git a/app-text/poppler/files/poppler-0.68.0-bool.patch b/app-text/poppler/files/poppler-0.68.0-bool.patch deleted file mode 100644 index a2d8ba7bd40..000 --- a/app-text/poppler/files/poppler-0.68.0-bool.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/670252 - -From de34900993bff73c8da651319027b2fa8c490172 Mon Sep 17 00:00:00 2001 -From: Ed Porras -Date: Sun, 26 Aug 2018 20:24:23 +0200 -Subject: [PATCH] fix macOS compilation due to boolean define in jpeglib - -typedef enum { FALSE = 0, TRUE = 1 } boolean; - goo/JpegWriter.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc -index 16c97afe..26fa77a7 100644 a/goo/JpegWriter.cc -+++ b/goo/JpegWriter.cc -@@ -11,6 +11,7 @@ - // Copyright (C) 2013 Peter Breitenlohner - // Copyright (C) 2017, 2018 Albert Astals Cid - // Copyright (C) 2018 Martin Packman -+// Copyright (C) 2018 Ed Porras - // - // - -@@ -143,7 +144,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI) - } - - // Set whether to compute optimal Huffman coding tables -- priv->cinfo.optimize_coding = priv->optimize; -+ priv->cinfo.optimize_coding = static_cast(priv->optimize); - - // Get ready for data - jpeg_start_compress(&priv->cinfo, TRUE); --- -2.20.1 - diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild deleted file mode 100644 index e2839fc0c54..000 --- a/app-text/poppler/poppler-0.68.0.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils - -if [[ "${PV}" == "" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"; - SLOT="0/" -else - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/79" # CHECK THIS W
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: 4090dfd2d2c2be4cd3eccf155db2a3ddf1dd4091 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 30 22:27:45 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 30 22:29:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4090dfd2 app-text/poppler: Security cleanup Bug: https://bugs.gentoo.org/659828 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/poppler/Manifest | 1 - app-text/poppler/files/poppler-0.62.0-glibc.patch | 34 -- .../poppler/files/poppler-0.62.0-openjpeg2.patch | 14 --- app-text/poppler/poppler-0.62.0-r1.ebuild | 127 - 4 files changed, 176 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 7091647900a..5b781522168 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,4 +1,3 @@ -DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c7aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145 diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch deleted file mode 100644 index 6808e91601d..000 --- a/app-text/poppler/files/poppler-0.62.0-glibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001 -From: Pekka Vuorela -Date: Fri, 15 Dec 2017 16:56:20 +0200 -Subject: Honor configuration for building glibc copy of strtok_r - -config.h didn't get included and HAVE_STRTOK_R was never defined. -Now getting via glibc.h. - goo/glibc_strtok_r.cc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc -index e779bf5..e323bc2 100644 a/goo/glibc_strtok_r.cc -+++ b/goo/glibc_strtok_r.cc -@@ -50,12 +50,15 @@ - // Copyright (C) 2012 Alexey Pavlov - // Copyright (C) 2012 Albert Astals Cid - // Copyright (C) 2017 Adrian Johnson -+// Copyright (C) 2017 Pekka Vuorela - // - // To see a description of the changes please see the Changelog file that - // came with your tarball or type make ChangeLog if you are building from git - // - // - -+#include "glibc.h" -+ - #ifndef HAVE_STRTOK_R - - #include --- -cgit v1.1 - diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch deleted file mode 100644 index 789090cc9b2..000 --- a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch +++ /dev/null @@ -1,14 +0,0 @@ -Sadly the CMake side of openjpeg slotting in Gentoo is broken. -To reliably find openjpeg:2 we need to use pkg-config. - poppler-0.62.0/CMakeLists.txt -+++ poppler-0.62.0/CMakeLists.txt -@@ -193,7 +193,7 @@ - endif() - set(WITH_OPENJPEG FALSE) - if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2") -- find_package(LIBOPENJPEG2) -+ pkg_check_modules(LIBOPENJPEG2 libopenjp2) - set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND}) - if(NOT LIBOPENJPEG2_FOUND) - message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.") diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild deleted file mode 100644 index 568a800956b..000 --- a/app-text/poppler/poppler-0.62.0-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils - -if [[ "${PV}" == "" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" - SLOT="0/" -else - SRC_URI="https://poppler.freedesk
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: ecdea30cd4b1c5df9e7642921f0004f5137607a5 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Jan 30 21:21:27 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Jan 30 21:21:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecdea30c app-text/poppler: backport jpeg buildfix, bug #670252 jpeg-9c defines TRUE and FALSE as 'enum' values not compatible to bool. Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/670252 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> app-text/poppler/files/poppler-0.68.0-bool.patch | 36 app-text/poppler/poppler-0.68.0.ebuild | 1 + 2 files changed, 37 insertions(+) diff --git a/app-text/poppler/files/poppler-0.68.0-bool.patch b/app-text/poppler/files/poppler-0.68.0-bool.patch new file mode 100644 index 000..a2d8ba7bd40 --- /dev/null +++ b/app-text/poppler/files/poppler-0.68.0-bool.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/670252 + +From de34900993bff73c8da651319027b2fa8c490172 Mon Sep 17 00:00:00 2001 +From: Ed Porras +Date: Sun, 26 Aug 2018 20:24:23 +0200 +Subject: [PATCH] fix macOS compilation due to boolean define in jpeglib + +typedef enum { FALSE = 0, TRUE = 1 } boolean; +--- + goo/JpegWriter.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc +index 16c97afe..26fa77a7 100644 +--- a/goo/JpegWriter.cc b/goo/JpegWriter.cc +@@ -11,6 +11,7 @@ + // Copyright (C) 2013 Peter Breitenlohner + // Copyright (C) 2017, 2018 Albert Astals Cid + // Copyright (C) 2018 Martin Packman ++// Copyright (C) 2018 Ed Porras + // + // + +@@ -143,7 +144,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI) + } + + // Set whether to compute optimal Huffman coding tables +- priv->cinfo.optimize_coding = priv->optimize; ++ priv->cinfo.optimize_coding = static_cast(priv->optimize); + + // Get ready for data + jpeg_start_compress(&priv->cinfo, TRUE); +-- +2.20.1 + diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild index 16588ae074d..e2839fc0c54 100644 --- a/app-text/poppler/poppler-0.68.0.ebuild +++ b/app-text/poppler/poppler-0.68.0.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" + "${FILESDIR}/${PN}-0.68.0-bool.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: c9526cde161497cd43721f89c6d8aa23328be8e4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 18 14:06:40 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 7 15:35:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9526cde app-text/poppler: Cleanup vulnerable Bug: https://bugs.gentoo.org/644388 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-text/poppler/Manifest | 2 - .../files/poppler-0.26.0-qt5-dependencies.patch| 31 --- .../poppler/files/poppler-0.33.0-openjpeg2.patch | 15 -- app-text/poppler/files/poppler-0.40-FindQt4.patch | 31 --- .../files/poppler-0.53.0-respect-cflags.patch | 52 - .../files/poppler-0.57.0-CVE-2017-14517.patch | 27 --- .../files/poppler-0.57.0-CVE-2017-14518.patch | 27 --- .../files/poppler-0.57.0-CVE-2017-14519.patch | 100 .../files/poppler-0.57.0-CVE-2017-14520.patch | 24 -- .../files/poppler-0.57.0-CVE-2017-14617.patch | 31 --- .../files/poppler-0.57.0-CVE-2017-14926.patch | 36 --- .../files/poppler-0.57.0-CVE-2017-14927.patch | 32 --- .../files/poppler-0.57.0-CVE-2017-14928.patch | 69 -- .../files/poppler-0.57.0-CVE-2017-14929.patch | 252 - .../files/poppler-0.57.0-CVE-2017-15565.patch | 28 --- app-text/poppler/poppler-0.57.0-r1.ebuild | 158 - app-text/poppler/poppler-0.61.1.ebuild | 145 17 files changed, 1060 deletions(-) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index b0c5d45b7c7..2a44f3b9a7f 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,4 +1,2 @@ -DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f -DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa SHA512 780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706 DIST poppler-0.63.0.tar.xz 1439552 BLAKE2B 9bf5cff7f5fec93ec7d49d1745aadb2b03a68d38216003e4bff54a5d264c9dda10265da79a755af1f31b582602d034cfefb16b807185d674a2cfe0d20e5de277 SHA512 a151d08480e9940a02191355ef5e7499d6494cff05f22f49de2bb8223512f5e5c9bb9b33651943ded30b4cd7096a2423fb7a01fa62228fbcd1d3a221b885cfe9 diff --git a/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch deleted file mode 100644 index bf1effd4377..000 --- a/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 95f6a96e390830233d953f8afa37817499912b35 Mon Sep 17 00:00:00 2001 -From: Johannes Huber -Date: Sat, 10 May 2014 15:00:48 +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 fbafc4e..073f39b 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,12 +106,10 @@ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_ - find_package(Qt5Core) - find_package(Qt5Gui) - find_package(Qt5Xml) -- find_package(Qt5Widgets) -- find_package(Qt5Test) -- if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND) -+ if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND) - set(QT5_FOUND true) - else () --message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") -+message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found") - set(QT5_FOUND false) - endif() - else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) --- -1.9.2 - diff --git a/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch deleted file mode 100644 index af1a72fe9aa..000 --- a/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Sadly the CMake side of openjpeg slotting in Gentoo is broken. -To reliably find openjpeg:2 we need to use pkg-config. - -diff -ruN poppler-0.33.0.orig/CMakeLists.txt poppler-0.33.0/CMakeLists.txt poppler-0.33.0.orig/CMakeLists.txt 2015-05-14 20:22:31.0 +0200 -+++ poppler-0.33.0/CMakeLists.t
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: f3537c5c4ed62c425068d9a3d3f226fe53cbf9ba Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 24 21:29:00 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 24 23:06:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3537c5c app-text/poppler: Fix CVE-2017-145{18,19,20} Bug: https://bugs.gentoo.org/631292 Package-Manager: Portage-2.3.16, Repoman-2.3.6 .../files/poppler-0.57.0-CVE-2017-14518.patch | 27 ++ .../files/poppler-0.57.0-CVE-2017-14519.patch | 100 + .../files/poppler-0.57.0-CVE-2017-14520.patch | 24 + app-text/poppler/poppler-0.57.0-r1.ebuild | 3 + 4 files changed, 154 insertions(+) diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14518.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14518.patch new file mode 100644 index 000..9e8f4bfe624 --- /dev/null +++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14518.patch @@ -0,0 +1,27 @@ +From 6ba3bba6447897260bf4117e191e09d89d91ff62 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 13 Sep 2017 23:09:45 +0200 +Subject: [PATCH 2/4] isImageInterpolationRequired: Fix divide by 0 on broken + documents + +Bug #102688 +--- + splash/Splash.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/splash/Splash.cc b/splash/Splash.cc +index 46b8ce29..39fc7d64 100644 +--- a/splash/Splash.cc b/splash/Splash.cc +@@ -4134,7 +4134,7 @@ SplashError Splash::arbitraryTransformImage(SplashImageSource src, SplashICCTran + static GBool isImageInterpolationRequired(int srcWidth, int srcHeight, + int scaledWidth, int scaledHeight, + GBool interpolate) { +- if (interpolate) ++ if (interpolate || srcWidth == 0 || srcHeight == 0) + return gTrue; + + /* When scale factor is >= 400% we don't interpolate. See bugs #25268, #9860 */ +-- +2.14.1 + diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14519.patch b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14519.patch new file mode 100644 index 000..bd84e96fba3 --- /dev/null +++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14519.patch @@ -0,0 +1,100 @@ +From 778180c0c09002f6adfc272eba6b0d0e4401c4cc Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 13 Sep 2017 23:01:03 +0200 +Subject: [PATCH 3/4] Gfx::doShowText: Fix infinite recursion on broken files + +Bug #102701 +--- + poppler/Gfx.cc | 25 +++-- + poppler/Gfx.h | 1 + + poppler/GfxFont.cc | 9 + + poppler/GfxFont.h | 1 + + 4 files changed, 34 insertions(+), 2 deletions(-) + +diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc +index 37220280..9feac54c 100644 +--- a/poppler/Gfx.cc b/poppler/Gfx.cc +@@ -4031,12 +4031,33 @@ void Gfx::doShowText(GooString *s) { + state->transformDelta(dx, dy, &ddx, &ddy); + if (!out->beginType3Char(state, curX + riseX, curY + riseY, ddx, ddy, + code, u, uLen)) { +- ((Gfx8BitFont *)font)->getCharProc(code, &charProc); ++ ((Gfx8BitFont *)font)->getCharProcNF(code, &charProc); ++ int refNum = -1; ++ if (charProc.isRef()) { ++refNum = charProc.getRef().num; ++charProc.fetch(((Gfx8BitFont *)font)->getCharProcs()->getXRef(), &charProc); ++ } + if ((resDict = ((Gfx8BitFont *)font)->getResources())) { + pushResources(resDict); + } + if (charProc.isStream()) { +-display(&charProc, gFalse); ++std::set::iterator charProcDrawingIt; ++bool displayCharProc = true; ++if (refNum != -1) { ++ if (charProcDrawing.find(refNum) == charProcDrawing.end()) { ++charProcDrawingIt = charProcDrawing.insert(refNum).first; ++ } else { ++displayCharProc = false; ++error(errSyntaxError, -1, "CharProc wants to draw a CharProc that is already beign drawn"); ++ } ++} ++if (displayCharProc) { ++ display(&charProc, gFalse); ++ ++ if (refNum != -1) { ++charProcDrawing.erase(charProcDrawingIt); ++ } ++} + } else { + error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry"); + } +diff --git a/poppler/Gfx.h b/poppler/Gfx.h +index a82f9f4a..44adaed5 100644 +--- a/poppler/Gfx.h b/poppler/Gfx.h +@@ -228,6 +228,7 @@ private: + Parser *parser; // parser for page content stream(s) + + std::set formsDrawing; // the forms that are being drawn ++ std::set charProcDrawing; // the charProc that are being drawn + + GBool // callback to check for an abort + (*abortCheckCbk)(void *data); +diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc +index b59ec06c..bb87c5a0 100644 +--- a/poppler/GfxFont.cc b/poppler/GfxFont.cc +@@ -1818,6 +1818,15 @@ Object *Gfx8BitFont::getCha
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: b0f7e72d6950013ea98f65116dc44cedd8923dd5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Nov 24 22:55:47 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Nov 24 23:06:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0f7e72d app-text/poppler: Fix CVE-2017-{2820,9083} Bug: https://bugs.gentoo.org/619558 Bug: https://bugs.gentoo.org/624708 Package-Manager: Portage-2.3.16, Repoman-2.3.6 .../poppler-0.57.0-disable-internal-jpx.patch | 25 ++ app-text/poppler/poppler-0.57.0-r1.ebuild | 1 + 2 files changed, 26 insertions(+) diff --git a/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch new file mode 100644 index 000..faf632128ff --- /dev/null +++ b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch @@ -0,0 +1,25 @@ +Fix security issue [internal unmaintained JPX decoder] that is caused +by building without system-jpeg libs. Fedora does not care because they +always build with system-jpeg, however in Gentoo we allow the user to +disable both options and poppler's buildsystem is making us believe +there would be no JPX decoder built in that case, when in reality +JPXStream.cc is built (even if it may not be used by the code). + + +--- a/CMakeLists.txt 2017-11-24 23:12:41.953450442 +0100 b/CMakeLists.txt 2017-11-24 23:16:09.441030669 +0100 +@@ -506,9 +508,11 @@ + add_definitions(-DUSE_OPENJPEG2) + set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES}) + else () +- set(poppler_SRCS ${poppler_SRCS} +-poppler/JPXStream.cc +- ) ++ if(NOT WITH_OPENJPEG AND HAVE_JPX_DECODER) ++set(poppler_SRCS ${poppler_SRCS} ++ poppler/JPXStream.cc ++) ++ endif() + endif() + if(USE_CMS) + if(LCMS_FOUND) diff --git a/app-text/poppler/poppler-0.57.0-r1.ebuild b/app-text/poppler/poppler-0.57.0-r1.ebuild index b7a421f73e2..fafef568109 100644 --- a/app-text/poppler/poppler-0.57.0-r1.ebuild +++ b/app-text/poppler/poppler-0.57.0-r1.ebuild @@ -65,6 +65,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.53.0-respect-cflags.patch" "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" "${FILESDIR}/${PN}-0.40-FindQt4.patch" + "${FILESDIR}/${P}-disable-internal-jpx.patch" # Fedora backports from upstream "${FILESDIR}/${P}-CVE-2017-14517.patch" "${FILESDIR}/${P}-CVE-2017-14518.patch"
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: c0ea33368078783cab0e7de4e7b831dce6855779 Author: Lars Wendler gentoo org> AuthorDate: Fri Oct 6 07:06:00 2017 + Commit: Lars Wendler gentoo org> CommitDate: Fri Oct 6 07:06:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ea3336 app-text/poppler: Bump to version 0.60.1 Package-Manager: Portage-2.3.11, Repoman-2.3.3 app-text/poppler/Manifest | 1 + .../files/poppler-0.60.1-qt5-dependencies.patch| 29 .../files/poppler-0.60.1-respect-cflags.patch | 53 app-text/poppler/poppler-0.60.1.ebuild | 146 + 4 files changed, 229 insertions(+) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 470d1cebe77..a12dbceeb42 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -2,3 +2,4 @@ DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddf DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f WHIRLPOOL fb0c15e4834f23b2956014748f92557de9996b8a2a37cf4a7ba62ca22f01866455a933bcf0412775a8d5a8f6ba1ba463f2fd63e27fa406b5fb5bf1fd25d32000 DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837 DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2 +DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7 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 new file mode 100644 index 000..259be15c663 --- /dev/null +++ b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch @@ -0,0 +1,29 @@ +From af70882d85999b1912f9909f506ee7d22cc58ca7 Mon Sep 17 00:00:00 2001 +From: Johannes Huber +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.60.1-respect-cflags.patch b/app-text/poppler/files/poppler-0.60.1-respect-cflags.patch new file mode 100644 index 000..4e1df0d62c6 --- /dev/null +++ b/app-text/poppler/files/poppler-0.60.1-respect-cflags.patch @@ -0,0 +1,53 @@ +--- poppler-0.60.1/cmake/modules/PopplerMacros.cmake poppler-0.60.1/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 -
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: c42d83ff6146aa130025ce0cd1399fc75b749630 Author: Lars Wendler gentoo org> AuthorDate: Tue Sep 5 21:09:27 2017 + Commit: Lars Wendler gentoo org> CommitDate: Tue Sep 5 21:10:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c42d83ff app-text/poppler: Bump to version 0.59.0 Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-text/poppler/Manifest | 1 + .../files/poppler-0.59.0-qt5-dependencies.patch| 31 + .../files/poppler-0.59.0-respect-cflags.patch | 50 +++ app-text/poppler/poppler-0.59.0.ebuild | 146 + 4 files changed, 228 insertions(+) diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index cfd0638bd9a..470d1cebe77 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,3 +1,4 @@ DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8 DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f WHIRLPOOL fb0c15e4834f23b2956014748f92557de9996b8a2a37cf4a7ba62ca22f01866455a933bcf0412775a8d5a8f6ba1ba463f2fd63e27fa406b5fb5bf1fd25d32000 DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837 +DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2 diff --git a/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch new file mode 100644 index 000..2bef6945716 --- /dev/null +++ b/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch @@ -0,0 +1,31 @@ +From 2f7ca474ec49f805257c75cefb364e08ebd9e4d1 Mon Sep 17 00:00:00 2001 +From: Johannes Huber +Date: Tue, 5 Sep 2017 22:58:44 +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 a5b0a5be..787bd0d6 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -133,12 +133,10 @@ macro_optional_find_package(Qt4) + find_package(Qt5Core) + find_package(Qt5Gui) + find_package(Qt5Xml) +-find_package(Qt5Widgets) +-find_package(Qt5Test) +-if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND) ++if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND) + set(QT5_FOUND true) + else () +- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found") ++ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found") + set(QT5_FOUND false) + endif() + +-- +2.14.1 + diff --git a/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch new file mode 100644 index 000..ada6ddfc7d7 --- /dev/null +++ b/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch @@ -0,0 +1,50 @@ +--- poppler-0.59.0/cmake/modules/PopplerMacros.cmake poppler-0.59.0/cmake/modules/PopplerMacros.cmake +@@ -98,45 +98,14 @@ + set(CMAKE_BUILD_TYPE RelWithDebInfo) + endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + +-if(CMAKE_COMPILER_IS_GNUCXX) +if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" ) +endif() + +- # set the default compile warnings + set(DEFAULT_COMPILE_WARNINGS_NO) + set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions -fno-check-new -fno-common") + set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common") + +- set(CMAKE_CXX_FLAGS"-Wnon-virtual-dtor -Woverloaded-virtual -D_DEFAULT_SOURCE ${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") +- set(CMAKE_CXX_FLAGS_
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: cba3797d92767648c2a35c431a38a5ec8300b923 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Jul 31 20:51:02 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Jul 31 20:51:02 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba3797d app-text/poppler: Backport two crash fixes from upstream git Package-Manager: portage-2.3.0 .../poppler/files/poppler-0.46.0-crashfix-1.patch | 36 + .../poppler/files/poppler-0.46.0-crashfix-2.patch | 41 ++ app-text/poppler/poppler-0.46.0-r1.ebuild | 145 + 3 files changed, 222 insertions(+) diff --git a/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch b/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch new file mode 100644 index 000..6d2352b --- /dev/null +++ b/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch @@ -0,0 +1,36 @@ +From 7d3aea760a14a73962e429059f73d97391660367 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Sat, 30 Jul 2016 17:32:59 +0200 +Subject: [PATCH 1/2] Fix abort on documents where the docinfo obj is not a + dict + +Bug #97134 +--- + poppler/PDFDoc.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc +index c91d6e4..a51d8b6 100644 +--- a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc +@@ -14,7 +14,7 @@ + // under GPL version 2 or later + // + // Copyright (C) 2005, 2006, 2008 Brad Hards +-// Copyright (C) 2005, 2007-2009, 2011-2015 Albert Astals Cid ++// Copyright (C) 2005, 2007-2009, 2011-2016 Albert Astals Cid + // Copyright (C) 2008 Julien Rebetez + // Copyright (C) 2008, 2010 Pino Toscano + // Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos +@@ -646,7 +646,7 @@ void PDFDoc::setDocInfoStringEntry(const char *key, GooString *value) + GooString *PDFDoc::getDocInfoStringEntry(const char *key) { + Object infoObj; + getDocInfo(&infoObj); +- if (infoObj.isNull()) { ++ if (!infoObj.isDict()) { + return NULL; + } + +-- +2.9.1 + diff --git a/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch b/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch new file mode 100644 index 000..3c2aa0a --- /dev/null +++ b/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch @@ -0,0 +1,41 @@ +From 3f5c84e17acfa71dfd44514384398f5a4c449630 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Sat, 30 Jul 2016 17:50:42 +0200 +Subject: [PATCH 2/2] Check for XRefEntry existing before using it + +Bug #97005 +--- + poppler/Hints.cc | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/poppler/Hints.cc b/poppler/Hints.cc +index bdd0d32..6c2fc25 100644 +--- a/poppler/Hints.cc b/poppler/Hints.cc +@@ -5,7 +5,7 @@ + // This file is licensed under the GPLv2 or later + // + // Copyright 2010, 2012 Hib Eris +-// Copyright 2010, 2011, 2013, 2014 Albert Astals Cid ++// Copyright 2010, 2011, 2013, 2014, 2016 Albert Astals Cid + // Copyright 2010, 2013 Pino Toscano + // Copyright 2013 Adrian Johnson + // Copyright 2014 Fabio D'Urso +@@ -43,7 +43,13 @@ Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, Security + pageObjectFirst); + pageObjectFirst = 0; + } +- pageOffsetFirst = xref->getEntry(pageObjectFirst)->offset; ++ XRefEntry *pageObjectFirstXRefEntry = xref->getEntry(pageObjectFirst); ++ if (!pageObjectFirstXRefEntry) { ++ error(errSyntaxWarning, -1, "No XRef entry for first page object"); ++ pageOffsetFirst = 0; ++ } else { ++ pageOffsetFirst = pageObjectFirstXRefEntry->offset; ++ } + + if (nPages >= INT_MAX / (int)sizeof(Guint)) { + error(errSyntaxWarning, -1, "Invalid number of pages ({0:d}) for hints table", nPages); +-- +2.9.1 + diff --git a/app-text/poppler/poppler-0.46.0-r1.ebuild b/app-text/poppler/poppler-0.46.0-r1.ebuild new file mode 100644 index 000..fcc7008 --- /dev/null +++ b/app-text/poppler/poppler-0.46.0-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-utils toolchain-funcs xdg-utils + +if [[ "${PV}" == "" ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" + SLOT="0/" +else + SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SLOT="0/63" # 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="cairo cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/
commit: c05a126fc8e2f1c17b1657c3483a337bcce63094 Author: Michael Palimaka gentoo org> AuthorDate: Fri Jan 29 10:51:19 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Fri Jan 29 10:53:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05a126f app-text/poppler: add patch to ensure that qt4 is always detected properly Gentoo-bug: 572382 Package-Manager: portage-2.2.27 app-text/poppler/files/poppler-0.40-FindQt4.patch | 31 ++ ...oppler-.ebuild => poppler-0.40.0-r1.ebuild} | 5 ++-- app-text/poppler/poppler-.ebuild | 3 ++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/app-text/poppler/files/poppler-0.40-FindQt4.patch b/app-text/poppler/files/poppler-0.40-FindQt4.patch new file mode 100644 index 000..84c58d5 --- /dev/null +++ b/app-text/poppler/files/poppler-0.40-FindQt4.patch @@ -0,0 +1,31 @@ + +Ensure that the correct version of Qt is always used. + +With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to +/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. + +There is no guarantee to which version of Qt these symlinks might point, so it +is necessary to find the correct version explicitly. + +Once qmake is found, it is queried for the correct location of all other items. + +Gentoo-bug: 572382 + +--- a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake +@@ -313,11 +313,10 @@ + + GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) + # check for qmake +-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS +- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" +- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" +- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" +- $ENV{QTDIR}/bin ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS ++ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin ++ /usr/bin ++ NO_DEFAULT_PATH + ) + + IF (QT_QMAKE_EXECUTABLE) diff --git a/app-text/poppler/poppler-.ebuild b/app-text/poppler/poppler-0.40.0-r1.ebuild similarity index 95% copy from app-text/poppler/poppler-.ebuild copy to app-text/poppler/poppler-0.40.0-r1.ebuild index b888f28..0346703 100644 --- a/app-text/poppler/poppler-.ebuild +++ b/app-text/poppler/poppler-0.40.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ if [[ "${PV}" == "" ]] ; then else SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/52" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/58" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" + "${FILESDIR}/${PN}-0.40-FindQt4.patch" ) src_prepare() { diff --git a/app-text/poppler/poppler-.ebuild b/app-text/poppler/poppler-.ebuild index b888f28..cbb1902 100644 --- a/app-text/poppler/poppler-.ebuild +++ b/app-text/poppler/poppler-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" + "${FILESDIR}/${PN}-0.40-FindQt4.patch" ) src_prepare() {