* [PATCH 1/6] gtk+: Update to 2.23.2
2011-01-19 0:46 [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Zhai Edwin
@ 2011-01-19 0:46 ` Zhai Edwin
2011-01-19 0:46 ` [PATCH 2/6] gdk-pixbuf: Add 2.22.1 as new recipe Zhai Edwin
` (6 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2011-01-19 0: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] 18+ messages in thread* [PATCH 2/6] gdk-pixbuf: Add 2.22.1 as new recipe
2011-01-19 0:46 [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Zhai Edwin
2011-01-19 0:46 ` [PATCH 1/6] gtk+: Update to 2.23.2 Zhai Edwin
@ 2011-01-19 0:46 ` Zhai Edwin
2011-01-19 0:46 ` [PATCH 3/6] eds-dbus: Do not disable old API after upgrading gtk+ Zhai Edwin
` (5 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2011-01-19 0: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] 18+ messages in thread* [PATCH 3/6] eds-dbus: Do not disable old API after upgrading gtk+
2011-01-19 0:46 [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Zhai Edwin
2011-01-19 0:46 ` [PATCH 1/6] gtk+: Update to 2.23.2 Zhai Edwin
2011-01-19 0:46 ` [PATCH 2/6] gdk-pixbuf: Add 2.22.1 as new recipe Zhai Edwin
@ 2011-01-19 0:46 ` Zhai Edwin
2011-01-19 0:46 ` [PATCH 4/6] apr: Update to 1.4.2 Zhai Edwin
` (4 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2011-01-19 0: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] 18+ messages in thread* [PATCH 4/6] apr: Update to 1.4.2
2011-01-19 0:46 [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Zhai Edwin
` (2 preceding siblings ...)
2011-01-19 0:46 ` [PATCH 3/6] eds-dbus: Do not disable old API after upgrading gtk+ Zhai Edwin
@ 2011-01-19 0:46 ` Zhai Edwin
2011-01-19 0:46 ` [PATCH 5/6] apr-util: Update to 1.3.10 Zhai Edwin
` (3 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2011-01-19 0: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] 18+ messages in thread* [PATCH 5/6] apr-util: Update to 1.3.10
2011-01-19 0:46 [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Zhai Edwin
` (3 preceding siblings ...)
2011-01-19 0:46 ` [PATCH 4/6] apr: Update to 1.4.2 Zhai Edwin
@ 2011-01-19 0:46 ` Zhai Edwin
2011-01-19 0:46 ` [PATCH 6/6] webkit-gtk: upgrade to 1.3.7 Zhai Edwin
` (2 subsequent siblings)
7 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2011-01-19 0: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] 18+ messages in thread* [PATCH 6/6] webkit-gtk: upgrade to 1.3.7
2011-01-19 0:46 [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Zhai Edwin
` (4 preceding siblings ...)
2011-01-19 0:46 ` [PATCH 5/6] apr-util: Update to 1.3.10 Zhai Edwin
@ 2011-01-19 0:46 ` Zhai Edwin
2011-01-20 22:49 ` [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Saul Wold
2011-01-24 5:04 ` Saul Wold
7 siblings, 0 replies; 18+ messages in thread
From: Zhai Edwin @ 2011-01-19 0:46 UTC (permalink / raw)
To: poky
Also update some local files from upstream.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../conf/distro/include/poky-default-revisions.inc | 2 +-
meta/recipes-sato/webkit/files/GNUmakefile.am | 692 ++------------------
meta/recipes-sato/webkit/files/Makefile | 2 +-
meta/recipes-sato/webkit/files/autogen.sh | 2 +-
meta/recipes-sato/webkit/files/configure.ac | 164 ++++--
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 7 +-
6 files changed, 166 insertions(+), 703 deletions(-)
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index b2609c5..a93b925 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -173,7 +173,7 @@ SRCREV_pn-kernelshark ??= ${TRACECMDREV}
SRCREV_pn-tidy ??= "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
SRCREV_pn-u-boot-omap3 ??= "f40f6db278f602b55820693634a7256b0b4e4b80"
SRCREV_pn-ubootchart ??= "10"
-SRCREV_pn-webkit-gtk ??= "62027"
+SRCREV_pn-webkit-gtk ??= "72836"
SRCREV_pn-web-webkit ??= "130"
SRCREV_pn-web ??= "129"
SRCREV_pn-xcb-proto ??= "d81ca233e98be8fa59e8c90d262c0516944c5a66"
diff --git a/meta/recipes-sato/webkit/files/GNUmakefile.am b/meta/recipes-sato/webkit/files/GNUmakefile.am
index 39817f1..8884fcb 100644
--- a/meta/recipes-sato/webkit/files/GNUmakefile.am
+++ b/meta/recipes-sato/webkit/files/GNUmakefile.am
@@ -16,15 +16,11 @@
# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources,
# etc... The only exceptions are the global variables. See Global Variables
# below.
-#
-# Global Variables
-#
-# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any
-# specific port
-# global_cflags = CFLAGS that apply to JSC, WebCore, and to
-# any specific port
-# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any
-# specific port
+
+# Global Variables Reference
+# global_cppflags = CPPFLAGS that apply to all C/C++ files that are built for any project.
+# global_cflags = CFLAGS that apply to all C files that are built for any project.
+# global_cxxflags = CXXFLAGS that apply to all C++ files that are bult for any project.
srcdir = @srcdir@
VPATH = @srcdir@
@@ -35,18 +31,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
# Directory for autogenerated sources
GENSOURCES := $(top_builddir)/DerivedSources
-GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit
+GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
+GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
+GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
GENPROGRAMS := $(top_builddir)/Programs
-
-# Script for creating hash tables
-CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table
-
-# Script for creating regexp tables
-CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables
-
-# Programs to run the WebKitGtk unit tests
-GTESTER = gtester
-GTESTER_REPORT = gtester-report
+GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
+WebCore := $(srcdir)/WebCore
+WebKit := $(srcdir)/WebKit/gtk
# Libraries and support components
bin_PROGRAMS :=
@@ -63,36 +54,27 @@ javascriptcore_cppflags:=
javascriptcore_sources :=
javascriptcore_built_sources :=
javascriptcore_built_nosources :=
-javascriptcore_dist :=
webcore_cppflags :=
webcore_sources :=
webcore_libadd :=
webcore_built_sources :=
webcore_built_nosources :=
-webcore_dist :=
-webcoregtk_cppflags :=
webcoregtk_sources :=
-IDL_BINDINGS_GDOM :=
-GDOM_AUTO_CLASSES :=
-GDOM_FIXED_CLASSES :=
-GDOM_CLASSES :=
-GDOM_HEADERS_BUILT :=
-GDOM_HEADERS_FIXED :=
-libgdom_h_api :=
-libgdom_cleanfiles :=
+webcoregtk_cppflags :=
+webkitgtk_built_h_api :=
+webkitgtk_static_h_api :=
webkitgtk_h_api :=
webkitgtk_sources :=
webkitgtk_cppflags :=
+webkitgtk_gdom_built_sources :=
webkitgtk_built_sources :=
webkitgtk_built_nosources :=
-webkitgtk_cleanfiles :=
global_cppflags :=
global_cflags :=
global_cxxflags :=
-corekit_cflags :=
-corekit_cppflags :=
JSCORE_GIRSOURCES :=
WEBKIT_GIRSOURCES :=
+FEATURE_DEFINES :=
typelibsdir :=
typelibs_DATA :=
EXTRA_DIST :=
@@ -101,57 +83,15 @@ CLEANFILES :=
DISTCLEANFILES :=
MAINTAINERCLEANFILES :=
-webcoregtk_cppflags += \
- -I$(top_builddir)/DerivedSources/webkit \
- -I$(srcdir)/WebCore/bindings \
- -I$(srcdir)/WebCore/bindings/gobject
-
-# CFLAGS/CXXFLAGS used by WebCore and WebKit
-#
-# gtk+.pc already include glib, cairo, freetype and pango CFLAGS
-# Don't include them for now to reduce the noise when compiling
-# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS)
-corekit_cflags += \
- -fno-strict-aliasing \
- $(COVERAGE_CFLAGS) \
- $(ENCHANT_CFLAGS) \
- $(GAIL_CFLAGS) \
- $(GEOCLUE_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GSTREAMER_CFLAGS) \
- $(GTK_CFLAGS) \
- $(HILDON_CFLAGS) \
- $(LIBSOUP_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(LIBXSLT_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(UNICODE_CFLAGS) \
- $(XT_CFLAGS)
-
-# When building webcore/webkit, we want WebCore/config.h and NOT
-# JavaScriptCore/config.h, hence, it's important that WebCore/ should come first
-# before JavaScriptCore in the include path.
-corekit_cppflags += \
- $(global_cppflags) \
- $(webcore_cppflags) \
- $(webcoregtk_cppflags) \
- $(javascriptcore_cppflags)
-
-# For the Gtk port we want to use XP_UNIX both in X11 and Mac
-if !TARGET_WIN32
-corekit_cppflags += -DXP_UNIX
-endif
-
-# Default compiler flags
-global_cflags += \
+global_cppflags += \
-Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \
-Wformat -Wformat-security -Wno-format-y2k -Wundef \
-Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \
-Wno-unused-parameter -Wno-parentheses \
- -fno-exceptions
+ -fno-exceptions -DENABLE_GLIB_SUPPORT=1
+
global_cxxflags += \
- $(global_cflags) \
$(SYMBOL_VISIBILITY_INLINES) \
-fno-rtti
@@ -159,30 +99,17 @@ global_cxxflags += \
# It breaks the build on other platforms, so we use it conditionally
if OS_WIN32
no_undefined = -no-undefined
-version_script = -export-symbols-regex "^(webkit_|JS).*"
+version_script = -export-symbols-regex "^(webkit_|k?JS).*"
endif
if OS_GNU
version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
endif
-# Shared libraries
-lib_LTLIBRARIES += \
- libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
-
# Convenience libraries
noinst_LTLIBRARIES += \
libJavaScriptCore.la
-# JavaScriptCore
-javascriptcore_cppflags += \
- -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
- -I$(srcdir)/JavaScriptCore/parser \
- -I$(srcdir)/JavaScriptCore/wtf \
- -I$(srcdir)/JavaScriptCore/wtf/gtk \
- -I$(srcdir)/JavaScriptCore/wtf/gobject \
- -I$(top_builddir)/DerivedSources
-
nodist_EXTRA_libJavaScriptCore_la_SOURCES = \
$(javascriptcore_built_nosources)
@@ -215,78 +142,6 @@ libJavaScriptCore_la_CPPFLAGS = \
$(global_cppflags) \
$(javascriptcore_cppflags)
-# WebKit
-nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
- $(webcore_built_nosources)
-
-nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
- $(webcore_built_sources) \
- $(webkitgtk_built_sources)
-
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
- $(webkitgtk_h_api) \
- WebKit/gtk/webkit/webkitenumtypes.h
-
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
- $(webcore_sources) \
- $(webcoregtk_sources) \
- $(webkitgtk_sources)
-
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
- $(global_cxxflags) \
- $(corekit_cflags)
-
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
- $(global_cflags) \
- $(corekit_cflags)
-
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
- $(corekit_cppflags) \
- $(webkitgtk_cppflags) \
- $(HILDON_CPPFLAGS)
-
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
- -version-info @LIBWEBKITGTK_VERSION@ \
- $(version_script) \
- $(no_undefined)
-
-libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
- -lpthread \
- libJavaScriptCore.la \
- libWebCoreJS.la \
- libgdom.la \
- $(webcore_ldflags) \
- $(CAIRO_LIBS) \
- $(COVERAGE_LDFLAGS) \
- $(ENCHANT_LIBS) \
- $(FREETYPE_LIBS) \
- $(GAIL_LIBS) \
- $(GEOCLUE_LIBS) \
- $(GLIB_LIBS) \
- $(GSTREAMER_LIBS) \
- $(GTK_LIBS) \
- $(HILDON_LIBS) \
- $(JPEG_LIBS) \
- $(LIBSOUP_LIBS) \
- $(LIBXML_LIBS) \
- $(LIBXSLT_LIBS) \
- $(PANGO_LIBS) \
- $(PNG_LIBS) \
- $(SQLITE3_LIBS) \
- $(UNICODE_LIBS) \
- $(XT_LIBS)
-
-libgdom_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit
-nodist_libgdom_la_HEADERS = \
- $(libgdom_h_api)
-
-libgdom_cleanfiles += \
- $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \
- $(top_builddir)/libgdom.la \
- $(top_builddir)/stamp-webkitdomenumtypes.h
-
-#
# Extra checks and flags
global_cppflags += \
-DBUILDING_CAIRO__=1 \
@@ -308,17 +163,29 @@ global_cppflags += \
-DUSE_SYSTEM_MALLOC
endif
+if USE_GSTREAMER
+global_cppflags += \
+ -DWTF_USE_GSTREAMER=1
+endif
+
+# ----
+# GTK+ 2.x/3.x support
+# ----
+if GTK_API_VERSION_2
+global_cppflags += \
+ -DGTK_API_VERSION_2=1
+endif
+
if !ENABLE_DEBUG
global_cppflags += -DNDEBUG
global_cflags += $(SYMBOL_VISIBILITY)
else
-webcoregtk_cppflags += \
+global_cppflags += \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DPANGO_DISABLE_DEPRECATED
-
# Might be useful in the future
# -DGDK_MULTIHEAD_SAFE \
# -DGTK_MULTIHEAD_SAFE
@@ -330,454 +197,19 @@ global_cppflags += \
-DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS
endif
-webkitgtk_h_api += \
- $(srcdir)/WebKit/gtk/webkit/webkit.h \
- $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \
- $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \
- $(srcdir)/WebKit/gtk/webkit/webkiterror.h \
- $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \
- $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \
- $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \
- $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \
- $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \
- $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \
- $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \
- $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
-
-webkitgtk_built_sources += \
- DerivedSources/webkitenumtypes.cpp \
- DerivedSources/webkitdomenumtypes.cpp \
- DerivedSources/webkitmarshal.cpp \
- DerivedSources/webkitmarshal.h \
- WebKit/gtk/webkit/webkitenumtypes.h
-
-webkitgtk_sources += \
- WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
- WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
- WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \
- WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \
- WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \
- WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \
- WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \
- WebKit/gtk/WebCoreSupport/DragClientGtk.h \
- WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \
- WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \
- WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
- WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
- WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
- WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \
- WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \
- WebKit/gtk/webkit/webkitapplicationcache.cpp \
- WebKit/gtk/webkit/webkitdownload.cpp \
- WebKit/gtk/webkit/webkiterror.cpp \
- WebKit/gtk/webkit/webkithittestresult.cpp \
- WebKit/gtk/webkit/webkitnetworkrequest.cpp \
- WebKit/gtk/webkit/webkitnetworkresponse.cpp \
- WebKit/gtk/webkit/webkitprivate.cpp \
- WebKit/gtk/webkit/webkitprivate.h \
- WebKit/gtk/webkit/webkitsoupauthdialog.c \
- WebKit/gtk/webkit/webkitversion.cpp \
- WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
- WebKit/gtk/webkit/webkitwebdatasource.cpp \
- WebKit/gtk/webkit/webkitwebframe.cpp \
- WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
- WebKit/gtk/webkit/webkitwebinspector.cpp \
- WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
- WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
- WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \
- WebKit/gtk/webkit/webkitwebresource.cpp \
- WebKit/gtk/webkit/webkitwebdatabase.cpp \
- WebKit/gtk/webkit/webkitsecurityorigin.cpp \
- WebKit/gtk/webkit/webkitwebsettings.cpp \
- WebKit/gtk/webkit/webkitwebview.cpp \
- WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
- WebKit/gtk/webkit/webkitworkers.cpp
-
-webkitgtk_cppflags += \
- -DBUILDING_WEBKIT \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- -DDATA_DIR=\"${datadir}\" \
- -I$(srcdir)/WebKit/gtk \
- -I$(srcdir)/WebKit/gtk/WebCoreSupport \
- -I$(srcdir)/WebKit/gtk/webkit \
- -I$(top_builddir)/WebKit/gtk \
- -I$(top_builddir)/WebKit/gtk/webkit \
- -I$(GENSOURCESWEBKITDOM)
-
-webkitgtk_cleanfiles += \
- $(top_builddir)/stamp-webkitmarshal.cpp \
- $(top_builddir)/stamp-webkitmarshal.h \
- $(top_builddir)/stamp-webkitenumtypes.cpp \
- $(top_builddir)/stamp-webkitenumtypes.h \
- $(top_builddir)/Programs/GtkLauncher \
- $(top_builddir)/WebKit/gtk/docs/version.xml \
- $(top_builddir)/WebKit/gtk/docs/GNUmakefile \
- $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \
- $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
- $(top_builddir)/WebKit/gtk/webkit/webkitversion.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
-
-if ENABLE_INTROSPECTION
-
-JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
- cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/
-
-JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir
-WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir
-
-$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
- $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \
- --include=GObject-2.0 \
- --include=Gtk-@GTK_API_VERSION@ \
- --include=JSCore-@WEBKITGTK_API_VERSION@ \
- --include=Soup-2.4 \
- --library=webkitgtk-@WEBKITGTK_API_VERSION@ \
- --libtool="$(LIBTOOL)" \
- --pkg gobject-2.0 \
- --pkg gtk+-@GTK_API_VERSION@ \
- --pkg libsoup-2.4 \
- --output $@ \
- --add-include-path $(top_srcdir)/WebKit/gtk \
- --add-include-path $(builddir) \
- -I$(top_srcdir)/WebKit/gtk \
- -I$(top_builddir)/WebKit/gtk \
- -I$(top_builddir)/DerivedSources \
- -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \
- -I$(top_srcdir) \
- $(webkitgtk_h_api) \
- $(libgdom_h_api)
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
-
-typelibsdir += $(libdir)/girepository-1.0
-typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
-
-%.typelib: %.gir $(G_IR_COMPILER)
- $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@
-
-CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
-
-endif
-
-EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir
-
-WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
-WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
-
-$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
- @true
-
-$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
- @true
-
-stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
- $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
- $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
- echo timestamp > $(@F)
-
-stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
- echo timestamp > $(@F)
-
-WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h
- @true
-stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile
- $(AM_V_GEN)glib-mkenums \
- --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
- --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
- --fhead "#include <glib-object.h>\n\n" \
- --fhead "#include <webkit/webkitdefines.h>\n\n" \
- --fhead "G_BEGIN_DECLS\n\n" \
- --ftail "G_END_DECLS\n\n" \
- --ftail "#endif\n" \
- --fprod "#include <webkit/@basename@>\n\n" \
- --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
- --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
- $(webkitgtk_h_api) | \
- sed 's,web_kit,webkit,' | \
- sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
- > xgen-gth \
- && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \
- && rm -f xgen-gth \
- && echo timestamp > $(@F)
-
-DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
- $(AM_V_GEN)glib-mkenums \
- --fhead "#include <config.h>\n" \
- --fhead "#include <glib-object.h>\n" \
- --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \
- --fhead "extern \"C\" {\n\n" \
- --fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n};\n\n" \
- --vtail "GType @enum_name@_get_type(void)\n{\n" \
- --vtail " static GType type = 0;\n\n" \
- --vtail " if (!type)\n" \
- --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
- --vtail " return type;\n}\n\n" \
- --ftail "}\n" \
- $(webkitgtk_h_api) | \
- sed 's,web_kit,webkit,' \
- > xgen-gtc \
- && cp xgen-gtc $@ \
- && rm -f xgen-gtc
-
-WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h
- @true
-stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile
- $(AM_V_GEN)glib-mkenums \
- --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \
- --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \
- --fhead "#include <glib-object.h>\n\n" \
- --fhead "G_BEGIN_DECLS\n\n" \
- --ftail "G_END_DECLS\n\n" \
- --ftail "#endif\n" \
- --fprod "#include <webkit/@basename@>\n\n" \
- --eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
- --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \
- $(libgdom_h_api) | \
- sed 's,web_kit,webkit_dom,' | \
- sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \
- > xgen-cgth \
- && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \
- && rm -f xgen-cgth \
- && echo timestamp > $(@F)
-
-DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile
- $(AM_V_GEN)glib-mkenums \
- --fhead "#include <config.h>\n" \
- --fhead "#include <glib-object.h>\n" \
- --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \
- --fhead "extern \"C\" {\n\n" \
- --fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "static const G@Type@Value _@enum_name@_values] = {" \
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n};\n\n" \
- --vtail "GType @enum_name@_get_type(void)\n{\n" \
- --vtail " static GType type = 0;\n\n" \
- --vtail " if (!type)\n" \
- --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
- --vtail " return type;\n}\n\n" \
- --ftail "}\n" \
- $(libgdom_h_api) | \
- sed 's,web_kit,webkitdom,' \
- > xgen-cgtc \
- && cp xgen-cgtc $@ \
- && rm -f xgen-cgtc
-
-# Files that will be distributed
EXTRA_DIST += \
- $(srcdir)/gtk-doc.make \
- WebKit/LICENSE \
- $(javascriptcore_dist) \
- $(webcore_dist) \
$(srcdir)/autotools/symbols.filter \
- $(srcdir)/WebKit/gtk/ChangeLog \
- $(srcdir)/WebKit/gtk/NEWS \
- $(srcdir)/WebKit/gtk/webkitmarshal.list \
- $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
- $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
- $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
- $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
- $(srcdir)/WebKit/gtk/docs/version.xml.in \
- $(srcdir)/WebKit/gtk/po/* \
- $(srcdir)/WebKit/gtk/resources/* \
- $(srcdir)/WebKit/gtk/tests/resources/* \
- $(srcdir)/WebKit/gtk/tests/test_utils.h
-
-# extra resource files
-resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources
-dist_resources_DATA = \
- $(shell ls $(srcdir)/WebKit/gtk/resources/*.html)
-
-# END WEBKIT GTK+
+ $(srcdir)/gtk-doc.make \
+ $(srcdir)/WebKit/LICENSE
# Include module makefiles
include JavaScriptCore/GNUmakefile.am
include WebCore/GNUmakefile.am
+include WebKit/gtk/GNUmakefile.am
+include WebCore/bindings/gobject/GNUmakefile.am
include WebKitTools/GNUmakefile.am
include WebKit/gtk/po/GNUmakefile.am
-# Build unit tests
-noinst_PROGRAMS += $(TEST_PROGS)
-
-webkit_tests_cflags = \
- -fno-strict-aliasing \
- -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
- -I$(srcdir)/WebKit/gtk \
- -I$(top_builddir)/WebKit/gtk \
- -I$(top_builddir)/DerivedSources \
- -I$(top_srcdir)/WebCore/bindings \
- -I$(top_srcdir)/WebCore/bindings/gobject \
- $(global_cflags) \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- $(LIBSOUP_CFLAGS)
-
-webkit_tests_ldadd = \
- libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(LIBSOUP_LIBS)
-
-webkit_tests_ldflags = \
- -no-install \
- -no-fast-install
-
-TEST_PROGS += \
- Programs/unittests/testdomdocument \
- Programs/unittests/testdomdomwindow \
- Programs/unittests/testdomnode \
- Programs/unittests/testhttpbackend \
- Programs/unittests/testloading \
- Programs/unittests/testglobals \
- Programs/unittests/testmimehandling \
- Programs/unittests/testnetworkrequest \
- Programs/unittests/testnetworkresponse \
- Programs/unittests/testwebframe \
- Programs/unittests/testwebbackforwardlist \
- Programs/unittests/testwebhistoryitem \
- Programs/unittests/testwindow \
- Programs/unittests/testdownload \
- Programs/unittests/testatk \
- Programs/unittests/testatkroles \
- Programs/unittests/testhittestresult \
- Programs/unittests/testwebsettings \
- Programs/unittests/testwebresource \
- Programs/unittests/testwebdatasource \
- Programs/unittests/testwebview \
- Programs/unittests/testkeyevents \
- Programs/unittests/testcopyandpaste
-
-# Add additional tests here
-Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c
-Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c
-Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c
-Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
-Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c
-Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
-Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c
-Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
-Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c
-Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
-Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c
-Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c
-Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c
-Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c
-Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c
-Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c
-Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c
-Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c
-Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd)
-
-Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c
-Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd)
-
-Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c
-Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c
-Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd)
-
-Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c
-Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
-
-Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c
-Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags)
-Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd)
-Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags)
-
# Autogenerated sources
BUILT_SOURCES += \
$(javascriptcore_built_sources) \
@@ -785,21 +217,17 @@ BUILT_SOURCES += \
$(webcore_built_sources) \
$(webcore_built_nosources) \
$(webkitgtk_built_sources) \
- $(webkitgtk_built_nosources) \
- $(gdom_built_nosources)
-
-# Project-wide clean rules
-# Files that will be cleaned
-CLEANFILES += \
- $(BUILT_SOURCES) \
- $(webkitgtk_cleanfiles) \
- $(libgdom_cleanfiles)
+ $(webkitgtk_built_nosources)
DISTCLEANFILES += \
- $(CLEANFILES)
+ $(CLEANFILES) \
+ $(builddir)/doltcompile \
+ $(builddir)/doltlibtool
MAINTAINERCLEANFILES += \
$(CLEANFILES) \
+ $(builddir)/doltcompile \
+ $(builddir)/doltlibtool \
$(srcdir)/aconfig.h.in \
$(srcdir)/autotools/config.* \
$(srcdir)/autotools/compile \
@@ -814,7 +242,7 @@ MAINTAINERCLEANFILES += \
# Older automake versions (1.7) place Plo files in a different place so we need
# to create the output directory manually.
-all-local: stamp-po
+all-local:
$(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources
# remove built sources and program directories
@@ -822,35 +250,5 @@ clean-local:
-rm -rf $(GENPROGRAMS)
maintainer-clean-local: distclean-local
-
distclean-local:
-rm -rf $(GENSOURCES) $(GENPROGRAMS)
-
-dist-hook:
- cp $(srcdir)/WebKit/gtk/NEWS $(distdir)/
-
-install-data-local: po-install-data-local
-
-installdirs-data-local: po-installdirs-data-local
-
-uninstall-local: po-uninstall-local
-
-# Run all tests in cwd
-# FIXME: we should run this under xvfb
-test: $(TEST_PROGS)
- $(GTESTER) --verbose $(TEST_PROGS);
-
-# test-report: run tests in cwd and generate report
-# full-report: run tests in cwd with -m perf and -m slow and generate report
-# perf-report: run tests in cwd with -m perf and generate report
-test-report full-report perf-report: $(TEST_PROGS)
- @ case $@ in \
- test-report) test_options="-k";; \
- full-report) test_options="-k -m=perf";; \
- perf-report) test_options="-k -m=perf -m=slow";; \
- esac ; \
- $(GTESTER) --verbose $$test_options -o test-report.xml $(TEST_PROGS); \
- $(GTESTER_REPORT) test-report.xml > test-report.html ;
-
-.PHONY: test test-report perf-report full-report
-check-local: test
diff --git a/meta/recipes-sato/webkit/files/Makefile b/meta/recipes-sato/webkit/files/Makefile
index 1e50d1d..cdee9da 100644
--- a/meta/recipes-sato/webkit/files/Makefile
+++ b/meta/recipes-sato/webkit/files/Makefile
@@ -1,4 +1,4 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools
+MODULES = JavaScriptCore JavaScriptGlue ANGLE WebCore WebKit WebKit2 WebKitTools
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
diff --git a/meta/recipes-sato/webkit/files/autogen.sh b/meta/recipes-sato/webkit/files/autogen.sh
index 97beb20..60b163d 100755
--- a/meta/recipes-sato/webkit/files/autogen.sh
+++ b/meta/recipes-sato/webkit/files/autogen.sh
@@ -10,7 +10,7 @@ cd $srcdir
GTKDOCIZE_FLAGS="--copy"
LIBTOOLIZE_FLAGS="--force --automake"
-ACLOCAL_FLAGS="-I autotools"
+ACLOCAL_FLAGS="-I autotools $ACLOCAL_FLAGS"
AUTOMAKE_FLAGS="--foreign --add-missing"
DIE=0
diff --git a/meta/recipes-sato/webkit/files/configure.ac b/meta/recipes-sato/webkit/files/configure.ac
index d4f3e74..bb703b4 100644
--- a/meta/recipes-sato/webkit/files/configure.ac
+++ b/meta/recipes-sato/webkit/files/configure.ac
@@ -2,14 +2,14 @@ AC_PREREQ(2.59)
m4_define([webkit_major_version], [1])
m4_define([webkit_minor_version], [3])
-m4_define([webkit_micro_version], [2])
+m4_define([webkit_micro_version], [7])
# This is the version we'll be using as part of our User-Agent string
# e.g., AppleWebKit/$(webkit_user_agent_version) ...
#
# Sourced from WebCore/Configurations/Version.xcconfig
-m4_define([webkit_user_agent_major_version], [531])
-m4_define([webkit_user_agent_minor_version], [2])
+m4_define([webkit_user_agent_major_version], [534])
+m4_define([webkit_user_agent_minor_version], [7])
AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
@@ -34,8 +34,8 @@ AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION)
AC_CONFIG_SRCDIR([WebCore/config.h])
dnl # Libtool library version, not to confuse with API version
-dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
-LIBWEBKITGTK_VERSION=0:0:0
+dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
+LIBWEBKITGTK_VERSION=4:0:4
AC_SUBST([LIBWEBKITGTK_VERSION])
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@ -82,6 +82,8 @@ WEBKIT_INIT
AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
+# use dolt to speedup the build
+DOLT
AC_PATH_PROG(FLEX, flex)
if test -z "$FLEX"; then
@@ -165,6 +167,17 @@ if test "$png_ok" != yes; then
fi
AC_SUBST([PNG_LIBS])
+
+if test "$os_win32" = "yes"; then
+ WINMM_LIBS=-lwinmm
+ SHLWAPI_LIBS=-lshlwapi
+ OLE32_LIBS=-lole32
+fi
+AC_SUBST([WINMM_LIBS])
+AC_SUBST([SHLWAPI_LIBS])
+AC_SUBST([OLE32_LIBS])
+
+
# determine the GTK+ version to use
AC_MSG_CHECKING([the GTK+ version to use])
AC_ARG_WITH([gtk],
@@ -186,7 +199,7 @@ case "$with_gtk" in
GAIL_PC_NAME=gail
GAIL_REQUIRED_VERSION=1.8
;;
- 3.0) GTK_REQUIRED_VERSION=2.90
+ 3.0) GTK_REQUIRED_VERSION=2.91
GTK_API_VERSION=3.0
WEBKITGTK_API_MAJOR_VERSION=3
WEBKITGTK_API_MINOR_VERSION=0
@@ -258,7 +271,17 @@ ENCHANT_REQUIRED_VERSION=0.22
# todo: webcore gtk
WEBKIT_CHECK_DEPENDENCIES([glib unicode])
-GETTEXT_PACKAGE=$PACKAGE
+# Check if we can use GSettings
+PKG_CHECK_MODULES([GSETTINGS],
+ [gio-2.0 >= 2.25.0],
+ [have_gsettings=yes],
+ [have_gsettings=no])
+if test "$have_gsettings" = "yes"; then
+ AC_DEFINE([HAVE_GSETTINGS], 1, [Whether we can use GSettings])
+ GLIB_GSETTINGS
+fi
+
+GETTEXT_PACKAGE=$PACKAGE-$GTK_API_VERSION
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
[The gettext catalog name])
@@ -430,14 +453,6 @@ AC_ARG_ENABLE(datalist,
[],[enable_datalist="yes"])
AC_MSG_RESULT([$enable_datalist])
-# check whether to enable HTML5 ruby support
-AC_MSG_CHECKING([whether to enable HTML5 ruby support])
-AC_ARG_ENABLE(ruby,
- AC_HELP_STRING([--enable-ruby],
- [enable HTML5 ruby support [default=yes]]),
- [],[enable_ruby="yes"])
-AC_MSG_RESULT([$enable_ruby])
-
# check whether to enable HTML5 sandbox iframe support
AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support])
AC_ARG_ENABLE(sandbox,
@@ -526,6 +541,22 @@ AC_ARG_ENABLE(workers,
[],[enable_workers="yes"])
AC_MSG_RESULT([$enable_workers])
+# check whether to enable directory upload support
+AC_MSG_CHECKING([whether to enable directory upload support])
+AC_ARG_ENABLE(directory_upload,
+ AC_HELP_STRING([--enable-directory-upload],
+ [enable support for directory upload [default=no]]),
+ [], [enable_directory_upload="no"])
+AC_MSG_RESULT([$enable_directory_upload])
+
+# check whether to enable HTML5 FileSystem API support
+AC_MSG_CHECKING([whether to enable HTML5 FileSystem API support])
+AC_ARG_ENABLE(file_system,
+ AC_HELP_STRING([--enable-file-system],
+ [enable support for HTML5 FileSystem API [default=no]]),
+ [], [enable_file_system="no"])
+AC_MSG_RESULT([$enable_file_system])
+
# turn off svg features if --disable-svg is requested
if test "$enable_svg" = "no"; then
enable_svg_animation=no
@@ -600,8 +631,8 @@ fi
AC_MSG_CHECKING([whether to enable Web Sockets support])
AC_ARG_ENABLE(web_sockets,
AC_HELP_STRING([--enable-web-sockets],
- [enable support for Web Sockets [default=no]]),
- [],[enable_web_sockets="no"])
+ [enable support for Web Sockets [default=yes]]),
+ [],[enable_web_sockets="yes"])
AC_MSG_RESULT([$enable_web_sockets])
# check whether to enable Web Timing support
@@ -612,13 +643,13 @@ AC_ARG_ENABLE(web_timing,
[],[enable_web_timing="no"])
AC_MSG_RESULT([$enable_web_timing])
-# check whether to enable Blob.slice support
-AC_MSG_CHECKING([whether to enable Blob.slice support])
-AC_ARG_ENABLE(blob_slice,
- AC_HELP_STRING([--enable-blob-slice],
- [enable support for Blob.slice [default=no]]),
- [],[enable_blob_slice="no"])
-AC_MSG_RESULT([$enable_blob_slice])
+# check whether to enable Blob support
+AC_MSG_CHECKING([whether to enable Blob support])
+AC_ARG_ENABLE(blob,
+ AC_HELP_STRING([--enable-blob],
+ [enable support for Blob [default=no]]),
+ [],[enable_blob="no"])
+AC_MSG_RESULT([$enable_blob])
# check whether to enable Fast Mobile Scrolling support
AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling])
@@ -628,22 +659,6 @@ AC_ARG_ENABLE(fast_mobile_scrolling,
[],[enable_fast_mobile_scrolling="no"])
AC_MSG_RESULT([$enable_fast_mobile_scrolling])
-# check whether to enable FileReader support
-AC_MSG_CHECKING([whether to enable FileReader support])
-AC_ARG_ENABLE(file_reader,
- AC_HELP_STRING([--enable-file-reader],
- [enable support for FileReader [default=no]]),
- [],[enable_file_reader="no"])
-AC_MSG_RESULT([$enable_file_reader])
-
-# check whether to enable FileWriter support
-AC_MSG_CHECKING([whether to enable FileWriter support])
-AC_ARG_ENABLE(file_writer,
- AC_HELP_STRING([--enable-file-writer],
- [enable support for FileWriter [default=no]]),
- [],[enable_file_writer="no"])
-AC_MSG_RESULT([$enable_file_writer])
-
# check whether to enable code coverage
AC_MSG_CHECKING([whether to enable code coverage support])
AC_ARG_ENABLE(coverage,
@@ -667,6 +682,11 @@ AC_ARG_ENABLE([jit],
[],[enable_jit="yes"])
if test "$enable_jit" = "yes"; then
case "$host_cpu" in
+ arm*)
+ AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
+ AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
+ AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT])
+ ;;
i*86|x86_64)
AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
@@ -688,9 +708,36 @@ if test "$enable_jit" = "yes"; then
enable_jit="no (CPU '$host_cpu' not supported)"
;;
esac
+else
+ AC_DEFINE([ENABLE_JIT], [0], [Define to enable JIT])
fi
AC_MSG_RESULT([$enable_jit])
+# Opcode stats
+AC_MSG_CHECKING([whether to enable opcode stats])
+AC_ARG_ENABLE([opcode-stats],
+ [AS_HELP_STRING([--enable-opcode-stats], [Enable Opcode statistics (default: disabled)])],
+ [], [enable_opcode_stats=no])
+AC_MSG_RESULT([$enable_opcode_stats])
+
+if test "$enable_opcode_stats" = "yes"; then
+ if test "$enable_jit" = "yes"; then
+ AC_MSG_ERROR([JIT must be disabled for Opcode stats to work.])
+ fi
+ AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])
+fi
+
+# Link prefetch
+AC_MSG_CHECKING([whether to enable link prefetch support])
+AC_ARG_ENABLE([link-prefetch],
+ [AS_HELP_STRING([--enable-link-prefetch], [Enable Link prefetch support (default: disabled)])],
+ [],[enable_link_prefetch=no])
+AC_MSG_RESULT([$enable_link_prefetch])
+
+if test "$enable_link_prefetch" = "yes"; then
+ AC_DEFINE([ENABLE_LINK_PREFETCH], [1], [Define to enable link prefetch support])
+fi
+
# GObject Introspection
AC_MSG_CHECKING([whether to enable GObject introspection support])
AC_ARG_ENABLE([introspection],
@@ -705,7 +752,7 @@ GIRDIR=
GIRTYPELIBDIR=
if test "$enable_introspection" = "yes"; then
- GOBJECT_INTROSPECTION_REQUIRED=0.6.15
+ GOBJECT_INTROSPECTION_REQUIRED=0.9.5
PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED])
G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
@@ -816,9 +863,13 @@ if test "$enable_video" = "yes"; then
[gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-app-0.10
gstreamer-base-0.10
+ gstreamer-interfaces-0.10
gstreamer-pbutils-0.10
gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
- gstreamer-video-0.10])
+ gstreamer-video-0.10],
+ [have_gstreamer=yes],
+ [have_gstreamer=no])
+
AC_SUBST([GSTREAMER_CFLAGS])
AC_SUBST([GSTREAMER_LIBS])
fi
@@ -859,18 +910,26 @@ AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"])
AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"])
AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"])
+# GLib/GIO feature conditionals
+AM_CONDITIONAL([USE_GSETTINGS], [test "$have_gsettings" = "yes"])
+
+# GStreamer feature conditional
+AM_CONDITIONAL([USE_GSTREAMER], [test "$have_gstreamer" = "yes"])
+
# WebKit feature conditionals
AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"])
-AM_CONDITIONAL([ENABLE_BLOB_SLICE],[test "$enable_blob_slice" = "yes"])
+AM_CONDITIONAL([ENABLE_BLOB],[test "$enable_blob" = "yes"])
AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"])
AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"])
AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"])
+AM_CONDITIONAL([ENABLE_DIRECTORY_UPLOAD],[test "$enable_directory_upload" = "yes"])
AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"])
AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"])
AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"])
AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"])
+AM_CONDITIONAL([ENABLE_FILE_SYSTEM],[test "$enable_file_system" = "yes"])
AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"])
AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"])
AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"])
@@ -879,12 +938,8 @@ AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"])
AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"])
AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"])
AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"])
-AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"])
-AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"])
AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"])
AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"])
-AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"])
-AM_CONDITIONAL([ENABLE_SANDBOX],[test "$enable_sandbox" = "yes"])
AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"])
AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"])
AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"])
@@ -903,6 +958,7 @@ AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"])
AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
+AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
# Gtk conditionals
AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
@@ -918,7 +974,9 @@ WebKit/gtk/docs/version.xml
AC_CONFIG_FILES([
WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
-WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in]
+WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in
+WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in
+]
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
)
@@ -936,12 +994,11 @@ Build configuration:
Optimized memory allocator : $enable_fast_malloc
Features:
3D Transforms : $enable_3D_transforms
- Blob.slice support : $enable_blob_slice
+ Blob support : $enable_blob
+ Directory upload : $enable_directory_upload
Fast Mobile Scrolling : $enable_fast_mobile_scrolling
JIT compilation : $enable_jit
Filters support : $enable_filters
- FileReader support : $enable_file_reader
- FileWriter support : $enable_file_writer
Geolocation support : $enable_geolocation
JavaScript debugger/profiler support : $enable_javascript_debugger
MathML support : $enable_mathml
@@ -949,12 +1006,14 @@ Features:
HTML5 channel messaging support : $enable_channel_messaging
HTML5 client-side session and persistent storage support : $enable_dom_storage
HTML5 client-side database storage support : $enable_database
- HTML5 ruby support : $enable_ruby
+ HTML5 FileSystem API support : $enable_file_system
HTML5 sandboxed iframe support : $enable_sandbox
HTML5 server-sent events support : $enable_eventsource
HTML5 video element support : $enable_video
Icon database support : $enable_icon_database
Image resizer support : $enable_image_resizer
+ Link prefetch support : $enable_link_prefetch
+ Opcode stats : $enable_opcode_stats
SharedWorkers support : $enable_shared_workers
Speech input support : $enable_input_speech
SVG support : $enable_svg
@@ -970,6 +1029,7 @@ Features:
XHTML-MP support : $enable_xhtmlmp
XPATH support : $enable_xpath
XSLT support : $enable_xslt
+
GTK+ configuration:
GTK+ version : $with_gtk
GDK target : $with_target
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 8d4eb35..99652c1 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -12,7 +12,7 @@ DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer f
SRCREV_FORMAT = "webcore-rwebkit"
-PV = "1.3.2+svnr${SRCPV}"
+PV = "1.3.7+svnr${SRCPV}"
PR = "r0"
SRC_URI = "\
@@ -60,6 +60,11 @@ do_compile_prepend() {
cd ${S}
}
+do_install_prepend() {
+ cp ${S}/Programs/.libs/jsc ${S}/Programs/jsc-1 || true
+}
+
+
PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore"
FILES_${PN}launcher = "${bindir}/GtkLauncher"
FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-19 0:46 [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Zhai Edwin
` (5 preceding siblings ...)
2011-01-19 0:46 ` [PATCH 6/6] webkit-gtk: upgrade to 1.3.7 Zhai Edwin
@ 2011-01-20 22:49 ` Saul Wold
2011-01-21 1:21 ` Zhai, Edwin
2011-01-24 5:04 ` Saul Wold
7 siblings, 1 reply; 18+ messages in thread
From: Saul Wold @ 2011-01-20 22:49 UTC (permalink / raw)
To: Zhai Edwin; +Cc: poky
On 01/18/2011 04:46 PM, Zhai Edwin wrote:
> Saul,
> This is the 2nd pull request for gtk+,gdk-pixbuf,apr. Also added webkit-gtk.
> Qemu upgrade is under test across all platforms, and will be out soon.
>
Edwin,
It was noticed that you updated a little too aggressively! For the
gtk+, webkit, eds-dbus and glib, you moved to the development versions.
In some open source project even releases are stable and odd releases
are unstable, so in this case we want to go to the following:
gtk+: 2.22.1
glib: 2.26.1
eds-dbus: 2.32
webkit-gtk 1.2.6
This is something we will need to review more carefully to know for sure
which packages are even/odd stable/dev(or unstable) versioning.
I will remind the whole team about this as well.
Sau!
> 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 (6):
> 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
> webkit-gtk: upgrade to 1.3.7
>
> meta/classes/gtk-icon-cache.bbclass | 2 +-
> .../conf/distro/include/poky-default-revisions.inc | 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 +
> meta/recipes-sato/webkit/files/GNUmakefile.am | 692 ++------------------
> meta/recipes-sato/webkit/files/Makefile | 2 +-
> meta/recipes-sato/webkit/files/autogen.sh | 2 +-
> meta/recipes-sato/webkit/files/configure.ac | 164 ++++--
> meta/recipes-sato/webkit/webkit-gtk_svn.bb | 7 +-
> .../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 +-
> 36 files changed, 383 insertions(+), 1132 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%)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-20 22:49 ` [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Saul Wold
@ 2011-01-21 1:21 ` Zhai, Edwin
2011-01-21 1:50 ` Tian, Kevin
2011-01-21 8:57 ` Joshua Lock
0 siblings, 2 replies; 18+ messages in thread
From: Zhai, Edwin @ 2011-01-21 1:21 UTC (permalink / raw)
To: Wold, Saul; +Cc: poky@yoctoproject.org
I am always challenged by the version checking system that why not
upgrade to latest version:(
See my comments below for these packages...
Wold, Saul wrote:
> On 01/18/2011 04:46 PM, Zhai Edwin wrote:
>
>> Saul,
>> This is the 2nd pull request for gtk+,gdk-pixbuf,apr. Also added webkit-gtk.
>> Qemu upgrade is under test across all platforms, and will be out soon.
>>
>>
>
>
> Edwin,
>
> It was noticed that you updated a little too aggressively! For the
> gtk+, webkit, eds-dbus and glib, you moved to the development versions.
>
> In some open source project even releases are stable and odd releases
> are unstable, so in this case we want to go to the following:
>
> gtk+: 2.22.1
>
There is also 2.90.X there. And I treated it as development branch, and
stick to lower version.
I have compared between 2.22.1 and 2.23.2, and found no much difference.
One case is 2.23.2 support libtool 2.4, but 2.22.1 doesn't, so we may
have some autoconf issue there. Anyway, if you want to stick with stable
version， I can downgrade it to 2.22.1.
> glib: 2.26.1
>
Dongxiao owned this?
> eds-dbus: 2.32
>
My previous upgrade is 2.32.1. But with added nss/nspr, it's rejected.
Working is in progress.
> webkit-gtk 1.2.6
>
Our poky seems never has stable release, and always use development
branch. Maybe we want some new feature? RP can comment. Another benefit
is development branch is under svn, so we can selectively pick some
modules instead of big whole repo. Given development branch, there is no
even/odd difference.
I have a plan to change it to stable release with the cost of long
download & compile time, but I'm afraid can't make it in this release cycle.
> This is something we will need to review more carefully to know for sure
> which packages are even/odd stable/dev(or unstable) versioning.
>
> I will remind the whole team about this as well.
>
> Sau!
>
>
>
>> 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 (6):
>> 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
>> webkit-gtk: upgrade to 1.3.7
>>
>> meta/classes/gtk-icon-cache.bbclass | 2 +-
>> .../conf/distro/include/poky-default-revisions.inc | 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 +
>> meta/recipes-sato/webkit/files/GNUmakefile.am | 692 ++------------------
>> meta/recipes-sato/webkit/files/Makefile | 2 +-
>> meta/recipes-sato/webkit/files/autogen.sh | 2 +-
>> meta/recipes-sato/webkit/files/configure.ac | 164 ++++--
>> meta/recipes-sato/webkit/webkit-gtk_svn.bb | 7 +-
>> .../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 +-
>> 36 files changed, 383 insertions(+), 1132 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%)
>>
>> _______________________________________________
>> poky mailing list
>> poky@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/poky
>>
>>
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-21 1:21 ` Zhai, Edwin
@ 2011-01-21 1:50 ` Tian, Kevin
2011-01-21 8:36 ` Zhai, Edwin
2011-01-21 8:57 ` Joshua Lock
1 sibling, 1 reply; 18+ messages in thread
From: Tian, Kevin @ 2011-01-21 1:50 UTC (permalink / raw)
To: Zhai, Edwin, Wold, Saul; +Cc: poky@yoctoproject.org
> From: Zhai, Edwin
> Sent: Friday, January 21, 2011 9:22 AM
>
> I am always challenged by the version checking system that why not
> upgrade to latest version:(
> See my comments below for these packages...
>
> Wold, Saul wrote:
> > On 01/18/2011 04:46 PM, Zhai Edwin wrote:
> >
> >> Saul,
> >> This is the 2nd pull request for gtk+,gdk-pixbuf,apr. Also added webkit-gtk.
> >> Qemu upgrade is under test across all platforms, and will be out soon.
> >>
> >>
> >
> >
> > Edwin,
> >
> > It was noticed that you updated a little too aggressively! For the
> > gtk+, webkit, eds-dbus and glib, you moved to the development versions.
I think this is not a white-black question. Generally we choose a stable version.
If there's a reason going for development version, e.g. important security fix,
necessity to show case a new feature, etc. it still makes sense to be aggressive.
What we lack here is to have an explanation for why a version is chosen for the
upgrade commit. That way Saul/RP could get the rationale in the 1st place, and
instead of a delayed discussion like this.
So I'd propose people to start adding more info in the commit message, especially
when you choose a version for a specific reason, like what Edwin explains below.
Does it make sense?
> >
> > In some open source project even releases are stable and odd releases
> > are unstable, so in this case we want to go to the following:
> >
> > gtk+: 2.22.1
> >
>
> There is also 2.90.X there. And I treated it as development branch, and
> stick to lower version.
> I have compared between 2.22.1 and 2.23.2, and found no much difference.
> One case is 2.23.2 support libtool 2.4, but 2.22.1 doesn't, so we may
> have some autoconf issue there. Anyway, if you want to stick with stable
> version， I can downgrade it to 2.22.1.
This way I'd agree with 2.23.2 since it adds a new feature and based on your
comparison no much other changes to incur instability.
>
> > glib: 2.26.1
> >
>
> Dongxiao owned this?
> > eds-dbus: 2.32
> >
>
>
> My previous upgrade is 2.32.1. But with added nss/nspr, it's rejected.
> Working is in progress.
>
> > webkit-gtk 1.2.6
> >
>
> Our poky seems never has stable release, and always use development
> branch. Maybe we want some new feature? RP can comment. Another benefit
> is development branch is under svn, so we can selectively pick some
> modules instead of big whole repo. Given development branch, there is no
> even/odd difference.
>
> I have a plan to change it to stable release with the cost of long
> download & compile time, but I'm afraid can't make it in this release cycle.
Is it feasible to use development branch but only fetch the tag matching the stable
release? This way you get the benefit of svn while still sits in stable version.
Thanks
Kevin
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-21 1:50 ` Tian, Kevin
@ 2011-01-21 8:36 ` Zhai, Edwin
0 siblings, 0 replies; 18+ messages in thread
From: Zhai, Edwin @ 2011-01-21 8:36 UTC (permalink / raw)
To: Tian, Kevin; +Cc: poky@yoctoproject.org, Wold, Saul
Tian, Kevin wrote:
>>> webkit-gtk 1.2.6
>>>
>>>
>> Our poky seems never has stable release, and always use development
>> branch. Maybe we want some new feature? RP can comment. Another benefit
>> is development branch is under svn, so we can selectively pick some
>> modules instead of big whole repo. Given development branch, there is no
>> even/odd difference.
>>
>> I have a plan to change it to stable release with the cost of long
>> download & compile time, but I'm afraid can't make it in this release cycle.
>>
>
> Is it feasible to use development branch but only fetch the tag matching the stable
> release? This way you get the benefit of svn while still sits in stable version.
>
Stable release also has its own git tree. My understanding is all the
valuable fix and feature should be selectively backported to stable
tree. So there is no 1:1 relationship between stable and development tree:(
> Thanks
> Kevin
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-21 1:21 ` Zhai, Edwin
2011-01-21 1:50 ` Tian, Kevin
@ 2011-01-21 8:57 ` Joshua Lock
2011-01-21 9:00 ` Koen Kooi
2011-01-21 12:47 ` Richard Purdie
1 sibling, 2 replies; 18+ messages in thread
From: Joshua Lock @ 2011-01-21 8:57 UTC (permalink / raw)
To: poky
On Fri, 2011-01-21 at 09:21 +0800, Zhai, Edwin wrote:
> I am always challenged by the version checking system that why not
> upgrade to latest version:(
> See my comments below for these packages...
>
> Wold, Saul wrote:
> > On 01/18/2011 04:46 PM, Zhai Edwin wrote:
> >
> >> Saul,
> >> This is the 2nd pull request for gtk+,gdk-pixbuf,apr. Also added webkit-gtk.
> >> Qemu upgrade is under test across all platforms, and will be out soon.
> >>
> >>
> >
> >
> > Edwin,
> >
> > It was noticed that you updated a little too aggressively! For the
> > gtk+, webkit, eds-dbus and glib, you moved to the development versions.
> >
> > In some open source project even releases are stable and odd releases
> > are unstable, so in this case we want to go to the following:
> >
> > gtk+: 2.22.1
> >
>
> There is also 2.90.X there. And I treated it as development branch, and
> stick to lower version.
> I have compared between 2.22.1 and 2.23.2, and found no much difference.
> One case is 2.23.2 support libtool 2.4, but 2.22.1 doesn't, so we may
> have some autoconf issue there. Anyway, if you want to stick with stable
> version， I can downgrade it to 2.22.1.
GNOME version naming should be fairly well documented, version numbers
are split into x.y.z components.
The policy is Major.Minor.Release, with an odd minor number indicating a
development release and an even minor number indicating a stable
release.
http://live.gnome.org/ReleasePlanning/ModuleRequirements/Platform
2.90.X is the development series for Gtk+3, a major release with no ABI
guarantee to 2.x - though admittedly this seems to disagree with the
versioning scheme above.
If we're going to package 2.90.x it should be in addition to a 2.x
release, be parallel installable and the recipe be named sufficiently to
indicate that this is gtk+ 3.
The 2.23.x unstable branch is towards making a new release of Gtk+ with
the API/ABI guarantees of the 2.x series for people who are not in a
position to upgrade to Gtk+3. Most distributions will ship 2 and 3 for
at least a release or two while non-GNOME software is updated.
>
> > glib: 2.26.1
> >
>
> Dongxiao owned this?
> > eds-dbus: 2.32
> >
>
>
> My previous upgrade is 2.32.1. But with added nss/nspr, it's rejected.
> Working is in progress.
>
> > webkit-gtk 1.2.6
> >
>
> Our poky seems never has stable release, and always use development
> branch. Maybe we want some new feature? RP can comment. Another benefit
> is development branch is under svn, so we can selectively pick some
> modules instead of big whole repo. Given development branch, there is no
> even/odd difference.
>
> I have a plan to change it to stable release with the cost of long
> download & compile time, but I'm afraid can't make it in this release cycle.
I think we need someone else to own downgrading this recipe for the next
release then, we can't commit to a 6month stable cycle with an unstable
software package. Do you have a handle on potential impact of
downgrading this recipe?
IIRC only the sato browser (web-webkit) is affected by this recipe?
> > This is something we will need to review more carefully to know for sure
> > which packages are even/odd stable/dev(or unstable) versioning.
> >
> > I will remind the whole team about this as well.
> >
Cheers,
Joshua
--
Joshua Lock
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-21 8:57 ` Joshua Lock
@ 2011-01-21 9:00 ` Koen Kooi
2011-01-21 9:20 ` Joshua Lock
2011-01-21 12:47 ` Richard Purdie
1 sibling, 1 reply; 18+ messages in thread
From: Koen Kooi @ 2011-01-21 9:00 UTC (permalink / raw)
To: Joshua Lock; +Cc: poky
Op 21 jan 2011, om 09:57 heeft Joshua Lock het volgende geschreven:
> On Fri, 2011-01-21 at 09:21 +0800, Zhai, Edwin wrote:
>> I am always challenged by the version checking system that why not
>> upgrade to latest version:(
>> See my comments below for these packages...
>>
>> Wold, Saul wrote:
>>> On 01/18/2011 04:46 PM, Zhai Edwin wrote:
>>>
>>>> Saul,
>>>> This is the 2nd pull request for gtk+,gdk-pixbuf,apr. Also added webkit-gtk.
>>>> Qemu upgrade is under test across all platforms, and will be out soon.
>>>>
>>>>
>>>
>>>
>>> Edwin,
>>>
>>> It was noticed that you updated a little too aggressively! For the
>>> gtk+, webkit, eds-dbus and glib, you moved to the development versions.
>>>
>>> In some open source project even releases are stable and odd releases
>>> are unstable, so in this case we want to go to the following:
>>>
>>> gtk+: 2.22.1
>>>
>>
>> There is also 2.90.X there. And I treated it as development branch, and
>> stick to lower version.
>> I have compared between 2.22.1 and 2.23.2, and found no much difference.
>> One case is 2.23.2 support libtool 2.4, but 2.22.1 doesn't, so we may
>> have some autoconf issue there. Anyway, if you want to stick with stable
>> version， I can downgrade it to 2.22.1.
>
> GNOME version naming should be fairly well documented, version numbers
> are split into x.y.z components.
> The policy is Major.Minor.Release, with an odd minor number indicating a
> development release and an even minor number indicating a stable
> release.
>
> http://live.gnome.org/ReleasePlanning/ModuleRequirements/Platform
>
> 2.90.X is the development series for Gtk+3, a major release with no ABI
> guarantee to 2.x - though admittedly this seems to disagree with the
> versioning scheme above.
> If we're going to package 2.90.x it should be in addition to a 2.x
> release, be parallel installable and the recipe be named sufficiently to
> indicate that this is gtk+ 3.
>
> The 2.23.x unstable branch is towards making a new release of Gtk+ with
> the API/ABI guarantees of the 2.x series for people who are not in a
> position to upgrade to Gtk+3. Most distributions will ship 2 and 3 for
> at least a release or two while non-GNOME software is updated.
>
>>
>>> glib: 2.26.1
>>>
>>
>> Dongxiao owned this?
>>> eds-dbus: 2.32
>>>
>>
>>
>> My previous upgrade is 2.32.1. But with added nss/nspr, it's rejected.
>> Working is in progress.
>>
>>> webkit-gtk 1.2.6
>>>
>>
>> Our poky seems never has stable release, and always use development
>> branch. Maybe we want some new feature? RP can comment. Another benefit
>> is development branch is under svn, so we can selectively pick some
>> modules instead of big whole repo. Given development branch, there is no
>> even/odd difference.
>>
>> I have a plan to change it to stable release with the cost of long
>> download & compile time, but I'm afraid can't make it in this release cycle.
>
> I think we need someone else to own downgrading this recipe for the next
> release then, we can't commit to a 6month stable cycle with an unstable
> software package.
You might want to fix glib-2.0 as well, only a 2.27.x recipe is in yocto currently
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-21 9:00 ` Koen Kooi
@ 2011-01-21 9:20 ` Joshua Lock
0 siblings, 0 replies; 18+ messages in thread
From: Joshua Lock @ 2011-01-21 9:20 UTC (permalink / raw)
To: Koen Kooi; +Cc: poky
On Fri, 2011-01-21 at 10:00 +0100, Koen Kooi wrote:
> >> Our poky seems never has stable release, and always use development
> >> branch. Maybe we want some new feature? RP can comment. Another benefit
> >> is development branch is under svn, so we can selectively pick some
> >> modules instead of big whole repo. Given development branch, there is no
> >> even/odd difference.
> >>
> >> I have a plan to change it to stable release with the cost of long
> >> download & compile time, but I'm afraid can't make it in this release cycle.
> >
> > I think we need someone else to own downgrading this recipe for the next
> > release then, we can't commit to a 6month stable cycle with an unstable
> > software package.
>
> You might want to fix glib-2.0 as well, only a 2.27.x recipe is in yocto currently
Yes, definitely.
Cheers,
Joshua
--
Joshua Lock
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-21 8:57 ` Joshua Lock
2011-01-21 9:00 ` Koen Kooi
@ 2011-01-21 12:47 ` Richard Purdie
2011-01-21 12:58 ` Koen Kooi
1 sibling, 1 reply; 18+ messages in thread
From: Richard Purdie @ 2011-01-21 12:47 UTC (permalink / raw)
To: Joshua Lock; +Cc: poky
On Fri, 2011-01-21 at 08:57 +0000, Joshua Lock wrote:
> On Fri, 2011-01-21 at 09:21 +0800, Zhai, Edwin wrote:
> > There is also 2.90.X there. And I treated it as development branch, and
> > stick to lower version.
> > I have compared between 2.22.1 and 2.23.2, and found no much difference.
> > One case is 2.23.2 support libtool 2.4, but 2.22.1 doesn't, so we may
> > have some autoconf issue there. Anyway, if you want to stick with stable
> > version， I can downgrade it to 2.22.1.
Libtool 2.4 support is fine as we autoreconf and it doesn't have to have
it out the box.
For gtk+ we should avoid the 2.90 and 2.odd.x versions so 2.22.1 should
be the version we upgrade to.
If the package report system is saying otherwise, we need to teach it a
bit more about gnome project version numbers! :)
> GNOME version naming should be fairly well documented, version numbers
> are split into x.y.z components.
> The policy is Major.Minor.Release, with an odd minor number indicating a
> development release and an even minor number indicating a stable
> release.
>
> http://live.gnome.org/ReleasePlanning/ModuleRequirements/Platform
>
> 2.90.X is the development series for Gtk+3, a major release with no ABI
> guarantee to 2.x - though admittedly this seems to disagree with the
> versioning scheme above.
> If we're going to package 2.90.x it should be in addition to a 2.x
> release, be parallel installable and the recipe be named sufficiently to
> indicate that this is gtk+ 3.
>
> The 2.23.x unstable branch is towards making a new release of Gtk+ with
> the API/ABI guarantees of the 2.x series for people who are not in a
> position to upgrade to Gtk+3. Most distributions will ship 2 and 3 for
> at least a release or two while non-GNOME software is updated.
Right.
> > > glib: 2.26.1
> > >
> >
> > Dongxiao owned this?
Fair enough, we do need to use a stable version of glib-2.0 too though.
> > > eds-dbus: 2.32
> > >
> >
> >
> > My previous upgrade is 2.32.1. But with added nss/nspr, it's rejected.
> > Working is in progress.
I think Saul confused the message. I dropped the eds-dbus gtk+ related
patch since I didn't take the gtk+ update. I don't think there is a
problem with eds versions but again, we should stick to even release
numbers as its a gnome project.
> > > webkit-gtk 1.2.6
> > >
> >
> > Our poky seems never has stable release, and always use development
> > branch. Maybe we want some new feature? RP can comment. Another benefit
> > is development branch is under svn, so we can selectively pick some
> > modules instead of big whole repo. Given development branch, there is no
> > even/odd difference.
> >
> > I have a plan to change it to stable release with the cost of long
> > download & compile time, but I'm afraid can't make it in this release cycle.
>
> I think we need someone else to own downgrading this recipe for the next
> release then, we can't commit to a 6month stable cycle with an unstable
> software package. Do you have a handle on potential impact of
> downgrading this recipe?
>
> IIRC only the sato browser (web-webkit) is affected by this recipe?
webkit is an odd beast. My gut instinct says we're better off keeping up
to date with webkit and the 1.3.7 version is ok in this case. I don't
know how "old" 1.2.6 is and how unstable the 1.3 series is though. For
what we use it for (web-webkit), 1.3.7 is probably fine?
Cheers,
Richard
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-21 12:47 ` Richard Purdie
@ 2011-01-21 12:58 ` Koen Kooi
2011-01-21 13:42 ` Richard Purdie
0 siblings, 1 reply; 18+ messages in thread
From: Koen Kooi @ 2011-01-21 12:58 UTC (permalink / raw)
To: Richard Purdie; +Cc: poky
Op 21 jan 2011, om 13:47 heeft Richard Purdie het volgende geschreven:
> On Fri, 2011-01-21 at 08:57 +0000, Joshua Lock wrote:
>> On Fri, 2011-01-21 at 09:21 +0800, Zhai, Edwin wrote:
>
>>>> webkit-gtk 1.2.6
>>>>
>>>
>>> Our poky seems never has stable release, and always use development
>>> branch. Maybe we want some new feature? RP can comment. Another benefit
>>> is development branch is under svn, so we can selectively pick some
>>> modules instead of big whole repo. Given development branch, there is no
>>> even/odd difference.
>>>
>>> I have a plan to change it to stable release with the cost of long
>>> download & compile time, but I'm afraid can't make it in this release cycle.
>>
>> I think we need someone else to own downgrading this recipe for the next
>> release then, we can't commit to a 6month stable cycle with an unstable
>> software package. Do you have a handle on potential impact of
>> downgrading this recipe?
>>
>> IIRC only the sato browser (web-webkit) is affected by this recipe?
>
> webkit is an odd beast. My gut instinct says we're better off keeping up
> to date with webkit and the 1.3.7 version is ok in this case. I don't
> know how "old" 1.2.6 is and how unstable the 1.3 series is though. For
> what we use it for (web-webkit), 1.3.7 is probably fine?
The version is largely concerned with the GTK glue, not really with the underlying core webkit stuff. There is an SONAME change (webkit -> webkitgtk) in the 1.3.x series that would be nice to have, since it fixes namespacing issues when trying to use both webkit-gtk and webkit-efl. 1.3.x has been treating me well in angstrom so far.
regards,
Koen
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-21 12:58 ` Koen Kooi
@ 2011-01-21 13:42 ` Richard Purdie
0 siblings, 0 replies; 18+ messages in thread
From: Richard Purdie @ 2011-01-21 13:42 UTC (permalink / raw)
To: Koen Kooi; +Cc: poky
On Fri, 2011-01-21 at 13:58 +0100, Koen Kooi wrote:
> Op 21 jan 2011, om 13:47 heeft Richard Purdie het volgende geschreven:
>
> > On Fri, 2011-01-21 at 08:57 +0000, Joshua Lock wrote:
> >> On Fri, 2011-01-21 at 09:21 +0800, Zhai, Edwin wrote:
> >
> >>>> webkit-gtk 1.2.6
> >>>>
> >>>
> >>> Our poky seems never has stable release, and always use development
> >>> branch. Maybe we want some new feature? RP can comment. Another benefit
> >>> is development branch is under svn, so we can selectively pick some
> >>> modules instead of big whole repo. Given development branch, there is no
> >>> even/odd difference.
> >>>
> >>> I have a plan to change it to stable release with the cost of long
> >>> download & compile time, but I'm afraid can't make it in this release cycle.
> >>
> >> I think we need someone else to own downgrading this recipe for the next
> >> release then, we can't commit to a 6month stable cycle with an unstable
> >> software package. Do you have a handle on potential impact of
> >> downgrading this recipe?
> >>
> >> IIRC only the sato browser (web-webkit) is affected by this recipe?
> >
> > webkit is an odd beast. My gut instinct says we're better off keeping up
> > to date with webkit and the 1.3.7 version is ok in this case. I don't
> > know how "old" 1.2.6 is and how unstable the 1.3 series is though. For
> > what we use it for (web-webkit), 1.3.7 is probably fine?
>
> The version is largely concerned with the GTK glue, not really with
> the underlying core webkit stuff. There is an SONAME change (webkit ->
> webkitgtk) in the 1.3.x series that would be nice to have, since it
> fixes namespacing issues when trying to use both webkit-gtk and
> webkit-efl. 1.3.x has been treating me well in angstrom so far.
Ok, that sounds like good reasoning to me. Lets stick with the 1.3.x
version in this case, an exception to the general rule but I think its a
reasonable one.
Cheers,
Richard
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011
2011-01-19 0:46 [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Zhai Edwin
` (6 preceding siblings ...)
2011-01-20 22:49 ` [PATCH 0/6] 2nd pull request: UX, gtk+/apr, Edwin, Jan19, 2011 Saul Wold
@ 2011-01-24 5:04 ` Saul Wold
7 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2011-01-24 5:04 UTC (permalink / raw)
To: Zhai Edwin; +Cc: poky
On 01/18/2011 04:46 PM, Zhai Edwin wrote:
> Saul,
> This is the 2nd pull request for gtk+,gdk-pixbuf,apr. Also added webkit-gtk.
> Qemu upgrade is under test across all platforms, and will be out soon.
>
> 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 (6):
> 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
> webkit-gtk: upgrade to 1.3.7
>
Partial pull, as already stated, we do not want to update to the
development releases of gtk+ and eds-dbus.
I have pulled the gdk-pixbug and apr* changes.
Thanks
Sau!
> meta/classes/gtk-icon-cache.bbclass | 2 +-
> .../conf/distro/include/poky-default-revisions.inc | 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 +
> meta/recipes-sato/webkit/files/GNUmakefile.am | 692 ++------------------
> meta/recipes-sato/webkit/files/Makefile | 2 +-
> meta/recipes-sato/webkit/files/autogen.sh | 2 +-
> meta/recipes-sato/webkit/files/configure.ac | 164 ++++--
> meta/recipes-sato/webkit/webkit-gtk_svn.bb | 7 +-
> .../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 +-
> 36 files changed, 383 insertions(+), 1132 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%)
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
^ permalink raw reply [flat|nested] 18+ messages in thread