* [PATCH 0/5] UX and base: gtk+ and apr upgrade, edwin, Jan12, 2011
@ 2011-01-12 1:46 Zhai Edwin
2011-01-12 1:46 ` [PATCH 1/5] gtk+: Update to 2.23.2 Zhai Edwin
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Zhai Edwin @ 2011-01-12 1:46 UTC (permalink / raw)
To: poky
Saul,
This is 2nd time of pull request for apr. I'd like to use current solution, and
revisit in future if needed. What's your opinion? Also upgrade gtk+, and
separated gdk-pixbuf as stand-alone recipe.
Pls. help to review.
Thanks,
edwin
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: gzhai/upgrade01
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/upgrade01
Thanks,
Zhai Edwin <edwin.zhai@intel.com>
---
Zhai Edwin (5):
gtk+: Update to 2.23.2
gdk-pixbuf: Add 2.22.1 as new recipe
eds-dbus: Do not disable old API after upgrading gtk+
apr: Update to 1.4.2
apr-util: Update to 1.3.10
meta/classes/gtk-icon-cache.bbclass | 2 +-
.../gdk-pixbuf-2.22.1/configure_fix.patch | 19 ++
.../gdk-pixbuf-2.22.1}/hardcoded_libtool.patch | 20 +-
.../gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb | 13 ++
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc | 30 +++
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb | 35 +++
meta/recipes-gnome/gnome/metacity_2.30.3.bb | 2 +-
.../gtk+/gdk-pixbuf-csource-native_2.12.7.bb | 37 ----
.../gdk-pixbuf-csource/reduce-dependencies.patch | 221 --------------------
.../gtk+-2.20.1/disable-gio-png-sniff-test.diff | 97 ---------
meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch | 10 -
...Duplicate-the-exec-string-returned-by-gtk.patch | 0
.../cellrenderer-cairo.patch | 0
.../configurefix.patch | 0
.../{gtk+-2.20.1 => gtk+-2.23.2}/entry-cairo.patch | 0
.../hardcoded_libtool.patch | 22 +-
meta/recipes-gnome/gtk+/gtk+-2.23.2/no-demos.patch | 13 ++
.../run-iconcache.patch | 0
.../{gtk+-2.20.1 => gtk+-2.23.2}/toggle-font.diff | 0
.../{gtk+-2.20.1 => gtk+-2.23.2}/xsettings.patch | 0
meta/recipes-gnome/gtk+/gtk+.inc | 16 +--
.../gtk+/{gtk+_2.20.1.bb => gtk+_2.23.2.bb} | 18 +-
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +-
meta/recipes-graphics/mutter/mutter.inc | 2 +-
meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch | 17 ++
meta/recipes-sato/eds/eds-dbus_git.bb | 1 +
.../apr/{apr-util_1.3.4.bb => apr-util_1.3.10.bb} | 12 +-
meta/recipes-support/apr/apr/buildconf_fix.patch | 25 +++
meta/recipes-support/apr/apr/cleanup.patch | 9 +-
.../apr/{apr_1.3.3.bb => apr_1.4.2.bb} | 23 ++-
30 files changed, 217 insertions(+), 429 deletions(-)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch
copy meta/recipes-gnome/{gtk+/gtk+-2.20.1 => gdk-pixbuf/gdk-pixbuf-2.22.1}/hardcoded_libtool.patch (68%)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
delete mode 100644 meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
delete mode 100644 meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch
delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff
delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/cellrenderer-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/configurefix.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/entry-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/hardcoded_libtool.patch (66%)
create mode 100644 meta/recipes-gnome/gtk+/gtk+-2.23.2/no-demos.patch
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/run-iconcache.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/toggle-font.diff (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/xsettings.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+_2.20.1.bb => gtk+_2.23.2.bb} (74%)
create mode 100644 meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
rename meta/recipes-support/apr/{apr-util_1.3.4.bb => apr-util_1.3.10.bb} (72%)
create mode 100644 meta/recipes-support/apr/apr/buildconf_fix.patch
rename meta/recipes-support/apr/{apr_1.3.3.bb => apr_1.4.2.bb} (60%)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/5] gtk+: Update to 2.23.2
2011-01-12 1:46 [PATCH 0/5] UX and base: gtk+ and apr upgrade, edwin, Jan12, 2011 Zhai Edwin
@ 2011-01-12 1:46 ` Zhai Edwin
2011-01-12 1:46 ` [PATCH 2/5] gdk-pixbuf: Add 2.22.1 as new recipe Zhai Edwin
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Zhai Edwin @ 2011-01-12 1:46 UTC (permalink / raw)
To: poky
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.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../gtk+-2.20.1/disable-gio-png-sniff-test.diff | 97 --------------------
meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch | 10 --
...Duplicate-the-exec-string-returned-by-gtk.patch | 0
.../cellrenderer-cairo.patch | 0
.../configurefix.patch | 0
.../{gtk+-2.20.1 => gtk+-2.23.2}/entry-cairo.patch | 0
.../hardcoded_libtool.patch | 22 ++--
meta/recipes-gnome/gtk+/gtk+-2.23.2/no-demos.patch | 13 +++
.../run-iconcache.patch | 0
.../{gtk+-2.20.1 => gtk+-2.23.2}/toggle-font.diff | 0
.../{gtk+-2.20.1 => gtk+-2.23.2}/xsettings.patch | 0
meta/recipes-gnome/gtk+/gtk+.inc | 16 +---
.../gtk+/{gtk+_2.20.1.bb => gtk+_2.23.2.bb} | 18 ++--
13 files changed, 33 insertions(+), 143 deletions(-)
delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.20.1/disable-gio-png-sniff-test.diff
delete mode 100644 meta/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/cellrenderer-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/configurefix.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/entry-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/hardcoded_libtool.patch (66%)
create mode 100644 meta/recipes-gnome/gtk+/gtk+-2.23.2/no-demos.patch
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/run-iconcache.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/toggle-font.diff (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.20.1 => gtk+-2.23.2}/xsettings.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+_2.20.1.bb => gtk+_2.23.2.bb} (74%)
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 @@
-Index: gtk+-2.21.2/configure.in
-===================================================================
---- gtk+-2.21.2.orig/configure.in 2010-06-22 18:14:40.000000000 +0800
-+++ gtk+-2.21.2/configure.in 2010-06-22 18:14:58.000000000 +0800
-@@ -1072,48 +1072,50 @@
- # check one of the variables here
- AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
-
--if test x$gio_can_sniff = x; then
-- AC_MSG_CHECKING([if gio can sniff png])
-- gtk_save_LIBS="$LIBS"
-- gtk_save_CFLAGS="$CFLAGS"
-- LIBS="`$PKG_CONFIG --libs gio-2.0`"
-- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
-- AC_RUN_IFELSE([AC_LANG_SOURCE([[
-- #include <gio/gio.h>
-- static const gsize data_size = 159;
-- static const guint8 data[] =
-- {
-- 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
-- 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-- 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
-- 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
-- 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
-- 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
-- 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
-- 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
-- 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-- 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
-- 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
-- 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
-- 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-- 0x42, 0x60, 0x82
-- };
-- int
-- main (int argc, char **argv)
-- {
-- char *content_type;
-- char *image_png;
-- content_type = g_content_type_guess (NULL, data, data_size, NULL);
-- image_png = g_content_type_from_mime_type ("image/png");
-- return !!strcmp (content_type, image_png);
-- }]])],
-- [gio_can_sniff=yes
-- AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
-- [gio_can_sniff=no])
-- AC_MSG_RESULT($gio_can_sniff)
-- LIBS="$gtk_save_LIBS"
-- CFLAGS="$gtk_save_CFLAGS"
--fi
-+# Disabled due to cross-compile
-+#if test x$gio_can_sniff = x; then
-+# AC_MSG_CHECKING([if gio can sniff png])
-+# gtk_save_LIBS="$LIBS"
-+# gtk_save_CFLAGS="$CFLAGS"
-+# LIBS="`$PKG_CONFIG --libs gio-2.0`"
-+# CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
-+# AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+# #include <gio/gio.h>
-+# static const gsize data_size = 159;
-+# static const guint8 data[] =
-+# {
-+# 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
-+# 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-+# 0x08, 0x02, 0x00, 0x00, 0x00, 0x90, 0x77, 0x53, 0xde, 0x00, 0x00, 0x00,
-+# 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
-+# 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00,
-+# 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 0x00, 0x00, 0x00, 0x07, 0x74,
-+# 0x49, 0x4d, 0x45, 0x07, 0xd8, 0x07, 0x0f, 0x10, 0x08, 0x15, 0x61, 0xd8,
-+# 0x35, 0x37, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x43, 0x6f,
-+# 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
-+# 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x47, 0x49, 0x4d, 0x50, 0x57,
-+# 0x81, 0x0e, 0x17, 0x00, 0x00, 0x00, 0x0c, 0x49, 0x44, 0x41, 0x54, 0x08,
-+# 0xd7, 0x63, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0x05, 0xfe, 0x02, 0xfe, 0xdc,
-+# 0xcc, 0x59, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
-+# 0x42, 0x60, 0x82
-+# };
-+# int
-+# main (int argc, char **argv)
-+# {
-+# char *content_type;
-+# char *image_png;
-+# content_type = g_content_type_guess (NULL, data, data_size, NULL);
-+# image_png = g_content_type_from_mime_type ("image/png");
-+# return !!strcmp (content_type, image_png);
-+# }]])],
-+# [gio_can_sniff=yes
-+# [gio_can_sniff=no])
-+# AC_MSG_RESULT($gio_can_sniff)
-+# LIBS="$gtk_save_LIBS"
-+# CFLAGS="$gtk_save_CFLAGS"
-+#fi
-+
-+AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])],
-
- #
- # 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 @@
---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100
-+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100
-@@ -1,6 +1,6 @@
- ## Makefile.am for GTK+
-
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
-
- # 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.23.2/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.20.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.23.2/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.23.2/cellrenderer-cairo.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.20.1/cellrenderer-cairo.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.23.2/cellrenderer-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.23.2/configurefix.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.20.1/configurefix.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.23.2/configurefix.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.23.2/entry-cairo.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.20.1/entry-cairo.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.23.2/entry-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.23.2/hardcoded_libtool.patch
similarity index 66%
rename from meta/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.23.2/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.23.2/hardcoded_libtool.patch
@@ -1,8 +1,8 @@
-Index: gtk+-2.21.2/configure.in
+Index: gtk+-2.23.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 @@
+--- 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
@@ -11,21 +11,21 @@ Index: gtk+-2.21.2/configure.in
if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
enable_explicit_deps=yes
else
-@@ -804,7 +804,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
-- 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 | \
+- 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/'`
-@@ -1974,7 +1974,7 @@
+@@ -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_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//"`
+ GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
+ GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.23.2/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.23.2/no-demos.patch
new file mode 100644
index 0000000..2170016
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.23.2/no-demos.patch
@@ -0,0 +1,13 @@
+Index: gtk+-2.23.2/Makefile.am
+===================================================================
+--- gtk+-2.23.2.orig/Makefile.am 2010-11-10 20:34:42.000000000 +0800
++++ gtk+-2.23.2/Makefile.am 2010-11-25 13:39:22.000000000 +0800
+@@ -1,7 +1,7 @@
+ ## Makefile.am for GTK+
+ include $(top_srcdir)/Makefile.decl
+
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules tests perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+
+ # 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.23.2/run-iconcache.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.23.2/run-iconcache.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.23.2/toggle-font.diff
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
rename to meta/recipes-gnome/gtk+/gtk+-2.23.2/toggle-font.diff
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.23.2/xsettings.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.20.1/xsettings.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.23.2/xsettings.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 425a21e..cdaf379 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"
SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc-native libxrandr \
- libgcrypt libxdamage libxrender libxcomposite cairo"
+ libgcrypt libxdamage libxrender libxcomposite cairo gdk-pixbuf"
inherit autotools pkgconfig
-FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
- ${bindir}/gtk-update-icon-cache \
+FILES_${PN} = "${bindir}/gtk-update-icon-cache \
${bindir}/gtk-query-immodules-2.0 \
${libdir}/lib*${SOLIBS} \
${datadir}/themes ${sysconfdir} \
@@ -28,7 +27,6 @@ FILES_${PN}-dev += " \
${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
${libdir}/gtk-2.0/${LIBV}/engines/*.la \
- ${bindir}/gdk-pixbuf-csource \
${bindir}/gtk-builder-convert"
FILES_${PN}-dbg += " \
@@ -75,13 +73,3 @@ if [ "x$D" != "x" ]; then
fi
}
-
-postinst_pixbufloader() {
-if [ "x$D" != "x" ]; then
- exit 1
-fi
-
-gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
-
-test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor
-}
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.23.2.bb
similarity index 74%
rename from meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
rename to meta/recipes-gnome/gtk+/gtk+_2.23.2.bb
index 80be21c..baccc29 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.20.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.23.2.bb
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
-PR = "r2"
+PR = "r0"
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \
+SRC_URI = "http://download.gnome.org/sources/gtk+/2.23/gtk+-${PV}.tar.bz2 \
file://xsettings.patch;patch=1 \
file://run-iconcache.patch;patch=1 \
file://hardcoded_libtool.patch;patch=1 \
@@ -24,18 +24,17 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.20/gtk+-${PV}.tar.bz2 \
# file://gtklabel-resize-patch;patch=1 \
# file://menu-deactivate.patch;patch=1 \
# file://combo-arrow-size.patch;patch=1;pnum=0 \
- file://disable-gio-png-sniff-test.diff;patch=1 \
- file://configurefix.patch;patch=1 \
+# file://configurefix.patch;patch=1 \
"
-SRC_URI[md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"
-SRC_URI[sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65"
+SRC_URI[md5sum] = "6afece3667ca2763e83cc76dc03f556d"
+SRC_URI[sha256sum] = "da5791f6a638fad7ce96497a5053f9846263e733c2e01cc43064f8ba1dfdb530"
-EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups"
+EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups"
LIBV = "2.10.0"
-PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
+PACKAGES_DYNAMIC += "gtk-immodule-* gtk-printbackend-*"
#-fomit-frame-pointer in default FULL_OPTIMIZATION will cause matchbox-panel segfault on atom-pc & emenlow
FULL_OPTIMIZATION_emenlow = "-fexpensive-optimizations -frename-registers -O2 -ggdb -feliminate-unused-debug-types"
@@ -45,14 +44,11 @@ python populate_packages_prepend () {
import os.path
prologue = bb.data.getVar("postinst_prologue", d, 1)
- postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
- loaders_root = os.path.join(gtk_libdir, 'loaders')
immodules_root = os.path.join(gtk_libdir, 'immodules')
printmodules_root = os.path.join(gtk_libdir, 'printbackends');
- do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
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')
do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/5] gdk-pixbuf: Add 2.22.1 as new recipe
2011-01-12 1:46 [PATCH 0/5] UX and base: gtk+ and apr upgrade, edwin, Jan12, 2011 Zhai Edwin
2011-01-12 1:46 ` [PATCH 1/5] gtk+: Update to 2.23.2 Zhai Edwin
@ 2011-01-12 1:46 ` Zhai Edwin
2011-01-12 1:46 ` [PATCH 3/5] eds-dbus: Do not disable old API after upgrading gtk+ Zhai Edwin
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Zhai Edwin @ 2011-01-12 1:46 UTC (permalink / raw)
To: poky
Updating gtk+ to 2.23.2 requires gdk-pixbuf, which is originaly a module in gtk+.
Borrow hardcoded_libtool.patch from original gtk+, and add configure_fix.patch
to fix build failure in cross-compile environment.
As gdk-pixbuf is a stand-alone package now, gdk-pixbuf-csource-native can be
safely removed. So extend gdk-pixbuf with native support, and make related
packages depend on it.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/classes/gtk-icon-cache.bbclass | 2 +-
.../gdk-pixbuf-2.22.1/configure_fix.patch | 19 ++
.../gdk-pixbuf-2.22.1/hardcoded_libtool.patch | 31 +++
.../gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb | 13 ++
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc | 30 +++
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb | 35 +++
meta/recipes-gnome/gnome/metacity_2.30.3.bb | 2 +-
.../gtk+/gdk-pixbuf-csource-native_2.12.7.bb | 37 ----
.../gdk-pixbuf-csource/reduce-dependencies.patch | 221 --------------------
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 2 +-
meta/recipes-graphics/mutter/mutter.inc | 2 +-
11 files changed, 132 insertions(+), 262 deletions(-)
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc
create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
delete mode 100644 meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
delete mode 100644 meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 524c2f0..dcabaf5 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -9,7 +9,7 @@ if [ "x$D" != "x" ]; then
fi
# Update the pixbuf loaders in case they haven't been registered yet
-gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache
for icondir in /usr/share/icons/* ; do
if [ -d $icondir ] ; then
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch
new file mode 100644
index 0000000..bbf239c
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch
@@ -0,0 +1,19 @@
+can sniff check buillds and runs an C binary, which breaks configure in
+cross-compile environ.
+This patch simple disables it.
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Index: gdk-pixbuf-2.22.1/configure.ac
+===================================================================
+--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-25 16:26:41.000000000 +0800
++++ gdk-pixbuf-2.22.1/configure.ac 2010-11-25 16:29:22.000000000 +0800
+@@ -99,6 +99,8 @@
+ AC_MSG_CHECKING([for native Win32])
+ LIB_EXE_MACHINE_FLAG=X86
+ EXE_MANIFEST_ARCHITECTURE=X86
++dnl disable can sniff check in cross compile
++gio_can_sniff=no
+ case "$host" in
+ *-*-mingw*)
+ os_win32=yes
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch
new file mode 100644
index 0000000..ae16927
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch
@@ -0,0 +1,31 @@
+Index: gdk-pixbuf-2.22.1/configure.ac
+===================================================================
+--- gdk-pixbuf-2.22.1.orig/configure.ac 2010-11-26 09:06:34.000000000 +0800
++++ gdk-pixbuf-2.22.1/configure.ac 2010-11-26 09:07:33.000000000 +0800
+@@ -287,7 +287,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
+@@ -484,7 +484,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/'`
+@@ -957,7 +957,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//"`
+ fi
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb
new file mode 100644
index 0000000..992ce16
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-native_2.22.1.bb
@@ -0,0 +1,13 @@
+require gdk-pixbuf.inc
+inherit native
+
+DEPENDS = "libpng-native gettext-native glib-2.0-native"
+PR = "r0"
+
+PACKAGES_DYNAMIC = ""
+
+do_install_append() {
+ GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders ${D}${bindir}/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+ sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
+ find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
+}
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc
new file mode 100644
index 0000000..af3383e
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf.inc
@@ -0,0 +1,30 @@
+DESCRIPTION = "Image loading library for GTK+"
+HOMEPAGE = "http://www.gtk.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
+ file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=5066b71daefeff678494fffa3040aba9"
+
+SECTION = "libs"
+PRIORITY = "optional"
+
+DEPENDS = "libpng gettext glib-2.0"
+
+SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-${PV}.tar.gz \
+ file://hardcoded_libtool.patch;patch=1 \
+ file://configure_fix.patch;patch=1 \
+ "
+
+SRC_URI[md5sum] = "fcfc854e9aec7dbb2bb3059484d44556"
+SRC_URI[sha256sum] = "bbb57364ffba70d64f5fcfe6eda1d67249b3d58844edb06dc0f94d1ad599b4ec"
+
+inherit autotools pkgconfig
+
+LIBV = "2.10.0"
+
+EXTRA_OECONF = "\
+ --without-libtiff \
+ --with-libpng \
+"
+
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
new file mode 100644
index 0000000..ae57507
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
@@ -0,0 +1,35 @@
+require gdk-pixbuf.inc
+
+PR = "r0"
+
+FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
+ ${libdir}/lib*.so.*"
+
+FILES_${PN}-dev += " \
+ ${bindir}/gdk-pixbuf-csource \
+ ${includedir}/*"
+
+FILES_${PN}-dbg += " \
+ ${libdir}/.debug/* \
+ ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/*"
+
+postinst_pixbufloader () {
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders gdk-pixbuf-query-loaders --update-cache
+
+test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor
+}
+
+PACKAGES_DYNAMIC += "gdk-pixbuf-loader-*"
+
+python populate_packages_prepend () {
+ postinst_pixbufloader = bb.data.getVar("postinst_pixbufloader", d, 1)
+
+ loaders_root = bb.data.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders', d)
+
+ do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', postinst_pixbufloader)
+}
+
diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
index 6e9dd72..18105f2 100644
--- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://src/include/main.h;endline=24;md5=c2242df552c880280315989bab626b90"
-DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-csource-native libcanberra"
+DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-native libcanberra"
PR = "r0"
inherit gnome update-alternatives
diff --git a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
deleted file mode 100644
index 0c8506a..0000000
--- a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource-native_2.12.7.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-require gtk+_${PV}.bb
-inherit native
-DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-native"
-S = "${WORKDIR}/gtk+-${PV}"
-FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
-SRC_URI += "file://reduce-dependencies.patch;patch=1"
-PR = "r13"
-
-#clear recommends for uclibc builds
-RRECOMMENDS_${PN} = " "
-RRECOMMENDS_${PN}_linux = " "
-RRECOMMENDS_${PN}_linux-gnueabi = " "
-
-EXTRA_OECONF = "\
- --with-gdktarget=x11 \
- --without-libtiff \
- --with-libjpeg \
- --with-libpng \
- --x-includes=${STAGING_INCDIR} \
- --x-libraries=${STAGING_LIBDIR} \
-"
-
-PACKAGES_DYNAMIC = ""
-
-do_compile() {
- cd gdk-pixbuf && oe_runmake
-}
-
-do_install() {
- cd gdk-pixbuf
- oe_runmake 'DESTDIR=${D}' install
- install -d ${D}${sysconfdir}/gtk-2.0
- GDK_PIXBUF_MODULEDIR=${D}${libdir}/gtk-2.0/2.10.0/loaders ${D}${bindir}/gdk-pixbuf-query-loaders > ${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
- sed -i -e 's#${D}##g' ${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
- find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
-}
-
diff --git a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch b/meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch
deleted file mode 100644
index 6b030e8..0000000
--- a/meta/recipes-gnome/gtk+/gdk-pixbuf-csource/reduce-dependencies.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-#
-# strip unnecessary stuff out of configure, we just want
-# to build gdk-pixbuf-csource.
-# -- Michael 'Mickey' Lauer <mlauer@vanille-media.de>
-#
----
-# configure.in | 116 ++---------------------------------------------------------
-# 1 file changed, 5 insertions(+), 111 deletions(-)
-#
---- gtk+-2.12.7.orig/configure.in
-+++ gtk+-2.12.7/configure.in
-@@ -30,13 +30,10 @@ m4_define([gtk_api_version], [2.0])
- #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
- m4_define([gtk_binary_version], [2.10.0])
-
- # required versions of other packages
- m4_define([glib_required_version], [2.13.5])
--m4_define([pango_required_version], [1.17.3])
--m4_define([atk_required_version], [1.9.0])
--m4_define([cairo_required_version], [1.2.0])
-
-
- AC_INIT([gtk+], [gtk_version],
- [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
- [gtk+])
-@@ -347,14 +344,11 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
- ## Later on we actually use the cflags/libs from separate pkg-config
- ## calls. Oh, also the later pkg-config calls don't include
- ## the version requirements since those make the module lists
- ## annoying to construct
- PKG_CHECK_MODULES(BASE_DEPENDENCIES,
-- [glib-2.0 >= glib_required_version dnl
-- atk >= atk_required_version dnl
-- pango >= pango_required_version dnl
-- cairo >= cairo_required_version])
-+ [glib-2.0 >= glib_required_version])
-
- if test "$os_win32" != yes; then
- # libtool option to control which symbols are exported
- # right now, symbols starting with _ are not exported
- LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
-@@ -1059,27 +1053,19 @@ GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cf
-
- GDK_PIXBUF_XLIB_PACKAGES=
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
- GDK_PIXBUF_XLIB_EXTRA_LIBS=
-
--X_PACKAGES=fontconfig
-+X_PACKAGES=
- GDK_EXTRA_LIBS="$GDK_WLIBS"
- GDK_EXTRA_CFLAGS=
-
- # GTK+ uses some X calls, so needs to link against X directly
- GTK_DEP_PACKAGES_FOR_X=
- GTK_DEP_LIBS_FOR_X=
-
- if test "x$gdktarget" = "xx11"; then
-- #
-- # We use fontconfig very peripherally when decoding the default
-- # settings.
-- #
-- if $PKG_CONFIG --exists fontconfig; then : ; else
-- AC_MSG_ERROR([
--*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
-- fi
-
- #
- # Check for basic X packages; we use pkg-config if available
- #
- if $PKG_CONFIG --exists x11 xext xrender; then
-@@ -1122,20 +1108,10 @@ if test "x$gdktarget" = "xx11"; then
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
- gtk_save_LIBS=$LIBS
- LIBS="$x_libs_for_checks $LIBS"
-
-- # Sanity check for the X11 and Xext libraries. While everything we need from
-- # Xext is optional, the chances a system has *none* of these things is so
-- # small that we just unconditionally require it.
-- AC_CHECK_FUNC(XOpenDisplay, :,
-- AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
-- AC_CHECK_FUNC(XextFindDisplay, :,
-- AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
-- AC_CHECK_FUNC(XRenderQueryExtension, :,
-- AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
--
- # Check for xReply
-
- AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
- AC_TRY_COMPILE([#include <X11/Xlibint.h>],
- [xReply *rep;],
-@@ -1416,104 +1392,33 @@ if test "x$gdktarget" = "xdirectfb"; the
- AM_CONDITIONAL(USE_DIRECTFB, true)
- else
- AM_CONDITIONAL(USE_DIRECTFB, false)
- fi
-
--
--# Check for Pango flags
--
--if test "x$gdktarget" = "xwin32"; then
-- PANGO_PACKAGES="pangowin32 pangocairo"
--else
-- PANGO_PACKAGES="pango pangocairo"
--fi
--
--AC_MSG_CHECKING(Pango flags)
--if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
-- PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
-- PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
--
-- AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
--else
-- AC_MSG_ERROR([
--*** Pango not found. Pango built with Cairo support is required
--*** to build GTK+. See http://www.pango.org for Pango information.
--])
--fi
--
--CFLAGS="$CFLAGS $PANGO_CFLAGS"
--
--if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
-- :
--else
-- gtk_save_LIBS="$LIBS"
-- LIBS="$PANGO_LIBS $LIBS"
-- AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
--*** Can't link to Pango. Pango is required to build
--*** GTK+. For more information see http://www.pango.org]))
-- LIBS="$gtk_save_LIBS"
--fi
--
--CFLAGS="$saved_cflags"
--LDFLAGS="$saved_ldflags"
--
--GDK_PACKAGES="$PANGO_PACKAGES"
--if test "x$gdktarget" = "xx11"; then
-- GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
--fi
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
- GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
-
- #
- # If we aren't writing explicit dependencies, then don't put the extra libraries we need
- # into the pkg-config files
- #
- if test $enable_explicit_deps != yes ; then
-- GDK_PACKAGES="$PANGO_PACKAGES"
-+ GDK_PACKAGES=
- GDK_EXTRA_LIBS=
- fi
-
- AC_SUBST(GDK_PACKAGES)
- AC_SUBST(GDK_EXTRA_LIBS)
- AC_SUBST(GDK_EXTRA_CFLAGS)
- AC_SUBST(GDK_DEP_LIBS)
- AC_SUBST(GDK_DEP_CFLAGS)
-
-
--########################################
--# Check for Accessibility Toolkit flags
--########################################
--
--ATK_PACKAGES=atk
--AC_MSG_CHECKING(ATK flags)
--if $PKG_CONFIG --exists $ATK_PACKAGES ; then
-- ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
-- ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
--
-- AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS)
--else
-- AC_MSG_ERROR([
--*** Accessibility Toolkit not found. Accessibility Toolkit is required
--*** to build GTK+.
--])
--fi
--
--if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
-- :
--else
-- gtk_save_LIBS="$LIBS"
-- LIBS="$ATK_LIBS $LIBS"
-- AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
-- *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
-- *** to build GTK+]))
-- LIBS="$gtk_save_LIBS"
--fi
--
--GTK_PACKAGES="atk cairo"
-+GTK_PACKAGES=
- GTK_EXTRA_LIBS=
- GTK_EXTRA_CFLAGS=
--GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
-+GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
- GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
-
- if test x"$os_win32" = xyes; then
- GTK_EXTRA_CFLAGS="$msnative_struct"
- fi
-@@ -1567,21 +1472,10 @@ LIBS="$CUPS_LIBS"
- AC_CHECK_FUNCS(httpGetAuthString)
- LIBS="$gtk_save_libs"
-
- gtk_save_cppflags="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
--
--AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
--*** Can't find cairo-pdf.h. You must build Cairo with the pdf
--*** backend enabled.]))
--
--if test "$os_win32" != "yes"; then
-- AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
--*** Can't find cairo-ps.h. You must build Cairo with the
--*** postscript backend enabled.]))
--fi
--
- CPPFLAGS="$gtk_save_cppflags"
-
-
- AC_ARG_ENABLE(test-print-backend,
- [AC_HELP_STRING([--enable-test-print-backend],
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index 0281d8e..ea9456d 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -43,6 +43,6 @@ if [ "x$D" != "x" ]; then
exit 1
fi
-test -x ${bindir}/gdk-pixbuf-query-loaders && { gdk-pixbuf-query-loaders > ${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders ; }
+test -x ${bindir}/gdk-pixbuf-query-loaders && { GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache ; }
test -x ${bindir}/gtk-update-icon-cache && gtk-update-icon-cache -q ${datadir}/icons/hicolor
}
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index f3b4a31..cf42e42 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
LICENSE = "GPLv2"
-DEPENDS = "startup-notification gtk+ gconf clutter-1.0 gdk-pixbuf-csource-native intltool glib-2.0-native"
+DEPENDS = "startup-notification gtk+ gconf clutter-1.0 gdk-pixbuf-native intltool glib-2.0-native"
# gobject-introspection
inherit gnome update-alternatives
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/5] eds-dbus: Do not disable old API after upgrading gtk+
2011-01-12 1:46 [PATCH 0/5] UX and base: gtk+ and apr upgrade, edwin, Jan12, 2011 Zhai Edwin
2011-01-12 1:46 ` [PATCH 1/5] gtk+: Update to 2.23.2 Zhai Edwin
2011-01-12 1:46 ` [PATCH 2/5] gdk-pixbuf: Add 2.22.1 as new recipe Zhai Edwin
@ 2011-01-12 1:46 ` Zhai Edwin
2011-01-12 1:46 ` [PATCH 4/5] apr: Update to 1.4.2 Zhai Edwin
2011-01-12 1:46 ` [PATCH 5/5] apr-util: Update to 1.3.10 Zhai Edwin
4 siblings, 0 replies; 6+ messages in thread
From: Zhai Edwin @ 2011-01-12 1:46 UTC (permalink / raw)
To: poky
This avoid build error due to defination missing.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch | 17 +++++++++++++++++
meta/recipes-sato/eds/eds-dbus_git.bb | 1 +
2 files changed, 18 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
diff --git a/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch b/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
new file mode 100644
index 0000000..8b60069
--- /dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/old-gdk-api.patch
@@ -0,0 +1,17 @@
+Do not disable old API after upgrading gtk+.
+This avoid build error due to defination missing.
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac 2010-12-16 10:25:24.000000000 +0800
++++ git/configure.ac 2010-12-16 10:25:58.000000000 +0800
+@@ -147,7 +147,6 @@
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+ "-DG_DISABLE_DEPRECATED
+ -DPANGO_DISABLE_DEPRECATED
+- -DGDK_DISABLE_DEPRECATED
+ -DGDK_PIXBUF_DISABLE_DEPRECATED
+ -DG_DISABLE_SINGLE_INCLUDES
+ -DGTK_DISABLE_SINGLE_INCLUDES
diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb
index e5b7e15..5ab96a7 100644
--- a/meta/recipes-sato/eds/eds-dbus_git.bb
+++ b/meta/recipes-sato/eds/eds-dbus_git.bb
@@ -18,6 +18,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://nossl.patch;patch=1 \
file://optional_imapx_provider.patch;patch=1 \
file://new-contact-fix.patch;patch=1 \
+ file://old-gdk-api.patch;patch=1 \
file://iconv-detect.h"
S = "${WORKDIR}/git"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/5] apr: Update to 1.4.2
2011-01-12 1:46 [PATCH 0/5] UX and base: gtk+ and apr upgrade, edwin, Jan12, 2011 Zhai Edwin
` (2 preceding siblings ...)
2011-01-12 1:46 ` [PATCH 3/5] eds-dbus: Do not disable old API after upgrading gtk+ Zhai Edwin
@ 2011-01-12 1:46 ` Zhai Edwin
2011-01-12 1:46 ` [PATCH 5/5] apr-util: Update to 1.3.10 Zhai Edwin
4 siblings, 0 replies; 6+ messages in thread
From: Zhai Edwin @ 2011-01-12 1:46 UTC (permalink / raw)
To: poky
Add buildconf_fix.patch of removing new libtool detection method to avoid config
failure. Handled build/libtool.m4 & apr_rules.mk after configure to take place
of "top_builddir" by "apr_builddir", as these files would be reused by apr-util.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
meta/recipes-support/apr/apr/buildconf_fix.patch | 25 ++++++++++++++++++++
meta/recipes-support/apr/apr/cleanup.patch | 9 +++----
.../apr/{apr_1.3.3.bb => apr_1.4.2.bb} | 23 ++++++++++++++----
3 files changed, 47 insertions(+), 10 deletions(-)
create mode 100644 meta/recipes-support/apr/apr/buildconf_fix.patch
rename meta/recipes-support/apr/{apr_1.3.3.bb => apr_1.4.2.bb} (60%)
diff --git a/meta/recipes-support/apr/apr/buildconf_fix.patch b/meta/recipes-support/apr/apr/buildconf_fix.patch
new file mode 100644
index 0000000..641340b
--- /dev/null
+++ b/meta/recipes-support/apr/apr/buildconf_fix.patch
@@ -0,0 +1,25 @@
+Remove the new libtool detection method to avoid config failure. Poky's libtool
+has different format for "aclocaldir", and there is no elegant parsing method,
+so fall back to old detection.
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+
+Index: apr-1.4.2/buildconf
+===================================================================
+--- apr-1.4.2.orig/buildconf 2009-11-13 06:19:49.000000000 +0800
++++ apr-1.4.2/buildconf 2010-11-29 14:39:19.000000000 +0800
+@@ -50,14 +50,6 @@
+
+ if [ -f libtool.m4 ]; then
+ ltfile=`pwd`/libtool.m4
+-elif grep all_pkgmacro_files $libtoolize > /dev/null; then
+- # libtool 2.x
+- aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
+- ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
+- for f in $ltfiles; do
+- test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build
+- done
+- ltfile=$aclocal_dir/libtool.m4
+ else
+ ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \
+ < $libtoolize`"
diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch
index fd74826..47f1c42 100644
--- a/meta/recipes-support/apr/apr/cleanup.patch
+++ b/meta/recipes-support/apr/apr/cleanup.patch
@@ -1,7 +1,7 @@
-Index: apr-1.3.3/build/buildcheck.sh
+Index: apr-1.4.2/build/buildcheck.sh
===================================================================
---- apr-1.3.3.orig/build/buildcheck.sh 2009-01-15 13:32:33.000000000 +0000
-+++ apr-1.3.3/build/buildcheck.sh 2009-01-15 13:33:06.000000000 +0000
+--- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800
++++ apr-1.4.2/build/buildcheck.sh 2010-11-26 15:44:00.000000000 +0800
@@ -32,35 +32,4 @@
echo "buildconf: autoconf version $ac_version (ok)"
fi
@@ -12,7 +12,7 @@ Index: apr-1.3.3/build/buildcheck.sh
-# output is multiline from 1.5 onwards
-
-# Require libtool 1.4 or newer
--libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
+-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-if test -z "$lt_pversion"; then
-echo "buildconf: libtool not found."
@@ -39,4 +39,3 @@ Index: apr-1.3.3/build/buildcheck.sh
-
-exit 1
+exit 0
-\ No newline at end of file
diff --git a/meta/recipes-support/apr/apr_1.3.3.bb b/meta/recipes-support/apr/apr_1.4.2.bb
similarity index 60%
rename from meta/recipes-support/apr/apr_1.3.3.bb
rename to meta/recipes-support/apr/apr_1.4.2.bb
index 26cc01f..fe983eb 100644
--- a/meta/recipes-support/apr/apr_1.3.3.bb
+++ b/meta/recipes-support/apr/apr_1.4.2.bb
@@ -1,16 +1,21 @@
DESCRIPTION = "Apache Portable Runtime (APR) library"
+HOMEPAGE = "http://apr.apache.org/"
SECTION = "libs"
+
LICENSE = "Apache License, Version 2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b"
-PR = "r5"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \
+ file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96"
+
+PR = "r0"
SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
file://configure_fixes.patch;patch=1 \
file://cleanup.patch;patch=1 \
- file://configfix.patch;patch=1"
+ file://configfix.patch;patch=1 \
+ file://buildconf_fix.patch;patch=1"
-SRC_URI[md5sum] = "2090c21dee4f0eb1512604127dcd158f"
-SRC_URI[sha256sum] = "d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37"
+SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
+SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
inherit autotools lib_package binconfig
@@ -21,6 +26,14 @@ do_configure_prepend() {
./buildconf
}
+#for some reason, build/libtool.m4 handled by buildconf still be overwritten
+#when autoconf, so handle it again.
+do_configure_append() {
+ cd ${S}
+ sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/libtool.m4
+ sed -i -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' build/apr_rules.mk
+}
+
SYSROOT_PREPROCESS_FUNCS += "apr_sysroot_preprocess"
apr_sysroot_preprocess () {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] apr-util: Update to 1.3.10
2011-01-12 1:46 [PATCH 0/5] UX and base: gtk+ and apr upgrade, edwin, Jan12, 2011 Zhai Edwin
` (3 preceding siblings ...)
2011-01-12 1:46 ` [PATCH 4/5] apr: Update to 1.4.2 Zhai Edwin
@ 2011-01-12 1:46 ` Zhai Edwin
4 siblings, 0 replies; 6+ messages in thread
From: Zhai Edwin @ 2011-01-12 1:46 UTC (permalink / raw)
To: poky
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../apr/{apr-util_1.3.4.bb => apr-util_1.3.10.bb} | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
rename meta/recipes-support/apr/{apr-util_1.3.4.bb => apr-util_1.3.10.bb} (72%)
diff --git a/meta/recipes-support/apr/apr-util_1.3.4.bb b/meta/recipes-support/apr/apr-util_1.3.10.bb
similarity index 72%
rename from meta/recipes-support/apr/apr-util_1.3.4.bb
rename to meta/recipes-support/apr/apr-util_1.3.10.bb
index cefdfe6..930f757 100644
--- a/meta/recipes-support/apr/apr-util_1.3.4.bb
+++ b/meta/recipes-support/apr/apr-util_1.3.10.bb
@@ -1,16 +1,20 @@
DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+HOMEPAGE = "http://apr.apache.org/"
SECTION = "libs"
DEPENDS = "apr expat gdbm"
+
LICENSE = "Apache License, Version 2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb"
-PR = "r7"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
+ file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42"
+
+PR = "r0"
SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
file://configfix.patch;patch=1 \
file://configure_fixes.patch;patch=1"
-SRC_URI[md5sum] = "a10e2ca150ff07f484c724c36142211f"
-SRC_URI[sha256sum] = "3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e"
+SRC_URI[md5sum] = "82acd25cf3df8c72eba44eaee8b80c19"
+SRC_URI[sha256sum] = "7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
--without-odbc \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-12 1:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-12 1:46 [PATCH 0/5] UX and base: gtk+ and apr upgrade, edwin, Jan12, 2011 Zhai Edwin
2011-01-12 1:46 ` [PATCH 1/5] gtk+: Update to 2.23.2 Zhai Edwin
2011-01-12 1:46 ` [PATCH 2/5] gdk-pixbuf: Add 2.22.1 as new recipe Zhai Edwin
2011-01-12 1:46 ` [PATCH 3/5] eds-dbus: Do not disable old API after upgrading gtk+ Zhai Edwin
2011-01-12 1:46 ` [PATCH 4/5] apr: Update to 1.4.2 Zhai Edwin
2011-01-12 1:46 ` [PATCH 5/5] apr-util: Update to 1.3.10 Zhai Edwin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.