qt4-tools-nativesdk fixes

Several fixes for qt4-tools-nativesdk.

The following changes since commit 835d817f1ba7b99167743fdb86ba80f3a07bd82d:

systemtap: remove non-core COMPATIBLE_MACHINES (2011-06-16 22:12:40 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/qt4-nativesdk-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-nativesdk-fix

Paul Eggleton (3):
qt4-tools-nativesdk: fix unpack failure due to missing g++.conf
qt4-tools-nativesdk: drop freetype include as we build with
-no-freetype
qt4-tools-nativesdk: fix compile failure in src/dbus

 meta/recipes-qt/qt4/files/qt-dbus-const.patch |   21 +++++++++++++++++++++
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc   |    7 ++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/files/qt-dbus-const.patch

1.7.4.1

FILESPATHPKG was being used to in order to bring in linux.conf and g++.conf in this recipe, however this probably never worked since FILESPATHPKG always has the MACHINE appended to it and these are not machine-specific files. The only reason it built was that these two files could be found within the "files" subdir until we removed Qt 4.6.3. Using FILESEXTRAPATHS (as qt4-tools-native does) solves this.

---
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

index 5faf40c..d1f4b47 100644
@@ -5,9 +5,10 @@ HOMEPAGE = "http://qt.nokia.com"
 PRIORITY = "optional"
 LICENSE = "LGPLv2.1 | GPLv3"
 
-INC_PR = "r3"
+INC_PR = "r4"
+
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
 
-FILESPATHPKG =. "qt-${PV}:"
 inherit nativesdk qmake2
 
 SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \

1.7.4.1

Freetype support is disabled so there's no need to point to the freetype headers.

Prompted by OE commit 4931b37c8faf1eef7322cc82bf979885c770f4e0 from Dmitry Eremin-Solenikov <[email protected]>

---
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

index d1f4b47..114f998 100644
@@ -44,7 +44,6 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -embedded -no-freetype -no-glib -no-iconv \
                 -qt3support \
                 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include \
-                -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/freetype2 \
                 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/dbus-1.0 \
                 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/lib/dbus-1.0/include \
                 -I${STAGING_DIR_HOST}${SDKPATHNATIVE}/usr/include/c++ \

1.7.4.1

[Qt #17962] -- http://bugreports.qt.nokia.com/browse/QTBUG-17962
[YOCTO #1168] -- http://bugzilla.pokylinux.org/show_bug.cgi?id=1168

Fix "invalid conversion from 'const void*' to 'void*'" error compiling src/dbus/qdbusintegrator.cpp. It is assumed that the use of "const" here is incorrect as no other usage of Q_GLOBAL_STATIC_WITH_ARGS uses const prefix on the first (TYPE) argument.

Patch was imported from the Qt bug tracker (see above reference); the patch was rejected but for procedural rather than validity reasons.

Fixes [YOCTO #1168]

---
 meta/recipes-qt/qt4/files/qt-dbus-const.patch |   21 +++++++++++++++++++++
 meta/recipes-qt/qt4/qt4-tools-nativesdk.inc   |    1 +
 2 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-qt/qt4/files/qt-dbus-const.patch

new file mode 100644
index 0000000..a856912
@@ -0,0 +1,21 @@
+Remove "const" usage that causes compile failure building qt4-tools-nativesdk
+
+Patch has apparently been rejected upstream, not because it is invalid
+but because the submitter did not submit a merge request for it, so the
+validity of the patch upstream is uncertain. For further details see:
+http://bugreports.qt.nokia.com/browse/QTBUG-17962
+
+Original Author: Pavel Heimlich <tropikhajma at gmail.com>
+Upstream-Status: Rejected
+
+--- qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp.orig	2011-03-12 02:11:32.313467991 +0100
++++ qt-everywhere-opensource-src-4.7.3/src/dbus/qdbusintegrator.cpp	2011-03-12 02:11:03.795809176 +0100
+@@ -71,7 +71,7 @@
+ static bool isDebugging;
+ #define qDBusDebug              if (!::isDebugging); else qDebug
+ 
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+ 
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }

index 114f998..19da0ce 100644
@@ -17,6 +17,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://qt-config.patch \
            file://qmake-exists-check.patch \
            file://configure-paths.patch \
+           file://qt-dbus-const.patch \
            file://g++.conf \
            file://linux.conf"
 

1.7.4.1

FILESPATHPKG is not supported in oe-core. Its an oe.dev feature for now.

The only reason it built was that these two files

Right, but there's still a reference to it in utils.bbclass where it supposedly operates in the manner I described. This patch actually removes its usage in the qt4-tools-nativesdk recipe however.

Cheers,
Paull

Paul Eggleton
Intel Open Source Technology Centre

Merged to master, thanks.

Richard