public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.22.2.ebuild
@ 2013-03-12  7:43 Andreas HAttel (dilfridge)
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2013-03-12  7:43 UTC (permalink / raw
  To: gentoo-commits

dilfridge    13/03/12 07:43:21

  Modified:             ChangeLog
  Added:                poppler-0.22.2.ebuild
  Log:
  Version bump. Set EAPI=5, add subslot equal major soversion.
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key B6C5F7DE)

Revision  Changes    Path
1.358                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.358&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.358&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.357&r2=1.358

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- ChangeLog	2 Mar 2013 19:44:22 -0000	1.357
+++ ChangeLog	12 Mar 2013 07:43:21 -0000	1.358
@@ -1,6 +1,12 @@
 # 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.357 2013/03/02 19:44:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.358 2013/03/12 07:43:21 dilfridge Exp $
+
+*poppler-0.22.2 (12 Mar 2013)
+
+  12 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +poppler-0.22.2.ebuild:
+  Version bump. Set EAPI=5, add subslot equal major soversion.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> poppler-0.20.4.ebuild,
   poppler-0.20.5.ebuild, poppler-0.22.1.ebuild:



1.1                  app-text/poppler/poppler-0.22.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?rev=1.1&content-type=text/plain

Index: poppler-0.22.2.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.1 2013/03/12 07:43:21 dilfridge Exp $

EAPI=5

inherit cmake-utils

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.gz"

LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/35"
IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils"

# No test data provided
RESTRICT="test"

COMMON_DEPEND="
	>=media-libs/fontconfig-2.6.0
	>=media-libs/freetype-2.3.9
	sys-libs/zlib
	cairo? (
		dev-libs/glib:2
		>=x11-libs/cairo-1.10.0
		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
	)
	curl? ( net-misc/curl )
	jpeg? ( virtual/jpeg )
	jpeg2k? ( media-libs/openjpeg )
	lcms? ( media-libs/lcms:2 )
	png? ( >=media-libs/libpng-1.4:0 )
	qt4? (
		dev-qt/qtcore:4
		dev-qt/qtgui:4
	)
	tiff? ( media-libs/tiff:0 )
"
DEPEND="${COMMON_DEPEND}
	virtual/pkgconfig
"
RDEPEND="${COMMON_DEPEND}
	!dev-libs/poppler
	!dev-libs/poppler-glib
	!dev-libs/poppler-qt3
	!dev-libs/poppler-qt4
	!app-text/poppler-utils
	cjk? ( >=app-text/poppler-data-0.4.4 )
"

DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)

src_configure() {
	mycmakeargs=(
		-DBUILD_GTK_TESTS=OFF
		-DBUILD_QT4_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_with tiff)
	)
	if use lcms; then
		mycmakeargs+=(-DENABLE_CMS=lcms2)
	else
		mycmakeargs+=(-DENABLE_CMS=)
	fi

	cmake-utils_src_configure
}

src_install() {
	cmake-utils_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/* || die 'failed to install API documentation'
	fi
}

pkg_postinst() {
	ewarn "After upgrading app-text/poppler you may need to reinstall packages"
	ewarn "linking to it. For EAPI=5 subslot-capable packages this may be done"
	ewarn "automatically. Anyway, if you're not a portage-2.2_rc user, you're advised"
	ewarn "to run revdep-rebuild."
}





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.22.2.ebuild
@ 2013-03-13 23:48 Andreas HAttel (dilfridge)
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2013-03-13 23:48 UTC (permalink / raw
  To: gentoo-commits

dilfridge    13/03/13 23:48:02

  Modified:             ChangeLog poppler-0.22.2.ebuild
  Log:
  Fix build without libjpeg, bug 461510; build by default with libjpeg
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key B6C5F7DE)

Revision  Changes    Path
1.360                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.360&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.360&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.359&r2=1.360

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- ChangeLog	12 Mar 2013 12:26:07 -0000	1.359
+++ ChangeLog	13 Mar 2013 23:48:02 -0000	1.360
@@ -1,6 +1,10 @@
 # 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.359 2013/03/12 12:26:07 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.360 2013/03/13 23:48:02 dilfridge Exp $
+
+  13 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> poppler-0.22.2.ebuild,
+  +files/poppler-0.22.2-nojpeg.patch:
+  Fix build without libjpeg, bug 461510; build by default with libjpeg
 
   12 Mar 2013; Michael Palimaka <kensington@gentoo.org> poppler-0.20.4.ebuild,
   poppler-0.22.1.ebuild, poppler-0.22.2.ebuild:



1.3                  app-text/poppler/poppler-0.22.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?r1=1.2&r2=1.3

Index: poppler-0.22.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poppler-0.22.2.ebuild	12 Mar 2013 12:26:07 -0000	1.2
+++ poppler-0.22.2.ebuild	13 Mar 2013 23:48:02 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.2 2013/03/12 12:26:07 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.3 2013/03/13 23:48:02 dilfridge Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0/35"
-IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
@@ -52,6 +52,10 @@
 
 DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
 
+PATCHES=(
+	"${FILESDIR}/${P}-nojpeg.patch"
+)
+
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.22.2.ebuild
@ 2013-03-16 11:40 Andreas HAttel (dilfridge)
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2013-03-16 11:40 UTC (permalink / raw
  To: gentoo-commits

dilfridge    13/03/16 11:40:11

  Modified:             ChangeLog poppler-0.22.2.ebuild
  Log:
  Detect freetype via pkg-config, needed for multilib support, bug 459394
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key B6C5F7DE)

Revision  Changes    Path
1.361                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.361&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.361&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.360&r2=1.361

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- ChangeLog	13 Mar 2013 23:48:02 -0000	1.360
+++ ChangeLog	16 Mar 2013 11:40:11 -0000	1.361
@@ -1,6 +1,9 @@
 # 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.360 2013/03/13 23:48:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.361 2013/03/16 11:40:11 dilfridge Exp $
+
+  16 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> poppler-0.22.2.ebuild:
+  Detect freetype via pkg-config, needed for multilib support, bug 459394
 
   13 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> poppler-0.22.2.ebuild,
   +files/poppler-0.22.2-nojpeg.patch:



1.4                  app-text/poppler/poppler-0.22.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?r1=1.3&r2=1.4

Index: poppler-0.22.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poppler-0.22.2.ebuild	13 Mar 2013 23:48:02 -0000	1.3
+++ poppler-0.22.2.ebuild	16 Mar 2013 11:40:11 -0000	1.4
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.3 2013/03/13 23:48:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.4 2013/03/16 11:40:11 dilfridge Exp $
 
 EAPI=5
 
-inherit cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
@@ -57,6 +57,13 @@
 )
 
 src_configure() {
+	# this is needed for multilib, see bug 459394
+	local ft_libdir ft_includedir
+	ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
+	ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
+	export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
+	einfo "Detected FreeType at ${FREETYPE_DIR}"
+
 	mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF
 		-DBUILD_QT4_TESTS=OFF





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.22.2.ebuild
@ 2013-03-16 17:13 Andreas HAttel (dilfridge)
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas HAttel (dilfridge) @ 2013-03-16 17:13 UTC (permalink / raw
  To: gentoo-commits

dilfridge    13/03/16 17:13:11

  Modified:             ChangeLog poppler-0.22.2.ebuild
  Log:
  Do not install ChangeLog, even compressed it is huge
  
  (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key B6C5F7DE)

Revision  Changes    Path
1.363                app-text/poppler/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.363&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.363&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.362&r2=1.363

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- ChangeLog	16 Mar 2013 11:52:28 -0000	1.362
+++ ChangeLog	16 Mar 2013 17:13:11 -0000	1.363
@@ -1,6 +1,9 @@
 # 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.362 2013/03/16 11:52:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.363 2013/03/16 17:13:11 dilfridge Exp $
+
+  16 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> poppler-0.22.2.ebuild:
+  Do not install ChangeLog, even compressed it is huge
 
   16 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   -poppler-0.20.4.ebuild, -poppler-0.22.1.ebuild:



1.5                  app-text/poppler/poppler-0.22.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild?r1=1.4&r2=1.5

Index: poppler-0.22.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poppler-0.22.2.ebuild	16 Mar 2013 11:40:11 -0000	1.4
+++ poppler-0.22.2.ebuild	16 Mar 2013 17:13:11 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.4 2013/03/16 11:40:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2.ebuild,v 1.5 2013/03/16 17:13:11 dilfridge Exp $
 
 EAPI=5
 
@@ -50,7 +50,7 @@
 	cjk? ( >=app-text/poppler-data-0.4.4 )
 "
 
-DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
 
 PATCHES=(
 	"${FILESDIR}/${P}-nojpeg.patch"





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-03-16 17:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-16 17:13 [gentoo-commits] gentoo-x86 commit in app-text/poppler: ChangeLog poppler-0.22.2.ebuild Andreas HAttel (dilfridge)
  -- strict thread matches above, loose matches on Subject: below --
2013-03-16 11:40 Andreas HAttel (dilfridge)
2013-03-13 23:48 Andreas HAttel (dilfridge)
2013-03-12  7:43 Andreas HAttel (dilfridge)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox