Attachment #591458 for bug #695942

View | Details | Raw Unified | Return to bug 695942
Collapse All | Expand All

Lines 26-31 Link Here

(-)a/app-text/poppler/metadata.xml (-3 / +1 lines)
26	</use>	26	</use>
27	<slots>	27	<slots>
28	<subslots>Reflects ABI compatibility of libpoppler.so only,	28	<subslots>Reflects ABI compatibility of libpoppler.so only,
29	NOT libpoppler-{glib,qt4,cpp}.so!</subslots>	29	NOT libpoppler-{glib,qt5,cpp}.so!</subslots>
30	</slots>	30	</slots>
31	</pkgmetadata>	31	</pkgmetadata>
32	-
33	--
34	app-text/poppler/poppler-9999.ebuild \| 5 ++---	32	app-text/poppler/poppler-9999.ebuild \| 5 ++---
35	1 file changed, 2 insertions(+), 3 deletions(-)	33	1 file changed, 2 insertions(+), 3 deletions(-)




# Copyright 2005-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7

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/91"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi

DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"

		-DENABLE_ZLIB=ON
		-DENABLE_ZLIB_UNCOMPRESS=OFF
		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
		-DSPLASH_CMYK=OFF
		-DUSE_FLOAT=OFF
		-DWITH_Cairo=$(usex cairo)
		-DENABLE_LIBCURL=$(usex curl)
- 
--
app-text/poppler/Manifest              |   1 +
app-text/poppler/poppler-0.81.0.ebuild | 125 +++++++++++++++++++++++++
2 files changed, 126 insertions(+)
create mode 100644 app-text/poppler/poppler-0.81.0.ebuild

Lines 1-2 Link Here

(-)a/app-text/poppler/Manifest (+1 lines)
1	DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9	1	DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
2	DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f	2	DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
		3	DIST poppler-0.81.0.tar.xz 1548944 BLAKE2B 23b460d50b22d8b42690c28156398fa3cf299ac24ea883dc8c79044c44aebc126388cab2f31e69c76c50750ef86bd5203958efbb1c353c582c0337e6e0486a85 SHA512 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b




# Copyright 2005-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} == *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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
	SLOT="0/91"   # 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.78.0-respect-cflags.patch"
	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
)

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)' \
			-i CMakeLists.txt || die
	else
		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
	fi

	# we need to up the C++ version, bug #622526, #643278
	append-cxxflags -std=c++11
}

src_configure() {
	xdg_environment_reset
	local mycmakeargs=(
		-DBUILD_GTK_TESTS=OFF
		-DBUILD_QT5_TESTS=OFF
		-DBUILD_CPP_TESTS=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-utils_use_find_package qt5 Qt5Core)
		-DWITH_TIFF=$(usex tiff)
		-DENABLE_UTILS=$(usex utils)
	)
	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )

	cmake-utils_src_configure
}

src_install() {
	cmake-utils_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
}

Return to bug 695942

Lines 1-4 Link Here

(-)a/app-text/poppler/poppler-9999.ebuild (-5 / +2 lines)
1	# Copyright 1999-2019 Gentoo Authors	1	# Copyright 2005-2019 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=7	4	EAPI=7
Lines 12-18 if [[ ${PV} == 9999 ]] ; then Link Here
12	else	12	else
13	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"	13	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
14	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"	14	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"
15	SLOT="0/90" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION	15	SLOT="0/91" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
16	fi	16	fi
17		17
18	DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"	18	DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
Lines 94-100 src_configure() { Link Here
94	-DENABLE_ZLIB=ON	94	-DENABLE_ZLIB=ON
95	-DENABLE_ZLIB_UNCOMPRESS=OFF	95	-DENABLE_ZLIB_UNCOMPRESS=OFF
96	-DENABLE_UNSTABLE_API_ABI_HEADERS=ON	96	-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
97	-DSPLASH_CMYK=OFF
98	-DUSE_FLOAT=OFF	97	-DUSE_FLOAT=OFF
99	-DWITH_Cairo=$(usex cairo)	98	-DWITH_Cairo=$(usex cairo)
100	-DENABLE_LIBCURL=$(usex curl)	99	-DENABLE_LIBCURL=$(usex curl)
101	-
102	--
103	app-text/poppler/Manifest \| 1 +	100	app-text/poppler/Manifest \| 1 +
104	app-text/poppler/poppler-0.81.0.ebuild \| 125 +++++++++++++++++++++++++	101	app-text/poppler/poppler-0.81.0.ebuild \| 125 +++++++++++++++++++++++++
105	2 files changed, 126 insertions(+)	102	2 files changed, 126 insertions(+)
106	create mode 100644 app-text/poppler/poppler-0.81.0.ebuild	103	create mode 100644 app-text/poppler/poppler-0.81.0.ebuild

Line 0 Link Here

(-)a/app-text/poppler/poppler-0.81.0.ebuild (-1 / +125 lines)
0	-	1	# Copyright 2005-2019 Gentoo Authors
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=7
		5
		6	inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
		7
		8	if [[ ${PV} == 9999 ]] ; then
		9	inherit git-r3
		10	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
		11	SLOT="0/9999"
		12	else
		13	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
		14	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"
		15	SLOT="0/91" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
		16	fi
		17
		18	DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
		19	HOMEPAGE="https://poppler.freedesktop.org/"
		20
		21	LICENSE="GPL-2"
		22	IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
		23
		24	# No test data provided
		25	RESTRICT="test"
		26
		27	BDEPEND="
		28	dev-util/glib-utils
		29	virtual/pkgconfig
		30	"
		31	DEPEND="
		32	media-libs/fontconfig
		33	media-libs/freetype
		34	sys-libs/zlib
		35	cairo? (
		36	dev-libs/glib:2
		37	x11-libs/cairo
		38	introspection? ( dev-libs/gobject-introspection:= )
		39	)
		40	curl? ( net-misc/curl )
		41	jpeg? ( virtual/jpeg:0 )
		42	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
		43	lcms? ( media-libs/lcms:2 )
		44	nss? ( >=dev-libs/nss-3.19:0 )
		45	png? ( media-libs/libpng:0= )
		46	qt5? (
		47	dev-qt/qtcore:5
		48	dev-qt/qtgui:5
		49	dev-qt/qtxml:5
		50	)
		51	tiff? ( media-libs/tiff:0 )
		52	"
		53	RDEPEND="${DEPEND}
		54	cjk? ( app-text/poppler-data )
		55	"
		56
		57	DOCS=( AUTHORS NEWS README.md README-XPDF )
		58
		59	PATCHES=(
		60	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
		61	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
		62	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
		63	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
		64	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
		65	)
66
67	src_prepare() {
68	cmake-utils_src_prepare
69
70	# Clang doesn't grok this flag, the configure nicely tests that, but
71	# cmake just uses it, so remove it if we use clang
72	if [[ ${CC} == clang ]] ; then
73	sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake \|\| die
74	fi
75
76	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
77	sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
78	-i CMakeLists.txt \|\| die
79	else
80	einfo "policy(SET CMP0002 OLD) - workaround can be removed"
81	fi
82
83	# we need to up the C++ version, bug #622526, #643278
84	append-cxxflags -std=c++11
85	}
86
87	src_configure() {
88	xdg_environment_reset
89	local mycmakeargs=(
90	-DBUILD_GTK_TESTS=OFF
91	-DBUILD_QT5_TESTS=OFF
92	-DBUILD_CPP_TESTS=OFF
93	-DENABLE_SPLASH=ON
94	-DENABLE_ZLIB=ON
95	-DENABLE_ZLIB_UNCOMPRESS=OFF
96	-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
97	-DUSE_FLOAT=OFF
98	-DWITH_Cairo=$(usex cairo)
99	-DENABLE_LIBCURL=$(usex curl)
100	-DENABLE_CPP=$(usex cxx)
101	-DWITH_JPEG=$(usex jpeg)
102	-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
103	-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
104	-DENABLE_CMS=$(usex lcms lcms2 none)
105	-DWITH_NSS3=$(usex nss)
106	-DWITH_PNG=$(usex png)
107	$(cmake-utils_use_find_package qt5 Qt5Core)
108	-DWITH_TIFF=$(usex tiff)
109	-DENABLE_UTILS=$(usex utils)
110	)
111	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
112
113	cmake-utils_src_configure
114	}
115
116	src_install() {
117	cmake-utils_src_install
118
119	# live version doesn't provide html documentation
120	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
121	# For now install gtk-doc there
122	insinto /usr/share/gtk-doc/html/poppler
123	doins -r "${S}"/glib/reference/html/*
124	fi
125	}