[gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-9999.ebuild poppler-0.33.0-r1.ebuild ChangeLog poppler-0.33.0.ebuild
johu15/06/21 11:59:03 Modified: poppler-.ebuild poppler-0.33.0-r1.ebuild ChangeLog Removed: poppler-0.33.0.ebuild Log: Replace nonfatal usage with live version check, bug #551158. Sync live. Remove old. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x295445CE) Revision ChangesPath 1.10 app-text/poppler/poppler-.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?rev=1.10view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?rev=1.10content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?r1=1.9r2=1.10 Index: poppler-.ebuild === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- poppler-.ebuild 29 May 2015 13:00:45 - 1.9 +++ poppler-.ebuild 21 Jun 2015 11:59:02 - 1.10 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v 1.9 2015/05/29 13:00:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v 1.10 2015/06/21 11:59:02 johu Exp $ EAPI=5 @@ -66,6 +66,16 @@ ${FILESDIR}/${PN}-0.33.0-openjpeg2.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 -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die + fi +} + src_configure() { local mycmakeargs=( -DBUILD_GTK_TESTS=OFF @@ -103,10 +113,10 @@ src_install() { cmake-utils_src_install - if use cairo use doc; then + # live version doesn't provide html documentation + if use cairo use doc [[ ${PV} != ]]; then # For now install gtk-doc there insinto /usr/share/gtk-doc/html/poppler - # nonfatal, because live version doesn't provide html documentation. - nonfatal doins -r ${S}/glib/reference/html/* + doins -r ${S}/glib/reference/html/* fi } 1.5 app-text/poppler/poppler-0.33.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.5view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.5content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?r1=1.4r2=1.5 Index: poppler-0.33.0-r1.ebuild === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- poppler-0.33.0-r1.ebuild1 Jun 2015 19:54:32 - 1.4 +++ poppler-0.33.0-r1.ebuild21 Jun 2015 11:59:02 - 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.4 2015/06/01 19:54:32 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.5 2015/06/21 11:59:02 johu Exp $ EAPI=5 @@ -113,10 +113,10 @@ src_install() { cmake-utils_src_install - if use cairo use doc; then + # live version doesn't provide html documentation + if use cairo use doc [[ ${PV} != ]]; then # For now install gtk-doc there insinto /usr/share/gtk-doc/html/poppler - # nonfatal, because live version doesn't provide html documentation. - nonfatal doins -r ${S}/glib/reference/html/* + doins -r ${S}/glib/reference/html/* fi } 1.463app-text/poppler/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.463view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.463content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.462r2=1.463 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v retrieving revision 1.462 retrieving revision 1.463 diff -u -r1.462 -r1.463 --- ChangeLog 1 Jun 2015 19:54:32 - 1.462 +++ ChangeLog 21 Jun 2015 11:59:02 - 1.463 @@ -1,6 +1,11 @@ #
[gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-9999.ebuild poppler-0.33.0-r1.ebuild ChangeLog
dilfridge15/05/29 13:00:45 Modified: poppler-.ebuild poppler-0.33.0-r1.ebuild ChangeLog Log: Add slot operator for openjpeg (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 94BFDF4484AD142F) Revision ChangesPath 1.9 app-text/poppler/poppler-.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?rev=1.9view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?rev=1.9content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?r1=1.8r2=1.9 Index: poppler-.ebuild === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- poppler-.ebuild 25 May 2015 11:42:29 - 1.8 +++ poppler-.ebuild 29 May 2015 13:00:45 - 1.9 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v 1.8 2015/05/25 11:42:29 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v 1.9 2015/05/29 13:00:45 dilfridge Exp $ EAPI=5 @@ -36,7 +36,7 @@ ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2 ) + jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) png? ( media-libs/libpng:0= ) qt4? ( 1.3 app-text/poppler/poppler-0.33.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.3view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.3content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?r1=1.2r2=1.3 Index: poppler-0.33.0-r1.ebuild === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- poppler-0.33.0-r1.ebuild25 May 2015 11:42:29 - 1.2 +++ poppler-0.33.0-r1.ebuild29 May 2015 13:00:45 - 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.2 2015/05/25 11:42:29 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.3 2015/05/29 13:00:45 dilfridge Exp $ EAPI=5 @@ -36,7 +36,7 @@ ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2 ) + jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) png? ( media-libs/libpng:0= ) qt4? ( 1.461app-text/poppler/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.461view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.461content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.460r2=1.461 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v retrieving revision 1.460 retrieving revision 1.461 diff -u -r1.460 -r1.461 --- ChangeLog 25 May 2015 11:42:29 - 1.460 +++ ChangeLog 29 May 2015 13:00:45 - 1.461 @@ -1,6 +1,10 @@ # ChangeLog for app-text/poppler # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.460 2015/05/25 11:42:29 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.461 2015/05/29 13:00:45 dilfridge Exp $ + + 29 May 2015; Andreas K. Hüttel dilfri...@gentoo.org + poppler-0.33.0-r1.ebuild, poppler-.ebuild: + Add slot operator for openjpeg 25 May 2015; Andreas K. Huettel dilfri...@gentoo.org poppler-0.33.0-r1.ebuild, poppler-.ebuild:
[gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-9999.ebuild poppler-0.33.0-r1.ebuild ChangeLog
dilfridge15/05/25 11:42:29 Modified: poppler-.ebuild poppler-0.33.0-r1.ebuild ChangeLog Log: Using openjpeg instead of the internal jpeg2k decoder is recommended by upstream, so enable it by default (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0B08240A96F66571) Revision ChangesPath 1.8 app-text/poppler/poppler-.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?rev=1.8view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?rev=1.8content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-.ebuild?r1=1.7r2=1.8 Index: poppler-.ebuild === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- poppler-.ebuild 24 May 2015 18:45:23 - 1.7 +++ poppler-.ebuild 25 May 2015 11:42:29 - 1.8 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v 1.7 2015/05/24 18:45:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-.ebuild,v 1.8 2015/05/25 11:42:29 dilfridge Exp $ EAPI=5 @@ -20,7 +20,7 @@ HOMEPAGE=http://poppler.freedesktop.org/; LICENSE=GPL-2 -IUSE=cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils +IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils # No test data provided RESTRICT=test 1.2 app-text/poppler/poppler-0.33.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.2view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.2content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?r1=1.1r2=1.2 Index: poppler-0.33.0-r1.ebuild === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- poppler-0.33.0-r1.ebuild24 May 2015 18:45:23 - 1.1 +++ poppler-0.33.0-r1.ebuild25 May 2015 11:42:29 - 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.1 2015/05/24 18:45:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.2 2015/05/25 11:42:29 dilfridge Exp $ EAPI=5 @@ -20,7 +20,7 @@ HOMEPAGE=http://poppler.freedesktop.org/; LICENSE=GPL-2 -IUSE=cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils +IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils # No test data provided RESTRICT=test 1.460app-text/poppler/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.460view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.460content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.459r2=1.460 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v retrieving revision 1.459 retrieving revision 1.460 diff -u -r1.459 -r1.460 --- ChangeLog 24 May 2015 18:45:23 - 1.459 +++ ChangeLog 25 May 2015 11:42:29 - 1.460 @@ -1,6 +1,11 @@ # ChangeLog for app-text/poppler # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.459 2015/05/24 18:45:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.460 2015/05/25 11:42:29 dilfridge Exp $ + + 25 May 2015; Andreas K. Huettel dilfri...@gentoo.org + poppler-0.33.0-r1.ebuild, poppler-.ebuild: + Using openjpeg instead of the internal jpeg2k decoder is recommended by + upstream, so enable it by default *poppler-0.33.0-r1 (24 May 2015)