* [WIP][PATCH 0/9] Glib related upgrades
@ 2011-09-30 15:43 Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 1/9] atk: add patch to replace G_CONST_RETURN with const Martin Jansa
` (10 more replies)
0 siblings, 11 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
We were using 2.29.3+git% from meta-oe and after upgrade to 2.30.0 I was hit
by few G_CONST_RETURN and other issues due to newer glib. Here is what I have
now to build shr images OK again, but probably there is more recipes which need
upgrade/fix to cope with glib-2.30.0.
Someone who cares about gnome should continue from this, but IMHO this is good start :).
The following changes since commit c54c1280fc0d06a53e23339c3913ec88eead13d9:
base.bbclass: Drop unneeded dependency (2011-09-30 11:34:44 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/glib
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/glib
Martin Jansa (9):
atk: add patch to replace G_CONST_RETURN with const
json-glib: upgrade to 0.14.0
libproxy: upgrade to 0.4.7
libglade: add gdk-pixbuf dependency
gstreamer: upgrade to 0.10.35
zlib: fix inverted LFS logic
gdk-pixbuf: upgrade to 2.24.6
glib: upgrade to 2.30.0
gtk+: upgrade to 2.24.6
...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -
.../0005-glib-mkenums-interpreter.patch.patch | 25 -
.../60_wait-longer-for-threads-to-die.patch | 24 +-
meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 2 -
.../glib-2.0/remove.test.for.qsort_r.patch | 53 ++
meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 -
meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 ++
.../zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch | 20 +
meta/recipes-core/zlib/zlib_1.2.5.bb | 5 +-
.../configure_fix.patch | 0
.../hardcoded_libtool.patch | 0
.../{gdk-pixbuf_2.22.1.bb => gdk-pixbuf_2.24.0.bb} | 7 +-
...Duplicate-the-exec-string-returned-by-gtk.patch | 0
.../cellrenderer-cairo.patch | 0
.../configurefix.patch | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/doc-fixes.patch | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/entry-cairo.patch | 0
.../hardcoded_libtool.patch | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/no-demos.patch | 0
.../run-iconcache.patch | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/toggle-font.diff | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/xsettings.patch | 0
.../gtk+/{gtk+_2.22.1.bb => gtk+_2.24.6.bb} | 8 +-
.../{json-glib_0.12.4.bb => json-glib_0.14.0.bb} | 8 +-
meta/recipes-gnome/libglade/libglade_2.6.4.bb | 2 +-
.../check_fix.patch | 0
.../gst-inspect-check-error.patch | 0
.../gstregistrybinary.c | 0
.../gstregistrybinary.h | 0
.../{gstreamer_0.10.32.bb => gstreamer_0.10.35.bb} | 6 +-
.../atk/atk-1.32.0/remove.G_CONST_RETURN.patch | 628 ++++++++++++++++++++
meta/recipes-support/atk/atk_1.32.0.bb | 5 +-
.../{libproxy_0.4.6.bb => libproxy_0.4.7.bb} | 6 +-
33 files changed, 775 insertions(+), 116 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
create mode 100644 meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.22.1 => gdk-pixbuf-2.24.0}/configure_fix.patch (100%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.22.1 => gdk-pixbuf-2.24.0}/hardcoded_libtool.patch (100%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.22.1.bb => gdk-pixbuf_2.24.0.bb} (92%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/cellrenderer-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/configurefix.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/doc-fixes.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/entry-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/hardcoded_libtool.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/no-demos.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/run-iconcache.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/toggle-font.diff (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/xsettings.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+_2.22.1.bb => gtk+_2.24.6.bb} (90%)
rename meta/recipes-gnome/json-glib/{json-glib_0.12.4.bb => json-glib_0.14.0.bb} (74%)
rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/check_fix.patch (100%)
rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gst-inspect-check-error.patch (100%)
rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gstregistrybinary.c (100%)
rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gstregistrybinary.h (100%)
rename meta/recipes-multimedia/gstreamer/{gstreamer_0.10.32.bb => gstreamer_0.10.35.bb} (90%)
create mode 100644 meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
rename meta/recipes-support/libproxy/{libproxy_0.4.6.bb => libproxy_0.4.7.bb} (85%)
--
1.7.6.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* [WIP][PATCH 1/9] atk: add patch to replace G_CONST_RETURN with const
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-09-30 18:25 ` [PATCHv2] " Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 2/9] json-glib: upgrade to 0.14.0 Martin Jansa
` (9 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
* otherwise build fails when glib is 2.30.0 or newer (and G_DISABLE_DEPRECATED is enabled - like in atk)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../atk/atk-1.32.0/remove.G_CONST_RETURN.patch | 628 ++++++++++++++++++++
meta/recipes-support/atk/atk_1.32.0.bb | 5 +-
2 files changed, 632 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
diff --git a/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch b/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
new file mode 100644
index 0000000..0cdf041
--- /dev/null
+++ b/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
@@ -0,0 +1,628 @@
+Upstream-Status: Accepted
+
+Similar patch is already included in 2.0.1 and newer
+http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.news
+
+diff -uNr atk-1.32.0.orig/atk/atkaction.c atk-1.32.0/atk/atkaction.c
+--- atk-1.32.0.orig/atk/atkaction.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkaction.c 2011-09-30 10:29:49.896997586 +0200
+@@ -101,7 +101,7 @@
+ * Returns a description string, or %NULL
+ * if @action does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_description (AtkAction *obj,
+ gint i)
+ {
+@@ -140,7 +140,7 @@
+ * Returns a name string, or %NULL
+ * if @action does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_name (AtkAction *obj,
+ gint i)
+ {
+@@ -166,7 +166,7 @@
+ * Returns a name string, or %NULL
+ * if @action does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_localized_name (AtkAction *obj,
+ gint i)
+ {
+@@ -203,7 +203,7 @@
+ * if there is no keybinding for this action.
+ *
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_keybinding (AtkAction *obj,
+ gint i)
+ {
+diff -uNr atk-1.32.0.orig/atk/atkaction.h atk-1.32.0/atk/atkaction.h
+--- atk-1.32.0.orig/atk/atkaction.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkaction.h 2011-09-30 10:29:49.897997588 +0200
+@@ -55,16 +55,16 @@
+ gboolean (*do_action) (AtkAction *action,
+ gint i);
+ gint (*get_n_actions) (AtkAction *action);
+- G_CONST_RETURN gchar* (*get_description) (AtkAction *action,
++ const gchar* (*get_description) (AtkAction *action,
+ gint i);
+- G_CONST_RETURN gchar* (*get_name) (AtkAction *action,
++ const gchar* (*get_name) (AtkAction *action,
+ gint i);
+- G_CONST_RETURN gchar* (*get_keybinding) (AtkAction *action,
++ const gchar* (*get_keybinding) (AtkAction *action,
+ gint i);
+ gboolean (*set_description) (AtkAction *action,
+ gint i,
+ const gchar *desc);
+- G_CONST_RETURN gchar* (*get_localized_name)(AtkAction *action,
++ const gchar* (*get_localized_name)(AtkAction *action,
+ gint i);
+ AtkFunction pad2;
+ };
+@@ -85,11 +85,11 @@
+ gboolean atk_action_do_action (AtkAction *action,
+ gint i);
+ gint atk_action_get_n_actions (AtkAction *action);
+-G_CONST_RETURN gchar* atk_action_get_description (AtkAction *action,
++const gchar* atk_action_get_description (AtkAction *action,
+ gint i);
+-G_CONST_RETURN gchar* atk_action_get_name (AtkAction *action,
++const gchar* atk_action_get_name (AtkAction *action,
+ gint i);
+-G_CONST_RETURN gchar* atk_action_get_keybinding (AtkAction *action,
++const gchar* atk_action_get_keybinding (AtkAction *action,
+ gint i);
+ gboolean atk_action_set_description (AtkAction *action,
+ gint i,
+@@ -97,7 +97,7 @@
+
+ /* NEW in ATK 1.1: */
+
+-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction *action,
++const gchar* atk_action_get_localized_name (AtkAction *action,
+ gint i);
+
+ /*
+diff -uNr atk-1.32.0.orig/atk/atkdocument.c atk-1.32.0/atk/atkdocument.c
+--- atk-1.32.0.orig/atk/atkdocument.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkdocument.c 2011-09-30 10:29:49.898997588 +0200
+@@ -93,7 +93,7 @@
+ *
+ * Returns: a string indicating the document type
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_document_get_document_type (AtkDocument *document)
+ {
+ AtkDocumentIface *iface;
+@@ -155,7 +155,7 @@
+ * locale of the document content as a whole, or NULL if
+ * the document content does not specify a locale.
+ **/
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_document_get_locale (AtkDocument *document)
+ {
+ AtkDocumentIface *iface;
+@@ -219,7 +219,7 @@
+ * document, or NULL if a value for #attribute_name has not been specified
+ * for this document.
+ */
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_document_get_attribute_value (AtkDocument *document,
+ const gchar *attribute_name)
+ {
+diff -uNr atk-1.32.0.orig/atk/atkdocument.h atk-1.32.0/atk/atkdocument.h
+--- atk-1.32.0.orig/atk/atkdocument.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkdocument.h 2011-09-30 10:29:49.899997588 +0200
+@@ -49,12 +49,12 @@
+ struct _AtkDocumentIface
+ {
+ GTypeInterface parent;
+- G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument *document);
++ const gchar* ( *get_document_type) (AtkDocument *document);
+ gpointer ( *get_document) (AtkDocument *document);
+
+- G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument *document);
++ const gchar* ( *get_document_locale) (AtkDocument *document);
+ AtkAttributeSet * ( *get_document_attributes) (AtkDocument *document);
+- G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument *document,
++ const gchar* ( *get_document_attribute_value) (AtkDocument *document,
+ const gchar *attribute_name);
+ gboolean ( *set_document_attribute) (AtkDocument *document,
+ const gchar *attribute_name,
+@@ -68,11 +68,11 @@
+
+ GType atk_document_get_type (void);
+
+-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument *document);
++const gchar* atk_document_get_document_type (AtkDocument *document);
+ gpointer atk_document_get_document (AtkDocument *document);
+-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
++const gchar* atk_document_get_locale (AtkDocument *document);
+ AtkAttributeSet* atk_document_get_attributes (AtkDocument *document);
+-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document,
++const gchar* atk_document_get_attribute_value (AtkDocument *document,
+ const gchar *attribute_name);
+ gboolean atk_document_set_attribute_value (AtkDocument *document,
+ const gchar *attribute_name,
+diff -uNr atk-1.32.0.orig/atk/atkimage.c atk-1.32.0/atk/atkimage.c
+--- atk-1.32.0.orig/atk/atkimage.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkimage.c 2011-09-30 10:29:49.900997587 +0200
+@@ -46,7 +46,7 @@
+ *
+ * Returns: a string representing the image description
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_image_get_image_description (AtkImage *image)
+ {
+ AtkImageIface *iface;
+@@ -192,7 +192,7 @@
+ * Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale.
+ *
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_image_get_image_locale (AtkImage *image)
+ {
+
+diff -uNr atk-1.32.0.orig/atk/atkimage.h atk-1.32.0/atk/atkimage.h
+--- atk-1.32.0.orig/atk/atkimage.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkimage.h 2011-09-30 10:29:49.901997587 +0200
+@@ -53,13 +53,13 @@
+ gint *x,
+ gint *y,
+ AtkCoordType coord_type);
+- G_CONST_RETURN gchar* ( *get_image_description) (AtkImage *image);
++ const gchar* ( *get_image_description) (AtkImage *image);
+ void ( *get_image_size) (AtkImage *image,
+ gint *width,
+ gint *height);
+ gboolean ( *set_image_description) (AtkImage *image,
+ const gchar *description);
+- G_CONST_RETURN gchar* ( *get_image_locale) (AtkImage *image);
++ const gchar* ( *get_image_locale) (AtkImage *image);
+
+ AtkFunction pad1;
+
+@@ -67,7 +67,7 @@
+
+ GType atk_image_get_type (void);
+
+-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage *image);
++const gchar* atk_image_get_image_description (AtkImage *image);
+
+ void atk_image_get_image_size (AtkImage *image,
+ gint *width,
+@@ -80,7 +80,7 @@
+ gint *y,
+ AtkCoordType coord_type);
+
+-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage *image);
++const gchar* atk_image_get_image_locale (AtkImage *image);
+
+ G_END_DECLS
+
+diff -uNr atk-1.32.0.orig/atk/atkobject.c atk-1.32.0/atk/atkobject.c
+--- atk-1.32.0.orig/atk/atkobject.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkobject.c 2011-09-30 10:29:49.905997587 +0200
+@@ -285,9 +285,9 @@
+ GValue *value,
+ GParamSpec *pspec);
+ static void atk_object_finalize (GObject *object);
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_name (AtkObject *object);
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_description
+ (AtkObject *object);
+ static AtkObject* atk_object_real_get_parent (AtkObject *object);
+@@ -692,7 +692,7 @@
+ *
+ * Returns: a character string representing the accessible name of the object.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_object_get_name (AtkObject *accessible)
+ {
+ AtkObjectClass *klass;
+@@ -716,7 +716,7 @@
+ * of the accessible.
+ *
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_object_get_description (AtkObject *accessible)
+ {
+ AtkObjectClass *klass;
+@@ -1123,7 +1123,7 @@
+ AtkState state,
+ gboolean value)
+ {
+- G_CONST_RETURN gchar* name;
++ const gchar* name;
+
+ g_return_if_fail (ATK_IS_OBJECT (accessible));
+
+@@ -1319,13 +1319,13 @@
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_name (AtkObject *object)
+ {
+ return object->name;
+ }
+
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_description (AtkObject *object)
+ {
+ return object->description;
+@@ -1487,7 +1487,7 @@
+ *
+ * Returns: the string describing the AtkRole
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_role_get_name (AtkRole role)
+ {
+ if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
+@@ -1514,7 +1514,7 @@
+ *
+ * Returns: the localized string describing the AtkRole
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_role_get_localized_name (AtkRole role)
+ {
+ gettext_initialization ();
+diff -uNr atk-1.32.0.orig/atk/atkobject.h atk-1.32.0/atk/atkobject.h
+--- atk-1.32.0.orig/atk/atkobject.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkobject.h 2011-09-30 10:29:49.907997585 +0200
+@@ -381,11 +381,11 @@
+ /*
+ * Gets the accessible name of the object
+ */
+- G_CONST_RETURN gchar* (* get_name) (AtkObject *accessible);
++ const gchar* (* get_name) (AtkObject *accessible);
+ /*
+ * Gets the accessible description of the object
+ */
+- G_CONST_RETURN gchar* (* get_description) (AtkObject *accessible);
++ const gchar* (* get_description) (AtkObject *accessible);
+ /*
+ * Gets the accessible parent of the object
+ */
+@@ -535,8 +535,8 @@
+ * Properties directly supported by AtkObject
+ */
+
+-G_CONST_RETURN gchar* atk_object_get_name (AtkObject *accessible);
+-G_CONST_RETURN gchar* atk_object_get_description (AtkObject *accessible);
++const gchar* atk_object_get_name (AtkObject *accessible);
++const gchar* atk_object_get_description (AtkObject *accessible);
+ AtkObject* atk_object_get_parent (AtkObject *accessible);
+ gint atk_object_get_n_accessible_children (AtkObject *accessible);
+ AtkObject* atk_object_ref_accessible_child (AtkObject *accessible,
+@@ -571,7 +571,7 @@
+ void atk_object_initialize (AtkObject *accessible,
+ gpointer data);
+
+-G_CONST_RETURN gchar* atk_role_get_name (AtkRole role);
++const gchar* atk_role_get_name (AtkRole role);
+ AtkRole atk_role_for_name (const gchar *name);
+
+
+@@ -582,7 +582,7 @@
+ gboolean atk_object_remove_relationship (AtkObject *object,
+ AtkRelationType relationship,
+ AtkObject *target);
+-G_CONST_RETURN gchar* atk_role_get_localized_name (AtkRole role);
++const gchar* atk_role_get_localized_name (AtkRole role);
+
+ /* */
+
+diff -uNr atk-1.32.0.orig/atk/atkrelation.c atk-1.32.0/atk/atkrelation.c
+--- atk-1.32.0.orig/atk/atkrelation.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkrelation.c 2011-09-30 10:29:49.908997585 +0200
+@@ -130,7 +130,7 @@
+ *
+ * Returns: the string describing the AtkRelationType
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_relation_type_get_name (AtkRelationType type)
+ {
+ GTypeClass *type_class;
+diff -uNr atk-1.32.0.orig/atk/atkrelation.h atk-1.32.0/atk/atkrelation.h
+--- atk-1.32.0.orig/atk/atkrelation.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkrelation.h 2011-09-30 10:29:49.909997586 +0200
+@@ -61,7 +61,7 @@
+ GType atk_relation_get_type (void);
+
+ AtkRelationType atk_relation_type_register (const gchar *name);
+-G_CONST_RETURN gchar* atk_relation_type_get_name (AtkRelationType type);
++const gchar* atk_relation_type_get_name (AtkRelationType type);
+ AtkRelationType atk_relation_type_for_name (const gchar *name);
+
+ /*
+diff -uNr atk-1.32.0.orig/atk/atkstate.c atk-1.32.0/atk/atkstate.c
+--- atk-1.32.0.orig/atk/atkstate.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkstate.c 2011-09-30 10:29:49.910997587 +0200
+@@ -57,7 +57,7 @@
+ *
+ * Returns: the string describing the AtkStateType
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_state_type_get_name (AtkStateType type)
+ {
+ GTypeClass *type_class;
+diff -uNr atk-1.32.0.orig/atk/atkstate.h atk-1.32.0/atk/atkstate.h
+--- atk-1.32.0.orig/atk/atkstate.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkstate.h 2011-09-30 10:29:49.911997587 +0200
+@@ -170,7 +170,7 @@
+
+ AtkStateType atk_state_type_register (const gchar *name);
+
+-G_CONST_RETURN gchar* atk_state_type_get_name (AtkStateType type);
++const gchar* atk_state_type_get_name (AtkStateType type);
+ AtkStateType atk_state_type_for_name (const gchar *name);
+
+ G_END_DECLS
+diff -uNr atk-1.32.0.orig/atk/atkstreamablecontent.c atk-1.32.0/atk/atkstreamablecontent.c
+--- atk-1.32.0.orig/atk/atkstreamablecontent.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkstreamablecontent.c 2011-09-30 10:29:49.912997587 +0200
+@@ -73,7 +73,7 @@
+ * Returns : a gchar* representing the specified mime type; the caller
+ * should not free the character string.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+ gint i)
+ {
+diff -uNr atk-1.32.0.orig/atk/atkstreamablecontent.h atk-1.32.0/atk/atkstreamablecontent.h
+--- atk-1.32.0.orig/atk/atkstreamablecontent.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkstreamablecontent.h 2011-09-30 10:29:49.913997587 +0200
+@@ -54,11 +54,11 @@
+ * at index 0 should be considered the "default" data type for the stream.
+ *
+ * This assumes that the strings for the mime types are stored in the
+- * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
++ * AtkStreamableContent. Alternatively the const could be removed
+ * and the caller would be responsible for calling g_free() on the
+ * returned value.
+ */
+- G_CONST_RETURN gchar* (* get_mime_type) (AtkStreamableContent *streamable,
++ const gchar* (* get_mime_type) (AtkStreamableContent *streamable,
+ gint i);
+ /*
+ * One possible implementation for this method is that it constructs the
+@@ -80,7 +80,7 @@
+ * constructed. Note that it is possible for get_uri to return NULL but for
+ * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
+ */
+- G_CONST_RETURN gchar* (* get_uri) (AtkStreamableContent *streamable,
++ const gchar* (* get_uri) (AtkStreamableContent *streamable,
+ const gchar *mime_type);
+
+
+@@ -92,7 +92,7 @@
+
+ gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable);
+
+-G_CONST_RETURN gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
++const gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+ gint i);
+ GIOChannel* atk_streamable_content_get_stream (AtkStreamableContent *streamable,
+ const gchar *mime_type);
+diff -uNr atk-1.32.0.orig/atk/atktable.c atk-1.32.0/atk/atktable.c
+--- atk-1.32.0.orig/atk/atktable.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atktable.c 2011-09-30 10:29:49.915997586 +0200
+@@ -300,7 +300,7 @@
+ * Returns: a gchar* representing the column description, or %NULL
+ * if value does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_column_description (AtkTable *table,
+ gint column)
+ {
+@@ -404,7 +404,7 @@
+ * Returns: a gchar* representing the row description, or %NULL
+ * if value does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_row_description (AtkTable *table,
+ gint row)
+ {
+diff -uNr atk-1.32.0.orig/atk/atktable.h atk-1.32.0/atk/atktable.h
+--- atk-1.32.0.orig/atk/atktable.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atktable.h 2011-09-30 10:29:49.916997586 +0200
+@@ -69,12 +69,12 @@
+ gint column);
+ AtkObject*
+ (* get_caption) (AtkTable *table);
+- G_CONST_RETURN gchar*
++ const gchar*
+ (* get_column_description) (AtkTable *table,
+ gint column);
+ AtkObject* (* get_column_header) (AtkTable *table,
+ gint column);
+- G_CONST_RETURN gchar*
++ const gchar*
+ (* get_row_description) (AtkTable *table,
+ gint row);
+ AtkObject* (* get_row_header) (AtkTable *table,
+@@ -163,12 +163,12 @@
+ gint column);
+ AtkObject*
+ atk_table_get_caption (AtkTable *table);
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_column_description (AtkTable *table,
+ gint column);
+ AtkObject* atk_table_get_column_header (AtkTable *table,
+ gint column);
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_row_description (AtkTable *table,
+ gint row);
+ AtkObject* atk_table_get_row_header (AtkTable *table,
+diff -uNr atk-1.32.0.orig/atk/atktext.c atk-1.32.0/atk/atktext.c
+--- atk-1.32.0.orig/atk/atktext.c 2010-09-27 09:07:09.000000000 +0200
++++ atk-1.32.0/atk/atktext.c 2011-09-30 10:29:49.919997586 +0200
+@@ -1054,7 +1054,7 @@
+ *
+ * Returns: a string containing the name; this string should not be freed
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_text_attribute_get_name (AtkTextAttribute attr)
+ {
+ GTypeClass *type_class;
+@@ -1150,7 +1150,7 @@
+ * Returns: a string containing the value; this string should not be freed;
+ * NULL is returned if there are no values maintained for the attr value.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_text_attribute_get_value (AtkTextAttribute attr,
+ gint index)
+ {
+diff -uNr atk-1.32.0.orig/atk/atktext.h atk-1.32.0/atk/atktext.h
+--- atk-1.32.0.orig/atk/atktext.h 2010-09-27 09:07:09.000000000 +0200
++++ atk-1.32.0/atk/atktext.h 2011-09-30 10:29:49.921997586 +0200
+@@ -355,9 +355,9 @@
+ AtkTextClipType y_clip_type);
+ void atk_text_free_ranges (AtkTextRange **ranges);
+ void atk_attribute_set_free (AtkAttributeSet *attrib_set);
+-G_CONST_RETURN gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
++const gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
+ AtkTextAttribute atk_text_attribute_for_name (const gchar *name);
+-G_CONST_RETURN gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
++const gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
+ gint index_);
+
+ G_END_DECLS
+diff -uNr atk-1.32.0.orig/atk/atkutil.c atk-1.32.0/atk/atkutil.c
+--- atk-1.32.0.orig/atk/atkutil.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkutil.c 2011-09-30 10:29:49.922997586 +0200
+@@ -340,7 +340,7 @@
+ *
+ * Returns: name string for the GUI toolkit implementing ATK for this application
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_get_toolkit_name (void)
+ {
+ const gchar *retval;
+@@ -365,7 +365,7 @@
+ *
+ * Returns: version string for the GUI toolkit implementing ATK for this application
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_get_toolkit_version (void)
+ {
+ const gchar *retval;
+@@ -391,7 +391,7 @@
+ * Returns: version string for ATK
+ **/
+
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_get_version (void)
+ {
+ return VERSION;
+diff -uNr atk-1.32.0.orig/atk/atkutil.h atk-1.32.0/atk/atkutil.h
+--- atk-1.32.0.orig/atk/atkutil.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkutil.h 2011-09-30 10:29:49.923997586 +0200
+@@ -147,8 +147,8 @@
+ gpointer data);
+ void (* remove_key_event_listener) (guint listener_id);
+ AtkObject* (* get_root) (void);
+- G_CONST_RETURN gchar* (* get_toolkit_name) (void);
+- G_CONST_RETURN gchar* (* get_toolkit_version) (void);
++ const gchar* (* get_toolkit_name) (void);
++ const gchar* (* get_toolkit_version) (void);
+ };
+ GType atk_util_get_type (void);
+
+@@ -229,17 +229,17 @@
+ /*
+ * Returns name string for the GUI toolkit.
+ */
+-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
++const gchar *atk_get_toolkit_name (void);
+
+ /*
+ * Returns version string for the GUI toolkit.
+ */
+-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
++const gchar *atk_get_toolkit_version (void);
+
+ /*
+ * Gets the current version of ATK
+ */
+-G_CONST_RETURN gchar *atk_get_version (void);
++const gchar *atk_get_version (void);
+
+ /* --- GType boilerplate --- */
+ /* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
+diff -uNr atk-1.32.0.orig/tests/testrelation.c atk-1.32.0/tests/testrelation.c
+--- atk-1.32.0.orig/tests/testrelation.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/tests/testrelation.c 2011-09-30 10:29:49.924997586 +0200
+@@ -28,7 +28,7 @@
+ test_relation (void)
+ {
+ AtkRelationType type1, type2;
+- G_CONST_RETURN gchar *name;
++ const gchar *name;
+ AtkObject *obj;
+ gboolean ret_value;
+ AtkRelationSet *set;
+@@ -169,7 +169,7 @@
+ test_role (void)
+ {
+ AtkRole role1, role2;
+- G_CONST_RETURN gchar *name;
++ const gchar *name;
+
+ name = atk_role_get_name (ATK_ROLE_PAGE_TAB);
+ g_return_val_if_fail (name, FALSE);
+@@ -230,7 +230,7 @@
+ test_text_attr (void)
+ {
+ AtkTextAttribute attr1, attr2;
+- G_CONST_RETURN gchar *name;
++ const gchar *name;
+
+ name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP);
+ g_return_val_if_fail (name, FALSE);
+diff -uNr atk-1.32.0.orig/tests/teststateset.c atk-1.32.0/tests/teststateset.c
+--- atk-1.32.0.orig/tests/teststateset.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/tests/teststateset.c 2011-09-30 10:29:49.926997586 +0200
+@@ -208,7 +208,7 @@
+ test_state (void)
+ {
+ AtkStateType type1, type2;
+- G_CONST_RETURN gchar *name;
++ const gchar *name;
+
+ name = atk_state_type_get_name (ATK_STATE_VISIBLE);
+ g_return_val_if_fail (name, FALSE);
diff --git a/meta/recipes-support/atk/atk_1.32.0.bb b/meta/recipes-support/atk/atk_1.32.0.bb
index e6883eb..db8ca1f 100644
--- a/meta/recipes-support/atk/atk_1.32.0.bb
+++ b/meta/recipes-support/atk/atk_1.32.0.bb
@@ -4,7 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
-SRC_URI = "http://download.gnome.org/sources/atk/1.32/${BPN}-${PV}.tar.bz2"
+PR = "r1"
+SRC_URI = "http://download.gnome.org/sources/atk/1.32/${BPN}-${PV}.tar.bz2 \
+ file://remove.G_CONST_RETURN.patch \
+"
SRC_URI[md5sum] = "b9a19a3e426cd9ca930f0108c4ee343f"
SRC_URI[sha256sum] = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [WIP][PATCH 2/9] json-glib: upgrade to 0.14.0
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 1/9] atk: add patch to replace G_CONST_RETURN with const Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 3/9] libproxy: upgrade to 0.4.7 Martin Jansa
` (8 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
* 0.12.4 fails to build with glib-2.30.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../{json-glib_0.12.4.bb => json-glib_0.14.0.bb} | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-gnome/json-glib/{json-glib_0.12.4.bb => json-glib_0.14.0.bb} (74%)
diff --git a/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb b/meta/recipes-gnome/json-glib/json-glib_0.14.0.bb
similarity index 74%
rename from meta/recipes-gnome/json-glib/json-glib_0.12.4.bb
rename to meta/recipes-gnome/json-glib/json-glib_0.14.0.bb
index 5bd9dcd..8635bf0 100644
--- a/meta/recipes-gnome/json-glib/json-glib_0.12.4.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_0.14.0.bb
@@ -10,11 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "glib-2.0"
-SRC_URI[archive.md5sum] = "347e1714e4a2ce54298969d5ffec7dca"
-SRC_URI[archive.sha256sum] = "462cd611016ae189d5e3f258dc7741e6a2e8267404b4e3806aaf346d50f1df7e"
+SRC_URI[archive.md5sum] = "6ba14cc2cc9582250451ff645c20a779"
+SRC_URI[archive.sha256sum] = "efa6a22711c99208feef3bdcd6692573640ac7635725417024980b80990a2966"
-PR = "r0"
-
-inherit gnome
+inherit gnome gettext
EXTRA_OECONF = "--disable-introspection"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [WIP][PATCH 3/9] libproxy: upgrade to 0.4.7
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 1/9] atk: add patch to replace G_CONST_RETURN with const Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 2/9] json-glib: upgrade to 0.14.0 Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 4/9] libglade: add gdk-pixbuf dependency Martin Jansa
` (7 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../{libproxy_0.4.6.bb => libproxy_0.4.7.bb} | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-support/libproxy/{libproxy_0.4.6.bb => libproxy_0.4.7.bb} (85%)
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.6.bb b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
similarity index 85%
rename from meta/recipes-support/libproxy/libproxy_0.4.6.bb
rename to meta/recipes-support/libproxy/libproxy_0.4.7.bb
index d907c55..2793b41 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.6.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb
@@ -11,10 +11,8 @@ DEPENDS = "gconf"
SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
-SRC_URI[md5sum] = "199c6b120baf1f7258a55f38d5ec74f5"
-SRC_URI[sha256sum] = "9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30"
-
-PR = "r2"
+SRC_URI[md5sum] = "509e03a488a61cd62bfbaf3ab6a2a7a5"
+SRC_URI[sha256sum] = "8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797"
inherit cmake pkgconfig
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [WIP][PATCH 4/9] libglade: add gdk-pixbuf dependency
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
` (2 preceding siblings ...)
2011-09-30 15:43 ` [WIP][PATCH 3/9] libproxy: upgrade to 0.4.7 Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 5/9] gstreamer: upgrade to 0.10.35 Martin Jansa
` (6 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-gnome/libglade/libglade_2.6.4.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-gnome/libglade/libglade_2.6.4.bb b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
index b0e0339..90a7b33 100644
--- a/meta/recipes-gnome/libglade/libglade_2.6.4.bb
+++ b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
SECTION = "libs"
PR = "r1"
-DEPENDS = "gtk+ gtk-doc-native"
+DEPENDS = "gdk-pixbuf gtk+ gtk-doc-native"
inherit autotools pkgconfig gnome
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [WIP][PATCH 5/9] gstreamer: upgrade to 0.10.35
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
` (3 preceding siblings ...)
2011-09-30 15:43 ` [WIP][PATCH 4/9] libglade: add gdk-pixbuf dependency Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 6/9] zlib: fix inverted LFS logic Martin Jansa
` (5 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../check_fix.patch | 0
.../gst-inspect-check-error.patch | 0
.../gstregistrybinary.c | 0
.../gstregistrybinary.h | 0
.../{gstreamer_0.10.32.bb => gstreamer_0.10.35.bb} | 6 ++----
5 files changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/check_fix.patch (100%)
rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gst-inspect-check-error.patch (100%)
rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gstregistrybinary.c (100%)
rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gstregistrybinary.h (100%)
rename meta/recipes-multimedia/gstreamer/{gstreamer_0.10.32.bb => gstreamer_0.10.35.bb} (90%)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/check_fix.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/check_fix.patch
similarity index 100%
rename from meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/check_fix.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/check_fix.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gst-inspect-check-error.patch b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gst-inspect-check-error.patch
similarity index 100%
rename from meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gst-inspect-check-error.patch
rename to meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gst-inspect-check-error.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.c b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.c
similarity index 100%
rename from meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.c
rename to meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.c
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.h b/meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.h
similarity index 100%
rename from meta/recipes-multimedia/gstreamer/gstreamer-0.10.32/gstregistrybinary.h
rename to meta/recipes-multimedia/gstreamer/gstreamer-0.10.35/gstregistrybinary.h
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb
similarity index 90%
rename from meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb
index 1713755..50916e5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.32.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.35.bb
@@ -9,14 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
-PR = "r1"
-
SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
file://check_fix.patch \
file://gst-inspect-check-error.patch"
-SRC_URI[md5sum] = "442bc3d37b8511a73379143e7531d726"
-SRC_URI[sha256sum] = "3bf4e46a186ee9a1f5e212aaf651d67cffb4f5f05345a7c99ae71d5d992be133"
+SRC_URI[md5sum] = "4a0a00edad7a2c83de5211ca679dfaf9"
+SRC_URI[sha256sum] = "817bfea2cd46e2487b97e2ed9218f0299b32a3de1e5e80b4c7868d17e9089786"
inherit autotools pkgconfig gettext
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [WIP][PATCH 6/9] zlib: fix inverted LFS logic
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
` (4 preceding siblings ...)
2011-09-30 15:43 ` [WIP][PATCH 5/9] gstreamer: upgrade to 0.10.35 Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 7/9] gdk-pixbuf: upgrade to 2.24.6 Martin Jansa
` (4 subsequent siblings)
10 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch | 20 ++++++++++++++++++++
meta/recipes-core/zlib/zlib_1.2.5.bb | 5 +++--
2 files changed, 23 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch
diff --git a/meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch b/meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch
new file mode 100644
index 0000000..038c1a2
--- /dev/null
+++ b/meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Pending
+
+see
+https://bugs.gentoo.org/316377?id=316377
+https://bugs.freedesktop.org/show_bug.cgi?id=33710
+http://lists.freedesktop.org/archives/poppler-bugs/2011-January/006014.html
+for details
+
+diff -up zlib-1.2.5/zlib.h.pom zlib-1.2.5/zlib.h
+--- zlib-1.2.5/zlib.h.pom 2010-04-20 06:12:48.000000000 +0200
++++ zlib-1.2.5/zlib.h 2010-06-16 13:08:59.000000000 +0200
+@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
+ # define gzoffset gzoffset64
+ # define adler32_combine adler32_combine64
+ # define crc32_combine crc32_combine64
+-# ifdef _LARGEFILE64_SOURCE
++# ifndef _LARGEFILE64_SOURCE
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
diff --git a/meta/recipes-core/zlib/zlib_1.2.5.bb b/meta/recipes-core/zlib/zlib_1.2.5.bb
index 96dab25..bca400c 100644
--- a/meta/recipes-core/zlib/zlib_1.2.5.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.5.bb
@@ -7,11 +7,12 @@ LICENSE = "Zlib"
LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
DEPENDS = "libtool-cross"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
file://configure.ac \
- file://Makefile.am"
+ file://Makefile.am \
+ file://fix.inverted.LFS.logic.patch"
SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [WIP][PATCH 7/9] gdk-pixbuf: upgrade to 2.24.6
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
` (5 preceding siblings ...)
2011-09-30 15:43 ` [WIP][PATCH 6/9] zlib: fix inverted LFS logic Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-10-10 9:16 ` Richard Purdie
2011-09-30 15:43 ` [WIP][PATCH 8/9] glib: upgrade to 2.30.0 Martin Jansa
` (3 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
* older version doesn't build with glib-2.30.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../configure_fix.patch | 0
.../hardcoded_libtool.patch | 0
.../{gdk-pixbuf_2.22.1.bb => gdk-pixbuf_2.24.0.bb} | 7 +++----
3 files changed, 3 insertions(+), 4 deletions(-)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.22.1 => gdk-pixbuf-2.24.0}/configure_fix.patch (100%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.22.1 => gdk-pixbuf-2.24.0}/hardcoded_libtool.patch (100%)
rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.22.1.bb => gdk-pixbuf_2.24.0.bb} (92%)
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.24.0/configure_fix.patch
similarity index 100%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/configure_fix.patch
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_fix.patch
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.24.0/hardcoded_libtool.patch
similarity index 100%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.22.1/hardcoded_libtool.patch
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
similarity index 92%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index 50597b0..9fabbe2 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.22.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -9,15 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
SECTION = "libs"
DEPENDS = "libpng glib-2.0 jpeg"
-PR = "r1"
-SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.22/gdk-pixbuf-${PV}.tar.gz \
+SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2 \
file://hardcoded_libtool.patch \
file://configure_fix.patch \
"
-SRC_URI[md5sum] = "fcfc854e9aec7dbb2bb3059484d44556"
-SRC_URI[sha256sum] = "bbb57364ffba70d64f5fcfe6eda1d67249b3d58844edb06dc0f94d1ad599b4ec"
+SRC_URI[md5sum] = "d8ece3a4ade4a91c768328620e473ab8"
+SRC_URI[sha256sum] = "38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700"
inherit autotools pkgconfig gettext
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [WIP][PATCH 8/9] glib: upgrade to 2.30.0
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
` (6 preceding siblings ...)
2011-09-30 15:43 ` [WIP][PATCH 7/9] gdk-pixbuf: upgrade to 2.24.6 Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-10-07 15:05 ` Richard Purdie
2011-09-30 15:43 ` [WIP][PATCH 9/9] gtk+: upgrade to 2.24.6 Martin Jansa
` (2 subsequent siblings)
10 siblings, 1 reply; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...003-gatomic-proper-pointer-get-cast.patch.patch | 28 ----------
.../0005-glib-mkenums-interpreter.patch.patch | 25 ---------
.../60_wait-longer-for-threads-to-die.patch | 24 +++++-----
meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 2 -
.../glib-2.0/remove.test.for.qsort_r.patch | 53 ++++++++++++++++++++
meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 ---------
meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 +++++++++++++++
7 files changed, 106 insertions(+), 90 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
deleted file mode 100644
index 5c0afbc..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 23:51:35 +0200
-Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch
-
-Upstream-Status: Pending
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- glib/gatomic.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/glib/gatomic.h b/glib/gatomic.h
-index ddd39b8..b758142 100644
---- a/glib/gatomic.h
-+++ b/glib/gatomic.h
-@@ -70,7 +70,7 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI
- (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
- # define g_atomic_pointer_get(atomic) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
-- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
-+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic)))
- # define g_atomic_pointer_set(atomic, newval) \
- ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
- (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
---
-1.6.6.1
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
deleted file mode 100644
index db9a799..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 23:52:17 +0200
-Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- gobject/glib-mkenums.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
-index 6372245..b486fe9 100755
---- a/gobject/glib-mkenums.in
-+++ b/gobject/glib-mkenums.in
-@@ -1,4 +1,4 @@
--#! @PERL_PATH@
-+#! /usr/bin/env perl
-
- use warnings;
- use File::Basename;
---
-1.6.6.1
-
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
index b65a474..4ff7b80 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
@@ -4,9 +4,9 @@ Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
Upstream-Status: Inappropriate [patches for test code]
-diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c
---- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
-+++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
+diff -ruN glib-2.30.0-orig/tests/threadpool-test.c glib-2.30.0/tests/threadpool-test.c
+--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
++++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
@@ -5,8 +5,8 @@
#include <glib.h>
@@ -18,16 +18,16 @@ diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-
#define WAIT 5 /* seconds */
#define MAX_THREADS 10
-@@ -124,10 +124,10 @@
- DEBUG_MSG (("[unused] stopping unused threads"));
- g_thread_pool_stop_unused_threads ();
+@@ -130,10 +130,10 @@
+ test_count_threads () == 0)
+ break;
-- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
-+ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
+- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
++ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
- /* Some time for threads to die. */
-- g_usleep (G_USEC_PER_SEC);
-+ g_usleep (5 * G_USEC_PER_SEC);
+ /* Some time for threads to die. */
+- g_usleep (G_USEC_PER_SEC);
++ g_usleep (5 * G_USEC_PER_SEC);
+ }
DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
- g_thread_pool_get_num_unused_threads (),
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch b/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
index a100192..cca57d4 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch
@@ -6,8 +6,6 @@ impact on case when they are available.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Inappropriate [embedded specific]
-
Index: glib-2.26.1/glib/gconvert.c
===================================================================
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch b/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
new file mode 100644
index 0000000..5c0a07a
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
@@ -0,0 +1,53 @@
+while cross compiling we cannot execute run tests
+
+Upstream-Status: Inappropriate [configuration]
+
+--- glib-2.30.0.orig/configure.ac 2011-09-29 16:57:35.000000000 +0200
++++ glib-2.30.0/configure.ac 2011-09-29 17:00:19.931493488 +0200
+@@ -586,45 +586,7 @@
+ dnl until we have checked this function is actually usable
+ AC_CHECK_FUNC([qsort_r])
+
+-# BSD has a qsort_r with wrong argument order
+-if test x$ac_cv_func_qsort_r = xyes ; then
+- AC_CACHE_CHECK([if qsort_r uses glibc compatible argument order], glib_cv_have_qsort_r, [
+- AC_RUN_IFELSE([AC_LANG_SOURCE([[
+- #define _GNU_SOURCE
+- #include <stdlib.h>
+-
+- static int
+- cmp (const void *a, const void *b, void *c)
+- {
+- const int *ia = a;
+- const int *ib = b;
+-
+- if (*ia < *ib)
+- return -1;
+- else if (*ia > *ib)
+- return 1;
+- else
+- return 0;
+- }
+-
+- int
+- main (int argc, char **argv)
+- {
+- int arr[3] = { 1, 2, 0 };
+- int d = 3;
+-
+- qsort_r (arr, 3, sizeof (int), cmp, &d);
+-
+- if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2)
+- return 0;
+- else
+- return 1;
+- }]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
+-fi
+-
+-if test x$glib_cv_have_qsort_r = xyes ; then
+- AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
+-fi
++AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
+
+ AC_CHECK_SIZEOF(char)
+ AC_CHECK_SIZEOF(short)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
deleted file mode 100644
index 7430d88..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require glib.inc
-
-PR = "r5"
-PE = "1"
-
-SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
- file://configure-libtool.patch \
- file://60_wait-longer-for-threads-to-die.patch \
- file://g_once_init_enter.patch \
- file://0003-gatomic-proper-pointer-get-cast.patch.patch \
- file://0005-glib-mkenums-interpreter.patch.patch \
- "
-# Only apply this patch for target recipe on uclibc
-SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
-
-SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
-
-SRC_URI[md5sum] = "789e7520f71c6a4bf08bc683ec764d24"
-SRC_URI[sha256sum] = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f"
-
-BBCLASSEXTEND = "native"
-
-EXTRA_OECONF_append = " --enable-dtrace=no"
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
new file mode 100644
index 0000000..3b44703
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
@@ -0,0 +1,41 @@
+require glib.inc
+
+PR = "r1"
+PE = "1"
+
+DEPENDS += "libffi python-argparse-native"
+DEPENDS_virtclass-native += "libffi-native python-argparse-native"
+
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \
+ file://configure-libtool.patch \
+ file://60_wait-longer-for-threads-to-die.patch \
+ file://g_once_init_enter.patch \
+ file://remove.test.for.qsort_r.patch \
+ "
+SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b"
+SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687"
+
+# Only apply this patch for target recipe on uclibc
+SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
+
+SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
+BBCLASSEXTEND = "native"
+
+do_configure_prepend() {
+ # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native)
+ sed -i '/^docs/d' ${S}/configure.ac
+ sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am
+ sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am
+}
+
+do_install_append() {
+ # remove some unpackaged files
+ rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc
+ rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo
+}
+
+PACKAGES += "${PN}-codegen"
+FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py"
+FILES_${PN} += "${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [WIP][PATCH 9/9] gtk+: upgrade to 2.24.6
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
` (7 preceding siblings ...)
2011-09-30 15:43 ` [WIP][PATCH 8/9] glib: upgrade to 2.30.0 Martin Jansa
@ 2011-09-30 15:43 ` Martin Jansa
2011-09-30 16:34 ` [WIP][PATCH 0/9] Glib related upgrades Koen Kooi
2011-09-30 16:46 ` Richard Purdie
10 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 15:43 UTC (permalink / raw)
To: openembedded-core
* older version doesn't build with glib-2.30.0
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...Duplicate-the-exec-string-returned-by-gtk.patch | 0
.../cellrenderer-cairo.patch | 0
.../configurefix.patch | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/doc-fixes.patch | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/entry-cairo.patch | 0
.../hardcoded_libtool.patch | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/no-demos.patch | 0
.../run-iconcache.patch | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/toggle-font.diff | 0
.../{gtk+-2.22.1 => gtk+-2.24.6}/xsettings.patch | 0
.../gtk+/{gtk+_2.22.1.bb => gtk+_2.24.6.bb} | 8 +++-----
11 files changed, 3 insertions(+), 5 deletions(-)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/cellrenderer-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/configurefix.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/doc-fixes.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/entry-cairo.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/hardcoded_libtool.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/no-demos.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/run-iconcache.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/toggle-font.diff (100%)
rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/xsettings.patch (100%)
rename meta/recipes-gnome/gtk+/{gtk+_2.22.1.bb => gtk+_2.24.6.bb} (90%)
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/cellrenderer-cairo.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/cellrenderer-cairo.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/cellrenderer-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/configurefix.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/configurefix.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/doc-fixes.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/doc-fixes.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/entry-cairo.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/entry-cairo.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/entry-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/hardcoded_libtool.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/no-demos.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/no-demos.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/no-demos.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/run-iconcache.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/run-iconcache.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/run-iconcache.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.24.6/toggle-font.diff
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/toggle-font.diff
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/toggle-font.diff
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/xsettings.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.22.1/xsettings.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.6/xsettings.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
similarity index 90%
rename from meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
rename to meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
index ea8a5cb..c017f99 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.6.bb
@@ -4,9 +4,7 @@ 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 = "r5"
-
-SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
+SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
file://xsettings.patch \
file://run-iconcache.patch \
file://hardcoded_libtool.patch \
@@ -28,8 +26,8 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
# file://combo-arrow-size.patch;striplevel=0
# file://configurefix.patch
-SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9"
-SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07"
+SRC_URI[md5sum] = "421100f6597e613234f8dead6091a9fe"
+SRC_URI[sha256sum] = "6f45bdbf9ea27eb3b5f977d7ee2365dede0d0ce454985680c26e5210163bbf37"
EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [WIP][PATCH 0/9] Glib related upgrades
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
` (8 preceding siblings ...)
2011-09-30 15:43 ` [WIP][PATCH 9/9] gtk+: upgrade to 2.24.6 Martin Jansa
@ 2011-09-30 16:34 ` Koen Kooi
2011-09-30 16:46 ` Richard Purdie
10 siblings, 0 replies; 17+ messages in thread
From: Koen Kooi @ 2011-09-30 16:34 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-core
Op 30 sep. 2011 om 10:43 heeft Martin Jansa <martin.jansa@gmail.com> het volgende geschreven:
> We were using 2.29.3+git% from meta-oe and after upgrade to 2.30.0 I was hit
> by few G_CONST_RETURN and other issues due to newer glib. Here is what I have
> now to build shr images OK again, but probably there is more recipes which need
> upgrade/fix to cope with glib-2.30.0.
>
> Someone who cares about gnome should continue from this, but IMHO this is good start :).
I was planning to do the glib 2.30/gtk3.2 thing next week when I get back from the US
>
> The following changes since commit c54c1280fc0d06a53e23339c3913ec88eead13d9:
>
> base.bbclass: Drop unneeded dependency (2011-09-30 11:34:44 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib jansa/glib
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/glib
>
> Martin Jansa (9):
> atk: add patch to replace G_CONST_RETURN with const
> json-glib: upgrade to 0.14.0
> libproxy: upgrade to 0.4.7
> libglade: add gdk-pixbuf dependency
> gstreamer: upgrade to 0.10.35
> zlib: fix inverted LFS logic
> gdk-pixbuf: upgrade to 2.24.6
> glib: upgrade to 2.30.0
> gtk+: upgrade to 2.24.6
>
> ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -
> .../0005-glib-mkenums-interpreter.patch.patch | 25 -
> .../60_wait-longer-for-threads-to-die.patch | 24 +-
> meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 2 -
> .../glib-2.0/remove.test.for.qsort_r.patch | 53 ++
> meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 -
> meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 ++
> .../zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch | 20 +
> meta/recipes-core/zlib/zlib_1.2.5.bb | 5 +-
> .../configure_fix.patch | 0
> .../hardcoded_libtool.patch | 0
> .../{gdk-pixbuf_2.22.1.bb => gdk-pixbuf_2.24.0.bb} | 7 +-
> ...Duplicate-the-exec-string-returned-by-gtk.patch | 0
> .../cellrenderer-cairo.patch | 0
> .../configurefix.patch | 0
> .../{gtk+-2.22.1 => gtk+-2.24.6}/doc-fixes.patch | 0
> .../{gtk+-2.22.1 => gtk+-2.24.6}/entry-cairo.patch | 0
> .../hardcoded_libtool.patch | 0
> .../{gtk+-2.22.1 => gtk+-2.24.6}/no-demos.patch | 0
> .../run-iconcache.patch | 0
> .../{gtk+-2.22.1 => gtk+-2.24.6}/toggle-font.diff | 0
> .../{gtk+-2.22.1 => gtk+-2.24.6}/xsettings.patch | 0
> .../gtk+/{gtk+_2.22.1.bb => gtk+_2.24.6.bb} | 8 +-
> .../{json-glib_0.12.4.bb => json-glib_0.14.0.bb} | 8 +-
> meta/recipes-gnome/libglade/libglade_2.6.4.bb | 2 +-
> .../check_fix.patch | 0
> .../gst-inspect-check-error.patch | 0
> .../gstregistrybinary.c | 0
> .../gstregistrybinary.h | 0
> .../{gstreamer_0.10.32.bb => gstreamer_0.10.35.bb} | 6 +-
> .../atk/atk-1.32.0/remove.G_CONST_RETURN.patch | 628 ++++++++++++++++++++
> meta/recipes-support/atk/atk_1.32.0.bb | 5 +-
> .../{libproxy_0.4.6.bb => libproxy_0.4.7.bb} | 6 +-
> 33 files changed, 775 insertions(+), 116 deletions(-)
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
> create mode 100644 meta/recipes-core/zlib/zlib-1.2.5/fix.inverted.LFS.logic.patch
> rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.22.1 => gdk-pixbuf-2.24.0}/configure_fix.patch (100%)
> rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf-2.22.1 => gdk-pixbuf-2.24.0}/hardcoded_libtool.patch (100%)
> rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.22.1.bb => gdk-pixbuf_2.24.0.bb} (92%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/cellrenderer-cairo.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/configurefix.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/doc-fixes.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/entry-cairo.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/hardcoded_libtool.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/no-demos.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/run-iconcache.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/toggle-font.diff (100%)
> rename meta/recipes-gnome/gtk+/{gtk+-2.22.1 => gtk+-2.24.6}/xsettings.patch (100%)
> rename meta/recipes-gnome/gtk+/{gtk+_2.22.1.bb => gtk+_2.24.6.bb} (90%)
> rename meta/recipes-gnome/json-glib/{json-glib_0.12.4.bb => json-glib_0.14.0.bb} (74%)
> rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/check_fix.patch (100%)
> rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gst-inspect-check-error.patch (100%)
> rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gstregistrybinary.c (100%)
> rename meta/recipes-multimedia/gstreamer/{gstreamer-0.10.32 => gstreamer-0.10.35}/gstregistrybinary.h (100%)
> rename meta/recipes-multimedia/gstreamer/{gstreamer_0.10.32.bb => gstreamer_0.10.35.bb} (90%)
> create mode 100644 meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
> rename meta/recipes-support/libproxy/{libproxy_0.4.6.bb => libproxy_0.4.7.bb} (85%)
>
> --
> 1.7.6.1
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP][PATCH 0/9] Glib related upgrades
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
` (9 preceding siblings ...)
2011-09-30 16:34 ` [WIP][PATCH 0/9] Glib related upgrades Koen Kooi
@ 2011-09-30 16:46 ` Richard Purdie
2011-09-30 16:49 ` Martin Jansa
10 siblings, 1 reply; 17+ messages in thread
From: Richard Purdie @ 2011-09-30 16:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote:
> We were using 2.29.3+git% from meta-oe and after upgrade to 2.30.0 I was hit
> by few G_CONST_RETURN and other issues due to newer glib. Here is what I have
> now to build shr images OK again, but probably there is more recipes which need
> upgrade/fix to cope with glib-2.30.0.
>
> Someone who cares about gnome should continue from this, but IMHO this is good start :).
These are marked as WIP. Does this mean they are ready to be taken or is
there a reason to hold off these patches?
Cheers,
Richard
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP][PATCH 0/9] Glib related upgrades
2011-09-30 16:46 ` Richard Purdie
@ 2011-09-30 16:49 ` Martin Jansa
0 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 16:49 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 961 bytes --]
On Fri, Sep 30, 2011 at 05:46:24PM +0100, Richard Purdie wrote:
> On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote:
> > We were using 2.29.3+git% from meta-oe and after upgrade to 2.30.0 I was hit
> > by few G_CONST_RETURN and other issues due to newer glib. Here is what I have
> > now to build shr images OK again, but probably there is more recipes which need
> > upgrade/fix to cope with glib-2.30.0.
> >
> > Someone who cares about gnome should continue from this, but IMHO this is good start :).
>
> These are marked as WIP. Does this mean they are ready to be taken or is
> there a reason to hold off these patches?
Marked as WIP as I've tested them only on images I care about.. and
fixed stuff which was failing for me.
Someone building full gnome desktop (I guess koen) should send patches
for remaining gnome stuff if needed, before taking this in.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCHv2] atk: add patch to replace G_CONST_RETURN with const
2011-09-30 15:43 ` [WIP][PATCH 1/9] atk: add patch to replace G_CONST_RETURN with const Martin Jansa
@ 2011-09-30 18:25 ` Martin Jansa
0 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-09-30 18:25 UTC (permalink / raw)
To: openembedded-core
* otherwise build fails when glib is 2.30.0 or newer (and G_DISABLE_DEPRECATED is enabled - like in atk)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../atk/atk-1.32.0/remove.G_CONST_RETURN.patch | 630 ++++++++++++++++++++
meta/recipes-support/atk/atk_1.32.0.bb | 5 +-
2 files changed, 634 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
diff --git a/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch b/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
new file mode 100644
index 0000000..0de3f26
--- /dev/null
+++ b/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
@@ -0,0 +1,630 @@
+Upstream-Status: Accepted
+
+Similar patch is already included in 2.0.1 and newer
+http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.news
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+diff -uNr atk-1.32.0.orig/atk/atkaction.c atk-1.32.0/atk/atkaction.c
+--- atk-1.32.0.orig/atk/atkaction.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkaction.c 2011-09-30 10:29:49.896997586 +0200
+@@ -101,7 +101,7 @@
+ * Returns a description string, or %NULL
+ * if @action does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_description (AtkAction *obj,
+ gint i)
+ {
+@@ -140,7 +140,7 @@
+ * Returns a name string, or %NULL
+ * if @action does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_name (AtkAction *obj,
+ gint i)
+ {
+@@ -166,7 +166,7 @@
+ * Returns a name string, or %NULL
+ * if @action does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_localized_name (AtkAction *obj,
+ gint i)
+ {
+@@ -203,7 +203,7 @@
+ * if there is no keybinding for this action.
+ *
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_action_get_keybinding (AtkAction *obj,
+ gint i)
+ {
+diff -uNr atk-1.32.0.orig/atk/atkaction.h atk-1.32.0/atk/atkaction.h
+--- atk-1.32.0.orig/atk/atkaction.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkaction.h 2011-09-30 10:29:49.897997588 +0200
+@@ -55,16 +55,16 @@
+ gboolean (*do_action) (AtkAction *action,
+ gint i);
+ gint (*get_n_actions) (AtkAction *action);
+- G_CONST_RETURN gchar* (*get_description) (AtkAction *action,
++ const gchar* (*get_description) (AtkAction *action,
+ gint i);
+- G_CONST_RETURN gchar* (*get_name) (AtkAction *action,
++ const gchar* (*get_name) (AtkAction *action,
+ gint i);
+- G_CONST_RETURN gchar* (*get_keybinding) (AtkAction *action,
++ const gchar* (*get_keybinding) (AtkAction *action,
+ gint i);
+ gboolean (*set_description) (AtkAction *action,
+ gint i,
+ const gchar *desc);
+- G_CONST_RETURN gchar* (*get_localized_name)(AtkAction *action,
++ const gchar* (*get_localized_name)(AtkAction *action,
+ gint i);
+ AtkFunction pad2;
+ };
+@@ -85,11 +85,11 @@
+ gboolean atk_action_do_action (AtkAction *action,
+ gint i);
+ gint atk_action_get_n_actions (AtkAction *action);
+-G_CONST_RETURN gchar* atk_action_get_description (AtkAction *action,
++const gchar* atk_action_get_description (AtkAction *action,
+ gint i);
+-G_CONST_RETURN gchar* atk_action_get_name (AtkAction *action,
++const gchar* atk_action_get_name (AtkAction *action,
+ gint i);
+-G_CONST_RETURN gchar* atk_action_get_keybinding (AtkAction *action,
++const gchar* atk_action_get_keybinding (AtkAction *action,
+ gint i);
+ gboolean atk_action_set_description (AtkAction *action,
+ gint i,
+@@ -97,7 +97,7 @@
+
+ /* NEW in ATK 1.1: */
+
+-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction *action,
++const gchar* atk_action_get_localized_name (AtkAction *action,
+ gint i);
+
+ /*
+diff -uNr atk-1.32.0.orig/atk/atkdocument.c atk-1.32.0/atk/atkdocument.c
+--- atk-1.32.0.orig/atk/atkdocument.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkdocument.c 2011-09-30 10:29:49.898997588 +0200
+@@ -93,7 +93,7 @@
+ *
+ * Returns: a string indicating the document type
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_document_get_document_type (AtkDocument *document)
+ {
+ AtkDocumentIface *iface;
+@@ -155,7 +155,7 @@
+ * locale of the document content as a whole, or NULL if
+ * the document content does not specify a locale.
+ **/
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_document_get_locale (AtkDocument *document)
+ {
+ AtkDocumentIface *iface;
+@@ -219,7 +219,7 @@
+ * document, or NULL if a value for #attribute_name has not been specified
+ * for this document.
+ */
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_document_get_attribute_value (AtkDocument *document,
+ const gchar *attribute_name)
+ {
+diff -uNr atk-1.32.0.orig/atk/atkdocument.h atk-1.32.0/atk/atkdocument.h
+--- atk-1.32.0.orig/atk/atkdocument.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkdocument.h 2011-09-30 10:29:49.899997588 +0200
+@@ -49,12 +49,12 @@
+ struct _AtkDocumentIface
+ {
+ GTypeInterface parent;
+- G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument *document);
++ const gchar* ( *get_document_type) (AtkDocument *document);
+ gpointer ( *get_document) (AtkDocument *document);
+
+- G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument *document);
++ const gchar* ( *get_document_locale) (AtkDocument *document);
+ AtkAttributeSet * ( *get_document_attributes) (AtkDocument *document);
+- G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument *document,
++ const gchar* ( *get_document_attribute_value) (AtkDocument *document,
+ const gchar *attribute_name);
+ gboolean ( *set_document_attribute) (AtkDocument *document,
+ const gchar *attribute_name,
+@@ -68,11 +68,11 @@
+
+ GType atk_document_get_type (void);
+
+-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument *document);
++const gchar* atk_document_get_document_type (AtkDocument *document);
+ gpointer atk_document_get_document (AtkDocument *document);
+-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
++const gchar* atk_document_get_locale (AtkDocument *document);
+ AtkAttributeSet* atk_document_get_attributes (AtkDocument *document);
+-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document,
++const gchar* atk_document_get_attribute_value (AtkDocument *document,
+ const gchar *attribute_name);
+ gboolean atk_document_set_attribute_value (AtkDocument *document,
+ const gchar *attribute_name,
+diff -uNr atk-1.32.0.orig/atk/atkimage.c atk-1.32.0/atk/atkimage.c
+--- atk-1.32.0.orig/atk/atkimage.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkimage.c 2011-09-30 10:29:49.900997587 +0200
+@@ -46,7 +46,7 @@
+ *
+ * Returns: a string representing the image description
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_image_get_image_description (AtkImage *image)
+ {
+ AtkImageIface *iface;
+@@ -192,7 +192,7 @@
+ * Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale.
+ *
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_image_get_image_locale (AtkImage *image)
+ {
+
+diff -uNr atk-1.32.0.orig/atk/atkimage.h atk-1.32.0/atk/atkimage.h
+--- atk-1.32.0.orig/atk/atkimage.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkimage.h 2011-09-30 10:29:49.901997587 +0200
+@@ -53,13 +53,13 @@
+ gint *x,
+ gint *y,
+ AtkCoordType coord_type);
+- G_CONST_RETURN gchar* ( *get_image_description) (AtkImage *image);
++ const gchar* ( *get_image_description) (AtkImage *image);
+ void ( *get_image_size) (AtkImage *image,
+ gint *width,
+ gint *height);
+ gboolean ( *set_image_description) (AtkImage *image,
+ const gchar *description);
+- G_CONST_RETURN gchar* ( *get_image_locale) (AtkImage *image);
++ const gchar* ( *get_image_locale) (AtkImage *image);
+
+ AtkFunction pad1;
+
+@@ -67,7 +67,7 @@
+
+ GType atk_image_get_type (void);
+
+-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage *image);
++const gchar* atk_image_get_image_description (AtkImage *image);
+
+ void atk_image_get_image_size (AtkImage *image,
+ gint *width,
+@@ -80,7 +80,7 @@
+ gint *y,
+ AtkCoordType coord_type);
+
+-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage *image);
++const gchar* atk_image_get_image_locale (AtkImage *image);
+
+ G_END_DECLS
+
+diff -uNr atk-1.32.0.orig/atk/atkobject.c atk-1.32.0/atk/atkobject.c
+--- atk-1.32.0.orig/atk/atkobject.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkobject.c 2011-09-30 10:29:49.905997587 +0200
+@@ -285,9 +285,9 @@
+ GValue *value,
+ GParamSpec *pspec);
+ static void atk_object_finalize (GObject *object);
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_name (AtkObject *object);
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_description
+ (AtkObject *object);
+ static AtkObject* atk_object_real_get_parent (AtkObject *object);
+@@ -692,7 +692,7 @@
+ *
+ * Returns: a character string representing the accessible name of the object.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_object_get_name (AtkObject *accessible)
+ {
+ AtkObjectClass *klass;
+@@ -716,7 +716,7 @@
+ * of the accessible.
+ *
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_object_get_description (AtkObject *accessible)
+ {
+ AtkObjectClass *klass;
+@@ -1123,7 +1123,7 @@
+ AtkState state,
+ gboolean value)
+ {
+- G_CONST_RETURN gchar* name;
++ const gchar* name;
+
+ g_return_if_fail (ATK_IS_OBJECT (accessible));
+
+@@ -1319,13 +1319,13 @@
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+ }
+
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_name (AtkObject *object)
+ {
+ return object->name;
+ }
+
+-static G_CONST_RETURN gchar*
++static const gchar*
+ atk_object_real_get_description (AtkObject *object)
+ {
+ return object->description;
+@@ -1487,7 +1487,7 @@
+ *
+ * Returns: the string describing the AtkRole
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_role_get_name (AtkRole role)
+ {
+ if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
+@@ -1514,7 +1514,7 @@
+ *
+ * Returns: the localized string describing the AtkRole
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_role_get_localized_name (AtkRole role)
+ {
+ gettext_initialization ();
+diff -uNr atk-1.32.0.orig/atk/atkobject.h atk-1.32.0/atk/atkobject.h
+--- atk-1.32.0.orig/atk/atkobject.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkobject.h 2011-09-30 10:29:49.907997585 +0200
+@@ -381,11 +381,11 @@
+ /*
+ * Gets the accessible name of the object
+ */
+- G_CONST_RETURN gchar* (* get_name) (AtkObject *accessible);
++ const gchar* (* get_name) (AtkObject *accessible);
+ /*
+ * Gets the accessible description of the object
+ */
+- G_CONST_RETURN gchar* (* get_description) (AtkObject *accessible);
++ const gchar* (* get_description) (AtkObject *accessible);
+ /*
+ * Gets the accessible parent of the object
+ */
+@@ -535,8 +535,8 @@
+ * Properties directly supported by AtkObject
+ */
+
+-G_CONST_RETURN gchar* atk_object_get_name (AtkObject *accessible);
+-G_CONST_RETURN gchar* atk_object_get_description (AtkObject *accessible);
++const gchar* atk_object_get_name (AtkObject *accessible);
++const gchar* atk_object_get_description (AtkObject *accessible);
+ AtkObject* atk_object_get_parent (AtkObject *accessible);
+ gint atk_object_get_n_accessible_children (AtkObject *accessible);
+ AtkObject* atk_object_ref_accessible_child (AtkObject *accessible,
+@@ -571,7 +571,7 @@
+ void atk_object_initialize (AtkObject *accessible,
+ gpointer data);
+
+-G_CONST_RETURN gchar* atk_role_get_name (AtkRole role);
++const gchar* atk_role_get_name (AtkRole role);
+ AtkRole atk_role_for_name (const gchar *name);
+
+
+@@ -582,7 +582,7 @@
+ gboolean atk_object_remove_relationship (AtkObject *object,
+ AtkRelationType relationship,
+ AtkObject *target);
+-G_CONST_RETURN gchar* atk_role_get_localized_name (AtkRole role);
++const gchar* atk_role_get_localized_name (AtkRole role);
+
+ /* */
+
+diff -uNr atk-1.32.0.orig/atk/atkrelation.c atk-1.32.0/atk/atkrelation.c
+--- atk-1.32.0.orig/atk/atkrelation.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkrelation.c 2011-09-30 10:29:49.908997585 +0200
+@@ -130,7 +130,7 @@
+ *
+ * Returns: the string describing the AtkRelationType
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_relation_type_get_name (AtkRelationType type)
+ {
+ GTypeClass *type_class;
+diff -uNr atk-1.32.0.orig/atk/atkrelation.h atk-1.32.0/atk/atkrelation.h
+--- atk-1.32.0.orig/atk/atkrelation.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkrelation.h 2011-09-30 10:29:49.909997586 +0200
+@@ -61,7 +61,7 @@
+ GType atk_relation_get_type (void);
+
+ AtkRelationType atk_relation_type_register (const gchar *name);
+-G_CONST_RETURN gchar* atk_relation_type_get_name (AtkRelationType type);
++const gchar* atk_relation_type_get_name (AtkRelationType type);
+ AtkRelationType atk_relation_type_for_name (const gchar *name);
+
+ /*
+diff -uNr atk-1.32.0.orig/atk/atkstate.c atk-1.32.0/atk/atkstate.c
+--- atk-1.32.0.orig/atk/atkstate.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkstate.c 2011-09-30 10:29:49.910997587 +0200
+@@ -57,7 +57,7 @@
+ *
+ * Returns: the string describing the AtkStateType
+ */
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_state_type_get_name (AtkStateType type)
+ {
+ GTypeClass *type_class;
+diff -uNr atk-1.32.0.orig/atk/atkstate.h atk-1.32.0/atk/atkstate.h
+--- atk-1.32.0.orig/atk/atkstate.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkstate.h 2011-09-30 10:29:49.911997587 +0200
+@@ -170,7 +170,7 @@
+
+ AtkStateType atk_state_type_register (const gchar *name);
+
+-G_CONST_RETURN gchar* atk_state_type_get_name (AtkStateType type);
++const gchar* atk_state_type_get_name (AtkStateType type);
+ AtkStateType atk_state_type_for_name (const gchar *name);
+
+ G_END_DECLS
+diff -uNr atk-1.32.0.orig/atk/atkstreamablecontent.c atk-1.32.0/atk/atkstreamablecontent.c
+--- atk-1.32.0.orig/atk/atkstreamablecontent.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkstreamablecontent.c 2011-09-30 10:29:49.912997587 +0200
+@@ -73,7 +73,7 @@
+ * Returns : a gchar* representing the specified mime type; the caller
+ * should not free the character string.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+ gint i)
+ {
+diff -uNr atk-1.32.0.orig/atk/atkstreamablecontent.h atk-1.32.0/atk/atkstreamablecontent.h
+--- atk-1.32.0.orig/atk/atkstreamablecontent.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkstreamablecontent.h 2011-09-30 10:29:49.913997587 +0200
+@@ -54,11 +54,11 @@
+ * at index 0 should be considered the "default" data type for the stream.
+ *
+ * This assumes that the strings for the mime types are stored in the
+- * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
++ * AtkStreamableContent. Alternatively the const could be removed
+ * and the caller would be responsible for calling g_free() on the
+ * returned value.
+ */
+- G_CONST_RETURN gchar* (* get_mime_type) (AtkStreamableContent *streamable,
++ const gchar* (* get_mime_type) (AtkStreamableContent *streamable,
+ gint i);
+ /*
+ * One possible implementation for this method is that it constructs the
+@@ -80,7 +80,7 @@
+ * constructed. Note that it is possible for get_uri to return NULL but for
+ * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
+ */
+- G_CONST_RETURN gchar* (* get_uri) (AtkStreamableContent *streamable,
++ const gchar* (* get_uri) (AtkStreamableContent *streamable,
+ const gchar *mime_type);
+
+
+@@ -92,7 +92,7 @@
+
+ gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable);
+
+-G_CONST_RETURN gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
++const gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
+ gint i);
+ GIOChannel* atk_streamable_content_get_stream (AtkStreamableContent *streamable,
+ const gchar *mime_type);
+diff -uNr atk-1.32.0.orig/atk/atktable.c atk-1.32.0/atk/atktable.c
+--- atk-1.32.0.orig/atk/atktable.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atktable.c 2011-09-30 10:29:49.915997586 +0200
+@@ -300,7 +300,7 @@
+ * Returns: a gchar* representing the column description, or %NULL
+ * if value does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_column_description (AtkTable *table,
+ gint column)
+ {
+@@ -404,7 +404,7 @@
+ * Returns: a gchar* representing the row description, or %NULL
+ * if value does not implement this interface.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_row_description (AtkTable *table,
+ gint row)
+ {
+diff -uNr atk-1.32.0.orig/atk/atktable.h atk-1.32.0/atk/atktable.h
+--- atk-1.32.0.orig/atk/atktable.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atktable.h 2011-09-30 10:29:49.916997586 +0200
+@@ -69,12 +69,12 @@
+ gint column);
+ AtkObject*
+ (* get_caption) (AtkTable *table);
+- G_CONST_RETURN gchar*
++ const gchar*
+ (* get_column_description) (AtkTable *table,
+ gint column);
+ AtkObject* (* get_column_header) (AtkTable *table,
+ gint column);
+- G_CONST_RETURN gchar*
++ const gchar*
+ (* get_row_description) (AtkTable *table,
+ gint row);
+ AtkObject* (* get_row_header) (AtkTable *table,
+@@ -163,12 +163,12 @@
+ gint column);
+ AtkObject*
+ atk_table_get_caption (AtkTable *table);
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_column_description (AtkTable *table,
+ gint column);
+ AtkObject* atk_table_get_column_header (AtkTable *table,
+ gint column);
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_table_get_row_description (AtkTable *table,
+ gint row);
+ AtkObject* atk_table_get_row_header (AtkTable *table,
+diff -uNr atk-1.32.0.orig/atk/atktext.c atk-1.32.0/atk/atktext.c
+--- atk-1.32.0.orig/atk/atktext.c 2010-09-27 09:07:09.000000000 +0200
++++ atk-1.32.0/atk/atktext.c 2011-09-30 10:29:49.919997586 +0200
+@@ -1054,7 +1054,7 @@
+ *
+ * Returns: a string containing the name; this string should not be freed
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_text_attribute_get_name (AtkTextAttribute attr)
+ {
+ GTypeClass *type_class;
+@@ -1150,7 +1150,7 @@
+ * Returns: a string containing the value; this string should not be freed;
+ * NULL is returned if there are no values maintained for the attr value.
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_text_attribute_get_value (AtkTextAttribute attr,
+ gint index)
+ {
+diff -uNr atk-1.32.0.orig/atk/atktext.h atk-1.32.0/atk/atktext.h
+--- atk-1.32.0.orig/atk/atktext.h 2010-09-27 09:07:09.000000000 +0200
++++ atk-1.32.0/atk/atktext.h 2011-09-30 10:29:49.921997586 +0200
+@@ -355,9 +355,9 @@
+ AtkTextClipType y_clip_type);
+ void atk_text_free_ranges (AtkTextRange **ranges);
+ void atk_attribute_set_free (AtkAttributeSet *attrib_set);
+-G_CONST_RETURN gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
++const gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
+ AtkTextAttribute atk_text_attribute_for_name (const gchar *name);
+-G_CONST_RETURN gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
++const gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
+ gint index_);
+
+ G_END_DECLS
+diff -uNr atk-1.32.0.orig/atk/atkutil.c atk-1.32.0/atk/atkutil.c
+--- atk-1.32.0.orig/atk/atkutil.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkutil.c 2011-09-30 10:29:49.922997586 +0200
+@@ -340,7 +340,7 @@
+ *
+ * Returns: name string for the GUI toolkit implementing ATK for this application
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_get_toolkit_name (void)
+ {
+ const gchar *retval;
+@@ -365,7 +365,7 @@
+ *
+ * Returns: version string for the GUI toolkit implementing ATK for this application
+ **/
+-G_CONST_RETURN gchar*
++const gchar*
+ atk_get_toolkit_version (void)
+ {
+ const gchar *retval;
+@@ -391,7 +391,7 @@
+ * Returns: version string for ATK
+ **/
+
+-G_CONST_RETURN gchar *
++const gchar *
+ atk_get_version (void)
+ {
+ return VERSION;
+diff -uNr atk-1.32.0.orig/atk/atkutil.h atk-1.32.0/atk/atkutil.h
+--- atk-1.32.0.orig/atk/atkutil.h 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/atk/atkutil.h 2011-09-30 10:29:49.923997586 +0200
+@@ -147,8 +147,8 @@
+ gpointer data);
+ void (* remove_key_event_listener) (guint listener_id);
+ AtkObject* (* get_root) (void);
+- G_CONST_RETURN gchar* (* get_toolkit_name) (void);
+- G_CONST_RETURN gchar* (* get_toolkit_version) (void);
++ const gchar* (* get_toolkit_name) (void);
++ const gchar* (* get_toolkit_version) (void);
+ };
+ GType atk_util_get_type (void);
+
+@@ -229,17 +229,17 @@
+ /*
+ * Returns name string for the GUI toolkit.
+ */
+-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
++const gchar *atk_get_toolkit_name (void);
+
+ /*
+ * Returns version string for the GUI toolkit.
+ */
+-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
++const gchar *atk_get_toolkit_version (void);
+
+ /*
+ * Gets the current version of ATK
+ */
+-G_CONST_RETURN gchar *atk_get_version (void);
++const gchar *atk_get_version (void);
+
+ /* --- GType boilerplate --- */
+ /* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
+diff -uNr atk-1.32.0.orig/tests/testrelation.c atk-1.32.0/tests/testrelation.c
+--- atk-1.32.0.orig/tests/testrelation.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/tests/testrelation.c 2011-09-30 10:29:49.924997586 +0200
+@@ -28,7 +28,7 @@
+ test_relation (void)
+ {
+ AtkRelationType type1, type2;
+- G_CONST_RETURN gchar *name;
++ const gchar *name;
+ AtkObject *obj;
+ gboolean ret_value;
+ AtkRelationSet *set;
+@@ -169,7 +169,7 @@
+ test_role (void)
+ {
+ AtkRole role1, role2;
+- G_CONST_RETURN gchar *name;
++ const gchar *name;
+
+ name = atk_role_get_name (ATK_ROLE_PAGE_TAB);
+ g_return_val_if_fail (name, FALSE);
+@@ -230,7 +230,7 @@
+ test_text_attr (void)
+ {
+ AtkTextAttribute attr1, attr2;
+- G_CONST_RETURN gchar *name;
++ const gchar *name;
+
+ name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP);
+ g_return_val_if_fail (name, FALSE);
+diff -uNr atk-1.32.0.orig/tests/teststateset.c atk-1.32.0/tests/teststateset.c
+--- atk-1.32.0.orig/tests/teststateset.c 2010-09-06 08:45:45.000000000 +0200
++++ atk-1.32.0/tests/teststateset.c 2011-09-30 10:29:49.926997586 +0200
+@@ -208,7 +208,7 @@
+ test_state (void)
+ {
+ AtkStateType type1, type2;
+- G_CONST_RETURN gchar *name;
++ const gchar *name;
+
+ name = atk_state_type_get_name (ATK_STATE_VISIBLE);
+ g_return_val_if_fail (name, FALSE);
diff --git a/meta/recipes-support/atk/atk_1.32.0.bb b/meta/recipes-support/atk/atk_1.32.0.bb
index e6883eb..db8ca1f 100644
--- a/meta/recipes-support/atk/atk_1.32.0.bb
+++ b/meta/recipes-support/atk/atk_1.32.0.bb
@@ -4,7 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
-SRC_URI = "http://download.gnome.org/sources/atk/1.32/${BPN}-${PV}.tar.bz2"
+PR = "r1"
+SRC_URI = "http://download.gnome.org/sources/atk/1.32/${BPN}-${PV}.tar.bz2 \
+ file://remove.G_CONST_RETURN.patch \
+"
SRC_URI[md5sum] = "b9a19a3e426cd9ca930f0108c4ee343f"
SRC_URI[sha256sum] = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e"
--
1.7.6.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [WIP][PATCH 8/9] glib: upgrade to 2.30.0
2011-09-30 15:43 ` [WIP][PATCH 8/9] glib: upgrade to 2.30.0 Martin Jansa
@ 2011-10-07 15:05 ` Richard Purdie
2011-10-07 17:09 ` Martin Jansa
0 siblings, 1 reply; 17+ messages in thread
From: Richard Purdie @ 2011-10-07 15:05 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 ----------
> .../0005-glib-mkenums-interpreter.patch.patch | 25 ---------
> .../60_wait-longer-for-threads-to-die.patch | 24 +++++-----
> meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 2 -
> .../glib-2.0/remove.test.for.qsort_r.patch | 53 ++++++++++++++++++++
> meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 ---------
> meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 +++++++++++++++
> 7 files changed, 106 insertions(+), 90 deletions(-)
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
> +DEPENDS += "libffi python-argparse-native"
> +DEPENDS_virtclass-native += "libffi-native python-argparse-native"
Just to be clear on the status of this, the above dependencies present a
problem for OE-Core :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP][PATCH 8/9] glib: upgrade to 2.30.0
2011-10-07 15:05 ` Richard Purdie
@ 2011-10-07 17:09 ` Martin Jansa
0 siblings, 0 replies; 17+ messages in thread
From: Martin Jansa @ 2011-10-07 17:09 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]
On Fri, Oct 07, 2011 at 04:05:34PM +0100, Richard Purdie wrote:
> On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 ----------
> > .../0005-glib-mkenums-interpreter.patch.patch | 25 ---------
> > .../60_wait-longer-for-threads-to-die.patch | 24 +++++-----
> > meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 2 -
> > .../glib-2.0/remove.test.for.qsort_r.patch | 53 ++++++++++++++++++++
> > meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 ---------
> > meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 +++++++++++++++
> > 7 files changed, 106 insertions(+), 90 deletions(-)
> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> > create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
> > create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
>
> > +DEPENDS += "libffi python-argparse-native"
> > +DEPENDS_virtclass-native += "libffi-native python-argparse-native"
>
> Just to be clear on the status of this, the above dependencies present a
> problem for OE-Core :(
python-argparse: import from meta-oe, needed for newer glib
was added on top of jansa/glib branch to resolve this..
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [WIP][PATCH 7/9] gdk-pixbuf: upgrade to 2.24.6
2011-09-30 15:43 ` [WIP][PATCH 7/9] gdk-pixbuf: upgrade to 2.24.6 Martin Jansa
@ 2011-10-10 9:16 ` Richard Purdie
0 siblings, 0 replies; 17+ messages in thread
From: Richard Purdie @ 2011-10-10 9:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote:
> * older version doesn't build with glib-2.30.0
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
I merged this (and patches 4-6), thanks.
Richard
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2011-10-10 9:22 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-30 15:43 [WIP][PATCH 0/9] Glib related upgrades Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 1/9] atk: add patch to replace G_CONST_RETURN with const Martin Jansa
2011-09-30 18:25 ` [PATCHv2] " Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 2/9] json-glib: upgrade to 0.14.0 Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 3/9] libproxy: upgrade to 0.4.7 Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 4/9] libglade: add gdk-pixbuf dependency Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 5/9] gstreamer: upgrade to 0.10.35 Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 6/9] zlib: fix inverted LFS logic Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 7/9] gdk-pixbuf: upgrade to 2.24.6 Martin Jansa
2011-10-10 9:16 ` Richard Purdie
2011-09-30 15:43 ` [WIP][PATCH 8/9] glib: upgrade to 2.30.0 Martin Jansa
2011-10-07 15:05 ` Richard Purdie
2011-10-07 17:09 ` Martin Jansa
2011-09-30 15:43 ` [WIP][PATCH 9/9] gtk+: upgrade to 2.24.6 Martin Jansa
2011-09-30 16:34 ` [WIP][PATCH 0/9] Glib related upgrades Koen Kooi
2011-09-30 16:46 ` Richard Purdie
2011-09-30 16:49 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.