summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-11-22 06:26:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-27 21:52:01 (GMT)
commit7c9c78bebd074d72270adaa8baed860bf554ad82 (patch)
treee28a5c7033d9ee973c96674e733c592f9724be0a /meta/recipes-gnome/gtk+
parent8a6e8623b43a5b38546e0a8c96f473dba9b31eee (diff)
downloadpoky-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.gz
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+')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff97
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch10
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch)22
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch13
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff (renamed from meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch (renamed from meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch)0
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc16
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.22.1.bb (renamed from meta/recipes-gnome/gtk+/gtk+_2.20.1.bb)18
13 files changed, 33 insertions, 143 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff b/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff
deleted file mode 100644
index 13ae61e..0000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff
+++ /dev/null
@@ -1,97 +0,0 @@
1Index: gtk+-2.21.2/configure.in
2===================================================================
3--- gtk+-2.21.2.orig/configure.in 2010-06-22 18:14:40.000000000 +0800
4+++ gtk+-2.21.2/configure.in 2010-06-22 18:14:58.000000000 +0800
5@@ -1072,48 +1072,50 @@
6 # check one of the variables here
7 AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
8
9-if test x$gio_can_sniff = x; then
10- AC_MSG_CHECKING([if gio can sniff png])
11- gtk_save_LIBS="$LIBS"
12- gtk_save_CFLAGS="$CFLAGS"
13- LIBS="`$PKG_CONFIG --libs gio-2.0`"
14- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
15- AC_RUN_IFELSE([AC_LANG_SOURCE([[
16- #include <gio/gio.h>
17- static const gsize data_size = 159;
18- static const guint8 data[] =
19- {
20- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
21- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
22- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
23- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
24- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
25- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
26- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
27- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
28- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
29- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
30- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
31- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
32- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
33- 0x42, 0x60, 0x82
34- };
35- int
36- main (int argc, char **argv)
37- {
38- char *content_type;
39- char *image_png;
40- content_type = g_content_type_guess (NULL, data, data_size, NULL);
41- image_png = g_content_type_from_mime_type ("image/png");
42- return !!strcmp (content_type, image_png);
43- }]])],
44- [gio_can_sniff=yes
45- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
46- [gio_can_sniff=no])
47- AC_MSG_RESULT($gio_can_sniff)
48- LIBS="$gtk_save_LIBS"
49- CFLAGS="$gtk_save_CFLAGS"
50-fi
51+# Disabled due to cross-compile
52+#if test x$gio_can_sniff = x; then
53+# AC_MSG_CHECKING([if gio can sniff png])
54+# gtk_save_LIBS="$LIBS"
55+# gtk_save_CFLAGS="$CFLAGS"
56+# LIBS="`$PKG_CONFIG --libs gio-2.0`"
57+# CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
58+# AC_RUN_IFELSE([AC_LANG_SOURCE([[
59+# #include <gio/gio.h>
60+# static const gsize data_size = 159;
61+# static const guint8 data[] =
62+# {
63+# 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
64+# 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
65+# 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
66+# 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
67+# 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
68+# 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
69+# 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
70+# 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
71+# 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
72+# 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
73+# 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
74+# 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
75+# 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
76+# 0x42, 0x60, 0x82
77+# };
78+# int
79+# main (int argc, char **argv)
80+# {
81+# char *content_type;
82+# char *image_png;
83+# content_type = g_content_type_guess (NULL, data, data_size, NULL);
84+# image_png = g_content_type_from_mime_type ("image/png");
85+# return !!strcmp (content_type, image_png);
86+# }]])],
87+# [gio_can_sniff=yes
88+# [gio_can_sniff=no])
89+# AC_MSG_RESULT($gio_can_sniff)
90+# LIBS="$gtk_save_LIBS"
91+# CFLAGS="$gtk_save_CFLAGS"
92+#fi
93+
94+AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
95
96 #
97 # Allow building some or all immodules included
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
deleted file mode 100644
index 0fc4c48..0000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100
2+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100
3@@ -1,6 +1,6 @@
4 ## Makefile.am for GTK+
5
6-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
7+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
8 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
9
10 # require automake 1.4
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
index ee55f9c..ee55f9c 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch
index 92ce643..92ce643 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
index 7f6c73b..7f6c73b 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch
index 3313e7f..3313e7f 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch
index 66be744..7937ef2 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch
@@ -1,8 +1,8 @@
1Index: gtk+-2.21.2/configure.in 1Index: gtk+-2.23.2/configure.in
2=================================================================== 2===================================================================
3--- gtk+-2.21.2.orig/configure.in 2010-06-22 17:21:41.000000000 +0800 3--- gtk+-2.23.2.orig/configure.in 2010-11-10 22:22:47.000000000 +0800
4+++ gtk+-2.21.2/configure.in 2010-06-22 17:28:59.000000000 +0800 4+++ gtk+-2.23.2/configure.in 2010-11-25 13:32:40.000000000 +0800
5@@ -425,7 +425,7 @@ 5@@ -414,7 +414,7 @@
6 case $enable_explicit_deps in 6 case $enable_explicit_deps in
7 auto) 7 auto)
8 export SED 8 export SED
@@ -11,21 +11,21 @@ Index: gtk+-2.21.2/configure.in
11 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then 11 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
12 enable_explicit_deps=yes 12 enable_explicit_deps=yes
13 else 13 else
14@@ -804,7 +804,7 @@ 14@@ -773,7 +773,7 @@
15 dnl Now we check to see if our libtool supports shared lib deps 15 dnl Now we check to see if our libtool supports shared lib deps
16 dnl (in a rather ugly way even) 16 dnl (in a rather ugly way even)
17 if $dynworks; then 17 if $dynworks; then
18- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" 18- module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
19+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" 19+ module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
20 pixbuf_deplibs_check=`$pixbuf_libtool_config | \ 20 module_deplibs_check=`$module_libtool_config | \
21 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ 21 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
22 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` 22 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
23@@ -1974,7 +1974,7 @@ 23@@ -1555,7 +1555,7 @@
24 # We are using gmodule-no-export now, but I'm leaving the stripping 24 # We are using gmodule-no-export now, but I'm leaving the stripping
25 # code in place for now, since pango and atk still require gmodule. 25 # code in place for now, since pango and atk still require gmodule.
26 export SED 26 export SED
27-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` 27-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
28+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` 28+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
29 if test -n "$export_dynamic"; then 29 if test -n "$export_dynamic"; then
30 GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` 30 GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
31 GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` 31 GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch
new file mode 100644
index 0000000..2170016
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch
@@ -0,0 +1,13 @@
1Index: gtk+-2.23.2/Makefile.am
2===================================================================
3--- gtk+-2.23.2.orig/Makefile.am 2010-11-10 20:34:42.000000000 +0800
4+++ gtk+-2.23.2/Makefile.am 2010-11-25 13:39:22.000000000 +0800
5@@ -1,7 +1,7 @@
6 ## Makefile.am for GTK+
7 include $(top_srcdir)/Makefile.decl
8
9-SRC_SUBDIRS = gdk gtk modules demos tests perf
10+SRC_SUBDIRS = gdk gtk modules tests perf
11 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
12
13 # require automake 1.4
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch
index 518875e..518875e 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff
index 4853628..4853628 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch
index 84231e9..84231e9 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index f04b29c..94a8fe6 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -11,12 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
11SECTION = "libs" 11SECTION = "libs"
12PRIORITY = "optional" 12PRIORITY = "optional"
13DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \ 13DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \
14 libgcrypt libxdamage libxrender libxcomposite cairo" 14 libgcrypt libxdamage libxrender libxcomposite cairo gdk-pixbuf"
15 15
16inherit autotools pkgconfig 16inherit autotools pkgconfig
17 17
18FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ 18FILES_${PN} = "${bindir}/gtk-update-icon-cache \
19 ${bindir}/gtk-update-icon-cache \
20 ${bindir}/gtk-query-immodules-2.0 \ 19 ${bindir}/gtk-query-immodules-2.0 \
21 ${libdir}/lib*${SOLIBS} \ 20 ${libdir}/lib*${SOLIBS} \
22 ${datadir}/themes ${sysconfdir} \ 21 ${datadir}/themes ${sysconfdir} \
@@ -28,7 +27,6 @@ FILES_${PN}-dev += " \
28 ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \ 27 ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
29 ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \ 28 ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
30 ${libdir}/gtk-2.0/${LIBV}/engines/*.la \ 29 ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
31 ${bindir}/gdk-pixbuf-csource \
32 ${bindir}/gtk-builder-convert" 30 ${bindir}/gtk-builder-convert"
33 31
34FILES_${PN}-dbg += " \ 32FILES_${PN}-dbg += " \
@@ -75,13 +73,3 @@ if [ "x$D" != "x" ]; then
75fi 73fi
76 74
77} 75}
78
79postinst_pixbufloader() {
80if [ "x$D" != "x" ]; then
81 exit 1
82fi
83
84gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
85
86test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor
87}
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
index 80be21c..35aa883 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ 4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ 5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" 6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7PR = "r2" 7PR = "r0"
8 8
9SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \ 9SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
10 file://xsettings.patch;patch=1 \ 10 file://xsettings.patch;patch=1 \
11 file://run-iconcache.patch;patch=1 \ 11 file://run-iconcache.patch;patch=1 \
12 file://hardcoded_libtool.patch;patch=1 \ 12 file://hardcoded_libtool.patch;patch=1 \
@@ -24,18 +24,17 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \
24# file://gtklabel-resize-patch;patch=1 \ 24# file://gtklabel-resize-patch;patch=1 \
25# file://menu-deactivate.patch;patch=1 \ 25# file://menu-deactivate.patch;patch=1 \
26# file://combo-arrow-size.patch;patch=1;pnum=0 \ 26# file://combo-arrow-size.patch;patch=1;pnum=0 \
27 file://disable-gio-png-sniff-test.diff;patch=1 \ 27# file://configurefix.patch;patch=1 \
28 file://configurefix.patch;patch=1 \
29 " 28 "
30 29
31SRC_URI[md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" 30SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9"
32SRC_URI[sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65" 31SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07"
33 32
34EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups" 33EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups"
35 34
36LIBV = "2.10.0" 35LIBV = "2.10.0"
37 36
38PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" 37PACKAGES_DYNAMIC += "gtk-immodule-* gtk-printbackend-*"
39 38
40#-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on atom-pc & emenlow 39#-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on atom-pc & emenlow
41FULL_OPTIMIZATION_emenlow = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types" 40FULL_OPTIMIZATION_emenlow = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
@@ -45,14 +44,11 @@ python populate_packages_prepend () {
45 import os.path 44 import os.path
46 45
47 prologue = bb.data.getVar("postinst_prologue", d, 1) 46 prologue = bb.data.getVar("postinst_prologue", d, 1)
48 postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
49 47
50 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) 48 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
51 loaders_root = os.path.join(gtk_libdir, 'loaders')
52 immodules_root = os.path.join(gtk_libdir, 'immodules') 49 immodules_root = os.path.join(gtk_libdir, 'immodules')
53 printmodules_root = os.path.join(gtk_libdir, 'printbackends'); 50 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
54 51
55 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
56 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules') 52 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
57 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 53 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
58 54