From f5562d4528000e1f7152b813f8c193ae12a031c1 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 7 Apr 2007 17:46:42 +0000 Subject: [PATCH] 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 --- .../gcalctool/gcalctool/fix-includedir.patch | 12 ++++++++++++ meta/packages/gcalctool/gcalctool_5.7.32.bb | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 meta/packages/gcalctool/gcalctool/fix-includedir.patch 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 @@ +Index: gcalctool-5.7.32/gcalctool/Makefile.am +=================================================================== +--- gcalctool-5.7.32.orig/gcalctool/Makefile.am 2007-04-07 19:44:00.000000000 +0200 ++++ gcalctool-5.7.32/gcalctool/Makefile.am 2007-04-07 19:44:15.000000000 +0200 +@@ -1,7 +1,6 @@ + ## Process this file with automake to produce Makefile.in + + INCLUDES = \ +- -I$(includedir) \ + -DG_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -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" SECTION = "x11" DEPENDS = "gtk+" DESCRIPTION = "gcalctool is a powerful calculator" -PR = "r1" +PR = "r2" SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \ - file://makefile-fix.diff;patch=1" + file://makefile-fix.diff;patch=1\ + file://fix-includedir.patch;patch=1" inherit autotools pkgconfig