summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-04-07 17:46:42 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-04-07 17:46:42 +0000
commitf5562d4528000e1f7152b813f8c193ae12a031c1 (patch)
tree9e7c567562cdaaf119273d8e0f25979742d3d314
parent3121b796cc5f2b88d10d96b4772b530ce27be30a (diff)
downloadpoky-f5562d4528000e1f7152b813f8c193ae12a031c1.tar.gz
gcalctool: do not use includedir as this break on cross builds
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1453 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/gcalctool/gcalctool/fix-includedir.patch12
-rw-r--r--meta/packages/gcalctool/gcalctool_5.7.32.bb5
2 files changed, 15 insertions, 2 deletions
diff --git a/meta/packages/gcalctool/gcalctool/fix-includedir.patch b/meta/packages/gcalctool/gcalctool/fix-includedir.patch
new file mode 100644
index 0000000000..62b386bf9d
--- /dev/null
+++ b/meta/packages/gcalctool/gcalctool/fix-includedir.patch
@@ -0,0 +1,12 @@
1Index: gcalctool-5.7.32/gcalctool/Makefile.am
2===================================================================
3--- gcalctool-5.7.32.orig/gcalctool/Makefile.am 2007-04-07 19:44:00.000000000 +0200
4+++ gcalctool-5.7.32/gcalctool/Makefile.am 2007-04-07 19:44:15.000000000 +0200
5@@ -1,7 +1,6 @@
6 ## Process this file with automake to produce Makefile.in
7
8 INCLUDES = \
9- -I$(includedir) \
10 -DG_DISABLE_DEPRECATED \
11 -DGDK_PIXBUF_DISABLE_DEPRECATED \
12 -DGDK_DISABLE_DEPRECATED \
diff --git a/meta/packages/gcalctool/gcalctool_5.7.32.bb b/meta/packages/gcalctool/gcalctool_5.7.32.bb
index 084b5e4c82..f12e6c402a 100644
--- a/meta/packages/gcalctool/gcalctool_5.7.32.bb
+++ b/meta/packages/gcalctool/gcalctool_5.7.32.bb
@@ -2,10 +2,11 @@ LICENSE = "GPL"
2SECTION = "x11" 2SECTION = "x11"
3DEPENDS = "gtk+" 3DEPENDS = "gtk+"
4DESCRIPTION = "gcalctool is a powerful calculator" 4DESCRIPTION = "gcalctool is a powerful calculator"
5PR = "r1" 5PR = "r2"
6 6
7SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \ 7SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \
8 file://makefile-fix.diff;patch=1" 8 file://makefile-fix.diff;patch=1\
9 file://fix-includedir.patch;patch=1"
9 10
10inherit autotools pkgconfig 11inherit autotools pkgconfig
11 12