summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/gtk+/gtk+-2.10.6/run-iconcache.patch21
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/automake-lossage.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/cellrenderer-cairo.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/disable-print.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/disable-print.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/entry-cairo.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch (renamed from meta/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch)18
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/migration.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/migration.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/no-demos.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/no-demos.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/no-xwc.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff (renamed from meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch19
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/scroll-timings.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/single-click.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/single-click.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch)0
-rw-r--r--meta/packages/gtk+/gtk+-2.10.9/xsettings.patch (renamed from meta/packages/gtk+/gtk+-2.10.6/xsettings.patch)0
-rw-r--r--meta/packages/gtk+/gtk+_2.10.9.bb (renamed from meta/packages/gtk+/gtk+_2.10.6.bb)0
21 files changed, 28 insertions, 30 deletions
diff --git a/meta/packages/gtk+/gtk+-2.10.6/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.10.6/run-iconcache.patch
deleted file mode 100644
index 5c114dbdda..0000000000
--- a/meta/packages/gtk+/gtk+-2.10.6/run-iconcache.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Index: gtk+-2.10.6/gtk/Makefile.am
2===================================================================
3--- gtk+-2.10.6.orig/gtk/Makefile.am 2006-10-30 12:56:34.000000000 +0000
4+++ gtk+-2.10.6/gtk/Makefile.am 2006-10-30 12:57:08.000000000 +0000
5@@ -1119,11 +1119,11 @@
6 done \
7 && touch stamp-icons
8
9-gtkbuiltincache.h: @REBUILD@ stamp-icons
10- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
11- GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
12- ./gtk-update-icon-cache --force --ignore-theme-index \
13- --source builtin_icons stock-icons > gtkbuiltincache.h
14+#gtkbuiltincache.h: @REBUILD@ stamp-icons
15+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
16+# GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \
17+# ./gtk-update-icon-cache --force --ignore-theme-index \
18+# --source builtin_icons stock-icons > gtkbuiltincache.h
19
20 EXTRA_DIST += \
21 $(STOCK_ICONS) \
diff --git a/meta/packages/gtk+/gtk+-2.10.6/automake-lossage.patch b/meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch
index 0d423ddbb9..0d423ddbb9 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/automake-lossage.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/automake-lossage.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/cellrenderer-cairo.patch b/meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch
index 4439e69fb6..4439e69fb6 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/cellrenderer-cairo.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/cellrenderer-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/disable-print.patch b/meta/packages/gtk+/gtk+-2.10.9/disable-print.patch
index 1067773f12..1067773f12 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/disable-print.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/disable-print.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch b/meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch
index d71d839c3c..d71d839c3c 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/disable-tooltips.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/disable-tooltips.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/entry-cairo.patch b/meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch
index 3313e7f132..3313e7f132 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/entry-cairo.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/entry-cairo.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch b/meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch
index 1ea86ce6b2..1ea86ce6b2 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/gtk+-handhelds.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch b/meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch
index df29656343..df29656343 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/gtklabel-resize-patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/gtklabel-resize-patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch b/meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch
index bdbdb32f97..6adb0cfef6 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/hardcoded_libtool.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/hardcoded_libtool.patch
@@ -1,15 +1,15 @@
1--- gtk+-2.10.0/configure.in.orig 2006-07-07 09:31:34.000000000 +0100 1--- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100
2+++ gtk+-2.10.0/configure.in 2006-07-07 09:32:49.000000000 +0100 2+++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100
3@@ -370,7 +370,7 @@ 3@@ -371,7 +371,7 @@
4 AC_MSG_CHECKING([Whether to write dependencies into .pc files])
5 case $enable_explicit_deps in 4 case $enable_explicit_deps in
6 auto) 5 auto)
7- deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh` 6 export SED
8+ deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh` 7- deplibs_check_method=`(./libtool --config; echo 'eval echo $deplibs_check_method') | sh`
8+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo $deplibs_check_method') | sh`
9 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then 9 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
10 enable_explicit_deps=yes 10 enable_explicit_deps=yes
11 else 11 else
12@@ -768,7 +768,7 @@ 12@@ -773,7 +773,7 @@
13 dnl Now we check to see if our libtool supports shared lib deps 13 dnl Now we check to see if our libtool supports shared lib deps
14 dnl (in a rather ugly way even) 14 dnl (in a rather ugly way even)
15 if $dynworks; then 15 if $dynworks; then
@@ -18,10 +18,10 @@
18 pixbuf_deplibs_check=`$pixbuf_libtool_config | \ 18 pixbuf_deplibs_check=`$pixbuf_libtool_config | \
19 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ 19 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
20 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` 20 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
21@@ -1600,7 +1600,7 @@ 21@@ -1611,7 +1611,7 @@
22 #
23 # We are using gmodule-no-export now, but I'm leaving the stripping 22 # We are using gmodule-no-export now, but I'm leaving the stripping
24 # code in place for now, since pango and atk still require gmodule. 23 # code in place for now, since pango and atk still require gmodule.
24 export SED
25-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` 25-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
26+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` 26+export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
27 if test -n "$export_dynamic"; then 27 if test -n "$export_dynamic"; then
diff --git a/meta/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch
index cfb8849e9f..cfb8849e9f 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/menu-deactivate.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/menu-deactivate.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/migration.patch b/meta/packages/gtk+/gtk+-2.10.9/migration.patch
index 4ee786e688..4ee786e688 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/migration.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/migration.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/no-demos.patch b/meta/packages/gtk+/gtk+-2.10.9/no-demos.patch
index 0fc4c48d1a..0fc4c48d1a 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/no-demos.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/no-demos.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/no-xwc.patch b/meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch
index affb4a303e..affb4a303e 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/no-xwc.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/no-xwc.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff
index 63828cec63..63828cec63 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
+++ b/meta/packages/gtk+/gtk+-2.10.9/pangoxft2.10.6.diff
diff --git a/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch b/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch
new file mode 100644
index 0000000000..ac15e9ab24
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.10.9/run-iconcache.patch
@@ -0,0 +1,19 @@
1--- /tmp/Makefile.am 2007-01-08 17:44:47.000000000 +0100
2+++ gtk+-2.10.7/gtk/Makefile.am 2007-01-08 17:45:17.025251000 +0100
3@@ -1128,11 +1128,11 @@
4 ./gtk-update-icon-cache
5 endif
6
7-gtkbuiltincache.h: @REBUILD@ stamp-icons
8- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
9- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
10- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
11- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
12+#gtkbuiltincache.h: @REBUILD@ stamp-icons
13+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
14+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \
15+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
16+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
17
18 EXTRA_DIST += \
19 $(STOCK_ICONS) \
diff --git a/meta/packages/gtk+/gtk+-2.10.6/scroll-timings.patch b/meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch
index 3f823a7880..3f823a7880 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/scroll-timings.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/scroll-timings.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/single-click.patch b/meta/packages/gtk+/gtk+-2.10.9/single-click.patch
index 250f1629f5..250f1629f5 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/single-click.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/single-click.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch b/meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch
index 20bf4cf366..20bf4cf366 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/small-gtkfilesel.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/small-gtkfilesel.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch b/meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch
index c26dc6d93c..c26dc6d93c 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/spinbutton.patch
diff --git a/meta/packages/gtk+/gtk+-2.10.6/xsettings.patch b/meta/packages/gtk+/gtk+-2.10.9/xsettings.patch
index b63e262d34..b63e262d34 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/xsettings.patch
+++ b/meta/packages/gtk+/gtk+-2.10.9/xsettings.patch
diff --git a/meta/packages/gtk+/gtk+_2.10.6.bb b/meta/packages/gtk+/gtk+_2.10.9.bb
index dc762d41cf..dc762d41cf 100644
--- a/meta/packages/gtk+/gtk+_2.10.6.bb
+++ b/meta/packages/gtk+/gtk+_2.10.9.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 14:21:07 +0000