summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-05-23 14:40:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 16:48:24 +0100
commitc99fd8dfebf2284bbed3ed3034e518ffef1aaf3f (patch)
treed3978f856f0c77a16530241c4454dd61569ac53d /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
parent271ea8b628e5a18bff66fcf37efb7e1ef5c26754 (diff)
downloadpoky-c99fd8dfebf2284bbed3ed3034e518ffef1aaf3f.tar.gz
gdk-pixbuf: upgrade to 2.28.1
Something along the lines of pngversion.patch was merged upstream, so drop that patch. Also use the new trim_version() function for a future-proof SRC_URI. (From OE-Core rev: 30b32addd189e7acce73965c9176227d5f392ab9) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
new file mode 100644
index 0000000000..b141690387
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch
@@ -0,0 +1,21 @@
1can sniff check buillds and runs an C binary, which breaks configure in
2cross-compile environ.
3This patch simple disables it.
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6
7Upstream-Status: Inappropriate [embedded specific]
8
9Index: gdk-pixbuf-2.22.1/configure.ac
10===================================================================
11--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-25 16:26:41.000000000 +0800
12+++ gdk-pixbuf-2.22.1/configure.ac 2010-11-25 16:29:22.000000000 +0800
13@@ -99,6 +99,8 @@
14 AC_MSG_CHECKING([for native Win32])
15 LIB_EXE_MACHINE_FLAG=X86
16 EXE_MANIFEST_ARCHITECTURE=X86
17+dnl disable can sniff check in cross compile
18+gio_can_sniff=no
19 case "$host" in
20 *-*-mingw*)
21 os_win32=yes