Bug fix: PDF annotation broken with latest GTK+ (bug #257980)

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 71 insertions, 2 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index 4d2ba6e0aa9e..8b5293fef2cb 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xournal
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.4 2008/10/04 18:30:34 rbu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.5 2009/02/11 18:21:45 rbu Exp $
+
+*xournal-0.4.2.1-r1 (11 Feb 2009)
+
+  11 Feb 2009; Robert Buchholz <rbu@gentoo.org>
+  +files/xournal-0.4.2.1-pdf-annotation.patch, +xournal-0.4.2.1-r1.ebuild:
+  Bug fix: PDF annotation broken with latest GTK+ (bug #257980)
 
   04 Oct 2008; Robert Buchholz <rbu@gentoo.org> xournal-0.4.2.1.ebuild:
   Add pkgconfig to DEPEND (bug #239602 by Evil Compile Person)
diff --git a/app-text/xournal/files/xournal-0.4.2.1-pdf-annotation.patch b/app-text/xournal/files/xournal-0.4.2.1-pdf-annotation.patch
new file mode 100644
index 000000000000..1c16672f176b
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.2.1-pdf-annotation.patch
@@ -0,0 +1,22 @@
+--- xournal-0.4.2.1/src/xo-file.c.orig	2008-03-21 17:59:19.000000000 -0500
++++ xournal-0.4.2.1/src/xo-file.c	2009-01-29 12:07:14.000000000 -0600
+@@ -987,7 +993,18 @@
+   for (npad = 6; npad>0; npad--) {
+      ppm_name = g_strdup_printf("%s/p-%0*d.ppm", bgpdf.tmpdir, npad, req->pageno);
+      if (bgpdf.status != STATUS_ABORTED && bgpdf.status != STATUS_SHUTDOWN)
+-       pixbuf = gdk_pixbuf_new_from_file(ppm_name, NULL);
++     { // workaround for PPM loading issue in recent GTK
++       gchar *buf;
++       gsize count;
++       GdkPixbufLoader *loader = gdk_pixbuf_loader_new_with_type("pnm", NULL);
++       if (loader!=NULL && g_file_get_contents(ppm_name, &buf, &count, NULL))
++       {
++         gdk_pixbuf_loader_write(loader, buf, count, NULL);
++         pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
++         gdk_pixbuf_loader_close(loader, NULL);
++         g_free(buf);
++       }
++     }
+      ret = unlink(ppm_name);
+      g_free(ppm_name);
+      if (pixbuf != NULL || ret == 0) break;
diff --git a/app-text/xournal/xournal-0.4.2.1-r1.ebuild b/app-text/xournal/xournal-0.4.2.1-r1.ebuild
new file mode 100644
index 000000000000..6577b2630efb
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.2.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.2.1-r1.ebuild,v 1.1 2009/02/11 18:21:45 rbu Exp $
+
+EAPI=2
+inherit gnome2 autotools
+DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
+HOMEPAGE="http://xournal.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf doc"
+
+DEPEND="${DEPEND}
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libgnomecanvas-2.4
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2"
+RDEPEND="${DEPEND}
+	pdf? ( app-text/poppler virtual/ghostscript )"
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pdf-annotation.patch #bug 257980
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" desktop-install || die "desktop-install failed"
+
+	dodoc ChangeLog AUTHORS README
+	if use doc ; then
+		dohtml -r html-doc/*
+	fi
+}