diff options
author | Robert Buchholz <rbu@gentoo.org> | 2009-02-11 18:21:46 +0000 |
---|---|---|
committer | Robert Buchholz <rbu@gentoo.org> | 2009-02-11 18:21:46 +0000 |
commit | 6e2bac5f7ed3b30b8287544e85716d5cf418db73 (patch) | |
tree | 0007f7ea01ace949a1d92b65e8c304b1c2f1e354 /app-text/xournal | |
parent | version bump (diff) | |
download | historical-6e2bac5f7ed3b30b8287544e85716d5cf418db73.tar.gz historical-6e2bac5f7ed3b30b8287544e85716d5cf418db73.tar.bz2 historical-6e2bac5f7ed3b30b8287544e85716d5cf418db73.zip |
Bug fix: PDF annotation broken with latest GTK+ (bug #257980)
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64
Diffstat (limited to 'app-text/xournal')
-rw-r--r-- | app-text/xournal/ChangeLog | 10 | ||||
-rw-r--r-- | app-text/xournal/Manifest | 4 | ||||
-rw-r--r-- | app-text/xournal/files/xournal-0.4.2.1-pdf-annotation.patch | 22 | ||||
-rw-r--r-- | app-text/xournal/xournal-0.4.2.1-r1.ebuild | 41 |
4 files changed, 74 insertions, 3 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/Manifest b/app-text/xournal/Manifest index 842169c98d0f..0dcfd35cb077 100644 --- a/app-text/xournal/Manifest +++ b/app-text/xournal/Manifest @@ -1,4 +1,6 @@ +AUX xournal-0.4.2.1-pdf-annotation.patch 997 RMD160 e03546e87d39d18af2e93c8d2f62a51d38c5a0a4 SHA1 6fc1bbdd695c485416069dd96d5f734ad60aa458 SHA256 ce4654a3449af65422c1a5002934e0c847613c42f4f971656111ae49fab9bf9d DIST xournal-0.4.2.1.tar.gz 516147 RMD160 8daf2deac1f4e07284ba8818eec2968bdbd9baea SHA1 e401675154afd207f7b345c2191714f351837251 SHA256 2eea4c3d455b54020af738467ac026c632bb509ebc9d7f0d4b019ea66163b8ff +EBUILD xournal-0.4.2.1-r1.ebuild 1077 RMD160 5c775eea622553550086a9cdc010771e34dd3b91 SHA1 81ef623f1a5f90615ffee6447f3ee698b5ce3640 SHA256 670844642a431f6bc9bdff4ba7423e52a5d3071f40010430f215a30e753f9764 EBUILD xournal-0.4.2.1.ebuild 1028 RMD160 c7abe335ea4686426e8ae38a2f49b8e435700bf2 SHA1 1f710c0b6cb0254efd724f7b2e70d557e763a119 SHA256 15ce165049609e6efff9750a84aaa94d92718a3300ee1312b31b07a948b028ed -MISC ChangeLog 854 RMD160 078f172a35a3e9a2bb0674369661791146e3aa18 SHA1 bf5df3d1567c07a56321a42eece96a588297065d SHA256 b0cb026a99cb3f778cfe90d16a273839cf98e6e6bab242e39494b33e994de7e0 +MISC ChangeLog 1077 RMD160 bb8362f66dd162a4514d01c0da3c85f4cceb2abf SHA1 a38876272c85afaf8accb6560f5d3f04473ecb0c SHA256 4f17f21d7ea768bf6cc9a4609f6f869cce0fd52fec1b69bf2dddec55f3f57588 MISC metadata.xml 608 RMD160 3a4dfac1c981219f56ff49aae0e1f0a18ca5a439 SHA1 a06f91dfa4bfd4d99e8175378c2b72f5912c6833 SHA256 f6691d5ca74e6fed04ae9cf84888def47bd29b3df5626d6d33b412bd9bde04aa 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 +} |