From 367d28ff1b6628c539bfa5ded36f924ff59f1817 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 12 Aug 2010 10:08:35 +0200 Subject: [PATCH] qt-4.7.0-beta1: move to beta2 Signed-off-by: Martin Jansa --- .../distro/include/preferred-shr-versions.inc | 2 +- .../0009-Disable-demos-affine.patch | 24 ------------------- ...7.0-beta1.inc => qt-4.6.3+4.7.0-beta2.inc} | 4 ++-- ...-Added-Openembedded-crossarch-option.patch | 0 .../0002-Disable-tools-assistant.patch | 0 .../0003-Disable-examples-designer.patch | 0 ...e-exaqmples-dbus-remotecontrolledcar.patch | 0 .../0005-Disable-examples-help.patch | 0 .../0006-Disable-demos-browser.patch | 0 .../0007-Disable-demos-qtdemos.patch | 0 .../0008-Disable-examples-declarative.patch | 0 .../add.xmlpatterns.lib.patch | 4 ++-- .../demos.browser.add.mediaservices.lib.patch | 0 ...0-beta1.bb => qt4-embedded_4.7.0-beta2.bb} | 4 ++-- .../fix.xlib-test.libs.patch | 0 ...ta1.bb => qt4-tools-native_4.7.0-beta2.bb} | 8 +++---- ...0-beta1.bb => qt4-x11-free_4.7.0-beta2.bb} | 6 ++--- 17 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch rename recipes/qt4/{qt-4.6.2+4.7.0-beta1.inc => qt-4.6.3+4.7.0-beta2.inc} (93%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/0001-Added-Openembedded-crossarch-option.patch (100%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/0002-Disable-tools-assistant.patch (100%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/0003-Disable-examples-designer.patch (100%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch (100%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/0005-Disable-examples-help.patch (100%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/0006-Disable-demos-browser.patch (100%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/0007-Disable-demos-qtdemos.patch (100%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/0008-Disable-examples-declarative.patch (100%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/add.xmlpatterns.lib.patch (92%) rename recipes/qt4/{qt-4.6.2+4.7.0-beta1 => qt-4.6.3+4.7.0-beta2}/demos.browser.add.mediaservices.lib.patch (100%) rename recipes/qt4/{qt4-embedded_4.7.0-beta1.bb => qt4-embedded_4.7.0-beta2.bb} (79%) rename recipes/qt4/{qt4-tools-native-4.6.2+4.7.0-beta1 => qt4-tools-native-4.6.3+4.7.0-beta2}/fix.xlib-test.libs.patch (100%) rename recipes/qt4/{qt4-tools-native_4.7.0-beta1.bb => qt4-tools-native_4.7.0-beta2.bb} (72%) rename recipes/qt4/{qt4-x11-free_4.7.0-beta1.bb => qt4-x11-free_4.7.0-beta2.bb} (73%) diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index 9b9dd097ac..23d320ce03 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -44,7 +44,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.24.1" UDEV_GE_141 = "1" PREFERRED_VERSION_postgresql = "8.4.4" -ANGSTROM_QT_VERSION ?= "4.6.2+4.7.0-beta1" +ANGSTROM_QT_VERSION ?= "4.6.3+4.7.0-beta2" PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}" PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}" diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch deleted file mode 100644 index c4efddaf7b..0000000000 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0009-Disable-demos-affine.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ab87c21fab1b2bb3e593a27e4a08ba66e689f724 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= -Date: Thu, 13 May 2010 20:46:18 +0200 -Subject: [PATCH 9/9] Disable demos/affine - ---- - demos/demos.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/demos/demos.pro b/demos/demos.pro -index a0691bc..082a77d 100644 ---- a/demos/demos.pro -+++ b/demos/demos.pro -@@ -6,7 +6,6 @@ SUBDIRS = \ - demos_deform \ - demos_gradients \ - demos_pathstroke \ -- demos_affine \ - demos_composition \ - demos_books \ - demos_interview \ --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc b/recipes/qt4/qt-4.6.3+4.7.0-beta2.inc similarity index 93% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1.inc rename to recipes/qt4/qt-4.6.3+4.7.0-beta2.inc index 114f3ae2ea..9c9554c198 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2.inc @@ -69,5 +69,5 @@ do_install_append() { done } -SRC_URI[md5sum] = "1a863712da64dd2c1d08380075b74f39" -SRC_URI[sha256sum] = "32237307496b255bb95abdcd1754885947008a52c76f32c6843744d330f2b7b5" +SRC_URI[md5sum] = "1449443c2d33ab9fefbd37b7104d0cdf" +SRC_URI[sha256sum] = "e0196ee11f683a4ec2e3f85e52ab2f2455886a3bb3b711489176f97ecb9aacbf" diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0001-Added-Openembedded-crossarch-option.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/0001-Added-Openembedded-crossarch-option.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/0001-Added-Openembedded-crossarch-option.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0002-Disable-tools-assistant.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/0002-Disable-tools-assistant.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/0002-Disable-tools-assistant.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0003-Disable-examples-designer.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/0003-Disable-examples-designer.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/0003-Disable-examples-designer.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0005-Disable-examples-help.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/0005-Disable-examples-help.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/0005-Disable-examples-help.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0006-Disable-demos-browser.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/0006-Disable-demos-browser.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/0006-Disable-demos-browser.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0007-Disable-demos-qtdemos.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/0007-Disable-demos-qtdemos.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/0007-Disable-demos-qtdemos.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/0008-Disable-examples-declarative.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/0008-Disable-examples-declarative.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/0008-Disable-examples-declarative.patch diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch similarity index 92% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch index 57ba4f169e..1f73f8950f 100644 --- a/recipes/qt4/qt-4.6.2+4.7.0-beta1/add.xmlpatterns.lib.patch +++ b/recipes/qt4/qt-4.6.3+4.7.0-beta2/add.xmlpatterns.lib.patch @@ -5,7 +5,7 @@ diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.p TEMPLATE = app TARGET = browser -QT += webkit network mediaservices -+QT += webkit network mediaservices xmlpatterns ++QT += webkit network mediaservices xmlpatterns phonon CONFIG += qt warn_on contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools @@ -16,7 +16,7 @@ diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qo FORMS += forms/mainwindow.ui -QT += xmlpatterns webkit -+QT += xmlpatterns webkit mediaservices ++QT += xmlpatterns webkit mediaservices phonon SOURCES += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp HEADERS += qobjectxmlmodel.h mainwindow.h ../shared/xmlsyntaxhighlighter.h RESOURCES = queries.qrc diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch b/recipes/qt4/qt-4.6.3+4.7.0-beta2/demos.browser.add.mediaservices.lib.patch similarity index 100% rename from recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch rename to recipes/qt4/qt-4.6.3+4.7.0-beta2/demos.browser.add.mediaservices.lib.patch diff --git a/recipes/qt4/qt4-embedded_4.7.0-beta1.bb b/recipes/qt4/qt4-embedded_4.7.0-beta2.bb similarity index 79% rename from recipes/qt4/qt4-embedded_4.7.0-beta1.bb rename to recipes/qt4/qt4-embedded_4.7.0-beta2.bb index 1dbb4aa4bf..481fabfccb 100644 --- a/recipes/qt4/qt4-embedded_4.7.0-beta1.bb +++ b/recipes/qt4/qt4-embedded_4.7.0-beta2.bb @@ -2,8 +2,8 @@ DEFAULT_PREFERENCE = "-1" require qt4-embedded.inc -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" PR = "${INC_PR}.0" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " diff --git a/recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch b/recipes/qt4/qt4-tools-native-4.6.3+4.7.0-beta2/fix.xlib-test.libs.patch similarity index 100% rename from recipes/qt4/qt4-tools-native-4.6.2+4.7.0-beta1/fix.xlib-test.libs.patch rename to recipes/qt4/qt4-tools-native-4.6.3+4.7.0-beta2/fix.xlib-test.libs.patch diff --git a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb b/recipes/qt4/qt4-tools-native_4.7.0-beta2.bb similarity index 72% rename from recipes/qt4/qt4-tools-native_4.7.0-beta1.bb rename to recipes/qt4/qt4-tools-native_4.7.0-beta2.bb index 62b7863e58..0ebb65f34f 100644 --- a/recipes/qt4/qt4-tools-native_4.7.0-beta1.bb +++ b/recipes/qt4/qt4-tools-native_4.7.0-beta2.bb @@ -3,8 +3,8 @@ DEFAULT_PREFERENCE = "-1" require qt4-tools-native.inc LICENSE = "LGPLv2.1 GPLv3" -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" PR = "${INC_PR}.0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${SRCVER}.tar.gz \ @@ -18,5 +18,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath" TOBUILD := "src/tools/bootstrap ${TOBUILD}" -SRC_URI[md5sum] = "1a863712da64dd2c1d08380075b74f39" -SRC_URI[sha256sum] = "32237307496b255bb95abdcd1754885947008a52c76f32c6843744d330f2b7b5" +SRC_URI[md5sum] = "1449443c2d33ab9fefbd37b7104d0cdf" +SRC_URI[sha256sum] = "e0196ee11f683a4ec2e3f85e52ab2f2455886a3bb3b711489176f97ecb9aacbf" diff --git a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb b/recipes/qt4/qt4-x11-free_4.7.0-beta2.bb similarity index 73% rename from recipes/qt4/qt4-x11-free_4.7.0-beta1.bb rename to recipes/qt4/qt4-x11-free_4.7.0-beta2.bb index c489a48d59..f38688cccb 100644 --- a/recipes/qt4/qt4-x11-free_4.7.0-beta1.bb +++ b/recipes/qt4/qt4-x11-free_4.7.0-beta2.bb @@ -2,9 +2,9 @@ DEFAULT_PREFERENCE = "-1" require qt4-x11-free.inc -SRCVER = "4.7.0-beta1" -PV = "4.6.2+${SRCVER}" -PR = "${INC_PR}.1" +SRCVER = "4.7.0-beta2" +PV = "4.6.3+${SRCVER}" +PR = "${INC_PR}.0" QT_CONFIG_FLAGS_append_armv6 = " -no-neon " -- 2.39.5