Bump. Improves support for bezier curves and opacity, and adds utilities for converting XPS to other formats.

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

4 files changed, 171 insertions, 1 deletions

diff --git a/app-text/libgxps/ChangeLog b/app-text/libgxps/ChangeLog
index 63469d48f97b..0eda7f766831 100644
--- a/app-text/libgxps/ChangeLog
+++ b/app-text/libgxps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/libgxps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libgxps/ChangeLog,v 1.1 2011/11/03 05:10:47 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libgxps/ChangeLog,v 1.2 2011/11/23 20:25:51 tetromino Exp $
+
+*libgxps-0.2.0 (23 Nov 2011)
+
+  23 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgxps-0.2.0.ebuild, +files/libgxps-0.2.0-libm.patch,
+  +files/libgxps-0.2.0-libpng15.patch:
+  Bump. Improves support for bezier curves and opacity, and adds utilities for
+  converting XPS to other formats.
 
 *libgxps-0.1.0 (03 Nov 2011)
 
diff --git a/app-text/libgxps/files/libgxps-0.2.0-libm.patch b/app-text/libgxps/files/libgxps-0.2.0-libm.patch
new file mode 100644
index 000000000000..6a1ea20b8fb3
--- /dev/null
+++ b/app-text/libgxps/files/libgxps-0.2.0-libm.patch
@@ -0,0 +1,70 @@
+From 7bc33181d7e44aab35db01d4ac1560dcf408d5d9 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Mon, 21 Nov 2011 08:51:54 +0100
+Subject: [PATCH] Build: link with libm. Fixes bgo#664439.
+
+---
+ configure.ac      |    1 +
+ tools/Makefile.am |    7 ++++++-
+ 2 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b7d38c6..7ef4310 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,6 +47,7 @@ AC_ISC_POSIX
+ AC_PROG_CC_STDC
+ AC_STDC_HEADERS
+ AC_C_BIGENDIAN
++LT_LIB_M
+ 
+ GNOME_MAINTAINER_MODE_DEFINES
+ GNOME_COMPILE_WARNINGS
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index ccb7e05..0bf1538 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -54,6 +54,7 @@ xpstopng_CFLAGS = \
+ 
+ xpstopng_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(LIBPNG_LIBS)
+ endif # HAVE_LIBPNG
+ 
+@@ -77,6 +78,7 @@ xpstojpeg_CFLAGS = \
+ 
+ xpstojpeg_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(LIBJPEG)
+ endif # HAVE_LIBJPEG
+ 
+@@ -99,6 +101,7 @@ xpstopdf_CFLAGS = \
+ 
+ xpstopdf_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(CAIRO_PDF_LIBS)
+ endif # HAVE_CAIRO_PDF
+ 
+@@ -121,6 +124,7 @@ xpstops_CFLAGS = \
+ 
+ xpstops_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(CAIRO_PS_LIBS)
+ endif # HAVE_CAIRO_PS
+ 
+@@ -143,5 +147,6 @@ xpstosvg_CFLAGS = \
+ 
+ xpstosvg_LDADD = \
+ 	libgxpstools.la		\
++	$(LIBM)                 \
+ 	$(CAIRO_SVG_LIBS)
+-endif # HAVE_CAIRO_SVG
+\ No newline at end of file
++endif # HAVE_CAIRO_SVG
+-- 
+1.7.8.rc3
+
diff --git a/app-text/libgxps/files/libgxps-0.2.0-libpng15.patch b/app-text/libgxps/files/libgxps-0.2.0-libpng15.patch
new file mode 100644
index 000000000000..c4d89f906ec6
--- /dev/null
+++ b/app-text/libgxps/files/libgxps-0.2.0-libpng15.patch
@@ -0,0 +1,29 @@
+From 1b8587d4abe24a4416628638f54e58d52287551a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 23 Nov 2011 13:24:50 -0500
+Subject: [PATCH] Fix building with libpng15
+
+https://bugzilla.gnome.org/show_bug.cgi?id=664666
+---
+ tools/gxps-png-writer.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/tools/gxps-png-writer.c b/tools/gxps-png-writer.c
+index 7d78ec9..369e0e0 100644
+--- a/tools/gxps-png-writer.c
++++ b/tools/gxps-png-writer.c
+@@ -23,6 +23,11 @@
+ #include <png.h>
+ #include <stdint.h>
+ 
++/* starting with libpng15, png.h no longer #includes zlib.h */
++#ifndef Z_BEST_COMPRESSION
++#define Z_BEST_COMPRESSION 9
++#endif
++
+ struct _GXPSPngWriter {
+ 	GObject parent;
+ 
+-- 
+1.7.8.rc3
+
diff --git a/app-text/libgxps/libgxps-0.2.0.ebuild b/app-text/libgxps/libgxps-0.2.0.ebuild
new file mode 100644
index 000000000000..7f45f4d0266f
--- /dev/null
+++ b/app-text/libgxps/libgxps-0.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/libgxps/libgxps-0.2.0.ebuild,v 1.1 2011/11/23 20:25:50 tetromino Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Library for handling and rendering XPS documents"
+HOMEPAGE="http://live.gnome.org/libgxps"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +introspection jpeg lcms static-libs tiff"
+
+RDEPEND=">=app-arch/libarchive-2.8
+	>=dev-libs/glib-2.24:2
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=x11-libs/cairo-1.10[svg]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )
+	jpeg? ( virtual/jpeg )
+	lcms? ( media-libs/lcms:2 )
+	tiff? ( media-libs/tiff[zlib] )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.14 )
+
+	dev-util/gtk-doc-am"
+# eautoreconf requires: dev-util/gtk-doc-am
+
+# There is no automatic test suite, only an interactive test application
+RESTRICT="test"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-man
+		--disable-test
+		$(use_enable debug)
+		$(use_enable introspection)
+		$(use_with jpeg libjpeg)
+		$(use_with lcms liblcms2)
+		$(use_enable static-libs static)
+		$(use_with tiff libtiff)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Upstream patch to fix linking, in next release, requires eautoreconf
+	epatch "${FILESDIR}/${P}-libm.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=664666
+	epatch "${FILESDIR}/${PN}-0.2.0-libpng15.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}