gtk+: update to upstream version 2.24.15

- configure-nm.patch updated to apply
- hardcoded_libtool.patch updated to apply
- obsolete_automake_macros.patch removes as it's now part of upstream

(From OE-Core rev: a4ed7da18d8622fc0b6e3d32ac8ce9456b912322)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Marko Lindqvist
2013-02-13 13:25:32 +02:00
committed by Richard Purdie
parent 01dab75215
commit 822552d417
15 changed files with 1825 additions and 63 deletions

View File

@@ -1,33 +0,0 @@
Upstream-Status: Inappropriate [embedded specific]
Index: gtk+-2.23.2/configure.in
===================================================================
--- gtk+-2.23.2.orig/configure.in 2010-11-10 22:22:47.000000000 +0800
+++ gtk+-2.23.2/configure.in 2010-11-25 13:32:40.000000000 +0800
@@ -414,7 +414,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
@@ -773,7 +773,7 @@
dnl Now we check to see if our libtool supports shared lib deps
dnl (in a rather ugly way even)
if $dynworks; then
- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
+ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
module_deplibs_check=`$module_libtool_config | \
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
@@ -1555,7 +1555,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_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`

View File

@@ -1,23 +0,0 @@
Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691267]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd gtk+-2.24.14/configure.in gtk+-2.24.14/configure.in
--- gtk+-2.24.14/configure.in 2012-12-06 05:46:07.000000000 +0200
+++ gtk+-2.24.14/configure.in 2013-01-07 04:18:43.546039799 +0200
@@ -51,7 +51,7 @@
cflags_set=${CFLAGS+set}
AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Support silent build rules, requires at least automake-1.11. Enable
# by either passing --enable-silent-rules to configure or passing V=0
@@ -300,7 +300,6 @@
# Checks for programs.
AC_ISC_POSIX
-AM_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_MAKE_SET

View File

@@ -3,8 +3,13 @@ https://bugzilla.gnome.org/show_bug.cgi?id=671515
Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com>
# Pick up ${NM} from the environment
--- a/configure.in
+++ b/configure.in
Updated to apply to gtk+-2.24.15
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac
--- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200
+++ gtk+-2.24.15/configure.ac 2013-02-12 21:25:06.073937041 +0200
@@ -190,7 +190,7 @@
AC_SYS_LARGEFILE
@@ -13,4 +18,4 @@ Signed-Off-By: Xiaofeng Yan <xiaofeng.yan@windriver.com>
+AC_CHECK_TOOLS(NM, [$NM nm], nm)
dnl Initialize maintainer mode
AM_MAINTAINER_MODE
AM_MAINTAINER_MODE([enable])

File diff suppressed because it is too large Load Diff

View File

@@ -14,7 +14,6 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \
file://doc-fixes.patch \
file://0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch \
file://obsolete_automake_macros.patch \
"
# TO MERGE
@@ -29,10 +28,10 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
# file://combo-arrow-size.patch;striplevel=0
# file://configurefix.patch
PR = "r1"
PR = "r0"
SRC_URI[md5sum] = "e2c16f119ed624893ecfc3775930ae4c"
SRC_URI[sha256sum] = "8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac"
SRC_URI[md5sum] = "68f034fb4f68086790d7488cf00e71c8"
SRC_URI[sha256sum] = "d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b"
EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"