aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-06-01 13:47:59 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-06-01 13:47:59 -0700
commit51e21b22f0b4a97082dbd7d95dd0d5947e765cd5 (patch)
tree06d387f858ecbf2a5f63c096448bca96277be5c2 /app-text/poppler
parentnet-print/cups-1.7.2-r2: @wrap cups-config (diff)
downloadgmt-51e21b22f0b4a97082dbd7d95dd0d5947e765cd5.tar.gz
gmt-51e21b22f0b4a97082dbd7d95dd0d5947e765cd5.tar.bz2
gmt-51e21b22f0b4a97082dbd7d95dd0d5947e765cd5.zip
app-text/poppler-0.26.1-r1: revbump/merge
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'app-text/poppler')
-rw-r--r--app-text/poppler/ChangeLog56
-rw-r--r--app-text/poppler/Manifest5
-rw-r--r--app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch31
-rw-r--r--app-text/poppler/poppler-0.26.1-r1.ebuild99
4 files changed, 188 insertions, 3 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 6d8e3fb..921ca3a 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,58 @@
# ChangeLog for app-text/poppler
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.411 2013/12/17 15:09:43 dilfridge Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.425 2014/05/24 20:07:56 dilfridge Exp $
+
+ 24 May 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+ -poppler-0.26.0.ebuild:
+ Remove old
+
+*poppler-0.26.1 (23 May 2014)
+
+ 23 May 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+ +poppler-0.26.1.ebuild, +files/poppler-0.26.0-qt5-dependencies.patch:
+ Version bump
+
+*poppler-0.26.0 (27 Apr 2014)
+
+ 27 Apr 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+ +poppler-0.26.0.ebuild:
+ Version bump
+
+ 16 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> -poppler-0.24.3.ebuild:
+ Remove old
+
+ 12 Jan 2014; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for ia64, wrt bug #496770
+
+ 05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for alpha, wrt bug #496770
+
+ 05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for arm, wrt bug #496770
+
+ 05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for sparc, wrt bug #496770
+
+ 05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for ppc, wrt bug #496770
+
+ 05 Jan 2014; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for ppc64, wrt bug #496770
+
+ 04 Jan 2014; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for x86, wrt bug #496770
+
+ 04 Jan 2014; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for amd64, wrt bug #496770
+
+ 04 Jan 2014; Jeroen Roovers <jer@gentoo.org> poppler-0.24.5.ebuild:
+ Stable for HPPA (bug #496770).
+
+*poppler-0.24.5 (03 Jan 2014)
+
+ 03 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+ +poppler-0.24.5.ebuild:
+ Version bump, bug 496770
17 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
-files/poppler-0.22.2-findgio.patch, -files/poppler-0.22.2-interp.patch,
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index fd7c475..738e36e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,4 +1,7 @@
+AUX poppler-0.26.0-qt5-dependencies.patch 1112 SHA256 f32f81e4fa0b39799acc5f4c3b36ffdf9d1674b8da902e14b1ff7e5ea01eec56 SHA512 94353b0c94b9385496074888e04e11e2349a9e1c60131c661bfb4c7df3df3c5c2494761b94b2bd47f8fe69c17aab4ea3c3d0812df6491554085001148d70477b WHIRLPOOL ef6e1b94a0d5f1085723ae3c80684772b4a30ae0628fe69548bb61468df14c17ae16e4a562f4edbd0dd41f28453657e3b17213ee97ba3907e396745b0738fa55
DIST poppler-0.24.5.tar.xz 1512476 SHA256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 SHA512 dfb40f7d864614f4ad7e8729334931c4b40c48c0dc3d7a8c33b14134cf13c61f8a562cc790a08bee4a43c2c29e587a9d26330437858d465e18ceafd69521250c WHIRLPOOL 066924beb46e58c2906a3b278e617438bd966e2b7bd884e110949f0d149d2cca0bf6326f2fa8c99e3a2c0f2d3cb3f145c8eeee4f060d17e3dded501ef8ec7f33
+DIST poppler-0.26.1.tar.xz 1592884 SHA256 c8c959c3f605a17ed21e2cfec2d9379be5e0c801db4edad5e7b2e44a6cef214c SHA512 5012bd4df931d86fd856a961819a7dd15162efa106518eeb8677edd9a21a62cfeff593a24e57181dfaacbd9e91e8bf782f2199d147c5a5398042ee055feab14d WHIRLPOOL 251481b53a180c1856b5860c6520a531547370454e78d0547afd8646c29a0de67bb2d25bf96ce27a0b976ac2539472f5ae7e53a03eb3a0f739f64a86697cb794
EBUILD poppler-0.24.5-r1.ebuild 2417 SHA256 1881183bfdc8d668c8e4bba9f4a418b1f76804108cd5d774cccdd3ba8df42f41 SHA512 c76b038e011e789f62cfd53dd5688a57525d99ed0d24b38651713f0f8422538f2c456773cca521122f0dbbf3ef6a41a433944eeca5f1810a7e5ca81114141839 WHIRLPOOL 9a506c7ff942ccdac9b7da556828cf0630578f36267a4c417ae9770021843595c58bb5999749df985fbca676708fe917be3811b1c69651c8372c305ffcceb262
-MISC ChangeLog 57440 SHA256 18ca3e29efe5a2ab5a0aa8ac1786dc6ae96c48b32d11af7f8808ff6e9e6c5018 SHA512 7002cce9caaffdd2a8c9b2f3887f89431f18461e974660243f22f6e829c95aef7949dd01fc00c32998bcead02f941cb500e302ac796f56e62166dafb9c73d00a WHIRLPOOL 62aaa94dc7062edb800f6aed9bdaff525293bacd09abcaee7aa73ace302154055bc4e9a3ee505d626a2dbfacf5cc91497c21cb3291ab893b8c6c2a7a85522708
+EBUILD poppler-0.26.1-r1.ebuild 2611 SHA256 107ce103d71485eba3c146ef0d896777429ce7bf0ce52477abe36dcb7fb7f456 SHA512 d473f066a79bf0030a06c00a3e901ff0b06f5b81df1dcb00ff497d7d596accc51c5a5798df011d623cb3b27a0a07ebc6c9ebbce7cfe4ad76d17698396774f818 WHIRLPOOL 78dff7a1c01c640cb4cce9a7251d2b8bc43b4a16455685b065ce3a950c7ce9aee5aa453b6ebf155fb956f5d259048d9e8b515c8bfc817f5a03f33c4a87f1a8bf
+MISC ChangeLog 59049 SHA256 82f6fb649b687377e4f5bdc438670eac4481659cf9f92cf240a4eefff71a5b8d SHA512 23e1d0aadb1f163100fee64e0b4f308b03b075ce61e7c7170c23f8145569650db78185ee4adf605d2199d1d59bc03510ce231c8796c78b22f93ca39480809ec0 WHIRLPOOL cbba02ed00d7e675d70c2c1fd95876e45fc201e2cc774df58c0686592acb64280e541cf7f2fe6d7f14f25ecb6c085b3702acfd1853573553735b633ce7162132
MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
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
new file mode 100644
index 0000000..bf1effd
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch
@@ -0,0 +1,31 @@
+From 95f6a96e390830233d953f8afa37817499912b35 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+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/poppler-0.26.1-r1.ebuild b/app-text/poppler/poppler-0.26.1-r1.ebuild
new file mode 100644
index 0000000..848d869
--- /dev/null
+++ b/app-text/poppler/poppler-0.26.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+# bug 495394
+CMAKE_MIN_VERSION=2.8.12.1-r2
+
+inherit cmake-multilib toolchain-funcs
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+SLOT="0/46"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+ >=media-libs/fontconfig-2.6.0[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.3.9[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ cairo? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.10.0[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.32.1[${MULTILIB_USEDEP}] )
+ )
+ curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+ jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:0[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ qt4? (
+ dev-qt/qtcore:4[${MULTILIB_USEDEP}]
+ dev-qt/qtgui:4[${MULTILIB_USEDEP}]
+ )
+ qt5? (
+ dev-qt/qtcore:5[${MULTILIB_USEDEP}]
+ dev-qt/qtgui:5[${MULTILIB_USEDEP}]
+ dev-qt/qtxml:5[${MULTILIB_USEDEP}]
+ )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+ cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
+
+src_configure() {
+ # this is needed for multilib, see bug 459394
+ mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT4_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DENABLE_SPLASH=ON
+ -DENABLE_ZLIB=ON
+ -DENABLE_XPDF_HEADERS=ON
+ $(cmake-utils_use_enable curl LIBCURL)
+ $(cmake-utils_use_enable cxx CPP)
+ $(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+ $(cmake-utils_use_enable utils)
+ $(cmake-utils_use_with cairo)
+ $(cmake-utils_use_with introspection GObjectIntrospection)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4)
+ $(cmake-utils_use_find_package qt5 Qt5Core)
+ $(cmake-utils_use_with tiff)
+ )
+ if use lcms; then
+ mycmakeargs+=(-DENABLE_CMS=lcms2)
+ else
+ mycmakeargs+=(-DENABLE_CMS=)
+ fi
+
+ cmake-multilib_src_configure
+}
+
+src_install() {
+ cmake-multilib_src_install
+
+ if use cairo && use doc; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}