Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20076
Modified Files:
xournal.info
Added Files:
xournal.patch
Log Message:
Upstream patch for a GTK2-related PDF annotation bug. Update by Ojas Parekh:
https://sourceforge.net/tracker/?func=detail&aid=2845212&group_id=17203&atid=414256
--- NEW FILE: xournal.patch ---
--- 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,20 @@
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;
Index: xournal.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/xournal.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- xournal.info 30 Dec 2008 12:52:25 -0000 1.6
+++ xournal.info 1 Sep 2009 13:07:57 -0000 1.7
@@ -1,12 +1,12 @@
Package: xournal
Version: 0.4.2.1
-Revision: 1003
+Revision: 1004
Description: For notetaking, sketching, and journaling
License: GPL
Maintainer: Ojas Parekh <f...@parekhmail.net>
# dependencies:
-BuildDepends: atk1 (>= 1.20.0-1), automaken, glib2-dev (>= 2.14.0-1),
gtk+2-dev (>= 2.6), libart2, libgettext3-dev, libgnomecanvas2-dev (>= 2.4),
libgnomeprint2.2-dev (>= 2.18.4-1), libgnomeprintui2.2-dev (>= 2.18.1-1),
libxml2 (>= 2.6.30-1), pango1-xft2-ft219-dev (>= 1.18.4-4), libiconv-dev, cairo
(>= 1.6-1), expat1, fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 2.3.5-1),
glitz, libjpeg, libpng3 (>= 1.2.5-4), libtiff, pixman (>= 0.10.0-1), pkgconfig
(>= 0.22-3), x11-dev, xft2-dev
+BuildDepends: fink (>= 0.24.12), atk1 (>= 1.20.0-1), automaken, glib2-dev (>=
2.14.0-1), gtk+2-dev (>= 2.6), libart2, libgettext3-dev, libgnomecanvas2-dev
(>= 2.4), libgnomeprint2.2-dev (>= 2.18.4-1), libgnomeprintui2.2-dev (>=
2.18.1-1), libxml2 (>= 2.6.30-1), pango1-xft2-ft219-dev (>= 1.18.4-4),
libiconv-dev, cairo (>= 1.6-1), expat1, fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1), glitz, libjpeg, libpng3 (>= 1.2.5-4), libtiff, pixman
(>= 0.10.0-1), pkgconfig (>= 0.22-3), x11-dev, xft2-dev
Depends: ghostscript, gtk+2 (>= 2.12.0-1), libgnomecanvas2 (>= 2.20.1-1),
libgnomeprint2.2-shlibs (>= 2.18.4-1), libgnomeprintui2.2-shlibs (>= 2.18.1-1),
xpdf, libiconv
# unpack phase:
@@ -15,8 +15,11 @@
# patch phase:
# with recent versions of gtk+2 (>=2.14), -lX11 is missing on the final linker
line
+PatchFile: %n.patch
+PatchFile-MD5: 32a38dcbba83bcf6564a80aa815afae1
PatchScript: <<
perl -pi -e 's|xournal_LDADD .*|$& -L/usr/X11R6/lib -lX11|' src/Makefile.am
+ patch -p1 < %{PatchFile}
<<
# compile phase:
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
