xournal: Fix linking flags and add zlib as a dependency

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1626 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 19 insertions, 3 deletions

diff --git a/meta/packages/xournal/files/ldflags.patch b/meta/packages/xournal/files/ldflags.patch
new file mode 100644
index 0000000000..7f6585befb
--- /dev/null
+++ b/meta/packages/xournal/files/ldflags.patch
@@ -0,0 +1,15 @@
+---
+ src/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: xournal-0.2/src/Makefile.am
+===================================================================
+--- xournal-0.2.orig/src/Makefile.am    2007-05-09 15:06:26.000000000 +0100
++++ xournal-0.2/src/Makefile.am 2007-05-09 15:06:35.000000000 +0100
+@@ -21,5 +21,5 @@ xournal_SOURCES = \
+        xo-interface.c xo-interface.h \
+        xo-callbacks.c xo-callbacks.h 
+ 
+-xournal_LDADD = @PACKAGE_LIBS@
++xournal_LDADD = @PACKAGE_LIBS@ -lz
+ 
diff --git a/meta/packages/xournal/xournal_0.2.bb b/meta/packages/xournal/xournal_0.2.bb
index 8663774a83..1ca6e1ed7c 100644
--- a/meta/packages/xournal/xournal_0.2.bb
+++ b/meta/packages/xournal/xournal_0.2.bb
@@ -1,11 +1,12 @@
 HOMEPAGE = "http://www-math.mit.edu/~auroux/software/xournal/"
 DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
-DEPENDS = "gtk+ libgnomecanvas"
+DEPENDS = "gtk+ libgnomecanvas zlib"
 SECTION = "x11"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://math.mit.edu/~auroux/software/xournal/xournal-0.2.tar.gz \
-        file://no-printing.diff;patch=1"
+           file://ldflags.patch;patch=1 \
+           file://no-printing.diff;patch=1"
 
 inherit autotools pkgconfig