Fixes for master-next
cover Fixes for master-next
From: Nitin A Kamble <[email protected]>
with eglibc-2.15 & gcc-4.7 noticed a compile issue for qt4. and here is a fix for the issue.
Thanks,
Nitin
The following changes since commit a004e53803c4715cdf31f1d77090d39c2a4f3483:
tune-sh4.inc: Fix spelling of big-endian feature set (2012-04-30 15:57:00 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/bugfixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/bugfixes
Nitin A Kamble (1):
qt4: fix compilation issue
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
Signature · 1 line
1.7.7
PATCH 1/1 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]>
--- 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
@@ -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
@@ -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
@@ -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