diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-11 02:17:06 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-11 20:23:58 +0100 |
commit | f92f6660713e02e31793193364beadfa9cf62a47 (patch) | |
tree | 3ec7b79915ddf0118dbd2c0f3505f7c851a9c794 /app-text | |
parent | www-client/firefox: bump to v84.0 RC 2 (diff) | |
download | gentoo-f92f6660713e02e31793193364beadfa9cf62a47.tar.gz gentoo-f92f6660713e02e31793193364beadfa9cf62a47.tar.bz2 gentoo-f92f6660713e02e31793193364beadfa9cf62a47.zip |
app-text/poppler: 20.12.1 version bump
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/poppler/Manifest | 1 | ||||
-rw-r--r-- | app-text/poppler/files/poppler-20.12.1-qt5-deps.patch | 49 | ||||
-rw-r--r-- | app-text/poppler/poppler-20.12.1.ebuild | 122 |
3 files changed, 172 insertions, 0 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 20f58da4096d..0693f2d1cf21 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 000000000000..234be8222146 --- /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 <asturm@gentoo.org> +Date: Wed, 9 Dec 2020 01:28:25 +0100 +Subject: [PATCH] Move Qt5 test dependencies into test dir + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + 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 000000000000..9a3ae26fd3c9 --- /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} == *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 ~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=" + 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}-20.12.1-qt5-deps.patch" + "${FILESDIR}/${PN}-20.12.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) + -DENABLE_QT6=OFF + ) + 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 +} |