Skip to contentSkip to conversation

Recipe upgrades

PATCH Applied [email protected] 2 participants 12 messages May 1, 2012 – May 3, 2012

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover Recipe upgrades

From: Nitin A Kamble <[email protected]>

The following changes since commit d89f7b9cab1946a3267e3b0402f168f946d480b2:

documentation/Makefile: Fixed figures publishing bug (2012-05-01 20:50:56 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/upgrades
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/upgrades

Nitin A Kamble (6):
qt4: fix compilation issue
makedepend: upgrade from 1.0.3 to 1.0.4
quilt: upgrade from 0.51 to 0.60
gdb: upgrade from 7.4 to 7.4.1
python: upgrade from 2.7.2 to 2.7.3
distro-tracking: update as per recent recipe upgrades

 meta/conf/distro/include/default-versions.inc      |    4 +-
 .../conf/distro/include/distro_tracking_fields.inc |   20 +++++-----
 meta/recipes-devtools/gdb/gdb-common.inc           |    6 ++--
 ...canadian_7.4.bb => gdb-cross-canadian_7.4.1.bb} |    2 +-
 .../gdb/{gdb-cross_7.4.bb => gdb-cross_7.4.1.bb}   |    0
 .../gdb/{gdb_7.4.bb => gdb_7.4.1.bb}               |    0
 ...thon-native_2.7.2.bb => python-native_2.7.3.bb} |    6 +---
 meta/recipes-devtools/python/python.inc            |    8 ++--
 .../python/python/04-default-is-optimized.patch    |   30 +++++++++------
 .../python/fix_for_using_different_libdir.patch    |   30 +++++++++-------
 .../python/sys_platform_is_now_always_linux2.patch |   39 --------------------
 .../python/{python_2.7.2.bb => python_2.7.3.bb}    |    3 +-
 .../quilt/{quilt-0.51.inc => quilt-0.60.inc}       |    4 +-
 .../{quilt-native_0.51.bb => quilt-native_0.60.bb} |    2 +-
 .../quilt/{quilt_0.51.bb => quilt_0.60.bb}         |    2 +-
 .../{makedepend_1.0.3.bb => makedepend_1.0.4.bb}   |    5 +--
 meta/recipes-qt/qt4/qt-4.8.1.inc                   |    1 +
 .../qt4/qt-4.8.1/fix_conflicting_types.patch       |   29 +++++++++++++++
 meta/recipes-qt/qt4/qt4-x11-free.inc               |    2 +-
 19 files changed, 94 insertions(+), 99 deletions(-)
 rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.4.bb => gdb-cross-canadian_7.4.1.bb} (88%)
 rename meta/recipes-devtools/gdb/{gdb-cross_7.4.bb => gdb-cross_7.4.1.bb} (100%)
 rename meta/recipes-devtools/gdb/{gdb_7.4.bb => gdb_7.4.1.bb} (100%)
 rename meta/recipes-devtools/python/{python-native_2.7.2.bb => python-native_2.7.3.bb} (92%)
 delete mode 100644 meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch
 rename meta/recipes-devtools/python/{python_2.7.2.bb => python_2.7.3.bb} (98%)
 rename meta/recipes-devtools/quilt/{quilt-0.51.inc => quilt-0.60.inc} (84%)
 rename meta/recipes-devtools/quilt/{quilt-native_0.51.bb => quilt-native_0.60.bb} (83%)
 rename meta/recipes-devtools/quilt/{quilt_0.51.bb => quilt_0.60.bb} (98%)
 rename meta/recipes-graphics/xorg-util/{makedepend_1.0.3.bb => makedepend_1.0.4.bb} (82%)
 create mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
Signature · 1 line
1.7.7
author
#1 lore raw

PATCH 1/6 qt4: fix compilation issue

From: Nitin A Kamble <[email protected]>

gcc 4.7 uncovers a type mismatch in the code. And this commit fixes the issue:

| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here

NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed

Signed-off-by Nitin A Kamble <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
 meta/recipes-qt/qt4/qt-4.8.1.inc                   |    1 +
 .../qt4/qt-4.8.1/fix_conflicting_types.patch       |   29 ++++++++++++++++++++
 meta/recipes-qt/qt4/qt4-x11-free.inc               |    2 +-
 3 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch
meta/recipes-qt/qt4/qt-4.8.1.inc +1 -0
index 8c38cae..2fc4228 100644
@@ -23,6 +23,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://gcc47-fix.patch \
            file://gcc47-fix2.patch \
            file://disable-fuse-gold-flag.patch \
+           file://fix_conflicting_types.patch \
            "
 
 SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +29 -0
new file mode 100644
index 0000000..8124505
@@ -0,0 +1,29 @@
+Upstream-Status: Pending
+
+This patch fixes the type mismatch fixing this compile issue:
+
+| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
+| In file included from ./wtf/Platform.h:1217:0,
+|                  from ./config.h:30,
+|                  from wtf/gobject/GOwnPtr.cpp:19:
+| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here
+NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
+
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/04/30
+
+
+Index:  qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+===================================================================
+--- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
+ typedef struct _GHashTable GHashTable;
+ typedef struct _GInputStream GInputStream;
+ typedef struct _GList GList;
+-typedef struct _GMutex GMutex;
++typedef union _GMutex GMutex;
+ typedef struct _GPatternSpec GPatternSpec;
+ typedef struct _GPollableOutputStream GPollableOutputStream;
+ typedef struct _GSocketClient GSocketClient;
meta/recipes-qt/qt4/qt4-x11-free.inc +1 -1
index a59198d..720b1bf 100644
@@ -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 = "r41"
+INC_PR = "r42"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"
Signature · 1 line
1.7.7
author
#2 lore raw

PATCH 2/6 makedepend: upgrade from 1.0.3 to 1.0.4

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../{makedepend_1.0.3.bb => makedepend_1.0.4.bb}   |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/xorg-util/{makedepend_1.0.3.bb => makedepend_1.0.4.bb} (82%)
meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb renamed from meta/recipes-graphics/xorg-util/makedepend_1.0.3.bb +2 -3
similarity index 82%
rename from meta/recipes-graphics/xorg-util/makedepend_1.0.3.bb
rename to meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb
index 86e5d81..fea0b22 100644
@@ -18,6 +18,5 @@ BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=43a6eda34b48ee821b3b66f4f753ce4f"
 
-SRC_URI[md5sum] = "ec37ca8b810a40cdfb16a736b3360f6c"
-SRC_URI[sha256sum] = "2d3466acc29b382a4368b30371f17a4083933281b97f8ef67fc8b785a60d52dc"
-
+SRC_URI[md5sum] = "bf1c54028427829c9c3193bef710dbee"
+SRC_URI[sha256sum] = "f53b8ce5dec02a05f8994036a8ebac485a96324143ff2382e29578fdc096b04f"
Signature · 1 line
1.7.7
author
#3 lore raw

PATCH 3/6 quilt: upgrade from 0.51 to 0.60

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../quilt/{quilt-0.51.inc => quilt-0.60.inc}       |    4 ++--
 .../{quilt-native_0.51.bb => quilt-native_0.60.bb} |    2 +-
 .../quilt/{quilt_0.51.bb => quilt_0.60.bb}         |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/quilt/{quilt-0.51.inc => quilt-0.60.inc} (84%)
 rename meta/recipes-devtools/quilt/{quilt-native_0.51.bb => quilt-native_0.60.bb} (83%)
 rename meta/recipes-devtools/quilt/{quilt_0.51.bb => quilt_0.60.bb} (98%)
meta/recipes-devtools/quilt/quilt-0.60.inc renamed from meta/recipes-devtools/quilt/quilt-0.51.inc +2 -2
similarity index 84%
rename from meta/recipes-devtools/quilt/quilt-0.51.inc
rename to meta/recipes-devtools/quilt/quilt-0.60.inc
index 824e624..1e240a0 100644
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
         file://install.patch"
 
-SRC_URI[md5sum] = "d56d23d5212297d5777502e84dc0ee80"
-SRC_URI[sha256sum] = "05441399d36399b3f26cb12e29c98a8ce4d1287d036957fa22408807860af614"
+SRC_URI[md5sum] = "058a08a9b626bdec9ec8c519dc92158c"
+SRC_URI[sha256sum] = "3d72a292e432beb9a73f9d0acfe3a77c9b4d7e42209919bb244e9958c7cfe64b"
 
 inherit autotools
meta/recipes-devtools/quilt/quilt-native_0.60.bb renamed from meta/recipes-devtools/quilt/quilt-native_0.51.bb +1 -1
similarity index 83%
rename from meta/recipes-devtools/quilt/quilt-native_0.51.bb
rename to meta/recipes-devtools/quilt/quilt-native_0.60.bb
index 1494bf2..b99b9b6 100644
@@ -1,4 +1,4 @@
 require quilt-${PV}.inc
 require quilt-native.inc
 
-PR = "r1"
+PR = "r0"
meta/recipes-devtools/quilt/quilt_0.60.bb renamed from meta/recipes-devtools/quilt/quilt_0.51.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/quilt/quilt_0.51.bb
rename to meta/recipes-devtools/quilt/quilt_0.60.bb
index 4e51b49..b085daf 100644
@@ -4,7 +4,7 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
 SRC_URI += "file://aclocal.patch \
             file://gnu_patch_test_fix_target.patch \
            "
-PR = "r4"
+PR = "r0"
 
 PERLPATH = "${bindir}/env perl"
 PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
Signature · 1 line
1.7.7
author
#4 lore raw

PATCH 4/6 gdb: upgrade from 7.4 to 7.4.1

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-devtools/gdb/gdb-common.inc           |    6 +++---
 ...canadian_7.4.bb => gdb-cross-canadian_7.4.1.bb} |    2 +-
 .../gdb/{gdb-cross_7.4.bb => gdb-cross_7.4.1.bb}   |    0
 .../gdb/{gdb_7.4.bb => gdb_7.4.1.bb}               |    0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.4.bb => gdb-cross-canadian_7.4.1.bb} (88%)
 rename meta/recipes-devtools/gdb/{gdb-cross_7.4.bb => gdb-cross_7.4.1.bb} (100%)
 rename meta/recipes-devtools/gdb/{gdb_7.4.bb => gdb_7.4.1.bb} (100%)
meta/recipes-devtools/gdb/gdb-common.inc +3 -3
index 8836aa3..ae82226 100644
@@ -12,7 +12,7 @@ LTTNGUST_mips64 = ""
 LTTNGUST_mips64el = ""
 LTTNGUST_sh4 = ""
 
-INC_PR = "r9"
+INC_PR = "r0"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 		file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \

@@ -23,8 +23,8 @@ inherit autotools
 SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
            file://no-werror.patch"
 
-SRC_URI[md5sum] = "7877875c8af7c7ef7d06d329ac961d3f"
-SRC_URI[sha256sum] = "e2c18e2f4a5feab897595455a3d623cebbba9e9dd2dbe9a5510ed7ad43ae01d2"
+SRC_URI[md5sum] = "5fb7fca9ef7a9e3cfee0e2f2c0e52051"
+SRC_URI[sha256sum] = "f99d2be831ead324712ae4f11868e07e545272f10aac4186060f1386f2629b3"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CXX_FOR_BUILD = "${BUILD_CXX}"
meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.1.bb renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb +1 -1
similarity index 88%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.1.bb
index b2f39ce..c15aa7a 100644
@@ -1,7 +1,7 @@
 require gdb-common.inc
 require gdb-cross-canadian.inc
 
-PR = "${INC_PR}.5"
+PR = "${INC_PR}.0"
 
 GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
meta/recipes-devtools/gdb/gdb-cross_7.4.1.bb renamed from meta/recipes-devtools/gdb/gdb-cross_7.4.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross_7.4.bb
rename to meta/recipes-devtools/gdb/gdb-cross_7.4.1.bb
meta/recipes-devtools/gdb/gdb_7.4.1.bb renamed from meta/recipes-devtools/gdb/gdb_7.4.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb_7.4.bb
rename to meta/recipes-devtools/gdb/gdb_7.4.1.bb
Signature · 1 line
1.7.7
#5 lore raw

Re: [PATCH 4/6] gdb: upgrade from 7.4 to 7.4.1

Quoted 27 lines · On 05/01/2012 03:00 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

Signed-off-by Nitin A Kamble<[email protected]>
---
  meta/recipes-devtools/gdb/gdb-common.inc           |    6 +++---
  ...canadian_7.4.bb =>  gdb-cross-canadian_7.4.1.bb} |    2 +-
  .../gdb/{gdb-cross_7.4.bb =>  gdb-cross_7.4.1.bb}   |    0
  .../gdb/{gdb_7.4.bb =>  gdb_7.4.1.bb}               |    0
  4 files changed, 4 insertions(+), 4 deletions(-)

rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.4.bb => gdb-cross-canadian_7.4.1.bb} (88%) rename meta/recipes-devtools/gdb/{gdb-cross_7.4.bb => gdb-cross_7.4.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb_7.4.bb => gdb_7.4.1.bb} (100%)

meta/recipes-devtools/gdb/gdb-common.inc +1 -1
index 8836aa3..ae82226 100644
@@ -12,7 +12,7 @@ LTTNGUST_mips64 = ""
  LTTNGUST_mips64el = ""
  LTTNGUST_sh4 = ""
 
-INC_PR = "r9"
+INC_PR = "r0"
 
  LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
  		file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \

meta/recipes-devtools/gdb/gdb-common.inc inherit autotools · line 28

Quoted 8 lines
meta/recipes-devtools/gdb/gdb-common.inc +2 -2
@@ -23,8 +23,8 @@ inherit autotools
  SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
             file://no-werror.patch"
 
-SRC_URI[md5sum] = "7877875c8af7c7ef7d06d329ac961d3f"
-SRC_URI[sha256sum] = "e2c18e2f4a5feab897595455a3d623cebbba9e9dd2dbe9a5510ed7ad43ae01d2"
+SRC_URI[md5sum] = "5fb7fca9ef7a9e3cfee0e2f2c0e52051"
+SRC_URI[sha256sum] = "f99d2be831ead324712ae4f11868e07e545272f10aac4186060f1386f2629b3"

Got a WARNING here and the checksum is wrong.

Sau!

Quoted 26 lines
meta/recipes-devtools/gdb/gdb-common.inc +0 -0
  export CC_FOR_BUILD = "${BUILD_CC}"
  export CXX_FOR_BUILD = "${BUILD_CXX}"
meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.1.bb renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb +1 -1
similarity index 88%
rename from meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
rename to meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.1.bb
index b2f39ce..c15aa7a 100644
@@ -1,7 +1,7 @@
  require gdb-common.inc
  require gdb-cross-canadian.inc
 
-PR = "${INC_PR}.5"
+PR = "${INC_PR}.0"
 
  GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
meta/recipes-devtools/gdb/gdb-cross_7.4.1.bb renamed from meta/recipes-devtools/gdb/gdb-cross_7.4.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb-cross_7.4.bb
rename to meta/recipes-devtools/gdb/gdb-cross_7.4.1.bb
meta/recipes-devtools/gdb/gdb_7.4.1.bb renamed from meta/recipes-devtools/gdb/gdb_7.4.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/gdb/gdb_7.4.bb
rename to meta/recipes-devtools/gdb/gdb_7.4.1.bb
author
#6 lore raw

Re: [PATCH 4/6] gdb: upgrade from 7.4 to 7.4.1

Quoted 10 lines

Review

Quoted 2 lines
(quoted diff) +0 -2
-SRC_URI[md5sum] = "7877875c8af7c7ef7d06d329ac961d3f"
-SRC_URI[sha256sum] =

"e2c18e2f4a5feab897595455a3d623cebbba9e9dd2dbe9a5510ed7ad43ae01d2"

Review

Quoted 2 lines
(quoted diff) +2 -0
+SRC_URI[md5sum] = "5fb7fca9ef7a9e3cfee0e2f2c0e52051"
+SRC_URI[sha256sum] =

"f99d2be831ead324712ae4f11868e07e545272f10aac4186060f1386f2629b3"

Quoted 1 line

Got a WARNING here and the checksum is wrong.

Sau!

It was a cut/paste error, the sha256sum is one digit short. Somehow it did not raise error on my build.

I will fix the issue and send it along with other commits.

Nitin

author
#7 lore raw

PATCH 5/6 python: upgrade from 2.7.2 to 2.7.3

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

bin/python2 link is provided by the python install process, so no need to create it.

rebase these patches to the newer code:
fix_for_using_different_libdir.patch
04-default-is-optimized.patch
remove this patch as it is upstream now:
sys_platform_is_now_always_linux2.patch

Change default python version to 2.7.3 in the distro config

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/conf/distro/include/default-versions.inc      |    4 +-
 ...thon-native_2.7.2.bb => python-native_2.7.3.bb} |    6 +---
 meta/recipes-devtools/python/python.inc            |    8 ++--
 .../python/python/04-default-is-optimized.patch    |   30 +++++++++------
 .../python/fix_for_using_different_libdir.patch    |   30 +++++++++-------
 .../python/sys_platform_is_now_always_linux2.patch |   39 --------------------
 .../python/{python_2.7.2.bb => python_2.7.3.bb}    |    3 +-
 7 files changed, 43 insertions(+), 77 deletions(-)
 rename meta/recipes-devtools/python/{python-native_2.7.2.bb => python-native_2.7.3.bb} (92%)
 delete mode 100644 meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch
 rename meta/recipes-devtools/python/{python_2.7.2.bb => python_2.7.3.bb} (98%)
meta/conf/distro/include/default-versions.inc +2 -2
index a86bc0c..53ec2e7 100644
@@ -4,8 +4,8 @@
 
 # Force the python versions in one place
 PYTHON_BASEVERSION ?= "2.7"
-PREFERRED_VERSION_python ?= "2.7.2"
-PREFERRED_VERSION_python-native ?= "2.7.2"
+PREFERRED_VERSION_python ?= "2.7.3"
+PREFERRED_VERSION_python-native ?= "2.7.3"
 
 # Force the older version of liberation-fonts until we fix the fontforge issue
 PREFERRED_VERSION_liberation-fonts ?= "1.04"
meta/recipes-devtools/python/python-native_2.7.3.bb renamed from meta/recipes-devtools/python/python-native_2.7.2.bb +1 -5
similarity index 92%
rename from meta/recipes-devtools/python/python-native_2.7.2.bb
rename to meta/recipes-devtools/python/python-native_2.7.3.bb
index 175f31d..50bf894 100644
@@ -1,6 +1,6 @@
 require python.inc
 DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://04-default-is-optimized.patch \
            file://05-enable-ctypes-cross-build.patch \

@@ -13,7 +13,6 @@ SRC_URI += "file://04-default-is-optimized.patch \
            file://nohostlibs.patch \
            file://multilib.patch \
            file://add-md5module-support.patch \
-           file://sys_platform_is_now_always_linux2.patch \
            "
 S = "${WORKDIR}/Python-${PV}"
 

@@ -42,7 +41,4 @@ do_install() {
 	for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do
 		sed -i -e '1s|^#!.*|#!/usr/bin/env python|' $PYTHSCRIPT
 	done
-
-	ln -sf python ${D}${bindir}/python2
-
 }
meta/recipes-devtools/python/python.inc +4 -4
index 2f17b00..eee7a64 100644
@@ -3,14 +3,14 @@ HOMEPAGE = "http://www.python.org"
 LICENSE = "PSFv2"
 SECTION = "devel/python"
 # bump this on every change in contrib/python/generate-manifest-2.7.py
-INC_PR = "r2"
+INC_PR = "r0"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2dffb81509b47974467ea23409909b1c"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6"
 
 SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2"
  
-SRC_URI[md5sum] = "ba7b2f11ffdbf195ee0d111b9455a5bd"
-SRC_URI[sha256sum] = "5057eb067eb5b5a6040dbd0e889e06550bde9ec041dadaa855ee9490034cbdab"
+SRC_URI[md5sum] = "c57477edd6d18bd9eeca2f21add73919"
+SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c"
 
 PYTHON_MAJMIN = "2.7"
meta/recipes-devtools/python/python/04-default-is-optimized.patch +18 -12
index 042ac5e..7ce819a 100644
@@ -1,14 +1,20 @@
 Upstream-Status: Inappropriate [embedded specific]
 
+Updated original patch for python 2.7.3
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2012/05/01
+
+
 # when compiling for an embedded system, we need every bit of
 # performance we can get. default to optimized with the option
 # of opt-out.
 # Signed-Off: Michael 'Mickey' Lauer <[email protected]>
 
-Index: Python-2.6.6/Python/compile.c
+Index: Python-2.7.3/Python/compile.c
 ===================================================================
---- Python-2.6.6.orig/Python/compile.c
-+++ Python-2.6.6/Python/compile.c
+--- Python-2.7.3.orig/Python/compile.c
++++ Python-2.7.3/Python/compile.c
 @@ -32,7 +32,7 @@
  #include "symtable.h"
  #include "opcode.h"

@@ -18,16 +24,16 @@ Index: Python-2.6.6/Python/compile.c
  
  #define DEFAULT_BLOCK_SIZE 16
  #define DEFAULT_BLOCKS 8
-Index: Python-2.6.6/Modules/main.c
+Index: Python-2.7.3/Modules/main.c
 ===================================================================
---- Python-2.6.6.orig/Modules/main.c
-+++ Python-2.6.6/Modules/main.c
+--- Python-2.7.3.orig/Modules/main.c
++++ Python-2.7.3/Modules/main.c
 @@ -40,7 +40,7 @@ static char **orig_argv;
  static int  orig_argc;
  
  /* command line options */
--#define BASE_OPTS "3bBc:dEhiJm:OQ:sStuUvVW:xX?"
-+#define BASE_OPTS "3bBc:dEhiJm:NOQ:sStuUvVW:xX?"
+-#define BASE_OPTS "3bBc:dEhiJm:OQ:RsStuUvVW:xX?"
++#define BASE_OPTS "3bBc:dEhiJm:NOQ:RsStuUvVW:xX?"
  
  #ifndef RISCOS
  #define PROGRAM_OPTS BASE_OPTS

@@ -38,10 +44,10 @@ Index: Python-2.6.6/Modules/main.c
 --O     : optimize generated bytecode slightly; also PYTHONOPTIMIZE=x\n\
 --OO    : remove doc-strings in addition to the -O optimizations\n\
 +-N     : do NOT optimize generated bytecode\n\
- -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
- -s     : don't add user site directory to sys.path; also PYTHONNOUSERSITE\n\
- -S     : don't imply 'import site' on initialization\n\
-@@ -328,8 +327,8 @@ Py_Main(int argc, char **argv)
+ -R     : use a pseudo-random salt to make hash() values of various types be\n\
+          unpredictable between separate invocations of the interpreter, as\n\
+          a defense against denial-of-service attacks\n\
+@@ -365,8 +364,8 @@ Py_Main(int argc, char **argv)
  
          /* case 'J': reserved for Jython */
meta/recipes-devtools/python/python/fix_for_using_different_libdir.patch +17 -13
index e8f19a2..50d3915 100644
@@ -7,10 +7,14 @@ in the install process of the host python.
 Signed-Off-By: Nitin A Kamble <[email protected]>
 Date: 2012/03/14
 
-Index: Python-2.7.2/Lib/sysconfig.py
+Updated for python 2.7.3
+Signed-Off-By: Nitin A Kamble <[email protected]>
+Date: 2012/05/01
+
+Index: Python-2.7.3/Lib/sysconfig.py
 ===================================================================
---- Python-2.7.2.orig/Lib/sysconfig.py
-+++ Python-2.7.2/Lib/sysconfig.py
+--- Python-2.7.3.orig/Lib/sysconfig.py
++++ Python-2.7.3/Lib/sysconfig.py
 @@ -7,10 +7,10 @@ from os.path import pardir, realpath
  
  _INSTALL_SCHEMES = {

@@ -41,14 +45,14 @@ Index: Python-2.7.2/Lib/sysconfig.py
          'include': '{userbase}/include/python{py_version_short}',
          'scripts': '{userbase}/bin',
          'data'   : '{userbase}',
-Index: Python-2.7.2/Makefile.pre.in
+Index: Python-2.7.3/Makefile.pre.in
 ===================================================================
---- Python-2.7.2.orig/Makefile.pre.in
-+++ Python-2.7.2/Makefile.pre.in
-@@ -928,25 +928,25 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
- 		done; \
- 	done
- 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+--- Python-2.7.3.orig/Makefile.pre.in
++++ Python-2.7.3/Makefile.pre.in
+@@ -941,25 +941,25 @@ libinstall:	build_all $(srcdir)/Lib/$(PL
+ 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+ 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
+ 	fi
 -	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
 +	PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}  $(RUNSHARED) \
  		$(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \

@@ -56,7 +60,7 @@ Index: Python-2.7.2/Makefile.pre.in
  		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
  		$(DESTDIR)$(LIBDEST)
 -	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+	PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}  $(RUNSHARED) \
++	PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
  		$(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
  		-d $(LIBDEST) -f \
  		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \

@@ -67,12 +71,12 @@ Index: Python-2.7.2/Makefile.pre.in
  		-d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 -	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}  $(RUNSHARED) \
++	-PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
  		$(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
  		-d $(LIBDEST)/site-packages -f \
  		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
 -	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-+	-PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH}  $(RUNSHARED) \
++	-PYTHONPATH=$(DESTDIR)$(LIBDEST):${CROSSPYTHONPATH} $(RUNSHARED) \
  		$(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
  
  # Create the PLATDIR source directory, if one wasn't distributed..
meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch deleted +0 -39
deleted file mode 100644
index ed52936..0000000
@@ -1,39 +0,0 @@
-Upstream-Status: Accepted [http://hg.python.org/cpython/rev/c816479f6aaf/]
-Bugtracker: http://bugs.python.org/issue12326
-
-[Removed "Misc/NEWS" hunk]
-
-Signed-off-by: Andreas Oberritter <[email protected]>
-
-# HG changeset patch
-# User Victor Stinner <[email protected]>
-# Date 1313841758 -7200
-# Node ID c816479f6aaf71dbd3f3fe4b239186d60c55ce48
-# Parent  3e093590ac57fdda428c7da3f72ddf0c475ecf2b
-Issue #12326: sys.platform is now always 'linux2' on Linux
-
-Even if Python is compiled on Linux 3.
-
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -2995,6 +2995,7 @@ then
- 	MACHDEP="$ac_md_system$ac_md_release"
- 
- 	case $MACHDEP in
-+	linux*) MACHDEP="linux2";;
- 	cygwin*) MACHDEP="cygwin";;
- 	darwin*) MACHDEP="darwin";;
- 	atheos*) MACHDEP="atheos";;
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -293,6 +293,7 @@ then
- 	MACHDEP="$ac_md_system$ac_md_release"
- 
- 	case $MACHDEP in
-+	linux*) MACHDEP="linux2";;
- 	cygwin*) MACHDEP="cygwin";;
- 	darwin*) MACHDEP="darwin";;
- 	atheos*) MACHDEP="atheos";;
-
meta/recipes-devtools/python/python_2.7.3.bb renamed from meta/recipes-devtools/python/python_2.7.2.bb +1 -2
similarity index 98%
rename from meta/recipes-devtools/python/python_2.7.2.bb
rename to meta/recipes-devtools/python/python_2.7.3.bb
index bd5c1ff..b06d7b7 100644
@@ -1,6 +1,6 @@
 require python.inc
 DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
-PR = "${INC_PR}.20"
+PR = "${INC_PR}.0"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"
 DISTRO_SRC_URI_linuxstdbase = ""

@@ -19,7 +19,6 @@ SRC_URI += "\
   file://setup_py_skip_cross_import_check.patch \
   file://add-md5module-support.patch \
   file://host_include_contamination.patch \
-  file://sys_platform_is_now_always_linux2.patch \
   file://fix_for_using_different_libdir.patch \
   file://setuptweaks.patch \
   file://check-if-target-is-64b-not-host.patch \
Signature · 1 line
1.7.7
author
#8 lore raw

PATCH 6/6 distro-tracking: update as per recent recipe upgrades

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../conf/distro/include/distro_tracking_fields.inc |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +10 -10
index c7e6d7d..f74c8d3 100644
@@ -89,8 +89,8 @@ RECIPE_LATEST_VERSION_pn-loudmouth = "check"
 RECIPE_MAINTAINER_pn-loudmouth = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-makedepend = "green"
-RECIPE_LATEST_VERSION_pn-makedepend = "1.0.3"
-RECIPE_LAST_UPDATE_pn-makedepend = "Nov 29, 2010"
+RECIPE_LATEST_VERSION_pn-makedepend = "1.0.4"
+RECIPE_LAST_UPDATE_pn-makedepend = "Apr 30, 2012"
 RECIPE_MAINTAINER_pn-makedepend = "Nitin A Kamble <[email protected]>"
 DISTRO_PN_ALIAS_pn-makedepend = "Mandriva=makedepend Ubuntu=xutils-dev"
 

@@ -2056,7 +2056,6 @@ DISTRO_PN_ALIAS_pn-ubootchart = "OSPDT upstream=http://code.google.com/p/ubootch
 
 RECIPE_STATUS_pn-tiff = "green"
 RECIPE_LATEST_VERSION_pn-tiff = "4.0.1"
-RECIPE_LATEST_RELEASE_DATE_pn-eggdbus = "Feb 18, 2012"
 RECIPE_LAST_UPDATE_pn-tiff = "Feb 27, 2012"
 RECIPE_MANUAL_CHECK_DATE_pn-tiff = "Feb 27, 2012"
 RECIPE_MAINTAINER_pn-tiff = "Saul Wold <[email protected]>"

@@ -3171,9 +3170,9 @@ RECIPE_MANUAL_CHECK_DATE_pn-fstests = "Jul 06, 2011"
 RECIPE_MAINTAINER_pn-fstests = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-gdb="green"
-RECIPE_LATEST_VERSION_pn-gdb="7.4"
-RECIPE_LAST_UPDATE_pn-gdb = "Feb 1, 2012"
-RECIPE_MANUAL_CHECK_DATE_pn-gdb = "Feb 01, 2012"
+RECIPE_LATEST_VERSION_pn-gdb="7.4.1"
+RECIPE_LAST_UPDATE_pn-gdb = "May 1, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-gdb = "May 01, 2012"
 RECIPE_MAINTAINER_pn-gdb = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-intltool="green"

@@ -3291,13 +3290,14 @@ DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mand
 RECIPE_MAINTAINER_pn-python-scons = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-python="red"
-RECIPE_LATEST_VERSION_pn-python="2.7.1"
-RECIPE_LAST_UPDATE_pn-python = "Nov 8, 2010"
+RECIPE_LATEST_VERSION_pn-python="2.7.3"
+RECIPE_LAST_UPDATE_pn-python = "May 01, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-python = "May 01, 2012"
 RECIPE_MAINTAINER_pn-python = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-quilt="green"
-RECIPE_LATEST_VERSION_pn-quilt="0.51"
-RECIPE_LAST_UPDATE_pn-quilt = "Feb 01, 2012"
+RECIPE_LATEST_VERSION_pn-quilt="0.60"
+RECIPE_LAST_UPDATE_pn-quilt = "Apr 30, 2012"
 RECIPE_MAINTAINER_pn-quilt = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-tcl="green"
Signature · 1 line
1.7.7
#9 lore raw

Re: [PATCH 1/6] qt4: fix compilation issue

In reply to [email protected]
Quoted 72 lines · On 05/01/2012 03:00 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

gcc 4.7 uncovers a type mismatch in the code. And this commit fixes the issue:

| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here

NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed

Signed-off-by Nitin A Kamble<[email protected]>
Signed-off-by Richard Purdie<[email protected]>
---
  meta/recipes-qt/qt4/qt-4.8.1.inc                   |    1 +
  .../qt4/qt-4.8.1/fix_conflicting_types.patch       |   29 ++++++++++++++++++++
  meta/recipes-qt/qt4/qt4-x11-free.inc               |    2 +-
  3 files changed, 31 insertions(+), 1 deletions(-)

create mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch

meta/recipes-qt/qt4/qt-4.8.1.inc +1 -0
index 8c38cae..2fc4228 100644
@@ -23,6 +23,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
             file://gcc47-fix.patch \
             file://gcc47-fix2.patch \
             file://disable-fuse-gold-flag.patch \
+           file://fix_conflicting_types.patch \
             "
 
  SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +29 -0
new file mode 100644
index 0000000..8124505
@@ -0,0 +1,29 @@
+Upstream-Status: Pending
+
+This patch fixes the type mismatch fixing this compile issue:
+
+| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
+| In file included from ./wtf/Platform.h:1217:0,
+|                  from ./config.h:30,
+|                  from wtf/gobject/GOwnPtr.cpp:19:
+| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here
+NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
+
+
+Signed-Off-By: Nitin A Kamble<[email protected]>
+2012/04/30
+
+
+Index:  qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+===================================================================
+--- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
+@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
+ typedef struct _GHashTable GHashTable;
+ typedef struct _GInputStream GInputStream;
+ typedef struct _GList GList;
+-typedef struct _GMutex GMutex;
++typedef union _GMutex GMutex;
+ typedef struct _GPatternSpec GPatternSpec;
+ typedef struct _GPollableOutputStream GPollableOutputStream;
+ typedef struct _GSocketClient GSocketClient;
meta/recipes-qt/qt4/qt4-x11-free.inc +0 -0
index a59198d..720b1bf 100644

meta/recipes-qt/qt4/qt4-x11-free.inc HOMEPAGE = "http://qt.nokia.com" · line 11

Quoted 8 lines
meta/recipes-qt/qt4/qt4-x11-free.inc +1 -1
@@ -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 = "r41"
+INC_PR = "r42"
 
  QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
  QT_GLFLAGS_qemux86 = "-opengl"

Nitin,

Was this supposed to fix:

| ccache i586-poky-linux-g++  -m32   -march=i586 --sysroot=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86 -c -O2 -pipe -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self -Werror -Wno-c++0x-compat -fno-stack-protector -Wno-c++0x-compat -O3 -pthread -fPIC -fPIC -fPIC -D_REENTRANT -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_GLIB_SUPPORT=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../../../mkspecs/linux-g++ -I. -I../../../../../include/QtCore -I../../../../../include -I. -I../../Source -I../ThirdParty -Iassembler -Ibytecode -Ibytecompiler -Iheap -Idfg -Idebugger -Iinterpreter -Ijit -Iparser -Iprofiler -Iruntime -Iwtf -Iwtf/gobject -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -Iwtf/unicode -Iyarr -IAPI -IForwardingHeaders -Igenerated -I../../Source -I../../include -I/include/QtWebKit -I/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include -I.moc/release-static -o .obj/release-static/OSRandomSource.o wtf/OSRandomSource.cpp
| moc wtf/qt/MainThreadQt.cpp
| ccache i586-poky-linux-g++  -m32   -march=i586 --sysroot=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86 -c -O2 -pipe -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self -Werror -Wno-c++0x-compat -fno-stack-protector -Wno-c++0x-compat -O3 -pthread -fPIC -fPIC -fPIC -D_REENTRANT -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_GLIB_SUPPORT=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../../../mkspecs/linux-g++ -I. -I../../../../../include/QtCore -I../../../../../include -I. -I../../Source -I../ThirdParty -Iassembler -Ibytecode -Ibytecompiler -Iheap -Idfg -Idebugger -Iinterpreter -Ijit -Iparser -Iprofiler -Iruntime -Iwtf -Iwtf/gobject -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -Iwtf/unicode -Iyarr -IAPI -IForwardingHeaders -Igenerated -I../../Source -I../../include -I/include/QtWebKit -I/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include -I.moc/release-static -o .obj/release-static/StringQt.o wtf/qt/StringQt.cpp
| moc wtf/qt/ThreadingQt.cpp
| ccache i586-poky-linux-g++  -m32   -march=i586 --sysroot=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86 -c -O2 -pipe -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self -Werror -Wno-c++0x-compat -fno-stack-protector -Wno-c++0x-compat -O3 -pthread -fPIC -fPIC -fPIC -D_REENTRANT -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_GLIB_SUPPORT=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../../../mkspecs/linux-g++ -I. -I../../../../../include/QtCore -I../../../../../include -I. -I../../Source -I../ThirdParty -Iassembler -Ibytecode -Ibytecompiler -Iheap -Idfg -Idebugger -Iinterpreter -Ijit -Iparser -Iprofiler -Iruntime -Iwtf -Iwtf/gobject -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -Iwtf/unicode -Iyarr -IAPI -IForwardingHeaders -Igenerated -I../../Source -I../../include -I/include/QtWebKit -I/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include -I.moc/release-static -o .obj/release-static/PageAllocationAligned.o wtf/PageAllocationAligned.cpp
| ccache i586-poky-linux-g++  -m32   -march=i586 --sysroot=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86 -c -O2 -pipe -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self -Werror -Wno-c++0x-compat -fno-stack-protector -Wno-c++0x-compat -O3 -pthread -fPIC -fPIC -fPIC -D_REENTRANT -DNDEBUG -DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS -DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_GLIB_SUPPORT=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3 -DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -I../../../../../mkspecs/linux-g++ -I. -I../../../../../include/QtCore -I../../../../../include -I. -I../../Source -I../ThirdParty -Iassembler -Ibytecode -Ibytecompiler -Iheap -Idfg -Idebugger -Iinterpreter -Ijit -Iparser -Iprofiler -Iruntime -Iwtf -Iwtf/gobject -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -Iwtf/unicode -Iyarr -IAPI -IForwardingHeaders -Igenerated -I../../Source -I../../include -I/include/QtWebKit -I/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include -I.moc/release-static -o .obj/release-static/PageBlock.o wtf/PageBlock.cpp
| In file included from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gtypes.h:34:0,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/galloca.h:34,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib.h:32,
|                  from wtf/gobject/GRefPtr.cpp:24:
| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include/glibconfig.h:159:16: error: 'struct' tag used in naming 'union _GMutex' [-Werror=permissive]
| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GRefPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:15: note: 'union _GMutex' was previously declared here
| In file included from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gasyncqueue.h:34:0,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib.h:34,
|                  from wtf/gobject/GRefPtr.cpp:24:
| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:71:16: error: 'struct' tag used in naming 'union _GMutex' [-Werror=permissive]
| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GRefPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:15: note: 'union _GMutex' was previously declared here
| cc1plus: all warnings being treated as errors
| make[2]: *** [.obj/release-static/GRefPtr.o] Error 1
| make[2]: *** Waiting for unfinished jobs....
| In file included from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gtypes.h:34:0,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/galloca.h:34,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib.h:32,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gobject/gbinding.h:30,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib-object.h:25,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gio/gioenums.h:30,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gio/giotypes.h:30,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gio/gio.h:28,
|                  from wtf/gobject/GOwnPtr.cpp:24:
| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include/glibconfig.h:159:16: error: 'struct' tag used in naming 'union _GMutex' [-Werror=permissive]
| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:15: note: 'union _GMutex' was previously declared here
| In file included from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gasyncqueue.h:34:0,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib.h:34,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/buERROR: Function failed: do_compile (see /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/temp/log.do_compile.14166 for further information)
| ild/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gobject/gbinding.h:30,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib-object.h:25,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gio/gioenums.h:30,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gio/giotypes.h:30,
|                  from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gio/gio.h:28,
|                  from wtf/gobject/GOwnPtr.cpp:24:
| /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:71:16: error: 'struct' tag used in naming 'union _GMutex' [-Werror=permissive]
| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:15: note: 'union _GMutex' was previously declared here
| cc1plus: all warnings being treated as errors
| make[2]: *** [.obj/release-static/GOwnPtr.o] Error 1
| make[2]: Leaving directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore'
| make[1]: *** [sub-JavaScriptCore-JavaScriptCore-pro-make_default-ordered] Error 2
| make[1]: *** Waiting for unfinished jobs....
| make[1]: Leaving directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source'
| make: *** [sub-webkit-make_default-ordered] Error 2
| ERROR: oe_runmake failed

Your patch is included in this build, but still seems to fail.

Sau!

author
#10 lore raw

Re: [PATCH 1/6] qt4: fix compilation issue

Quoted 419 lines

-----Original Message-----
From: Saul Wold [mailto:[email protected]]
Sent: Tuesday, May 01, 2012 8:39 PM
To: Patches and discussions about the oe-core layer
Cc: Kamble, Nitin A
Subject: Re: [OE-core] [PATCH 1/6] qt4: fix compilation issue

Quoted 3 lines · On 05/01/2012 03:00 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

gcc 4.7 uncovers a type mismatch in the code. And this commit fixes

the issue:

Quoted 2 lines

| /srv/home/nitin/builds/build-

gcc47/tmp/sysroots/qemux86/usr/include/

Quoted 1 line

| glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming

'struct _GMutex' [-Werror=permissive] In file included from ./wtf/Platform.h:1217:0,

Quoted 3 lines
|                  from ./config.h:30,
|                  from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was

previously

Quoted 8 lines

| declared here
NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed

Signed-off-by Nitin A Kamble<[email protected]>
Signed-off-by Richard Purdie<[email protected]>
---
  meta/recipes-qt/qt4/qt-4.8.1.inc                   |    1 +
  .../qt4/qt-4.8.1/fix_conflicting_types.patch       |   29

++++++++++++++++++++

meta/recipes-qt/qt4/qt-4.8.1.inc SRC_URI = "http://get.qt.nokia.com/qt/source/qt-

Quoted 11 lines
  meta/recipes-qt/qt4/qt4-x11-free.inc               |    2 +-
  3 files changed, 31 insertions(+), 1 deletions(-)

create mode 100644
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch

meta/recipes-qt/qt4/qt-4.8.1.inc +0 -0
index 8c38cae..2fc4228 100644
@@ -23,6 +23,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-

everywhere-opensource-src-${PV}.

Quoted 14 lines
meta/recipes-qt/qt4/qt-4.8.1.inc +1 -0
             file://gcc47-fix.patch \
             file://gcc47-fix2.patch \
             file://disable-fuse-gold-flag.patch \
+           file://fix_conflicting_types.patch \
             "
 
  SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +0 -0
new file mode 100644
index 0000000..8124505

meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch line 5

Quoted 5 lines
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +5 -0
@@ -0,0 +1,29 @@
+Upstream-Status: Pending
+
+This patch fixes the type mismatch fixing this compile issue:
+
+| /srv/home/nitin/builds/build-

gcc47/tmp/sysroots/qemux86/usr/include

meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch line 6

Quoted 1 line
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +1 -0
+| /glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming

'struct _GMutex' [-Werror=permissive] In file included from ./wtf/Platform.h:1217:0,

meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch

Quoted 13 lines
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +13 -0
+|                  from ./config.h:30,
+|                  from wtf/gobject/GOwnPtr.cpp:19:
+| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was
+| previously declared here
+NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
+
+
+Signed-Off-By: Nitin A Kamble<[email protected]>
+2012/04/30
+
+
+Index:
+qt-everywhere-opensource-src-

4.8.1/src/3rdparty/webkit/Source/JavaScr

meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch line 23

Quoted 4 lines
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +4 -0
+iptCore/wtf/gobject/GTypedefs.h
+===================================================================
+---
+qt-everywhere-opensource-src-

4.8.1/src/3rdparty.orig/webkit/Source/Ja

meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch line 25

Quoted 2 lines
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +2 -0
+vaScriptCore/wtf/gobject/GTypedefs.h
++++ qt-everywhere-opensource-src-

4.8.1/src/3rdparty/webkit/Source/Jav

Quoted 14 lines
meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch new file +8 -0
++++ aScriptCore/wtf/gobject/GTypedefs.h
+@@ -52,7 +52,7 @@ typedef struct _GFile GFile;  typedef struct
+_GHashTable GHashTable;  typedef struct _GInputStream GInputStream;
+typedef struct _GList GList; -typedef struct _GMutex GMutex;
++typedef union _GMutex GMutex;
+ typedef struct _GPatternSpec GPatternSpec; typedef struct
+ _GPollableOutputStream GPollableOutputStream; typedef struct
+ _GSocketClient GSocketClient;
meta/recipes-qt/qt4/qt4-x11-free.inc +0 -0
index a59198d..720b1bf 100644

meta/recipes-qt/qt4/qt4-x11-free.inc HOMEPAGE = "http://qt.nokia.com" · line 6

Quoted 2 lines
meta/recipes-qt/qt4/qt4-x11-free.inc +0 -0
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
  SECTION = "x11/libs"
  DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext

libxrender libxrandr libxcursor"

meta/recipes-qt/qt4/qt4-x11-free.inc HOMEPAGE = "http://qt.nokia.com"

Quoted 5 lines
meta/recipes-qt/qt4/qt4-x11-free.inc +1 -1
-INC_PR = "r41"
+INC_PR = "r42"
 
  QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-

opengl', '-no-opengl', d)} "

meta/recipes-qt/qt4/qt4-x11-free.inc HOMEPAGE = "http://qt.nokia.com" · line 11

Quoted 1 line
meta/recipes-qt/qt4/qt4-x11-free.inc +0 -0
  QT_GLFLAGS_qemux86 = "-opengl"

Nitin,

Was this supposed to fix:
| ccache i586-poky-linux-g++ -m32 -march=i586
--sysroot=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86
-c -O2 -pipe -feliminate-unused-debug-types -fpermissive -fvisibility- inlines-hidden -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar- subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno- sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn - Winit-self -Werror -Wno-c++0x-compat -fno-stack-protector -Wno-c++0x- compat -O3 -pthread -fPIC -fPIC -fPIC -D_REENTRANT -DNDEBUG - DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS - DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_GLIB_SUPPORT=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE - DQT_NO_DEBUG -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE

(quoted diff) +0 -2
-DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3
-DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -

I../../../../../mkspecs/linux-g++ -I. -I../../../../../include/QtCore - I../../../../../include -I. -I../../Source -I../ThirdParty -Iassembler -Ibytecode -Ibytecompiler -Iheap -Idfg -Idebugger -Iinterpreter -Ijit - Iparser -Iprofiler -Iruntime -Iwtf -Iwtf/gobject - I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt- everywhere-opensource-src- 4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -Iwtf/unicode -Iyarr -IAPI -IForwardingHeaders -Igenerated - I../../Source -I../../include -I/include/QtWebKit -I/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include -I.moc/release-static -o .obj/release-static/OSRandomSource.o wtf/OSRandomSource.cpp
| moc wtf/qt/MainThreadQt.cpp
| ccache i586-poky-linux-g++ -m32 -march=i586
--sysroot=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86
-c -O2 -pipe -feliminate-unused-debug-types -fpermissive -fvisibility- inlines-hidden -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar- subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno- sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn - Winit-self -Werror -Wno-c++0x-compat -fno-stack-protector -Wno-c++0x- compat -O3 -pthread -fPIC -fPIC -fPIC -D_REENTRANT -DNDEBUG - DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS - DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_GLIB_SUPPORT=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE - DQT_NO_DEBUG -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE

(quoted diff) +0 -2
-DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3
-DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -

I../../../../../mkspecs/linux-g++ -I. -I../../../../../include/QtCore - I../../../../../include -I. -I../../Source -I../ThirdParty -Iassembler -Ibytecode -Ibytecompiler -Iheap -Idfg -Idebugger -Iinterpreter -Ijit - Iparser -Iprofiler -Iruntime -Iwtf -Iwtf/gobject - I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt- everywhere-opensource-src- 4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -Iwtf/unicode -Iyarr -IAPI -IForwardingHeaders -Igenerated - I../../Source -I../../include -I/include/QtWebKit -I/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include -I.moc/release-static -o .obj/release-static/StringQt.o wtf/qt/StringQt.cpp
| moc wtf/qt/ThreadingQt.cpp
| ccache i586-poky-linux-g++ -m32 -march=i586
--sysroot=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86
-c -O2 -pipe -feliminate-unused-debug-types -fpermissive -fvisibility- inlines-hidden -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar- subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno- sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn - Winit-self -Werror -Wno-c++0x-compat -fno-stack-protector -Wno-c++0x- compat -O3 -pthread -fPIC -fPIC -fPIC -D_REENTRANT -DNDEBUG - DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS - DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_GLIB_SUPPORT=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE - DQT_NO_DEBUG -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE

(quoted diff) +0 -2
-DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3
-DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -

I../../../../../mkspecs/linux-g++ -I. -I../../../../../include/QtCore - I../../../../../include -I. -I../../Source -I../ThirdParty -Iassembler -Ibytecode -Ibytecompiler -Iheap -Idfg -Idebugger -Iinterpreter -Ijit - Iparser -Iprofiler -Iruntime -Iwtf -Iwtf/gobject - I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt- everywhere-opensource-src- 4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -Iwtf/unicode -Iyarr -IAPI -IForwardingHeaders -Igenerated - I../../Source -I../../include -I/include/QtWebKit -I/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include -I.moc/release-static -o .obj/release-static/PageAllocationAligned.o wtf/PageAllocationAligned.cpp
| ccache i586-poky-linux-g++ -m32 -march=i586
--sysroot=/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86
-c -O2 -pipe -feliminate-unused-debug-types -fpermissive -fvisibility- inlines-hidden -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar- subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno- sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn - Winit-self -Werror -Wno-c++0x-compat -fno-stack-protector -Wno-c++0x- compat -O3 -pthread -fPIC -fPIC -fPIC -D_REENTRANT -DNDEBUG - DBUILDING_QT__=1 -DNDEBUG -DQT_ASCII_CAST_WARNINGS - DBUILDING_JavaScriptCore -DBUILDING_WTF -DENABLE_GLIB_SUPPORT=1 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE - DQT_NO_DEBUG -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE

(quoted diff) +0 -2
-DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_HAVE_SSE3 -DQT_HAVE_SSSE3
-DQT_HAVE_SSE4_1 -DQT_HAVE_SSE4_2 -DQT_HAVE_AVX -DQT_SHARED -

I../../../../../mkspecs/linux-g++ -I. -I../../../../../include/QtCore - I../../../../../include -I. -I../../Source -I../ThirdParty -Iassembler -Ibytecode -Ibytecompiler -Iheap -Idfg -Idebugger -Iinterpreter -Ijit - Iparser -Iprofiler -Iruntime -Iwtf -Iwtf/gobject - I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt- everywhere-opensource-src- 4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/symbian -Iwtf/unicode -Iyarr -IAPI -IForwardingHeaders -Igenerated - I../../Source -I../../include -I/include/QtWebKit -I/include -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/freetype2 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0 -I/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/lib/glib-2.0/include -I.moc/release-static -o .obj/release-static/PageBlock.o wtf/PageBlock.cpp
| In file included from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/glib/gtypes.h:34:0,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/glib/galloca.h:34,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib.h:32,
| from wtf/gobject/GRefPtr.cpp:24:
|
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/lib/glib- 2.0/include/glibconfig.h:159:16:
error: 'struct' tag used in naming 'union _GMutex' [-Werror=permissive]

| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GRefPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:15: note: 'union _GMutex' was previously

declared here
| In file included from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/glib/gasyncqueue.h:34:0,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib.h:34,
| from wtf/gobject/GRefPtr.cpp:24:
|
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/glib/gthread.h:71:16:
error: 'struct' tag used in naming 'union _GMutex' [-Werror=permissive]

| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GRefPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:15: note: 'union _GMutex' was previously
declared here
| cc1plus: all warnings being treated as errors
| make[2]: *** [.obj/release-static/GRefPtr.o] Error 1
| make[2]: *** Waiting for unfinished jobs....
| In file included from

/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/glib/gtypes.h:34:0,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/glib/galloca.h:34,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib.h:32,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/gobject/gbinding.h:30,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib- object.h:25,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/gio/gioenums.h:30,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/gio/giotypes.h:30,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gio/gio.h:28,
| from wtf/gobject/GOwnPtr.cpp:24:
|
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/lib/glib- 2.0/include/glibconfig.h:159:16:
error: 'struct' tag used in naming 'union _GMutex' [-Werror=permissive]

| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:15: note: 'union _GMutex' was previously

declared here
| In file included from /home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/glib/gasyncqueue.h:34:0,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib.h:34,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-x86/buERROR:
Function failed: do_compile (see /home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1- r42.1/temp/log.do_compile.14166
for further information)
| ild/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/gobject/gbinding.h:30,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/glib- object.h:25,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/gio/gioenums.h:30,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/gio/giotypes.h:30,
| from
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib-2.0/gio/gio.h:28,
| from wtf/gobject/GOwnPtr.cpp:24:
|
/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/sysroots/qemux86/usr/include/glib- 2.0/glib/gthread.h:71:16:
error: 'struct' tag used in naming 'union _GMutex' [-Werror=permissive]

| In file included from ./wtf/Platform.h:1217:0,
|                  from ./config.h:30,
|                  from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:15: note: 'union _GMutex' was previously
declared here
| cc1plus: all warnings being treated as errors
| make[2]: *** [.obj/release-static/GOwnPtr.o] Error 1
| make[2]: Leaving directory

`/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt- everywhere-opensource-src- 4.8.1/src/3rdparty/webkit/Source/JavaScriptCore'
| make[1]: *** [sub-JavaScriptCore-JavaScriptCore-pro-make_default-ordered] Error 2 | make[1]: *** Waiting for unfinished jobs....
| make[1]: Leaving directory `/home/pokybuild/yocto-autobuilder/yocto-slave/nightly- x86/build/build/tmp/work/i586-poky-linux/qt4-x11-free-4.8.1-r42.1/qt- everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source' | make: *** [sub-webkit-make_default-ordered] Error 2
| ERROR: oe_runmake failed

Quoted 5 lines

Your patch is included in this build, but still seems to fail.

Sau!

This is not failing for me.

Nitin

Applied
#11 lore raw
In reply to [email protected]
Quoted 4 lines · On 05/01/2012 03:00 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

The following changes since commit d89f7b9cab1946a3267e3b0402f168f946d480b2:

Quoted 8 lines
   documentation/Makefile: Fixed figures publishing bug (2012-05-01 20:50:56 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/upgrades
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/upgrades

Nitin A Kamble (6):
qt4: fix compilation issue

This one got merged accidently and will cause some breakage until we get the updated version of glib-2.0 in, but other fixes are required also.

Quoted 26 lines
   makedepend: upgrade from 1.0.3 to 1.0.4
   quilt: upgrade from 0.51 to 0.60
   gdb: upgrade from 7.4 to 7.4.1
   python: upgrade from 2.7.2 to 2.7.3
   distro-tracking: update as per recent recipe upgrades
  meta/conf/distro/include/default-versions.inc      |    4 +-
  .../conf/distro/include/distro_tracking_fields.inc |   20 +++++-----
  meta/recipes-devtools/gdb/gdb-common.inc           |    6 ++--
  ...canadian_7.4.bb =>  gdb-cross-canadian_7.4.1.bb} |    2 +-
  .../gdb/{gdb-cross_7.4.bb =>  gdb-cross_7.4.1.bb}   |    0
  .../gdb/{gdb_7.4.bb =>  gdb_7.4.1.bb}               |    0
  ...thon-native_2.7.2.bb =>  python-native_2.7.3.bb} |    6 +---
  meta/recipes-devtools/python/python.inc            |    8 ++--
  .../python/python/04-default-is-optimized.patch    |   30 +++++++++------
  .../python/fix_for_using_different_libdir.patch    |   30 +++++++++-------
  .../python/sys_platform_is_now_always_linux2.patch |   39 --------------------
  .../python/{python_2.7.2.bb =>  python_2.7.3.bb}    |    3 +-
  .../quilt/{quilt-0.51.inc =>  quilt-0.60.inc}       |    4 +-
  .../{quilt-native_0.51.bb =>  quilt-native_0.60.bb} |    2 +-
  .../quilt/{quilt_0.51.bb =>  quilt_0.60.bb}         |    2 +-
  .../{makedepend_1.0.3.bb =>  makedepend_1.0.4.bb}   |    5 +--
  meta/recipes-qt/qt4/qt-4.8.1.inc                   |    1 +
  .../qt4/qt-4.8.1/fix_conflicting_types.patch       |   29 +++++++++++++++
  meta/recipes-qt/qt4/qt4-x11-free.inc               |    2 +-
  19 files changed, 94 insertions(+), 99 deletions(-)
Quoted 12 lines

rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.4.bb => gdb-cross-canadian_7.4.1.bb} (88%) rename meta/recipes-devtools/gdb/{gdb-cross_7.4.bb => gdb-cross_7.4.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb_7.4.bb => gdb_7.4.1.bb} (100%)
rename meta/recipes-devtools/python/{python-native_2.7.2.bb => python-native_2.7.3.bb} (92%) delete mode 100644 meta/recipes-devtools/python/python/sys_platform_is_now_always_linux2.patch rename meta/recipes-devtools/python/{python_2.7.2.bb => python_2.7.3.bb} (98%) rename meta/recipes-devtools/quilt/{quilt-0.51.inc => quilt-0.60.inc} (84%) rename meta/recipes-devtools/quilt/{quilt-native_0.51.bb => quilt-native_0.60.bb} (83%) rename meta/recipes-devtools/quilt/{quilt_0.51.bb => quilt_0.60.bb} (98%)
rename meta/recipes-graphics/xorg-util/{makedepend_1.0.3.bb => makedepend_1.0.4.bb} (82%) create mode 100644 meta/recipes-qt/qt4/qt-4.8.1/fix_conflicting_types.patch

Merged into OE-Core

Thanks
Sau!