diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-11-22 14:26:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 21:52:01 +0000 |
commit | 7c9c78bebd074d72270adaa8baed860bf554ad82 (patch) | |
tree | e28a5c7033d9ee973c96674e733c592f9724be0a /meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch | |
parent | 8a6e8623b43a5b38546e0a8c96f473dba9b31eee (diff) | |
download | openembedded-core-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.gz openembedded-core-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.bz2 openembedded-core-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.xz openembedded-core-7c9c78bebd074d72270adaa8baed860bf554ad82.zip |
gtk+: Update to 2.22.1
Remove disable-gio-png-sniff-test.diff as it alreay in upstream. gdk-pixbuf in
gtk+ is separated as another stand-alone package, so remove it.
In future need only pick up stable version(even number like 2.20.x, 2.22.x).
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch deleted file mode 100644 index 66be74475..000000000 --- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: gtk+-2.21.2/configure.in -=================================================================== ---- gtk+-2.21.2.orig/configure.in 2010-06-22 17:21:41.000000000 +0800 -+++ gtk+-2.21.2/configure.in 2010-06-22 17:28:59.000000000 +0800 -@@ -425,7 +425,7 @@ - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -804,7 +804,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1974,7 +1974,7 @@ - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` |