summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-12-16 10:32:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-27 21:52:10 +0000
commitef6cc9af8c6756b659824680846783444919eb90 (patch)
tree67193d3dc86e9aef0b4e91ea04755231523759f5
parent7c9c78bebd074d72270adaa8baed860bf554ad82 (diff)
downloadpoky-ef6cc9af8c6756b659824680846783444919eb90.tar.gz
eds-dbus: Do not disable old API after upgrading gtk+
This avoid build error due to defination missing. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch17
-rw-r--r--meta/recipes-sato/eds/eds-dbus_git.bb1
2 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch b/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
new file mode 100644
index 0000000000..8b600698bf
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
@@ -0,0 +1,17 @@
1Do not disable old API after upgrading gtk+.
2This avoid build error due to defination missing.
3
4Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5
6Index: git/configure.ac
7===================================================================
8--- git.orig/configure.ac 2010-12-16 10:25:24.000000000 +0800
9+++ git/configure.ac 2010-12-16 10:25:58.000000000 +0800
10@@ -147,7 +147,6 @@
11 AS_COMPILER_FLAGS(WARNING_FLAGS,
12 "-DG_DISABLE_DEPRECATED
13 -DPANGO_DISABLE_DEPRECATED
14- -DGDK_DISABLE_DEPRECATED
15 -DGDK_PIXBUF_DISABLE_DEPRECATED
16 -DG_DISABLE_SINGLE_INCLUDES
17 -DGTK_DISABLE_SINGLE_INCLUDES
diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb
index e5b7e15f71..5ab96a7efb 100644
--- a/meta/recipes-sato/eds/eds-dbus_git.bb
+++ b/meta/recipes-sato/eds/eds-dbus_git.bb
@@ -18,6 +18,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
18 file://nossl.patch;patch=1 \ 18 file://nossl.patch;patch=1 \
19 file://optional_imapx_provider.patch;patch=1 \ 19 file://optional_imapx_provider.patch;patch=1 \
20 file://new-contact-fix.patch;patch=1 \ 20 file://new-contact-fix.patch;patch=1 \
21 file://old-gdk-api.patch;patch=1 \
21 file://iconv-detect.h" 22 file://iconv-detect.h"
22 23
23S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"