summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-09 14:00:47 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-09 14:00:47 +0000
commit615dd4a36123b58bc252f1a3415fe82a13944b67 (patch)
treef4b478d0f87b71653c987725f3a790a140ae5d07 /meta
parent2ee4cf3f5e2df4de0ad91a2045f5d0ae0af9822d (diff)
downloadopenembedded-core-615dd4a36123b58bc252f1a3415fe82a13944b67.tar.gz
openembedded-core-615dd4a36123b58bc252f1a3415fe82a13944b67.tar.bz2
openembedded-core-615dd4a36123b58bc252f1a3415fe82a13944b67.tar.xz
openembedded-core-615dd4a36123b58bc252f1a3415fe82a13944b67.zip
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
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/xournal/files/ldflags.patch15
-rw-r--r--meta/packages/xournal/xournal_0.2.bb7
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 000000000..7f6585bef
--- /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 8663774a8..1ca6e1ed7 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