summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-04-06 12:47:07 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-04-06 13:06:48 +0200
commit88dccb6a12469312e551ea23a7ef1c67bb58a4a2 (patch)
tree9979642e1404ce563e8c766f70e4042090749ac4 /app-text/poppler
parentapp-office/libalkimia: Drop 8.0.4 (diff)
downloadgentoo-88dccb6a12469312e551ea23a7ef1c67bb58a4a2.tar.gz
gentoo-88dccb6a12469312e551ea23a7ef1c67bb58a4a2.tar.bz2
gentoo-88dccb6a12469312e551ea23a7ef1c67bb58a4a2.zip
app-text/poppler: Drop 20.11.0
Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-text/poppler')
-rw-r--r--app-text/poppler/Manifest1
-rw-r--r--app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch23
-rw-r--r--app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch29
-rw-r--r--app-text/poppler/files/poppler-0.61.0-respect-cflags.patch55
-rw-r--r--app-text/poppler/files/poppler-20.11.0-respect-cflags.patch64
-rw-r--r--app-text/poppler/poppler-20.11.0.ebuild124
6 files changed, 0 insertions, 296 deletions
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 62aff5842c4d..afa19e72ff3d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,4 +1,3 @@
-DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
DIST poppler-21.03.0.tar.xz 1690848 BLAKE2B 60aef92bdfdc603b38dfb2a1aebd59c9085e6d51a2e22864edb3b0fd535421f47fb8041241e321d44cd8539538b61c6e19fe2d99a8a2d21fd85c3757ccadb5d2 SHA512 0eea1b5f32d79c3a497351a6491b5f617b089bef0a9a446723e87185acadba535e3146c0c141f4c2165ced1aa6fa853b54760a322d0932cfe3049c0ad94d64fa
DIST poppler-21.04.0.tar.xz 1694132 BLAKE2B 759a22b175ca8b64fa666d61e394cb7b6baa34a3dbc9c6cceb24c7ad4b0892ee34faea90278d9889d72d7b9558fc9abf52ab74fd739dc12e7314c3a755661350 SHA512 c3391787456e8a4a3bd6e57f96faa25051bb5e15ae7eeb7072ad6fbc25e3f8a34818945cc49d90a0e6ebc3d38dd4e70d3c60ba0a5cb42c4000bd8c15c947e5bc
diff --git a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
deleted file mode 100644
index f0a8d3c7eb4a..000000000000
--- a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7178d25..934f38f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,6 +119,18 @@ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSIO
- message("-- CMake >= 2.8.8 is needed to enable Qt5")
- endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
-
-+#
-+# Ugly workaround: Manually patch library paths for Qt4 and Qt5:
-+#
-+IF( "${CMAKE_CXX_FLAGS}" MATCHES "-m32")
-+ GET_CMAKE_PROPERTY(_res VARIABLES)
-+ FOREACH(_var ${_res})
-+ IF(_var MATCHES "^QT" AND ${_var} MATCHES "lib64")
-+ STRING(REPLACE "lib64" "lib32" ${_var} "${${_var}}")
-+ ENDIF()
-+ ENDFOREACH()
-+ENDIF()
-+
- macro_optional_find_package(Cairo ${CAIRO_VERSION})
- if(CAIRO_FOUND)
- set(HAVE_CAIRO ${CAIRO_FOUND})
diff --git a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
deleted file mode 100644
index 259be15c6631..000000000000
--- a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From af70882d85999b1912f9909f506ee7d22cc58ca7 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Fri, 6 Oct 2017 08:52:10 +0200
-Subject: [PATCH] [Qt5] Drop unused dependencies
-
----
- CMakeLists.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7485b2ad..04327568 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,10 +147,8 @@ if (ENABLE_QT5)
- find_package(Qt5Core)
- find_package(Qt5Gui)
- find_package(Qt5Xml)
-- find_package(Qt5Widgets)
-- find_package(Qt5Test)
-- if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND))
-- message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
-+ if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND))
-+ message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
- set(ENABLE_QT5 OFF)
- endif()
- endif()
---
-2.14.2
-
diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
deleted file mode 100644
index a75b84b482f5..000000000000
--- a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- poppler-0.61.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake
-@@ -98,8 +98,6 @@
- set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-
--if(CMAKE_COMPILER_IS_GNUCXX)
-- # set the default compile warnings
- set(_warn "-Wall -Wextra -Wpedantic")
- set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
- set(_warn "${_warn} -Wcast-align")
-@@ -124,39 +122,6 @@
- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
-
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
-- poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
-- if(GCC_HAS_AS_NEEDED)
-- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
-- endif(GCC_HAS_AS_NEEDED)
--endif (CMAKE_COMPILER_IS_GNUCXX)
--
--if(CMAKE_C_COMPILER MATCHES "icc")
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUG "-O2 -g -0b0 -noalign ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUG "-O2 -g -Ob0 -noalign ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g -Ob0 -noalign ${_save_cflags}")
--endif(CMAKE_C_COMPILER MATCHES "icc")
--
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-+
-\ Kein Zeilenumbruch am Dateiende.
diff --git a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
deleted file mode 100644
index 9845c0970174..000000000000
--- a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 083bc159ce35e21ab5bb942e91e98a95ce1f8f99 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 2 Nov 2020 14:30:22 +0100
-Subject: [PATCH] build: respect cflags
-
----
- cmake/modules/PopplerMacros.cmake | 41 -------------------------------
- 1 file changed, 41 deletions(-)
-
-diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index 6e5f0050..1a3d0f9f 100644
---- a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -145,47 +145,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
-
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
-- set(_warn "-Wall -Wextra -Wpedantic")
-- set(_warn "${_warn} -Wno-unused-parameter")
-- set(_warn "${_warn} -Wcast-align")
-- set(_warn "${_warn} -Wformat-security")
-- set(_warn "${_warn} -Wframe-larger-than=65536")
-- set(_warn "${_warn} -Wmissing-format-attribute")
-- set(_warn "${_warn} -Wnon-virtual-dtor")
-- set(_warn "${_warn} -Woverloaded-virtual")
-- set(_warn "${_warn} -Wmissing-declarations")
-- set(_warn "${_warn} -Wundef")
-- set(_warn "${_warn} -Wzero-as-null-pointer-constant")
-- set(_warn "${_warn} -Wshadow")
-- set(_warn "${_warn} -Wweak-vtables")
--
-- # set extra warnings
-- set(_warnx "${_warnx} -Wconversion")
--
-- set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-- set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
-- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
-- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}")
-- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
-- set(CMAKE_CXX_FLAGS_DEBUG "-g ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}")
-- set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
-- set(_save_cflags "${CMAKE_C_FLAGS}")
-- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE")
-- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}")
-- # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
-- set(CMAKE_C_FLAGS_DEBUG "-g ${_save_cflags}")
-- set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cflags}")
-- set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
- set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
---
-2.29.2
-
diff --git a/app-text/poppler/poppler-20.11.0.ebuild b/app-text/poppler/poppler-20.11.0.ebuild
deleted file mode 100644
index b18996f2a132..000000000000
--- a/app-text/poppler/poppler-20.11.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2005-2021 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/104" # 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}-20.11.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)
- -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
-}