* Re: Some further build dependency timings
From: Mark Hatle @ 2011-10-12 14:40 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1318332940.23801.90.camel@ted>
On 10/11/11 6:35 AM, Richard Purdie wrote:
> On Mon, 2011-10-10 at 21:45 +0100, Richard Purdie wrote:
>> Just for reference, with a base configuration, sato image:
>>
>> real 50m8.223s
>> user 298m41.450s
>> sys 52m42.200s
>>
>> adding:
>>
>> ASSUME_PROVIDED =+ "bison-native flex-native sqlite3-native git-native"
>>
>> (and hacking the pseudo recipe to use a sqlite3-native):
>>
>> real 42m6.740s
>> user 296m21.940s
>> sys 52m25.220s
>>
>> We continue to have real dependency issues around gettext in both the
>> native and target builds...
>
> So to continue the story, adding:
>
> DEBUG_FLAGS = ""
> INHERIT_INSANE = ""
> PACKAGE_CLASSES = "package_ipk"
> USER_CLASSES = ""
>
> Results in:
>
> real 38m23.053s
> user 237m7.430s
> sys 39m3.720s
>
> Then adding PSEUDO_RELOADED=yes to the environment of tasks not needing
> pseudo (hack patch below):
>
> real 36m20.683s
> user 236m19.580s
> sys 37m54.450s
>
> Finally, adding:
>
> DISABLESTATIC = "--disable-static"
> DISABLESTATIC_pn-qemu = ""
> DISABLESTATIC_pn-qemu-native = ""
> DISABLESTATIC_pn-openssl = ""
> DISABLESTATIC_pn-openssl-native = ""
> EXTRA_OECONF += "${DISABLESTATIC}"
>
> real 34m53.877s
> user 233m34.780s
> sys 38m50.190s
>
> Cheers,
>
> Richard
>
>
> --- a/bitbake/lib/bb/runqueue.py
> +++ b/bitbake/lib/bb/runqueue.py
> @@ -1096,6 +1096,10 @@ class RunQueueExecute:
>
> logger.debug(2, 'Running %s:%s under fakeroot, fakedirs: %s' %
> (fn, taskname, ', '.join(fakedirs)))
> + else:
> + envbackup["PSEUDO_RELOADED"] = os.environ.get("PSEUDO_RELOADED")
> + os.environ["PSEUDO_RELOADED"] = "yes"
> + fakeenv["PSEUDO_RELOADED"] = "yes"
PSEUDO_RELOADED was intended to only be used internally by pseudo. Specifically
to signify to fork/exec that we're about to run the pseudo server process and to
remove PSEUDO from the LD_PRELOAD on the next fork/exec.
The system simply checks the environment on the fork-exec and doesn't check the
value on pseudo-load. This is why it works.
That side effect means that any subsequent calls can NOT re-enable pseudo as
it's no longer in memory at all.
So what you are seeing at best is the time difference from avoiding the
LD_PRELOAD and the jump table setup. (Even when pseudo is disabled, we need to
enable the jump table, we just pass the call to the original function.)
But more then likely because pseudo is no longer memory resident for the called
processes and it's sub-processes.. there is likely some place in the system that
uses pseudo functionality that is no longer functioning properly.
It would be interesting to determine first off, if there is anywhere pseudo
should be running that it currently isn't. And second if this is simply due to
LD_PRELOAD time, or if enabling the jump table is the culprit.
One potential optimization, when PSEUDO_DISABLE=1 is to only setup the jump
table entries for fork/exec items.
Also if it is desired to unload pseudo, I'd suggest we add a new environment
variable to pseudo that is specific about unloading pseudo, instead of using the
existing PSEUDO_RELOADED. Not only is the name confusing, but since it's an
internal item it's behavior may change or go away in the future.
(Below is from the pseudo man page:
PSEUDO_RELOADED
This purely internal variable is used to track state while try-
ing to re-execute to get rid of the LD_PRELOAD value when
spawning a server. (The pseudo server itself cannot function
running in the pseudo environment.)
)
>
> sys.stdout.flush()
> sys.stderr.flush()
>
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* [PATCH] cogl: Add git recipe (required by clutter)
From: Richard Purdie @ 2011-10-12 13:42 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
new file mode 100644
index 0000000..387f6ec
--- a/dev/null
+++ b/meta/recipes-graphics/clutter/cogl.inc
@@ -0,0 +1,22 @@
+DESCRIPTION = "Clutter graphics library"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gdk-pixbuf libxi"
+BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
+
+DEPENDS = "${STDDEPENDS} virtual/libgl"
+EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
+
+FILESPATH = "${FILE_DIRNAME}/clutter"
+
+inherit autotools pkgconfig gtk-doc gettext
+
+#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+require clutter-fpu.inc
+
+#Fix up some weirdness in the docs
+do_configure_prepend() {
+ sed -i s:doc/reference/Makefile::g ${S}/configure.ac
+ sed -i s:doc::g ${S}/Makefile.am
+}
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
new file mode 100644
index 0000000..890c654
--- a/dev/null
+++ b/meta/recipes-graphics/clutter/cogl_git.bb
@@ -0,0 +1,19 @@
+require cogl.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+SRCREV = "0a70a159c65357809740971570b2e301451161b5"
+PV = "1.8.0+git${SRCPV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://git.gnome.org/cogl;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+do_configure_prepend () {
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
^ permalink raw reply related
* [PATCH] autotools: Enhance gettext handling to better work with SCM versions of code
From: Richard Purdie @ 2011-10-12 13:42 UTC (permalink / raw)
To: openembedded-core
If we pull SCM based code using gettext, Makefile.in.in in the
po directory can be missing. We therefore need to add this if
its not already present. We could use gettextize if it wasn't
so broken (for example requiring user input on stdin and installing
way more files that we ever care about such as the m4 files).
We also have a problem if a recipe sets a different AUX dir, for
now fix this by allowing recipes to specify when this is being done
using the AUTOTOOLS_AUXDIR variable. Ultimately we could likely
figure this out automatically.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index a4ce851..0413322 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -80,6 +80,8 @@ oe_runconf () {
fi
}
+AUTOTOOLS_AUXDIR ?= "${S}"
+
autotools_do_configure() {
case ${PN} in
autoconf*)
@@ -144,7 +146,11 @@ autotools_do_configure() {
echo "no" | glib-gettextize --force --copy
fi
else if grep "^[[:space:]]*AM_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
- cp ${STAGING_DATADIR}/gettext/config.rpath ${S}/
+ # We'd call gettextize here if it wasn't so broken...
+ cp ${STAGING_DATADIR}/gettext/config.rpath ${AUTOTOOLS_AUXDIR}/
+ if [ ! -e ${S}/po/Makefile.in.in ]; then
+ cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
+ fi
fi
fi
fi
^ permalink raw reply related
* [PATCH] clutter-1.6: update to 1.6.18
From: Richard Purdie @ 2011-10-12 13:42 UTC (permalink / raw)
To: openembedded-core
From 345e2bbbb41830ea193c282691479add4a00b0d8 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 12 Oct 2011 13:15:11 +0000
Subject:
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb b/meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb
index 555133f..9c32efd 100644
--- a/meta/recipes-graphics/clutter/clutter-1.6_1.6.14.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.6_1.6.18.bb
@@ -22,5 +22,5 @@ do_configure_prepend () {
sed -i -e 's/^DOLT//' ${S}/configure.ac
}
-SRC_URI[md5sum] = "1da9f983115f9bd28b0be8176e53fe36"
-SRC_URI[sha256sum] = "0564e57ca8eb24e76014627c0bb28a80a6c01b620ba14bc4198365562549576d"
+SRC_URI[md5sum] = "7302513c96b00588b7779918fae0b33b"
+SRC_URI[sha256sum] = "d849f92944be193e9d8e707f1371e6bab7fca473e09a492265e2e2296febd749"
^ permalink raw reply related
* [PATCH] clutter: Update git recipe to more recent version
From: Richard Purdie @ 2011-10-12 13:41 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb
index 020453f..897f5ff 100644
--- a/meta/recipes-graphics/clutter/clutter_git.bb
+++ b/meta/recipes-graphics/clutter/clutter_git.bb
@@ -3,9 +3,13 @@ require clutter-package.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-SRCREV = "e957e277b8a4893ce8c99e94402036d42a8b3748"
-PV = "1.0.0+git${SRCPV}"
-PR = "r9"
+DEPENDS += "cogl"
+
+SRCREV = "39db46123ed6bbbc3e6ad359a64d4d344ca9e11b"
+PV = "1.8.0+git${SRCPV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
SRC_URI = "git://git.gnome.org/clutter;protocol=git;branch=master \
file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \
@@ -14,6 +18,8 @@ S = "${WORKDIR}/git"
BASE_CONF += "--disable-introspection"
+AUTOTOOLS_AUXDIR = "${S}/build"
+
do_configure_prepend () {
# Disable DOLT
sed -i -e 's/^DOLT//' ${S}/configure.ac
^ permalink raw reply related
* [PATCH] eds: Update to work with glib-2.0
From: Richard Purdie @ 2011-10-12 13:39 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch b/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch
new file mode 100644
index 0000000..0785a93
--- a/dev/null
+++ b/meta/recipes-sato/eds/eds-dbus/depbuildfix.patch
@@ -0,0 +1,78 @@
+G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
+build failures. Also resolve other deprecation issues.
+
+RP 2011/10/12
+
+Upstream-Status: Pending
+
+Index: git/libedataserver/e-data-server-util.c
+===================================================================
+--- git.orig/libedataserver/e-data-server-util.c 2011-10-12 01:42:40.622045788 +0100
++++ git/libedataserver/e-data-server-util.c 2011-10-12 01:48:16.732045664 +0100
+@@ -165,7 +165,8 @@
+ static gunichar
+ stripped_char (gunichar ch)
+ {
+- gunichar *decomp, retval;
++ gunichar decomp[4];
++ gunichar retval;
+ GUnicodeType utype;
+ gsize dlen;
+
+@@ -175,7 +176,7 @@
+ case G_UNICODE_CONTROL:
+ case G_UNICODE_FORMAT:
+ case G_UNICODE_UNASSIGNED:
+- case G_UNICODE_COMBINING_MARK:
++ case G_UNICODE_SPACING_MARK:
+ /* Ignore those */
+ return 0;
+ break;
+@@ -183,7 +184,7 @@
+ /* Convert to lowercase, fall through */
+ ch = g_unichar_tolower (ch);
+ case G_UNICODE_LOWERCASE_LETTER:
+- if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
++ if ((dlen = g_unichar_fully_decompose (ch, FALSE, decomp, 4))) {
+ retval = decomp[0];
+ g_free (decomp);
+ return retval;
+Index: git/addressbook/libedata-book/e-data-book-factory.c
+===================================================================
+--- git.orig/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:52:25.692045500 +0100
++++ git/addressbook/libedata-book/e-data-book-factory.c 2011-10-12 01:53:31.862045707 +0100
+@@ -238,7 +238,7 @@
+ return g_strdup_printf (
+ "/org/gnome/evolution/dataserver/addressbook/%d/%u",
+ getpid (),
+- g_atomic_int_exchange_and_add (&counter, 1));
++ g_atomic_int_add (&counter, 1));
+ }
+
+ static void
+Index: git/addressbook/libedata-book/e-data-book.c
+===================================================================
+--- git.orig/addressbook/libedata-book/e-data-book.c 2011-10-12 01:54:40.752045465 +0100
++++ git/addressbook/libedata-book/e-data-book.c 2011-10-12 01:55:16.012045897 +0100
+@@ -553,7 +553,7 @@
+
+ return g_strdup_printf ("/org/gnome/evolution/dataserver/addressbook/BookView/%d/%d",
+ getpid (),
+- g_atomic_int_exchange_and_add ((int*)&counter, 1));
++ g_atomic_int_add ((int*)&counter, 1));
+ }
+
+ static void
+Index: git/calendar/libedata-cal/e-data-cal-factory.c
+===================================================================
+--- git.orig/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:56.612045081 +0100
++++ git/calendar/libedata-cal/e-data-cal-factory.c 2011-10-12 01:57:58.832045211 +0100
+@@ -227,7 +227,7 @@
+ return g_strdup_printf (
+ "/org/gnome/evolution/dataserver/calendar/%d/%u",
+ getpid (),
+- g_atomic_int_exchange_and_add (&counter, 1));
++ g_atomic_int_add (&counter, 1));
+ }
+
+ static void
diff --git a/meta/recipes-sato/eds/eds-dbus_git.bb b/meta/recipes-sato/eds/eds-dbus_git.bb
index 7fa8311..9424353 100644
--- a/meta/recipes-sato/eds/eds-dbus_git.bb
+++ b/meta/recipes-sato/eds/eds-dbus_git.bb
@@ -12,7 +12,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi
SRCREV = "7337d11aed576e7caaa12b4e881ad8d33668799f"
PV = "2.30+git${SRCPV}"
-PR = "r1"
+PR = "r3"
SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://oh-contact.patch;striplevel=0 \
@@ -20,6 +20,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://optional_imapx_provider.patch \
file://new-contact-fix.patch \
file://old-gdk-api.patch \
+ file://depbuildfix.patch \
file://iconv-detect.h"
S = "${WORKDIR}/git"
^ permalink raw reply related
* Re: [PATCH] atk: Upgrade 1.32.0 -> 2.2.0
From: Koen Kooi @ 2011-10-12 13:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318426649.23801.161.camel@ted>
Op 12 okt. 2011, om 15:37 heeft Richard Purdie het volgende geschreven:
>
> diff --git a/meta/recipes-support/atk/atk_1.32.0.bb b/meta/recipes-support/atk/atk_2.2.0.bb
> index db8ca1f..1358f3e 100644
> --- a/meta/recipes-support/atk/atk_1.32.0.bb
> +++ b/meta/recipes-support/atk/atk_2.2.0.bb
> @@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
> file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
>
> PR = "r1"
Please reset that r0 or better, completely remove it.
^ permalink raw reply
* [PATCH] libunique: Update to work with glib-2.0
From: Richard Purdie @ 2011-10-12 13:39 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-gnome/libunique/libunique/noconst.patch b/meta/recipes-gnome/libunique/libunique/noconst.patch
new file mode 100644
index 0000000..2cc0347
--- a/dev/null
+++ b/meta/recipes-gnome/libunique/libunique/noconst.patch
@@ -0,0 +1,130 @@
+G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
+build failures.
+
+RP 2011/10/12
+
+Upstream-Status: Pending
+
+Index: libunique-1.1.6/unique/uniqueapp.c
+===================================================================
+--- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100
++++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100
+@@ -781,7 +781,7 @@
+ }
+
+
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_command_to_string (UniqueApp *app,
+ gint command)
+ {
+@@ -863,7 +863,7 @@
+ return retval;
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_response_to_string (UniqueResponse response)
+ {
+ GEnumClass *enum_class;
+Index: libunique-1.1.6/unique/uniquebackend.c
+===================================================================
+--- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100
++++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100
+@@ -111,7 +111,7 @@
+ *
+ * Return value: FIXME
+ */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_backend_get_name (UniqueBackend *backend)
+ {
+ g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
+@@ -154,7 +154,7 @@
+ *
+ * Return value: FIXME
+ */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_backend_get_startup_id (UniqueBackend *backend)
+ {
+ g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
+Index: libunique-1.1.6/unique/uniquebackend.h
+===================================================================
+--- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100
++++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100
+@@ -94,10 +94,10 @@
+
+ UniqueBackend * unique_backend_create (void);
+
+-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend);
++const gchar *unique_backend_get_name (UniqueBackend *backend);
+ void unique_backend_set_name (UniqueBackend *backend,
+ const gchar *name);
+-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend);
++const gchar *unique_backend_get_startup_id (UniqueBackend *backend);
+ void unique_backend_set_startup_id (UniqueBackend *backend,
+ const gchar *startup_id);
+ GdkScreen * unique_backend_get_screen (UniqueBackend *backend);
+Index: libunique-1.1.6/unique/uniqueinternals.h
+===================================================================
+--- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100
++++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100
+@@ -44,11 +44,11 @@
+ * and then back into an id
+ */
+ UniqueResponse unique_response_from_string (const gchar *response);
+-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response);
++const gchar *unique_response_to_string (UniqueResponse response);
+
+ gint unique_command_from_string (UniqueApp *app,
+ const gchar *command);
+-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app,
++const gchar *unique_command_to_string (UniqueApp *app,
+ gint command);
+
+ G_END_DECLS
+Index: libunique-1.1.6/unique/uniquemessage.c
+===================================================================
+--- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100
++++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100
+@@ -185,7 +185,7 @@
+ *
+ * Since: 1.0.2
+ */
+-G_CONST_RETURN guchar *
++const guchar *
+ unique_message_data_get (UniqueMessageData *message_data,
+ gsize *length)
+ {
+@@ -525,7 +525,7 @@
+ * owned by the #UniqueMessageData structure and should not be
+ * modified or freed
+ */
+-G_CONST_RETURN gchar *
++const gchar *
+ unique_message_data_get_startup_id (UniqueMessageData *message_data)
+ {
+ g_return_val_if_fail (message_data != NULL, NULL);
+Index: libunique-1.1.6/unique/uniquemessage.h
+===================================================================
+--- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100
++++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100
+@@ -48,7 +48,7 @@
+ void unique_message_data_set (UniqueMessageData *message_data,
+ const guchar *data,
+ gsize length);
+-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data,
++const guchar *unique_message_data_get (UniqueMessageData *message_data,
+ gsize *length);
+
+ gboolean unique_message_data_set_text (UniqueMessageData *message_data,
+@@ -63,7 +63,7 @@
+ gchar * unique_message_data_get_filename (UniqueMessageData *message_data);
+
+ GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data);
+-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
++const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
+ guint unique_message_data_get_workspace (UniqueMessageData *message_data);
+
+ G_END_DECLS
diff --git a/meta/recipes-gnome/libunique/libunique_1.1.6.bb b/meta/recipes-gnome/libunique/libunique_1.1.6.bb
index 4f3cdb6..9435e97 100644
--- a/meta/recipes-gnome/libunique/libunique_1.1.6.bb
+++ b/meta/recipes-gnome/libunique/libunique_1.1.6.bb
@@ -3,12 +3,13 @@ HOMEPAGE = "http://live.gnome.org/LibUnique"
BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique"
SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \
- file://fix_for_compile_with_gcc-4.6.0.patch"
+ file://fix_for_compile_with_gcc-4.6.0.patch \
+ file://noconst.patch"
SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d"
SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"
-PR = "r3"
+PR = "r4"
DEPENDS = "glib-2.0 gtk+ dbus"
^ permalink raw reply related
* [PATCH] pango: Update to work with glib-2.0
From: Richard Purdie @ 2011-10-12 13:38 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch b/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch
new file mode 100644
index 0000000..d4832a5
--- a/dev/null
+++ b/meta/recipes-graphics/pango/pango-1.28.4/noconst.patch
@@ -0,0 +1,408 @@
+G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
+build failures.
+
+RP 2011/10/12
+
+Upstream-Status: Pending
+
+Index: pango-1.28.4/pango/fonts.c
+===================================================================
+--- pango-1.28.4.orig/pango/fonts.c 2011-10-12 01:32:09.372046342 +0100
++++ pango-1.28.4/pango/fonts.c 2011-10-12 01:32:34.512036630 +0100
+@@ -165,7 +165,7 @@
+ * %NULL if not previously set. This has the same life-time
+ * as the font description itself and should not be freed.
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_description_get_family (const PangoFontDescription *desc)
+ {
+ g_return_val_if_fail (desc != NULL, NULL);
+@@ -1927,7 +1927,7 @@
+ * Return value: the name of the family. This string is owned
+ * by the family object and must not be modified or freed.
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_family_get_name (PangoFontFamily *family)
+ {
+ g_return_val_if_fail (PANGO_IS_FONT_FAMILY (family), NULL);
+@@ -2060,7 +2060,7 @@
+ * Return value: the face name for the face. This string is
+ * owned by the face object and must not be modified or freed.
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_face_get_face_name (PangoFontFace *face)
+ {
+ g_return_val_if_fail (PANGO_IS_FONT_FACE (face), NULL);
+Index: pango-1.28.4/pango/pango-attributes.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-attributes.c 2011-10-12 01:32:09.552046155 +0100
++++ pango-1.28.4/pango/pango-attributes.c 2011-10-12 01:32:34.522037975 +0100
+@@ -97,7 +97,7 @@
+ *
+ * Since: 1.22
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_attr_type_get_name (PangoAttrType type)
+ {
+ const char *result = NULL;
+Index: pango-1.28.4/pango/pango-attributes.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-attributes.h 2011-10-12 01:32:12.712046218 +0100
++++ pango-1.28.4/pango/pango-attributes.h 2011-10-12 01:32:36.342045777 +0100
+@@ -180,7 +180,7 @@
+ };
+
+ PangoAttrType pango_attr_type_register (const gchar *name);
+-G_CONST_RETURN char * pango_attr_type_get_name (PangoAttrType type) G_GNUC_CONST;
++const char * pango_attr_type_get_name (PangoAttrType type) G_GNUC_CONST;
+
+ void pango_attribute_init (PangoAttribute *attr,
+ const PangoAttrClass *klass);
+Index: pango-1.28.4/pango/pango-context.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-context.c 2011-10-12 01:32:09.782046152 +0100
++++ pango-1.28.4/pango/pango-context.c 2011-10-12 01:32:34.532039187 +0100
+@@ -188,7 +188,7 @@
+ *
+ * Since: 1.6
+ **/
+-G_CONST_RETURN PangoMatrix *
++const PangoMatrix *
+ pango_context_get_matrix (PangoContext *context)
+ {
+ g_return_val_if_fail (PANGO_IS_CONTEXT (context), NULL);
+Index: pango-1.28.4/pango/pango-context.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-context.h 2011-10-12 01:32:12.892046153 +0100
++++ pango-1.28.4/pango/pango-context.h 2011-10-12 01:32:36.352046105 +0100
+@@ -86,7 +86,7 @@
+
+ void pango_context_set_matrix (PangoContext *context,
+ const PangoMatrix *matrix);
+-G_CONST_RETURN PangoMatrix *pango_context_get_matrix (PangoContext *context);
++const PangoMatrix *pango_context_get_matrix (PangoContext *context);
+
+ /* Break a string of Unicode characters into segments with
+ * consistent shaping/language engine and bidrectional level.
+Index: pango-1.28.4/pango/pango-font.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-font.h 2011-10-12 01:32:13.072046150 +0100
++++ pango-1.28.4/pango/pango-font.h 2011-10-12 01:32:36.362046243 +0100
+@@ -117,7 +117,7 @@
+ const char *family);
+ void pango_font_description_set_family_static (PangoFontDescription *desc,
+ const char *family);
+-G_CONST_RETURN char *pango_font_description_get_family (const PangoFontDescription *desc) G_GNUC_PURE;
++const char *pango_font_description_get_family (const PangoFontDescription *desc) G_GNUC_PURE;
+ void pango_font_description_set_style (PangoFontDescription *desc,
+ PangoStyle style);
+ PangoStyle pango_font_description_get_style (const PangoFontDescription *desc) G_GNUC_PURE;
+@@ -212,7 +212,7 @@
+ void pango_font_family_list_faces (PangoFontFamily *family,
+ PangoFontFace ***faces,
+ int *n_faces);
+-G_CONST_RETURN char *pango_font_family_get_name (PangoFontFamily *family) G_GNUC_PURE;
++const char *pango_font_family_get_name (PangoFontFamily *family) G_GNUC_PURE;
+ gboolean pango_font_family_is_monospace (PangoFontFamily *family) G_GNUC_PURE;
+
+ #ifdef PANGO_ENABLE_BACKEND
+@@ -261,7 +261,7 @@
+ GType pango_font_face_get_type (void) G_GNUC_CONST;
+
+ PangoFontDescription *pango_font_face_describe (PangoFontFace *face);
+-G_CONST_RETURN char *pango_font_face_get_face_name (PangoFontFace *face) G_GNUC_PURE;
++const char *pango_font_face_get_face_name (PangoFontFace *face) G_GNUC_PURE;
+ void pango_font_face_list_sizes (PangoFontFace *face,
+ int **sizes,
+ int *n_sizes);
+Index: pango-1.28.4/pango/pango-fontmap.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-fontmap.c 2011-10-12 01:32:09.912046152 +0100
++++ pango-1.28.4/pango/pango-fontmap.c 2011-10-12 01:32:34.542040267 +0100
+@@ -290,7 +290,7 @@
+ *
+ * Since: 1.4
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_font_map_get_shape_engine_type (PangoFontMap *fontmap)
+ {
+ g_return_val_if_fail (PANGO_IS_FONT_MAP (fontmap), NULL);
+Index: pango-1.28.4/pango/pango-language.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-language.c 2011-10-12 01:32:10.052046151 +0100
++++ pango-1.28.4/pango/pango-language.c 2011-10-12 01:32:34.542040267 +0100
+@@ -319,7 +319,7 @@
+ * Returns: a string representing the language tag. This is owned by
+ * Pango and should not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ (pango_language_to_string) (PangoLanguage *language)
+ {
+ return pango_language_to_string (language);
+@@ -531,7 +531,7 @@
+ * Return value: the sample string. This value is owned by Pango
+ * and should not be freed.
+ **/
+-G_CONST_RETURN char *
++const char *
+ pango_language_get_sample_string (PangoLanguage *language)
+ {
+ const LangInfo *lang_info;
+@@ -592,7 +592,7 @@
+
+ * Since: 1.22
+ **/
+-G_CONST_RETURN PangoScript *
++const PangoScript *
+ pango_language_get_scripts (PangoLanguage *language,
+ int *num_scripts)
+ {
+Index: pango-1.28.4/pango/pango-language.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-language.h 2011-10-12 01:32:13.262046150 +0100
++++ pango-1.28.4/pango/pango-language.h 2011-10-12 01:32:36.362046243 +0100
+@@ -34,11 +34,11 @@
+ GType pango_language_get_type (void) G_GNUC_CONST;
+ PangoLanguage *pango_language_from_string (const char *language);
+
+-G_CONST_RETURN char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST;
++const char *pango_language_to_string (PangoLanguage *language) G_GNUC_CONST;
+ /* For back compat. Will have to keep indefinitely. */
+ #define pango_language_to_string(language) ((const char *)language)
+
+-G_CONST_RETURN char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
++const char *pango_language_get_sample_string (PangoLanguage *language) G_GNUC_CONST;
+ PangoLanguage *pango_language_get_default (void) G_GNUC_CONST;
+
+ gboolean pango_language_matches (PangoLanguage *language,
+@@ -48,7 +48,7 @@
+
+ gboolean pango_language_includes_script (PangoLanguage *language,
+ PangoScript script) G_GNUC_PURE;
+-G_CONST_RETURN PangoScript *pango_language_get_scripts (PangoLanguage *language,
++const PangoScript *pango_language_get_scripts (PangoLanguage *language,
+ int *num_scripts);
+
+ G_END_DECLS
+Index: pango-1.28.4/pango/pango-layout.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-layout.c 2011-10-12 01:32:10.072046151 +0100
++++ pango-1.28.4/pango/pango-layout.c 2011-10-12 01:32:34.552041215 +0100
+@@ -677,7 +677,7 @@
+ *
+ * Since: 1.8
+ **/
+-G_CONST_RETURN PangoFontDescription *
++const PangoFontDescription *
+ pango_layout_get_font_description (PangoLayout *layout)
+ {
+ g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
+@@ -1087,7 +1087,7 @@
+ *
+ * Return value: the text in the @layout.
+ **/
+-G_CONST_RETURN char*
++const char*
+ pango_layout_get_text (PangoLayout *layout)
+ {
+ g_return_val_if_fail (PANGO_IS_LAYOUT (layout), NULL);
+Index: pango-1.28.4/pango/pango-layout.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-layout.h 2011-10-12 01:32:13.302046150 +0100
++++ pango-1.28.4/pango/pango-layout.h 2011-10-12 01:32:36.362046243 +0100
+@@ -116,7 +116,7 @@
+ void pango_layout_set_font_description (PangoLayout *layout,
+ const PangoFontDescription *desc);
+
+-G_CONST_RETURN PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
++const PangoFontDescription *pango_layout_get_font_description (PangoLayout *layout);
+
+ void pango_layout_set_width (PangoLayout *layout,
+ int width);
+Index: pango-1.28.4/pango/pango-ot-ruleset.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-ot-ruleset.c 2011-10-12 01:32:10.152046150 +0100
++++ pango-1.28.4/pango/pango-ot-ruleset.c 2011-10-12 01:32:34.552041215 +0100
+@@ -107,7 +107,7 @@
+ *
+ * Since: 1.18
+ **/
+-G_CONST_RETURN PangoOTRuleset *
++const PangoOTRuleset *
+ pango_ot_ruleset_get_for_description (PangoOTInfo *info,
+ const PangoOTRulesetDescription *desc)
+ {
+Index: pango-1.28.4/pango/pango-renderer.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-renderer.c 2011-10-12 01:32:10.192046151 +0100
++++ pango-1.28.4/pango/pango-renderer.c 2011-10-12 01:32:34.562041682 +0100
+@@ -1352,7 +1352,7 @@
+ *
+ * Since: 1.8
+ **/
+-G_CONST_RETURN PangoMatrix *
++const PangoMatrix *
+ pango_renderer_get_matrix (PangoRenderer *renderer)
+ {
+ g_return_val_if_fail (PANGO_IS_RENDERER (renderer), NULL);
+Index: pango-1.28.4/pango/pango-renderer.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-renderer.h 2011-10-12 01:32:13.402046150 +0100
++++ pango-1.28.4/pango/pango-renderer.h 2011-10-12 01:32:36.362046243 +0100
+@@ -249,7 +249,7 @@
+
+ void pango_renderer_set_matrix (PangoRenderer *renderer,
+ const PangoMatrix *matrix);
+-G_CONST_RETURN PangoMatrix *pango_renderer_get_matrix (PangoRenderer *renderer);
++const PangoMatrix *pango_renderer_get_matrix (PangoRenderer *renderer);
+
+ PangoLayout *pango_renderer_get_layout (PangoRenderer *renderer);
+ PangoLayoutLine *pango_renderer_get_layout_line (PangoRenderer *renderer);
+Index: pango-1.28.4/pango/pango-script.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-script.c 2011-10-12 01:32:10.212046151 +0100
++++ pango-1.28.4/pango/pango-script.c 2011-10-12 01:32:34.562041682 +0100
+@@ -165,8 +165,8 @@
+ **/
+ void
+ pango_script_iter_get_range (PangoScriptIter *iter,
+- G_CONST_RETURN char **start,
+- G_CONST_RETURN char **end,
++ const char **start,
++ const char **end,
+ PangoScript *script)
+ {
+ if (start)
+Index: pango-1.28.4/pango/pango-script.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-script.h 2011-10-12 01:32:13.422046150 +0100
++++ pango-1.28.4/pango/pango-script.h 2011-10-12 01:32:36.362046243 +0100
+@@ -129,8 +129,8 @@
+ PangoScriptIter *pango_script_iter_new (const char *text,
+ int length);
+ void pango_script_iter_get_range (PangoScriptIter *iter,
+- G_CONST_RETURN char **start,
+- G_CONST_RETURN char **end,
++ const char **start,
++ const char **end,
+ PangoScript *script);
+ gboolean pango_script_iter_next (PangoScriptIter *iter);
+ void pango_script_iter_free (PangoScriptIter *iter);
+Index: pango-1.28.4/pango/pango-utils.c
+===================================================================
+--- pango-1.28.4.orig/pango/pango-utils.c 2011-10-12 01:32:10.242046149 +0100
++++ pango-1.28.4/pango/pango-utils.c 2011-10-12 01:32:34.562041682 +0100
+@@ -689,7 +689,7 @@
+ * Return value: the Pango sysconf directory. The returned string should
+ * not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ pango_get_sysconf_subdirectory (void)
+ {
+ #ifdef G_OS_WIN32
+@@ -718,7 +718,7 @@
+ * Return value: the Pango lib directory. The returned string should
+ * not be freed.
+ */
+-G_CONST_RETURN char *
++const char *
+ pango_get_lib_subdirectory (void)
+ {
+ #ifdef G_OS_WIN32
+Index: pango-1.28.4/pango/pango-utils.h
+===================================================================
+--- pango-1.28.4.orig/pango/pango-utils.h 2011-10-12 01:32:13.512046149 +0100
++++ pango-1.28.4/pango/pango-utils.h 2011-10-12 01:32:36.362046243 +0100
+@@ -82,13 +82,13 @@
+ * stored in the registry). The returned string should not be
+ * g_free'd.
+ */
+-G_CONST_RETURN char * pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
++const char * pango_get_sysconf_subdirectory (void) G_GNUC_PURE;
+
+ /* Ditto for LIBDIR/pango. On Win32, use the same Pango
+ * installation directory. This returned string should not be
+ * g_free'd either.
+ */
+-G_CONST_RETURN char * pango_get_lib_subdirectory (void) G_GNUC_PURE;
++const char * pango_get_lib_subdirectory (void) G_GNUC_PURE;
+
+ #endif /* PANGO_ENABLE_BACKEND */
+
+@@ -131,10 +131,10 @@
+ int pango_version (void) G_GNUC_CONST;
+
+ /* Return run-time Pango version as an string */
+-G_CONST_RETURN char * pango_version_string (void) G_GNUC_CONST;
++const char * pango_version_string (void) G_GNUC_CONST;
+
+ /* Check that run-time Pango is as new as required */
+-G_CONST_RETURN char * pango_version_check (int required_major,
++const char * pango_version_check (int required_major,
+ int required_minor,
+ int required_micro) G_GNUC_CONST;
+
+Index: pango-1.28.4/pango/pangocairo-context.c
+===================================================================
+--- pango-1.28.4.orig/pango/pangocairo-context.c 2011-10-12 01:32:09.622046154 +0100
++++ pango-1.28.4/pango/pangocairo-context.c 2011-10-12 01:32:34.522037975 +0100
+@@ -260,7 +260,7 @@
+ *
+ * Since: 1.10
+ **/
+-G_CONST_RETURN cairo_font_options_t *
++const cairo_font_options_t *
+ pango_cairo_context_get_font_options (PangoContext *context)
+ {
+ PangoCairoContextInfo *info;
+@@ -286,7 +286,7 @@
+ * Return value: the combined set of font options. This value is owned
+ * by the context and must not be modified or freed.
+ **/
+-G_CONST_RETURN cairo_font_options_t *
++const cairo_font_options_t *
+ _pango_cairo_context_get_merged_font_options (PangoContext *context)
+ {
+ PangoCairoContextInfo *info = get_context_info (context, TRUE);
+Index: pango-1.28.4/pango/pangoft2.c
+===================================================================
+--- pango-1.28.4.orig/pango/pangoft2.c 2011-10-12 01:32:09.942046152 +0100
++++ pango-1.28.4/pango/pangoft2.c 2011-10-12 01:32:34.542040267 +0100
+@@ -520,7 +520,7 @@
+ return ((ft_error_description *) pkey)->code - ((ft_error_description *) pbase)->code;
+ }
+
+-G_CONST_RETURN char *
++const char *
+ _pango_ft2_ft_strerror (FT_Error error)
+ {
+ #undef __FTERRORS_H__
+Index: pango-1.28.4/pango/pangox-fontmap.c
+===================================================================
+--- pango-1.28.4.orig/pango/pangox-fontmap.c 2011-10-12 01:32:10.352046151 +0100
++++ pango-1.28.4/pango/pangox-fontmap.c 2011-10-12 01:32:34.572042704 +0100
+@@ -1441,7 +1441,7 @@
+ }
+
+
+-G_CONST_RETURN char *
++const char *
+ pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
+ Atom atom)
+ {
+@@ -1645,7 +1645,7 @@
+ }
+ }
+
+-static G_CONST_RETURN char *
++static const char *
+ pango_x_family_get_name (PangoFontFamily *family)
+ {
+ PangoXFamily *xfamily = PANGO_X_FAMILY (family);
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb
index 68ab700..2cbd372 100644
--- a/meta/recipes-graphics/pango/pango_1.28.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.28.4.bb
@@ -2,9 +2,10 @@ require pango.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r1"
+PR = "r2"
SRC_URI += "file://no-tests.patch"
+SRC_URI += "file://noconst.patch"
SRC_URI[archive.md5sum] = "3f3989700f04e9117d30544a9078b3a0"
SRC_URI[archive.sha256sum] = "7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f"
^ permalink raw reply related
* [PATCH] atk: Upgrade 1.32.0 -> 2.2.0
From: Richard Purdie @ 2011-10-12 13:37 UTC (permalink / raw)
To: openembedded-core
---
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
deleted file mode 100644
index 0de3f26..0000000
--- a/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
+++ b/dev/null
@@ -1,630 +0,0 @@
-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_2.2.0.bb
index db8ca1f..1358f3e 100644
--- a/meta/recipes-support/atk/atk_1.32.0.bb
+++ b/meta/recipes-support/atk/atk_2.2.0.bb
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
PR = "r1"
-SRC_URI = "http://download.gnome.org/sources/atk/1.32/${BPN}-${PV}.tar.bz2 \
- file://remove.G_CONST_RETURN.patch \
-"
+SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "b9a19a3e426cd9ca930f0108c4ee343f"
-SRC_URI[sha256sum] = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e"
+SRC_URI[md5sum] = "4894e9b04f0a9f1c37a624a1e8d6d73f"
+SRC_URI[sha256sum] = "d201e3f5808aef0b1aec2277bfa61074f68863e405428adb57a73aab5c838450"
^ permalink raw reply related
* [PATCH] Import python-setuptools from meta-oe (for glib-2.0)
From: Richard Purdie @ 2011-10-12 13:36 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-devtools/python/python-setuptools_0.6c11.bb b/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
new file mode 100644
index 0000000..ca7335e
--- a/dev/null
+++ b/meta/recipes-devtools/python/python-setuptools_0.6c11.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages"
+HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
+SECTION = "devel/python"
+LICENSE = "PSF"
+LIC_FILES_CHKSUM = "file://setup.py;beginline=23;endline=23;md5=8a314270dd7a8dbca741775415f1716e"
+
+SRCNAME = "setuptools"
+PR = "ml2"
+DEPENDS += "python"
+DEPENDS_virtclass-native += "python-native"
+
+SRC_URI = "\
+ http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\
+"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_install_prepend() {
+ install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+}
+
+RDEPENDS_${PN} = "\
+ python-distutils \
+ python-compression \
+"
+
+SRC_URI[md5sum] = "7df2a529a074f613b509fb44feefe74e"
+SRC_URI[sha256sum] = "630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3"
+
+BBCLASSEXTEND = "native"
^ permalink raw reply related
* [PATCH] flac: Add missing gettext dependency (requires iconv)
From: Richard Purdie @ 2011-10-12 13:34 UTC (permalink / raw)
To: openembedded-core
diff --git a/meta/recipes-multimedia/flac/flac_1.2.1.bb b/meta/recipes-multimedia/flac/flac_1.2.1.bb
index 652d69a..5a9c66f 100644
--- a/meta/recipes-multimedia/flac/flac_1.2.1.bb
+++ b/meta/recipes-multimedia/flac/flac_1.2.1.bb
@@ -27,7 +27,7 @@ SRC_URI[sha256sum] = "9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f
S = "${WORKDIR}/flac-${PV}"
-inherit autotools
+inherit autotools gettext
EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \
--with-ogg-libraries=${STAGING_LIBDIR} \
^ permalink raw reply related
* Re: [RFC PATCH 0/1] QA check for defined packages
From: Koen Kooi @ 2011-10-12 12:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318423059.23801.151.camel@ted>
Op 12 okt. 2011, om 14:37 heeft Richard Purdie het volgende geschreven:
> On Tue, 2011-10-11 at 15:29 -0700, Joshua Lock wrote:
>> I'm looking for some comments on this WIP patch.
>>
>> The reason I've added this is because the hob GUI requires us to offer much
>> more reliable metadata - we show the user available packages, as defined by
>> each recipe, to add to their image. Should a recipe define a package and yet
>> not actually create it and the user has included that in their image we cause
>> errors at build time.
>>
>> However whilst the idea seems sound enough, there are some caveats - running
>> a world build with this patch I see failures fairly early on at least a few
>> of which I'd expect we'll need to special-case:
>> * eglibc-local
>> * linux-yocto
>> * linux-libc-headers
>> * gcc-runtime
>>
>> Thoughts?
>
> I think we probably do need to cleanup some of that data.
>
> I have some thoughts about where we're at with hob and this is probably
> as good a time as any to share them.
>
> Effectively the problem is that there is a large body of data we only
> compute during the build process. This includes what the exact runtime
> dependencies of packages are, which packages exactly are generated
> (PACKAGES_DYNAMIC), what the size of the packages are, how long they
> take to build and so on. Some things we can fix, some things we can hack
> around but at the end of the day there are some things we just plain
> can't change.
>
> I'm beginning to think we need to have two phases of control of the
> system:
>
> a) The build phase
>
> This is the step that generates the package feeds.
>
> b) The image construction phase
>
> This is the step that takes the package feed data and turns it into an
> image.
>
> Obviously, you can skip to b) if you already have a package feed.
>
> So we'd be talking about two UI's that could effectively hand off to
> each other and share a "build in progress" feedback to the user system.
> The image construction dialog would have a "Missing Packages? Build them
> here" type switch. This would mean the build system can continue on at
> what it does best yet the UI can let the users do what they want to do,
> particularly on a prebuilt package feed.
>
> Thoughts?
I really, really, REALLY like the attention packages feeds are getting lately on the oe-core and yocto mailinglists!
^ permalink raw reply
* Re: [RFC PATCH 0/1] QA check for defined packages
From: Richard Purdie @ 2011-10-12 12:39 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1318371066.git.josh@linux.intel.com>
On Tue, 2011-10-11 at 15:29 -0700, Joshua Lock wrote:
> Folks,
>
> I'm looking for some comments on this WIP patch.
>
> The reason I've added this is because the hob GUI requires us to offer much
> more reliable metadata - we show the user available packages, as defined by
> each recipe, to add to their image. Should a recipe define a package and yet
> not actually create it and the user has included that in their image we cause
> errors at build time.
>
> However whilst the idea seems sound enough, there are some caveats - running
> a world build with this patch I see failures fairly early on at least a few
> of which I'd expect we'll need to special-case:
> * eglibc-local
> * linux-yocto
> * linux-libc-headers
> * gcc-runtime
You'd probably get much better results from this patch if you account
for ALLOW_EMPTY_<pkgname> btw...
Cheers,
Richard
^ permalink raw reply
* Re: [RFC PATCH 0/1] QA check for defined packages
From: Richard Purdie @ 2011-10-12 12:37 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1318371066.git.josh@linux.intel.com>
On Tue, 2011-10-11 at 15:29 -0700, Joshua Lock wrote:
> I'm looking for some comments on this WIP patch.
>
> The reason I've added this is because the hob GUI requires us to offer much
> more reliable metadata - we show the user available packages, as defined by
> each recipe, to add to their image. Should a recipe define a package and yet
> not actually create it and the user has included that in their image we cause
> errors at build time.
>
> However whilst the idea seems sound enough, there are some caveats - running
> a world build with this patch I see failures fairly early on at least a few
> of which I'd expect we'll need to special-case:
> * eglibc-local
> * linux-yocto
> * linux-libc-headers
> * gcc-runtime
>
> Thoughts?
I think we probably do need to cleanup some of that data.
I have some thoughts about where we're at with hob and this is probably
as good a time as any to share them.
Effectively the problem is that there is a large body of data we only
compute during the build process. This includes what the exact runtime
dependencies of packages are, which packages exactly are generated
(PACKAGES_DYNAMIC), what the size of the packages are, how long they
take to build and so on. Some things we can fix, some things we can hack
around but at the end of the day there are some things we just plain
can't change.
I'm beginning to think we need to have two phases of control of the
system:
a) The build phase
This is the step that generates the package feeds.
b) The image construction phase
This is the step that takes the package feed data and turns it into an
image.
Obviously, you can skip to b) if you already have a package feed.
So we'd be talking about two UI's that could effectively hand off to
each other and share a "build in progress" feedback to the user system.
The image construction dialog would have a "Missing Packages? Build them
here" type switch. This would mean the build system can continue on at
what it does best yet the UI can let the users do what they want to do,
particularly on a prebuilt package feed.
Thoughts?
Cheers,
Richard
^ permalink raw reply
* Re: [yocto] [PATCH 7/7] Add proper deps for nfs-utils, util-linux, and strace
From: Martin Jansa @ 2011-10-12 12:06 UTC (permalink / raw)
To: Matthew McClintock; +Cc: yocto
In-Reply-To: <1317275552-19908-7-git-send-email-msm@freescale.com>
On Thu, Sep 29, 2011 at 7:52 AM, Matthew McClintock <msm@freescale.com> wrote:
> These packages need these deps for the RPM generation stage:
This was already applied, but I'll reply here and please send next
patch adressing those comments.
Today I've noticed that perl and libperl are pulled to my images only
because of util-linux and strace I belive I don't need them, see
inline comments
> error: Failed dependencies:
> | /usr/bin/python is needed by nfs-utils-1.2.3-r2.ppce5500
> | /usr/bin/perl is needed by util-linux-2.19.1-r4.ppce5500
> | /usr/bin/perl is needed by strace-4.5.20-r2.ppce5500
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> .../nfs-utils/nfs-utils_1.2.3.bb | 2 +-
> meta/recipes-core/util-linux/util-linux.inc | 2 +-
> meta/recipes-devtools/strace/strace_4.5.20.bb | 2 ++
> 3 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> index 08468fe..e8b0490 100644
> --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
> @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
>
> # util-linux for libblkid
> DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
> -RDEPENDS_${PN} = "portmap"
> +RDEPENDS_${PN} = "portmap python"
python is needed only for
./usr/sbin/mountstats:#!/usr/bin/env python
./usr/sbin/nfsiostat:#!/usr/bin/python
could you please move them to separate packages and keep python
runtime dependency only there?
> RRECOMMENDS_${PN} = "kernel-module-nfsd"
>
> PR = "r2"
> diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
> index 1f242b7..afce673 100644
> --- a/meta/recipes-core/util-linux/util-linux.inc
> +++ b/meta/recipes-core/util-linux/util-linux.inc
> @@ -55,7 +55,7 @@ FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdi
> FILES_util-linux-lscpu = "${bindir}/lscpu"
>
> RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
> -RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
> +RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl"
perl is needed only for
/usr/bin/chkdupexe
could you please move chkdupexe to separate package and add perl only
to RDEPENDS_${PN}-chkdupexe?
> RRECOMMENDS_${PN}_virtclass-native = ""
> RDEPENDS_${PN}_virtclass-native = ""
> diff --git a/meta/recipes-devtools/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
> index 391669f..b3d2aa5 100644
> --- a/meta/recipes-devtools/strace/strace_4.5.20.bb
> +++ b/meta/recipes-devtools/strace/strace_4.5.20.bb
> @@ -5,6 +5,8 @@ LICENSE = "BSD"
> LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
> PR = "r2"
>
> +RDEPENDS = "perl"
This should be RDEPENDS_${PN}
and much better would be to split
strace-graph to separate package and add perl only to
RDEPENDS_${PN}-graph
> +
> SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
> file://sigmask.patch \
> "
> --
> 1.7.6.1
And also you need to bump PR when you're changing RDEPENDs (otherwise
issues are shown much later when it's rebuild because of some other
changes).
Regards,
^ permalink raw reply
* Re: [oe-core 2/4] qt4-x11-free: bring back pkg-config fixups
From: Paul Eggleton @ 2011-10-12 9:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <040b38fbd0ab7c7a1275b2e688dba177a907c716.1318405370.git.Martin.Jansa@gmail.com>
On Wednesday 12 October 2011 08:45:03 Martin Jansa wrote:
> From: Simon Busch <morphis@gravedo.de>
>
> With b40b9c024be5e1ec81a31961158b3e6b529acfe0 some pkg-config fixups where
> removed from qt4.inc which breaks the pkg-config files for qt4-embedded.
> Without that the pkg-config files for qt4-x11-free are broken. So this
> patch puts the fixes into the qt4-x11-free.inc file to be used by
> qt4-x11-free and not qt4-embedded.
So why do we need these only in the X11 version? Surely they should be
applicable to both embedded and X11, or not at all...?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply
* Re: [oe-core 1/4] qt4-embedded: remove dependency on tslib and use std. linux input
From: Koen Kooi @ 2011-10-12 9:20 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <4E954984.7020202@eukrea.com>
Op 12 okt. 2011, om 10:02 heeft Eric Bénard het volgende geschreven:
> Hi,
>
> Le 12/10/2011 09:45, Martin Jansa a écrit :
>> From: Simon Busch<morphis@gravedo.de>
>>
>> In most cases we don't need tslib in std. configuration as touchscreen access in most
>> devices today is done with linux input interface. If some specific machine has a need for
>> tslib support it should add the dependency in it's machine layer again and modify the
>> profile script accordingly.
>>
> When using a resistive touchscreen, tslib is a common solution to handle calibration and raw value processing : do you think this is a good thing to remove this ?
We ran into this at work and like Eric, I'm curious how calibration (and e.g. dejitter) works in the linux-input world combined with qt/e.
regards,
Koen
^ permalink raw reply
* Re: git server move
From: Koen Kooi @ 2011-10-12 8:17 UTC (permalink / raw)
To: openembedded-core; +Cc: openembedded-devel
In-Reply-To: <CAOd_LFzbT0j3wSjp+d3POcTUo9X9+aiYtax4d6tep3YXmTwb2g@mail.gmail.com>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 11-10-11 21:11, Cliff Brake schreef:
> Hi, we are moving git.openembedded.org to a new server.
>
> SSH access on the old server has been disabled. git:// still works
> there.
>
> As soon as DNS propagates, SSH access will work with the new server.
>
> Let me know if you see any problems.
When will cgit be back up?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFOlU0rMkyGM64RGpERArroAJ9EuHaOEcv64o9q9kJLZk50/OLoSQCgmKjd
Yxh2H5CGKREmOq32gr36aes=
=Xubc
-----END PGP SIGNATURE-----
^ permalink raw reply
* Re: [oe-core 1/4] qt4-embedded: remove dependency on tslib and use std. linux input
From: Eric Bénard @ 2011-10-12 8:02 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <49a800f40bd08aa23d227dccafd34b3e59a7ccb5.1318405370.git.Martin.Jansa@gmail.com>
Hi,
Le 12/10/2011 09:45, Martin Jansa a écrit :
> From: Simon Busch<morphis@gravedo.de>
>
> In most cases we don't need tslib in std. configuration as touchscreen access in most
> devices today is done with linux input interface. If some specific machine has a need for
> tslib support it should add the dependency in it's machine layer again and modify the
> profile script accordingly.
>
When using a resistive touchscreen, tslib is a common solution to handle
calibration and raw value processing : do you think this is a good thing to
remove this ?
Eric
^ permalink raw reply
* [oe-core 4/4] xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
From: Martin Jansa @ 2011-10-12 7:45 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318405370.git.Martin.Jansa@gmail.com>
* as discussed here http://lists.linuxtogo.org/pipermail/openembedded-core/2011-October/010899.html
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-1.11.1.inc | 2 ++
.../xorg-xserver/xserver-xorg-common.inc | 1 -
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
index 690de3f..2c5bb0a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
@@ -3,5 +3,7 @@ SRC_URI += "file://crosscompile.patch"
# Misc build failure for master HEAD
SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+PR = "r1"
+
SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d"
SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 0cc3dc0..a8c7b0a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -60,7 +60,6 @@ PACKAGES =+ "${PN}-security-policy \
${PN}-module-libxf1bpp \
${PN}-module-libxf4bpp"
-RDEPENDS_${PN} += "xorg-minimal-fonts"
RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
RDEPENDS_${PN}-xvfb += "xkeyboard-config"
--
1.7.7
^ permalink raw reply related
* [oe-core 3/4] conf: machine: includes: add armv6-novfp support
From: Martin Jansa @ 2011-10-12 7:45 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318405370.git.Martin.Jansa@gmail.com>
From: GNUtoo <GNUtoo@no-log.org>
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/machine/include/arm/arch-armv6.inc | 45 ++++++++++++++++---------
meta/conf/machine/include/tune-arm1136j-s.inc | 10 +++++
2 files changed, 39 insertions(+), 16 deletions(-)
create mode 100644 meta/conf/machine/include/tune-arm1136j-s.inc
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
index 9f2e9ac..3dd6566 100644
--- a/meta/conf/machine/include/arm/arch-armv6.inc
+++ b/meta/conf/machine/include/arm/arch-armv6.inc
@@ -9,24 +9,37 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "
require conf/machine/include/arm/arch-armv5-dsp.inc
# Little Endian
-AVAILTUNES += "armv6 armv6t armv6hf armv6thf"
-TUNE_FEATURES_tune-armv6 ?= "armv6 vfp"
-TUNE_FEATURES_tune-armv6t ?= "armv6 vfp thumb"
-TUNE_FEATURES_tune-armv6hf ?= "${TUNE_FEATURES_tune-armv6} callconvention-hard"
-TUNE_FEATURES_tune-armv6thf ?= "${TUNE_FEATURES_tune-armv6t} callconvention-hard"
-PACKAGE_EXTRA_ARCHS_tune-armv6 = "${PACKAGE_EXTRA_ARCHS_tune-armv5e-vfp} armv6-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv6t = "${PACKAGE_EXTRA_ARCHS_tune-armv5te-vfp} armv6-vfp armv6t-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv6hf = "${PACKAGE_EXTRA_ARCHS_tune-armv5ehf-vfp} armv6hf-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv6thf = "${PACKAGE_EXTRA_ARCHS_tune-armv5tehf-vfp} armv6hf-vfp armv6thf-vfp"
+AVAILTUNES += "armv6 armv6t"
+TUNE_FEATURES_tune-armv6 ?= "armv6"
+TUNE_FEATURES_tune-armv6t ?= "armv6 thumb"
+PACKAGE_EXTRA_ARCHS_tune-armv6 = "${PACKAGE_EXTRA_ARCHS_tune-armv5} armv6"
+PACKAGE_EXTRA_ARCHS_tune-armv6t = "${PACKAGE_EXTRA_ARCHS_tune-armv5t} armv6 armv6t"
+
+# Little Endian + VFP
+AVAILTUNES += "armv6-vfp armv6t-vfp armv6hf-vfp armv6thf-vfp"
+TUNE_FEATURES_tune-armv6-vfp ?= "armv6 vfp"
+TUNE_FEATURES_tune-armv6t-vfp ?= "armv6 vfp thumb"
+TUNE_FEATURES_tune-armv6hf-vfp ?= "${TUNE_FEATURES_tune-armv6-vfp} callconvention-hard"
+TUNE_FEATURES_tune-armv6thf-vfp ?= "${TUNE_FEATURES_tune-armv6t-vfp} callconvention-hard"
+PACKAGE_EXTRA_ARCHS_tune-armv6-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5-vfp} armv6-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv6t-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5t-vfp} armv6-vfp armv6t-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv6hf-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5hf-vfp} armv6hf-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv6thf-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv5thf-vfp} armv6hf-vfp armv6thf-vfp"
# Big Endian
-AVAILTUNES += "armv6b armv6tb armv6hfb armv6thfb"
+AVAILTUNES += "armv6b armv6tb"
TUNE_FEATURES_tune-armv6b ?= "${TUNE_FEATURES_tune-armv6} bigendian"
TUNE_FEATURES_tune-armv6tb ?= "${TUNE_FEATURES_tune-armv6t} bigendian"
-TUNE_FEATURES_tune-armv6hfb ?= "${TUNE_FEATURES_tune-armv6b} callconvention-hard"
-TUNE_FEATURES_tune-armv6thfb ?= "${TUNE_FEATURES_tune-armv6tb} callconvention-hard"
-PACKAGE_EXTRA_ARCHS_tune-armv6b = "${PACKAGE_EXTRA_ARCHS_tune-armv5eb-vfp} armv6b-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv6tb = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb-vfp} armv6b-vfp armv6tb-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv6hfb = "${PACKAGE_EXTRA_ARCHS_tune-armv5ehfb-vfp} armv6hfb-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv6thfb = "${PACKAGE_EXTRA_ARCHS_tune-armv5tehfb-vfp} armv6hfb-vfp armv6thfb-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv6b = "${PACKAGE_EXTRA_ARCHS_tune-armv5} armv6b"
+PACKAGE_EXTRA_ARCHS_tune-armv6tb = "${PACKAGE_EXTRA_ARCHS_tune-armv5t} armv6b armv6tb"
+# Big Endian + VFP
+AVAILTUNES += "armv6b-vfp armv6tb-vfp armv6hfb-vfp armv6thfb-vfp"
+TUNE_FEATURES_tune-armv6b-vfp ?= "${TUNE_FEATURES_tune-armv6-vfp} bigendian"
+TUNE_FEATURES_tune-armv6tb-vfp ?= "${TUNE_FEATURES_tune-armv6t-vfp} bigendian"
+TUNE_FEATURES_tune-armv6hfb-vfp ?= "${TUNE_FEATURES_tune-armv6b-vfp} callconvention-hard"
+TUNE_FEATURES_tune-armv6thfb-vfp ?= "${TUNE_FEATURES_tune-armv6tb-vfp} callconvention-hard"
+PACKAGE_EXTRA_ARCHS_tune-armv6b-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv6b} armv6b-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv6tb-vfp = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv6b-vfp armv6tb-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv6hfb-vfp = "armv6hfb-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv6thfb-vfp = "armv6hfb-vfp armv6thfb-vfp"
diff --git a/meta/conf/machine/include/tune-arm1136j-s.inc b/meta/conf/machine/include/tune-arm1136j-s.inc
new file mode 100644
index 0000000..ce9ae7c
--- /dev/null
+++ b/meta/conf/machine/include/tune-arm1136j-s.inc
@@ -0,0 +1,10 @@
+DEFAULTTUNE ?= "arm1136js"
+
+require conf/machine/include/arm/arch-armv6.inc
+
+TUNEVALID[arm1136js] = "Enable arm1136js specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1136js", "-mtune=arm1136j-s", "", d)}"
+
+AVAILTUNES += "arm1136js"
+TUNE_FEATURES_tune-arm1136js = "${TUNE_FEATURES_tune-armv6t} arm1136js"
+PACKAGE_EXTRA_ARCHS_tune-arm1136js = "${PACKAGE_EXTRA_ARCHS_tune-armv6t}"
--
1.7.7
^ permalink raw reply related
* [oe-core 2/4] qt4-x11-free: bring back pkg-config fixups
From: Martin Jansa @ 2011-10-12 7:45 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318405370.git.Martin.Jansa@gmail.com>
From: Simon Busch <morphis@gravedo.de>
With b40b9c024be5e1ec81a31961158b3e6b529acfe0 some pkg-config fixups where removed from
qt4.inc which breaks the pkg-config files for qt4-embedded. Without that the pkg-config
files for qt4-x11-free are broken. So this patch puts the fixes into the qt4-x11-free.inc
file to be used by qt4-x11-free and not qt4-embedded.
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index f391028..04b7885 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r32"
+INC_PR = "r33"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
@@ -16,3 +16,17 @@ QT_BASE_LIB ?= "libqt"
inherit qt4x11
+do_install_append() {
+ # fix pkgconfig, libtool and prl files
+ sed -i -e 's#I/usr/include#Iincludedir}#g' \
+ -e 's#Iin#I${in#g' \
+ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc
+
+ # QT abuses $includedir to point to its headers, which breaks pkgconfig sysroot, so
+ # manually fix it up here:
+ for pc in ${D}${libdir}/pkgconfig/*.pc ; do
+ sed -i -e "s:prefix}include/${QT_BASE_NAME}/$(basename $pc .pc):prefix}/include:" \
+ -e "s,Cflags: ,Cflags: -IP{includedir}/${QT_BASE_NAME}/$(basename $pc .pc) ," \
+ -e 's:IP{:I${:g' $pc
+ done
+}
--
1.7.7
^ permalink raw reply related
* [oe-core 1/4] qt4-embedded: remove dependency on tslib and use std. linux input
From: Martin Jansa @ 2011-10-12 7:45 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318405370.git.Martin.Jansa@gmail.com>
From: Simon Busch <morphis@gravedo.de>
In most cases we don't need tslib in std. configuration as touchscreen access in most
devices today is done with linux input interface. If some specific machine has a need for
tslib support it should add the dependency in it's machine layer again and modify the
profile script accordingly.
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-qt/qt4/files/qte.sh | 2 +-
meta/recipes-qt/qt4/qt4-embedded.inc | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-qt/qt4/files/qte.sh b/meta/recipes-qt/qt4/files/qte.sh
index 21d6ecb..bb8dfae 100644
--- a/meta/recipes-qt/qt4/files/qte.sh
+++ b/meta/recipes-qt/qt4/files/qte.sh
@@ -2,6 +2,6 @@
if [ -e /dev/input/touchscreen0 ]
then
- QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
+ QWS_MOUSE_PROTO=LinuxInput:/dev/input/touchscreen0
export QWS_MOUSE_PROTO
fi
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index bee7345..179de87 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,8 +2,8 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
SECTION = "libs"
LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
-DEPENDS += "directfb tslib"
-INC_PR = "r36"
+DEPENDS += "directfb"
+INC_PR = "r37"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
@@ -15,7 +15,7 @@ QT_CONFIG_FLAGS += " \
-embedded ${QT_ARCH} \
-qtlibinfix ${QT_LIBINFIX} \
-plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
- -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
+ -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
-qt-kbd-tty \
-DQT_KEYPAD_NAVIGATION \
"
--
1.7.7
^ permalink raw reply related
* [oe-core 0/4] Qt4, armv6, xserver-xorg changes
From: Martin Jansa @ 2011-10-12 7:44 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 486b17af3e4cced76e9852e7634f75ea87433db2:
shared-mime-info: Fix a parallel make race (2011-10-11 18:06:56 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
GNUtoo (1):
conf: machine: includes: add armv6-novfp support
Martin Jansa (1):
xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
Simon Busch (2):
qt4-embedded: remove dependency on tslib and use std. linux input
qt4-x11-free: bring back pkg-config fixups
meta/conf/machine/include/arm/arch-armv6.inc | 45 +++++++++++++-------
meta/conf/machine/include/tune-arm1136j-s.inc | 10 ++++
.../xorg-xserver/xserver-xorg-1.11.1.inc | 2 +
.../xorg-xserver/xserver-xorg-common.inc | 1 -
meta/recipes-qt/qt4/files/qte.sh | 2 +-
meta/recipes-qt/qt4/qt4-embedded.inc | 6 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 16 +++++++-
7 files changed, 60 insertions(+), 22 deletions(-)
create mode 100644 meta/conf/machine/include/tune-arm1136j-s.inc
--
1.7.7
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox