Qt4 fixes

PATCH Applied Paul Eggleton 3 participants 7 messages May 13, 2011 – May 17, 2011

lore

Share & tools

lore

Paul Eggleton

author

2011-05-13 13:59 UTC #0 lore raw

cover Qt4 fixes

From: Paul Eggleton <[email protected]>

These patches update Qt 4.7 series from 4.7.2 to 4.7.3, and make it easier for other layers such as meta-oe to enable more SQL drivers.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: paule/qt-4.7.3
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/qt-4.7.3

Thanks,
Paul Eggleton <[email protected]>
---

Paul Eggleton (3):
qt4: update from 4.7.2 to 4.7.3 distro_tracking_fields.inc: update for qt 4.7.3 upgrade
qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS

 .../conf/distro/include/distro_tracking_fields.inc |   32 ++++++++++----------
 meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} |    5 +--
 .../0001-Added-Openembedded-crossarch-option.patch |    0
 .../recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf |    0
 .../hack-out-pg2-4.7.0.patch                       |    0
 .../qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf          |    0
 ...qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} |    2 +-
 ...s-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} |    4 +-
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb   |    6 ----
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb   |    6 ++++
 ...qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} |    2 +-
 meta/recipes-qt/qt4/qt4.inc                        |    4 ++-
 12 files changed, 31 insertions(+), 30 deletions(-)
 rename meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} (89%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/0001-Added-Openembedded-crossarch-option.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/hack-out-pg2-4.7.0.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf (100%)
 rename meta/recipes-qt/qt4/{qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} (87%)
 rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} (61%)
 delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
 rename meta/recipes-qt/qt4/{qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} (88%)

Signature · 1 line

1.7.4.4

Paul Eggleton

author

2011-05-13 13:59 UTC #3 lore raw

PATCH 2/3 distro_tracking_fields.inc: update for qt 4.7.3 upgrade

From: Paul Eggleton <[email protected]>

Signed-off-by Paul Eggleton <[email protected]>

---
 .../conf/distro/include/distro_tracking_fields.inc |   32 ++++++++++----------
 1 files changed, 16 insertions(+), 16 deletions(-)

meta/conf/distro/include/distro_tracking_fields.inc +16 ~~-16~~

index d9fe02c..ad45b94 100644
@@ -3352,32 +3352,32 @@ RECIPE_LAST_UPDATE_pn-imake = "Nov 21, 2010"
 RECIPE_MAINTAINER_pn-imake = "Yu Ke <[email protected]>"
 
 RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
-RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/03/01"
-RECIPE_LAST_UPDATE_pn-qt4-tools-native = "Apr 6, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.3"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/05/04"
+RECIPE_LAST_UPDATE_pn-qt4-tools-native = "May 12, 2011"
 RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton <[email protected]>"
 DISTRO_PN_ALIAS_pn-qt4-tools-native = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
 
 RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
-RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/03/01"
-RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "Apr 6, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.3"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
+RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
 RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <[email protected]>"
 
 RECIPE_STATUS_pn-qt4-embedded = "green"
-RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/03/01"
-RECIPE_LAST_UPDATE_pn-qt4-embedded = "Apr 6, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
+RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
 RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <[email protected]>"
 
 RECIPE_STATUS_pn-qt4-x11-free = "green"
-RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/03/01"
-RECIPE_LAST_UPDATE_pn-qt4-x11-free = "Apr 6, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "2 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/05/04"
+RECIPE_LAST_UPDATE_pn-qt4-x11-free = "May 12, 2011"
 RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton <[email protected]"
 DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"

Signature · 1 line

1.7.4.4

Paul Eggleton

author

2011-05-13 13:59 UTC #4 lore raw

PATCH 3/3 qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS

In reply to Paul Eggleton

From: Paul Eggleton <[email protected]>

This allows meta-oe to override these options easily in order to enable more SQL driver plugins.

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/recipes-qt/qt4/qt4.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

meta/recipes-qt/qt4/qt4.inc +3 -1

index b86f89f..7e15b61 100644
@@ -9,11 +9,13 @@ QT_ENDIAN = "${@qt_endian(d)}"
 QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
 QT_DISTRO_FLAGS_linuxstdbase = "-sm"
 
+QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite"
+
 QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
                     -shared -no-nas-sound -no-nis \
                     -qt-gif -system-libjpeg -system-libpng -system-zlib \
-                    -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \
                     -no-pch -qdbus -stl -glib -phonon -webkit \
+                    ${QT_SQL_DRIVER_FLAGS} \
                     ${QT_DISTRO_FLAGS} "
 
 EXTRA_OEMAKE = "-e"

Signature · 1 line

1.7.4.4

Paul Eggleton

author

2011-05-13 13:59 UTC #1 lore raw

PATCH 1/3 qt4: update from 4.7.2 to 4.7.3

In reply to Paul Eggleton

From: Paul Eggleton <[email protected]>

The Comodo certificates patch has been merged upstream so it no longer needs to be applied. Some PR values were reset and SRC_URI checksums updated but other than this there are no recipe changes.

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} |    5 ++---
 .../0001-Added-Openembedded-crossarch-option.patch |    0
 .../recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf |    0
 .../hack-out-pg2-4.7.0.patch                       |    0
 .../qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf          |    0
 ...qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} |    2 +-
 ...s-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} |    4 ++--
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb   |    6 ------
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb   |    6 ++++++
 ...qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} |    2 +-
 10 files changed, 12 insertions(+), 13 deletions(-)
 rename meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} (89%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/0001-Added-Openembedded-crossarch-option.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/hack-out-pg2-4.7.0.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf (100%)
 rename meta/recipes-qt/qt4/{qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} (87%)
 rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} (61%)
 delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
 rename meta/recipes-qt/qt4/{qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} (88%)

meta/recipes-qt/qt4/qt-4.7.3.inc renamed from meta/recipes-qt/qt4/qt-4.7.2.inc +2 -3

similarity index 89%
rename from meta/recipes-qt/qt4/qt-4.7.2.inc
rename to meta/recipes-qt/qt4/qt-4.7.3.inc
index 0f75a46..7f26b9b 100644
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
 FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
 
 SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://blacklist-fraudulent-comodo-certificates-patch.diff \
            file://0004-no-qmake.patch \
            file://hack-out-pg2-4.7.0.patch \
            file://0006-freetype-host-includes.patch \

@@ -15,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://linux.conf \
            "
 
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"

meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch renamed from meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch +0 -0

similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
rename to meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch

meta/recipes-qt/qt4/qt-4.7.3/g++.conf renamed from meta/recipes-qt/qt4/qt-4.7.2/g++.conf +0 -0

similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/g++.conf
rename to meta/recipes-qt/qt4/qt-4.7.3/g++.conf

meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch renamed from meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch +0 -0

similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
rename to meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch

meta/recipes-qt/qt4/qt-4.7.3/linux.conf renamed from meta/recipes-qt/qt4/qt-4.7.2/linux.conf +0 -0

similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/linux.conf
rename to meta/recipes-qt/qt4/qt-4.7.3/linux.conf

meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb renamed from meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb +1 -1

similarity index 87%
rename from meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
index c3f6713..b88b1e9 100644
@@ -1,7 +1,7 @@
 require qt-${PV}.inc
 require qt4-embedded.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "

meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb renamed from meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb +2 -2

similarity index 61%
rename from meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb
index d3c0eda..deb4231 100644
@@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
 
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
 
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"

meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb deleted +0 -6

deleted file mode 100644
index a917ac4..0000000
@@ -1,6 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"

meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb new file +6 -0

new file mode 100644
index 0000000..d61f312
@@ -0,0 +1,6 @@
+require qt4-tools-nativesdk.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"

meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb renamed from meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb +1 -1

similarity index 88%
rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
index 75c6314..359a756 100644
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 require qt-${PV}.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "

Signature · 1 line

1.7.4.4

Joshua Lock

Reviewed-by on v1 1/3

2011-05-13 17:14 UTC #2 lore raw

Re: [PATCH 1/3] qt4: update from 4.7.2 to 4.7.3

Quoted 7 lines · Paul Eggleton

From: Paul Eggleton <[email protected]>
The Comodo certificates patch has been merged upstream so it no longer needs to be applied. Some PR values were reset and SRC_URI checksums updated but other than this there are no recipe changes.
Signed-off-by Paul Eggleton <[email protected]>

Reviewed-by Joshua Lock <[email protected]>

Quoted 136 lines

---
 meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} |    5 ++---
 .../0001-Added-Openembedded-crossarch-option.patch |    0
 .../recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf |    0
 .../hack-out-pg2-4.7.0.patch                       |    0
 .../qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf          |    0
 ...qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} |    2 +-
 ...s-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} |    4 ++--
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb   |    6 ------
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb   |    6 ++++++
 ...qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} |    2 +-
 10 files changed, 12 insertions(+), 13 deletions(-)
 rename meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} (89%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/0001-Added-Openembedded-crossarch-option.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/hack-out-pg2-4.7.0.patch (100%)
 rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf (100%)
 rename meta/recipes-qt/qt4/{qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} (87%)
 rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} (61%)
 delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
 create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
 rename meta/recipes-qt/qt4/{qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} (88%)

meta/recipes-qt/qt4/qt-4.7.3.inc renamed from meta/recipes-qt/qt4/qt-4.7.2.inc +2 -3

similarity index 89%
rename from meta/recipes-qt/qt4/qt-4.7.2.inc
rename to meta/recipes-qt/qt4/qt-4.7.3.inc
index 0f75a46..7f26b9b 100644
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
 FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
 
 SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
-           file://blacklist-fraudulent-comodo-certificates-patch.diff \
            file://0004-no-qmake.patch \
            file://hack-out-pg2-4.7.0.patch \
            file://0006-freetype-host-includes.patch \

@@ -15,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://linux.conf \
            "
 
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"

meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch renamed from meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch +0 -0

similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch
rename to meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch

meta/recipes-qt/qt4/qt-4.7.3/g++.conf renamed from meta/recipes-qt/qt4/qt-4.7.2/g++.conf +0 -0

similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/g++.conf
rename to meta/recipes-qt/qt4/qt-4.7.3/g++.conf

meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch renamed from meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch +0 -0

similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch
rename to meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch

meta/recipes-qt/qt4/qt-4.7.3/linux.conf renamed from meta/recipes-qt/qt4/qt-4.7.2/linux.conf +0 -0

similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.2/linux.conf
rename to meta/recipes-qt/qt4/qt-4.7.3/linux.conf

meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb renamed from meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb +1 -1

similarity index 87%
rename from meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
index c3f6713..b88b1e9 100644
@@ -1,7 +1,7 @@
 require qt-${PV}.inc
 require qt4-embedded.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "

meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb renamed from meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb +2 -2

similarity index 61%
rename from meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb
index d3c0eda..deb4231 100644
@@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
 
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
 
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"

meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb deleted +0 -6

deleted file mode 100644
index a917ac4..0000000
@@ -1,6 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
-SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"

meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb new file +6 -0

new file mode 100644
index 0000000..d61f312
@@ -0,0 +1,6 @@
+require qt4-tools-nativesdk.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
+SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"

meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb renamed from meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb +1 -1

similarity index 88%
rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb
rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
index 75c6314..359a756 100644
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 require qt-${PV}.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
 
 QT_CONFIG_FLAGS_append_armv6 = " -no-neon "

Signature · 3 lines

Joshua Lock
        Yocto Build System Monkey
        Intel Open Source Technology Centre

Joshua Lock

Reviewed-by on v1 3/3

2011-05-13 17:14 UTC #5 lore raw

Re: [PATCH 3/3] qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS

In reply to Paul Eggleton

Quoted 6 lines · Paul Eggleton

From: Paul Eggleton <[email protected]>
This allows meta-oe to override these options easily in order to enable more SQL driver plugins.
Signed-off-by Paul Eggleton <[email protected]>

Cool!

Reviewed-by Joshua Lock <[email protected]>

Quoted 23 lines

---
 meta/recipes-qt/qt4/qt4.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

meta/recipes-qt/qt4/qt4.inc +3 -1

index b86f89f..7e15b61 100644
@@ -9,11 +9,13 @@ QT_ENDIAN = "${@qt_endian(d)}"
 QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
 QT_DISTRO_FLAGS_linuxstdbase = "-sm"
 
+QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite"
+
 QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
                     -shared -no-nas-sound -no-nis \
                     -qt-gif -system-libjpeg -system-libpng -system-zlib \
-                    -no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -plugin-sql-sqlite \
                     -no-pch -qdbus -stl -glib -phonon -webkit \
+                    ${QT_SQL_DRIVER_FLAGS} \
                     ${QT_DISTRO_FLAGS} "
 
 EXTRA_OEMAKE = "-e"

Signature · 3 lines

Joshua Lock
        Yocto Build System Monkey
        Intel Open Source Technology Centre

Saul Wold

Applied

2011-05-17 18:35 UTC #6 lore raw

In reply to Paul Eggleton

Quoted 37 lines · Paul Eggleton

From: Paul Eggleton<[email protected]>
These patches update Qt 4.7 series from 4.7.2 to 4.7.3, and make it easier for other layers such as meta-oe to enable more SQL drivers.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: paule/qt-4.7.3
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/qt-4.7.3
Thanks,
Paul Eggleton<[email protected]>
---
Paul Eggleton (3):
qt4: update from 4.7.2 to 4.7.3 distro_tracking_fields.inc: update for qt 4.7.3 upgrade
qt4: split out SQL driver config flags to QT_SQL_DRIVER_FLAGS
  .../conf/distro/include/distro_tracking_fields.inc |   32 ++++++++++----------
  meta/recipes-qt/qt4/{qt-4.7.2.inc =>  qt-4.7.3.inc} |    5 +--
  .../0001-Added-Openembedded-crossarch-option.patch |    0
  .../recipes-qt/qt4/{qt-4.7.2 =>  qt-4.7.3}/g++.conf |    0
  .../hack-out-pg2-4.7.0.patch                       |    0
  .../qt4/{qt-4.7.2 =>  qt-4.7.3}/linux.conf          |    0
  ...qt4-embedded_4.7.2.bb =>  qt4-embedded_4.7.3.bb} |    2 +-
  ...s-native_4.7.2.bb =>  qt4-tools-native_4.7.3.bb} |    4 +-
  meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb   |    6 ----
  meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb   |    6 ++++
  ...qt4-x11-free_4.7.2.bb =>  qt4-x11-free_4.7.3.bb} |    2 +-
  meta/recipes-qt/qt4/qt4.inc                        |    4 ++-
  12 files changed, 31 insertions(+), 30 deletions(-)
  rename meta/recipes-qt/qt4/{qt-4.7.2.inc =>  qt-4.7.3.inc} (89%)
  rename meta/recipes-qt/qt4/{qt-4.7.2 =>  qt-4.7.3}/0001-Added-Openembedded-crossarch-option.patch (100%)
  rename meta/recipes-qt/qt4/{qt-4.7.2 =>  qt-4.7.3}/g++.conf (100%)
  rename meta/recipes-qt/qt4/{qt-4.7.2 =>  qt-4.7.3}/hack-out-pg2-4.7.0.patch (100%)
  rename meta/recipes-qt/qt4/{qt-4.7.2 =>  qt-4.7.3}/linux.conf (100%)

Quoted 6 lines

rename meta/recipes-qt/qt4/{qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} (87%) rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} (61%) delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb
create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
rename meta/recipes-qt/qt4/{qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} (88%)

Merged into oe-core and poky

Thanks
Sau!