mirror of
https://git.yoctoproject.org/poky
synced 2026-10-21 06:48:18 +00:00
Upgrade GTK+
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1257 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
1 parent
015c1a84f5
commit
72f8f889aa
21 files changed
+28
-30
No files matched your search
@@ -1,21 +0,0 @@
|
||||
Index: gtk+-2.10.6/gtk/Makefile.am
|
||||
===================================================================
|
||||
--- gtk+-2.10.6.orig/gtk/Makefile.am 2006-10-30 12:56:34.000000000 +0000
|
||||
+++ gtk+-2.10.6/gtk/Makefile.am 2006-10-30 12:57:08.000000000 +0000
|
||||
@@ -1119,11 +1119,11 @@
|
||||
done \
|
||||
&& touch stamp-icons
|
||||
|
||||
-gtkbuiltincache.h: @REBUILD@ stamp-icons
|
||||
- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
||||
- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
|
||||
- ./gtk-update-icon-cache --force --ignore-theme-index \
|
||||
- --source builtin_icons stock-icons > gtkbuiltincache.h
|
||||
+#gtkbuiltincache.h: @REBUILD@ stamp-icons
|
||||
+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
||||
+# GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
|
||||
+# ./gtk-update-icon-cache --force --ignore-theme-index \
|
||||
+# --source builtin_icons stock-icons > gtkbuiltincache.h
|
||||
|
||||
EXTRA_DIST += \
|
||||
$(STOCK_ICONS) \
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Vendored
File renamed without changes.
File renamed without changes.
File renamed without changes.
+9
-9
@@ -1,15 +1,15 @@
|
||||
--- gtk+-2.10.0/configure.in.orig 2006-07-07 09:31:34.000000000 +0100
|
||||
+++ gtk+-2.10.0/configure.in 2006-07-07 09:32:49.000000000 +0100
|
||||
@@ -370,7 +370,7 @@
|
||||
AC_MSG_CHECKING([Whether to write dependencies into .pc files])
|
||||
--- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100
|
||||
+++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100
|
||||
@@ -371,7 +371,7 @@
|
||||
case $enable_explicit_deps in
|
||||
auto)
|
||||
- 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`
|
||||
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
|
||||
@@ -768,7 +768,7 @@
|
||||
@@ -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
|
||||
@@ -18,10 +18,10 @@
|
||||
pixbuf_deplibs_check=`$pixbuf_libtool_config | \
|
||||
grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
|
||||
sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
|
||||
@@ -1600,7 +1600,7 @@
|
||||
#
|
||||
@@ -1611,7 +1611,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
|
||||
File renamed without changes.
Vendored
File renamed without changes.
Vendored
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,19 @@
|
||||
--- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100
|
||||
+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100
|
||||
@@ -1128,11 +1128,11 @@
|
||||
./gtk-update-icon-cache
|
||||
endif
|
||||
|
||||
-gtkbuiltincache.h: @REBUILD@ stamp-icons
|
||||
- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
||||
- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
|
||||
- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
||||
- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
|
||||
+#gtkbuiltincache.h: @REBUILD@ stamp-icons
|
||||
+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
|
||||
+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \
|
||||
+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
|
||||
+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
|
||||
|
||||
EXTRA_DIST += \
|
||||
$(STOCK_ICONS) \
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
Vendored
File renamed without changes.
Vendored
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user