* [gentoo-commits] repo/gentoo:master commit in: profiles/, app-text/poppler/
@ 2020-03-24 20:38 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2020-03-24 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 0959da60c9b3626181471fe4e04c587c4771a932
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 24 20:30:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 24 20:37:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0959da60
app-text/poppler: Drop 0.86.0 (r0)
Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-text/poppler/Manifest | 1 -
app-text/poppler/poppler-0.86.0.ebuild | 123 ---------------------------------
profiles/package.mask | 4 +-
3 files changed, 1 insertion(+), 127 deletions(-)
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c0d2a7e491b..13b0908b632 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,4 +1,3 @@
DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
DIST poppler-0.85.0.tar.xz 1588616 BLAKE2B d30c16ff214d2b64fade28bb4099567150e99df6ab967702f48e18ed2191e444728f51d4c1ce1772567c31f9b87a8cf64993ebc383184e06f8b3707436c89143 SHA512 2311bde5ae52e065c12a6129f500469860f5ebefafc3f7be581393f08c2121f3eae57394ff54c1f83ee1b926f28c61530bcd8149d42de10a16b9ba7345f2604e
-DIST poppler-0.86.0.tar.xz 1593992 BLAKE2B 7b09d3d173db31a3dc2965e7eb5dc80fe1e714a7f1319b5fce0719ea345f496313536da023da8f7793d7365210159b26ea23ae95bdef709efbe665abeb13fdb9 SHA512 58a8ee7bc0bae1dfbbd1bd8d2f66bbb77bd4b93637f500b7d69f4b57d20f7f14b2b23b74f2e34a3f00c7b7887c366379ed6d95f5e1e610eafb9cf7847ea7583a
DIST poppler-0.86.1.tar.xz 1593856 BLAKE2B f39a3113d8d33480b186173dade5305ad8157b38df579e18f6a05ae48e449259aeb9788e1c94ab3b43fae9bb027655e4e3072ddf8a6dc9ccdef93262def62160 SHA512 435fc1e7f3e8123e0adde9aa60c0d7dc17db367cde8908932abfef913cee6f27efeb1c4f2d6f316019a69a87f1fa5251be4216d0a81a681a24f24a70ac571670
diff --git a/app-text/poppler/poppler-0.86.0.ebuild b/app-text/poppler/poppler-0.86.0.ebuild
deleted file mode 100644
index 4b6016d93eb..00000000000
--- a/app-text/poppler/poppler-0.86.0.ebuild
+++ /dev/null
@@ -1,123 +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} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
- SLOT="0/9999"
-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/96" # 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.1-qt5-dependencies.patch"
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
- "${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
- cmake_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)' \
- -i CMakeLists.txt || die
- else
- einfo "policy(SET CMP0002 OLD) - workaround can be removed"
- fi
-}
-
-src_configure() {
- xdg_environment_reset
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DRUN_GPERF_IF_PRESENT=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_ZLIB_UNCOMPRESS=OFF
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DUSE_FLOAT=OFF
- -DWITH_Cairo=$(usex cairo)
- -DENABLE_LIBCURL=$(usex curl)
- -DENABLE_CPP=$(usex cxx)
- -DWITH_JPEG=$(usex jpeg)
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_CMS=$(usex lcms lcms2 none)
- -DWITH_NSS3=$(usex nss)
- -DWITH_PNG=$(usex png)
- $(cmake_use_find_package qt5 Qt5Core)
- -DWITH_TIFF=$(usex tiff)
- -DENABLE_UTILS=$(usex utils)
- )
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 2c760a46587..b049823d803 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -399,9 +399,7 @@ dev-go/ed25519
dev-libs/rocm-opencl-driver
# Andreas Sturmlechner <asturm@gentoo.org> (2020-02-29)
-# Breaks at least app-text/texlive-core and app-office/libreoffice right now,
-# bugs 711096, 711102.
-~app-text/poppler-0.86.0
+# Breaks app-office/libreoffice right now, bug #711102.
~app-text/poppler-0.86.1
# Miroslav Šulc <fordfrog@gentoo.org> (2020-02-27)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: profiles/, app-text/poppler/
@ 2024-05-14 17:25 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2024-05-14 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 079547bf7aa5290ff79ade21cc3470a237e9214e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 21:46:14 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 14 17:24:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079547bf
app-text/poppler: 24.05.0 version bump package.masked, bump subslot
update deps
Update TEST_COMMIT to ff3133cdb6cb496ee1d2c3231bfa35006a5e8410
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-text/poppler/Manifest | 3 +++
.../{poppler-9999.ebuild => poppler-24.05.0.ebuild} | 18 +++++++++---------
app-text/poppler/poppler-9999.ebuild | 18 +++++++++---------
profiles/package.mask | 4 ++++
4 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 151229e37223..04cd4849cc7a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,4 +4,7 @@ DIST poppler-24.03.0.tar.xz 1902068 BLAKE2B 34cd3b64b1fbee53727d99bf73a896331c15
DIST poppler-24.03.0.tar.xz.sig 833 BLAKE2B efdf579fec7d5aca5ec197220d46e4420f60946992e0c6f0a461f4ebc0b45c363eca269e93ffa36e840a7959c8ca2225da17b62b412a0eb37e4d4e74f98a22c6 SHA512 7276311721a7c6ea35773e38147c816b79359422add5f9b954a1e95fd399f16161ff8791a82db56707b143e207e6cf8264d353b3a6da298c9f65f2e9cb2533d0
DIST poppler-24.04.0.tar.xz 1904936 BLAKE2B c4a9350b990981b0018229923160ded621f4035b19ec3d87c328ef67b22b9e36cc15ef4912da625a55a5befacc95aef6a8ef5dc48aa46cd79943b03985333b47 SHA512 49a9bef20ebdca3b56e53fa610d5ff76a7fba378dd7d8bb64a11bea909bf103ec7fd385e95ca971feab84aaebb523d4c7515a3a42ac0c7eb728e376a1239cfd9
DIST poppler-24.04.0.tar.xz.sig 833 BLAKE2B 842f500b45396a3a0a6e5789a6f0957ea5f3d66536dfb6e32420201bdfc4a867a0262d0dc97302cc0d530e68ca163fda10f143516a472394bcb085f746d891d1 SHA512 4419a2a94c34621ffde1f1e0d1d26929171f81b6809a5380af30434c2220a7bf694ff2f8e7ba7a611b1ebd265e91424060238f51d2cccd9acecd92f66e0e1e28
+DIST poppler-24.05.0.tar.xz 1909164 BLAKE2B 65d5d1509078012a26d0bd97985516a39c49594a3c83016f1b7c7745caf1d13faaa82bbaea62c16466f4b1c159c765fa88f97e20f10a87b08514b00e5bdb1113 SHA512 caa3d31b8f22186a7218831039c2ff7384b07863de04f166980dfe534a7a5f047e7c21e1114b9ed0ef323beb60983b45a36bb906c4189c0828f4119e3e2dbaa1
+DIST poppler-24.05.0.tar.xz.sig 833 BLAKE2B f1125a8b81089a4b8beb9385fa4a9b170b97f08e2bc732fd1cc2671ed43a81bb7b58b9ced61691e55188af94ee6b2c701be0ea1e12feecebbc7c4062a97b76fb SHA512 3010eeda09ff58d9705465bffe4861d9af1f294597b8eec1e1cc90f59008ab146000fcc694b2fad8bb675d89d68b2b78d54236ae6d42411058b9444b87514db3
DIST poppler-test-400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1.tar.bz2 5199265 BLAKE2B d58f6ee7b44ca45291c205f9619db3833871f5789dd6a4e3ccc9acce2b6d7967a6b8596e3f32b7b35ba3d185976e8b9c8a998071c4451bb5ce674825a4005d6d SHA512 5bf5d99956fa0a6a93e0b0dc4713ecd8810811eca35514cc5765ffaafb9485f64f94b21487afa46c16eaf66326fcb999e792b8121eeb188e7e33a32a4798fb76
+DIST poppler-test-ff3133cdb6cb496ee1d2c3231bfa35006a5e8410.tar.bz2 5207226 BLAKE2B 15153457989a53301bcdc3468ab2b06b637457199004651b39ea848f488f8a2ba594ce2e36091de4fd06fc0a52b783c6b2ee243ac5d95ce1e9db7483ea880829 SHA512 335cd3d55fc6e28331e791e5b63a08d293abc70764a9f314b2c590c26a5a78b38243c74f988bb95afffe0bdcc54dee1e633dbf1672b19a290be40a298e16995f
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-24.05.0.ebuild
similarity index 92%
copy from app-text/poppler/poppler-9999.ebuild
copy to app-text/poppler/poppler-24.05.0.ebuild
index 83006151fd51..fe2ff39083f0 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-24.05.0.ebuild
@@ -13,12 +13,12 @@ else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
inherit verify-sig
- TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
+ TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
- SLOT="0/136" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/137" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -35,7 +35,7 @@ COMMON_DEPEND="
cairo? (
>=dev-libs/glib-2.64:2
>=x11-libs/cairo-1.16
- introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+ introspection? ( >=dev-libs/gobject-introspection-1.72:= )
)
curl? ( net-misc/curl )
gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
@@ -45,9 +45,9 @@ COMMON_DEPEND="
nss? ( >=dev-libs/nss-3.49 )
png? ( media-libs/libpng:0= )
qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
+ >=dev-qt/qtcore-5.15.2:5
+ >=dev-qt/qtgui-5.15.2:5
+ >=dev-qt/qtxml-5.15.2:5
)
qt6? ( dev-qt/qtbase:6[gui,xml] )
tiff? ( media-libs/tiff:= )
@@ -56,11 +56,11 @@ RDEPEND="${COMMON_DEPEND}
cjk? ( app-text/poppler-data )
"
DEPEND="${COMMON_DEPEND}
- boost? ( >=dev-libs/boost-1.71 )
+ boost? ( >=dev-libs/boost-1.74 )
test? (
qt5? (
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
+ >=dev-qt/qttest-5.15.2:5
+ >=dev-qt/qtwidgets-5.15.2:5
)
qt6? ( dev-qt/qtbase:6[widgets] )
)
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 83006151fd51..fe2ff39083f0 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -13,12 +13,12 @@ else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/aacid.asc
inherit verify-sig
- TEST_COMMIT="400f3ff05b2b1c0ae17797a0bd50e75e35c1f1b1"
+ TEST_COMMIT="ff3133cdb6cb496ee1d2c3231bfa35006a5e8410"
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
SRC_URI+=" test? ( https://gitlab.freedesktop.org/poppler/test/-/archive/${TEST_COMMIT}/test-${TEST_COMMIT}.tar.bz2 -> ${PN}-test-${TEST_COMMIT}.tar.bz2 )"
SRC_URI+=" verify-sig? ( https://poppler.freedesktop.org/${P}.tar.xz.sig )"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
- SLOT="0/136" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/137" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -35,7 +35,7 @@ COMMON_DEPEND="
cairo? (
>=dev-libs/glib-2.64:2
>=x11-libs/cairo-1.16
- introspection? ( >=dev-libs/gobject-introspection-1.64:= )
+ introspection? ( >=dev-libs/gobject-introspection-1.72:= )
)
curl? ( net-misc/curl )
gpgme? ( >=app-crypt/gpgme-1.19.0:=[cxx] )
@@ -45,9 +45,9 @@ COMMON_DEPEND="
nss? ( >=dev-libs/nss-3.49 )
png? ( media-libs/libpng:0= )
qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
+ >=dev-qt/qtcore-5.15.2:5
+ >=dev-qt/qtgui-5.15.2:5
+ >=dev-qt/qtxml-5.15.2:5
)
qt6? ( dev-qt/qtbase:6[gui,xml] )
tiff? ( media-libs/tiff:= )
@@ -56,11 +56,11 @@ RDEPEND="${COMMON_DEPEND}
cjk? ( app-text/poppler-data )
"
DEPEND="${COMMON_DEPEND}
- boost? ( >=dev-libs/boost-1.71 )
+ boost? ( >=dev-libs/boost-1.74 )
test? (
qt5? (
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
+ >=dev-qt/qttest-5.15.2:5
+ >=dev-qt/qtwidgets-5.15.2:5
)
qt6? ( dev-qt/qtbase:6[widgets] )
)
diff --git a/profiles/package.mask b/profiles/package.mask
index 3deeb219666e..30d4a33c68ea 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
#--- END OF EXAMPLES ---
+# Andreas Sturmlechner <asturm@gentoo.org> (2024-05-14)
+# Breaks build of revdeps.
+~app-text/poppler-24.05.0
+
# Arthur Zamarin <arthurzam@gentoo.org> (2024-05-13)
# EAPI=6, fails to compile, archived upstream, uses deprecated go eclasses.
# Removal: 2024-06-12. Bugs #931879, #734186.
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-14 17:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-14 17:25 [gentoo-commits] repo/gentoo:master commit in: profiles/, app-text/poppler/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-03-24 20:38 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox