From 5d5ba83cc6eadbff6d60d5ae4947bc9b48d846f4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 28 Feb 2013 20:56:51 +0100 Subject: qt5-native: rename to qtbase-native to avoid confusion * we also had PROVIDES for qt5-tools-native, this makes it a bit easier to see what is what * drop FILESEXTRAPATHS, not needed after renaming to match BPN with qtbase patches Signed-off-by: Martin Jansa --- classes/qmake5.bbclass | 2 +- recipes-qt/qt5/qt5-native.inc | 66 ---------------------- .../qt5/qt5-native/0001-Always-build-uic.patch | 31 ---------- ...Allow-qt.conf-override-when-bootstrapping.patch | 30 ---------- recipes-qt/qt5/qt5-native_5.0.0+git.bb | 8 --- recipes-qt/qt5/qt5-native_5.0.1.bb | 7 --- recipes-qt/qt5/qt5.inc | 2 +- recipes-qt/qt5/qtbase-native.inc | 63 +++++++++++++++++++++ ...Allow-qt.conf-override-when-bootstrapping.patch | 30 ++++++++++ recipes-qt/qt5/qtbase-native_5.0.0+git.bb | 8 +++ recipes-qt/qt5/qtbase-native_5.0.1.bb | 9 +++ recipes-qt/qt5/qtbase.inc | 2 +- recipes-qt/qt5/qtbase/0001-Always-build-uic.patch | 31 ++++++++++ recipes-qt/qt5/qtjsbackend-native.inc | 2 +- 14 files changed, 145 insertions(+), 146 deletions(-) delete mode 100644 recipes-qt/qt5/qt5-native.inc delete mode 100644 recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch delete mode 100644 recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch delete mode 100644 recipes-qt/qt5/qt5-native_5.0.0+git.bb delete mode 100644 recipes-qt/qt5/qt5-native_5.0.1.bb create mode 100644 recipes-qt/qt5/qtbase-native.inc create mode 100644 recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch create mode 100644 recipes-qt/qt5/qtbase-native_5.0.0+git.bb create mode 100644 recipes-qt/qt5/qtbase-native_5.0.1.bb create mode 100644 recipes-qt/qt5/qtbase/0001-Always-build-uic.patch diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 180cedcf..00d6c0ea 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -3,7 +3,7 @@ # inherit qmake5_base -QT5TOOLSDEPENDS ?= "qt5-native " +QT5TOOLSDEPENDS ?= "qtbase-native " DEPENDS_prepend = "${QT5TOOLSDEPENDS}" export QMAKESPEC = "${STAGING_DATADIR}/qt5/mkspecs/${TARGET_OS}-oe-g++" diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc deleted file mode 100644 index 1aa5c0ce..00000000 --- a/recipes-qt/qt5/qt5-native.inc +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]" -DEPENDS = "zlib-native dbus-native" -SECTION = "libs" -HOMEPAGE = "http://qt-project.org" -PROVIDES = "qt5-tools-native" - -INC_PR = "r0" - -inherit native - -QT_MODULE = "qtbase" - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/qtbase:" - -SRC_URI += " \ - file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ - file://0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch \ - file://0001-Always-build-uic.patch \ -" - -EXTRA_OECONF = " \ - -prefix ${prefix} \ - -L ${STAGING_LIBDIR_NATIVE} \ - -I ${STAGING_INCDIR_NATIVE} \ - -system-zlib \ - -no-libjpeg \ - -no-libpng \ - -no-gif \ - -no-accessibility \ - -no-cups \ - -no-nis \ - -no-gui \ - -no-qml-debug \ - -no-sql-mysql \ - -no-sql-sqlite \ - -no-opengl \ - -no-openssl \ - -no-xcb \ - -verbose -release \ - -headerdir ${includedir}/qt5 \ - -datadir ${datadir}/qt5 \ - -docdir ${docdir}/qt5 \ - -no-glib \ - -no-iconv \ - -silent \ - -nomake examples \ - -nomake tests \ - -nomake demos \ - -no-rpath \ -" - -do_configure() { - # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) - unset LD - - (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_install() { - install -d ${D}${bindir}/ - for i in findtr fixqt4headers.pl moc qdoc qmake rcc qdbuscpp2xml qdbusxml2cpp syncqt uic; do - install -v -m 0755 bin/${i} ${D}${bindir}/${i} - done - install -d ${D}${datadir}/qt5/ - cp -PfR mkspecs ${D}${datadir}/qt5/ -} diff --git a/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch b/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch deleted file mode 100644 index 3f2e3fd9..00000000 --- a/recipes-qt/qt5/qt5-native/0001-Always-build-uic.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 27 Nov 2012 12:46:44 -0800 -Subject: [PATCH] Always build uic - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Signed-off-by: Mikko Levonmaa ---- - src/tools/tools.pro | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tools/tools.pro b/src/tools/tools.pro -index c67d6bf..b6f3b39 100644 ---- a/src/tools/tools.pro -+++ b/src/tools/tools.pro -@@ -1,8 +1,8 @@ - TEMPLATE = subdirs - --TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc -+TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic - contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml --!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic -+ - # Set subdir and respective target name - src_tools_bootstrap.subdir = $$PWD/bootstrap - src_tools_bootstrap.target = sub-tools-bootstrap --- -1.7.4.1 - diff --git a/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch deleted file mode 100644 index 1b294fd2..00000000 --- a/recipes-qt/qt5/qt5-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 40e6c0f88774b55111c63ed28bba626141797476 Mon Sep 17 00:00:00 2001 -From: Mikko Levonmaa -Date: Tue, 4 Dec 2012 15:32:33 -0800 -Subject: [PATCH 3/3] qtbase: Allow qt.conf override when bootstrapping - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa ---- - qmake/option.cpp | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/qmake/option.cpp b/qmake/option.cpp -index 91c154a..a4f3a85 100644 ---- a/qmake/option.cpp -+++ b/qmake/option.cpp -@@ -647,6 +647,10 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) - - QString qt_libraryInfoFile() - { -+ QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); -+ if (QFile::exists(qtconfig)) { -+ return qtconfig; -+ } - if (!Option::globals->qmake_abslocation.isEmpty()) - return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf"); - return QString(); --- -1.7.4.1 - diff --git a/recipes-qt/qt5/qt5-native_5.0.0+git.bb b/recipes-qt/qt5/qt5-native_5.0.0+git.bb deleted file mode 100644 index e99971fb..00000000 --- a/recipes-qt/qt5/qt5-native_5.0.0+git.bb +++ /dev/null @@ -1,8 +0,0 @@ -require qt5-native.inc -require qt5-5.0.0+git.inc - -PR = "${INC_PR}.0" - -DEFAULT_PREFERENCE = "-1" - -SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" diff --git a/recipes-qt/qt5/qt5-native_5.0.1.bb b/recipes-qt/qt5/qt5-native_5.0.1.bb deleted file mode 100644 index f822a3e3..00000000 --- a/recipes-qt/qt5/qt5-native_5.0.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require ${PN}.inc -require qt5-${PV}.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" -SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index e9b87a0b..97f3ee17 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -6,7 +6,7 @@ inherit qmake5_base ICU = "icu " ICU_powerpc = "pango" -DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" +DEPENDS += "virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" require qt5_arch.inc diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc new file mode 100644 index 00000000..db1292cd --- /dev/null +++ b/recipes-qt/qt5/qtbase-native.inc @@ -0,0 +1,63 @@ +DESCRIPTION = "Native version of Qt/[X11|Mac|Embedded]" +DEPENDS = "zlib-native dbus-native" +SECTION = "libs" +HOMEPAGE = "http://qt-project.org" + +INC_PR = "r0" + +inherit native + +QT_MODULE = "qtbase" + +SRC_URI += " \ + file://0001-qlibraryinfo-Allow-the-specification-of-where-to-loa.patch \ + file://0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch \ + file://0001-Always-build-uic.patch \ +" + +EXTRA_OECONF = " \ + -prefix ${prefix} \ + -L ${STAGING_LIBDIR_NATIVE} \ + -I ${STAGING_INCDIR_NATIVE} \ + -system-zlib \ + -no-libjpeg \ + -no-libpng \ + -no-gif \ + -no-accessibility \ + -no-cups \ + -no-nis \ + -no-gui \ + -no-qml-debug \ + -no-sql-mysql \ + -no-sql-sqlite \ + -no-opengl \ + -no-openssl \ + -no-xcb \ + -verbose -release \ + -headerdir ${includedir}/qt5 \ + -datadir ${datadir}/qt5 \ + -docdir ${docdir}/qt5 \ + -no-glib \ + -no-iconv \ + -silent \ + -nomake examples \ + -nomake tests \ + -nomake demos \ + -no-rpath \ +" + +do_configure() { + # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) + unset LD + + (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +do_install() { + install -d ${D}${bindir}/ + for i in findtr fixqt4headers.pl moc qdoc qmake rcc qdbuscpp2xml qdbusxml2cpp syncqt uic; do + install -v -m 0755 bin/${i} ${D}${bindir}/${i} + done + install -d ${D}${datadir}/qt5/ + cp -PfR mkspecs ${D}${datadir}/qt5/ +} diff --git a/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch b/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch new file mode 100644 index 00000000..1b294fd2 --- /dev/null +++ b/recipes-qt/qt5/qtbase-native/0003-qtbase-Allow-qt.conf-override-when-bootstrapping.patch @@ -0,0 +1,30 @@ +From 40e6c0f88774b55111c63ed28bba626141797476 Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 4 Dec 2012 15:32:33 -0800 +Subject: [PATCH 3/3] qtbase: Allow qt.conf override when bootstrapping + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +--- + qmake/option.cpp | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/qmake/option.cpp b/qmake/option.cpp +index 91c154a..a4f3a85 100644 +--- a/qmake/option.cpp ++++ b/qmake/option.cpp +@@ -647,6 +647,10 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) + + QString qt_libraryInfoFile() + { ++ QString qtconfig = QFile::decodeName(getenv("QT_CONF_PATH")); ++ if (QFile::exists(qtconfig)) { ++ return qtconfig; ++ } + if (!Option::globals->qmake_abslocation.isEmpty()) + return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf"); + return QString(); +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtbase-native_5.0.0+git.bb b/recipes-qt/qt5/qtbase-native_5.0.0+git.bb new file mode 100644 index 00000000..80d80565 --- /dev/null +++ b/recipes-qt/qt5/qtbase-native_5.0.0+git.bb @@ -0,0 +1,8 @@ +require ${PN}.inc +require qt5-5.0.0+git.inc + +PR = "${INC_PR}.0" + +DEFAULT_PREFERENCE = "-1" + +SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" diff --git a/recipes-qt/qt5/qtbase-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb new file mode 100644 index 00000000..f5d96130 --- /dev/null +++ b/recipes-qt/qt5/qtbase-native_5.0.1.bb @@ -0,0 +1,9 @@ +require ${PN}.inc +require qt5-${PV}.inc + +PR = "${INC_PR}.0" + +SRC_URI += "file://0001-Always-build-uic.patch" + +SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df" +SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8" diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 2b14de1e..f420d37a 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -8,7 +8,7 @@ SRC_URI += " \ file://qplatformdefs.h \ " -DEPENDS += "qt5-tools-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" +DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU}" # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h # DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch new file mode 100644 index 00000000..3f2e3fd9 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch @@ -0,0 +1,31 @@ +From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001 +From: Mikko Levonmaa +Date: Tue, 27 Nov 2012 12:46:44 -0800 +Subject: [PATCH] Always build uic + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Signed-off-by: Mikko Levonmaa +--- + src/tools/tools.pro | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tools/tools.pro b/src/tools/tools.pro +index c67d6bf..b6f3b39 100644 +--- a/src/tools/tools.pro ++++ b/src/tools/tools.pro +@@ -1,8 +1,8 @@ + TEMPLATE = subdirs + +-TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc ++TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic + contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml +-!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic ++ + # Set subdir and respective target name + src_tools_bootstrap.subdir = $$PWD/bootstrap + src_tools_bootstrap.target = sub-tools-bootstrap +-- +1.7.4.1 + diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 8a66229a..37e2b80d 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -1,7 +1,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780" -DEPENDS = "qt5-native" +DEPENDS = "qtbase-native" QT_MODULE = "qtjsbackend" -- cgit v1.2.3-54-g00ecf