From d456d49e1fdf767483638fa489d1248d83a82ea3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Aug 2008 19:56:55 +0000 Subject: [PATCH] qt4: update qt/e and qt4-x11 to 4.4.1 --- .../.mtn2git_empty | 0 .../0001-cross-compile.patch | 18 +++++++++--------- .../0003-no-tools.patch | 0 .../0004-no-qmake.patch | 0 .../0005-fix-mkspecs.patch | 0 .../0006-freetype-host-includes.patch | 0 .../0007-openssl-host-includes.patch | 0 .../allow-configure-plugins.patch | 0 .../build-tools.patch | 0 .../linux-oe-qmake.conf | 0 .../qconfig-oe.h | 0 ...-embedded_4.4.0.bb => qt-embedded_4.4.1.bb} | 2 +- .../.mtn2git_empty | 0 .../0001-cross-compile.patch | 18 +++++++++--------- .../0002-fix-resinit-declaration.patch | 0 .../0003-no-tools.patch | 0 .../0004-no-qmake.patch | 0 .../0005-fix-mkspecs.patch | 0 .../0006-freetype-host-includes.patch | 0 .../0007-openssl-host-includes.patch | 0 .../allow-configure-plugins.patch | 0 .../build-tools.patch | 0 .../linux-oe-qmake.conf | 0 .../qconfig-oe.h | 0 ...x11-free_4.4.0.bb => qt4-x11-free_4.4.1.bb} | 0 ...opia-core_4.4.0.bb => qtopia-core_4.4.1.bb} | 4 ++-- 26 files changed, 21 insertions(+), 21 deletions(-) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/.mtn2git_empty (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/0001-cross-compile.patch (70%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/0003-no-tools.patch (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/0004-no-qmake.patch (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/0005-fix-mkspecs.patch (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/0006-freetype-host-includes.patch (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/0007-openssl-host-includes.patch (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/allow-configure-plugins.patch (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/build-tools.patch (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/linux-oe-qmake.conf (100%) rename packages/qt4/{qt-embedded-4.4.0 => qt-embedded-4.4.1}/qconfig-oe.h (100%) rename packages/qt4/{qt-embedded_4.4.0.bb => qt-embedded_4.4.1.bb} (98%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/.mtn2git_empty (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/0001-cross-compile.patch (70%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/0002-fix-resinit-declaration.patch (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/0003-no-tools.patch (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/0004-no-qmake.patch (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/0005-fix-mkspecs.patch (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/0006-freetype-host-includes.patch (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/0007-openssl-host-includes.patch (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/allow-configure-plugins.patch (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/build-tools.patch (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/linux-oe-qmake.conf (100%) rename packages/qt4/{qt4-x11-free-4.4.0 => qt4-x11-free-4.4.1}/qconfig-oe.h (100%) rename packages/qt4/{qt4-x11-free_4.4.0.bb => qt4-x11-free_4.4.1.bb} (100%) rename packages/qt4/{qtopia-core_4.4.0.bb => qtopia-core_4.4.1.bb} (66%) diff --git a/packages/qt4/qt-embedded-4.4.0/.mtn2git_empty b/packages/qt4/qt-embedded-4.4.1/.mtn2git_empty similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/.mtn2git_empty rename to packages/qt4/qt-embedded-4.4.1/.mtn2git_empty diff --git a/packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch b/packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch similarity index 70% rename from packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch rename to packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch index 310f1931bc..f20576b45e 100644 --- a/packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch +++ b/packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch @@ -1,6 +1,6 @@ ---- /tmp/configure 2008-07-08 10:01:36.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/configure 2008-07-08 10:23:04.000000000 +0200 -@@ -762,7 +762,7 @@ +--- /tmp/configure 2008-08-01 20:59:48.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/configure 2008-08-01 21:02:05.000000000 +0200 +@@ -765,7 +765,7 @@ UNKNOWN_ARG=yes fi ;; @@ -9,7 +9,7 @@ VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" -@@ -1179,7 +1179,10 @@ +@@ -1182,7 +1182,10 @@ xplatform) XPLATFORM="$VAL" ;; @@ -21,12 +21,12 @@ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" else -@@ -2417,6 +2420,8 @@ - ARCH=$HOST_ARCH +@@ -2437,6 +2440,8 @@ + CFG_ARCH=$CFG_HOST_ARCH fi -+ARCH="$CROSSARCH" ++CFG_ARCH="$CROSSARCH" + - if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$ARCH' is supported" + echo " '$CFG_ARCH' is supported" diff --git a/packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch b/packages/qt4/qt-embedded-4.4.1/0003-no-tools.patch similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/0003-no-tools.patch rename to packages/qt4/qt-embedded-4.4.1/0003-no-tools.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch b/packages/qt4/qt-embedded-4.4.1/0004-no-qmake.patch similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch rename to packages/qt4/qt-embedded-4.4.1/0004-no-qmake.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch b/packages/qt4/qt-embedded-4.4.1/0005-fix-mkspecs.patch similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch rename to packages/qt4/qt-embedded-4.4.1/0005-fix-mkspecs.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch b/packages/qt4/qt-embedded-4.4.1/0006-freetype-host-includes.patch similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch rename to packages/qt4/qt-embedded-4.4.1/0006-freetype-host-includes.patch diff --git a/packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch b/packages/qt4/qt-embedded-4.4.1/0007-openssl-host-includes.patch similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch rename to packages/qt4/qt-embedded-4.4.1/0007-openssl-host-includes.patch diff --git a/packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch b/packages/qt4/qt-embedded-4.4.1/allow-configure-plugins.patch similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch rename to packages/qt4/qt-embedded-4.4.1/allow-configure-plugins.patch diff --git a/packages/qt4/qt-embedded-4.4.0/build-tools.patch b/packages/qt4/qt-embedded-4.4.1/build-tools.patch similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/build-tools.patch rename to packages/qt4/qt-embedded-4.4.1/build-tools.patch diff --git a/packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf b/packages/qt4/qt-embedded-4.4.1/linux-oe-qmake.conf similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf rename to packages/qt4/qt-embedded-4.4.1/linux-oe-qmake.conf diff --git a/packages/qt4/qt-embedded-4.4.0/qconfig-oe.h b/packages/qt4/qt-embedded-4.4.1/qconfig-oe.h similarity index 100% rename from packages/qt4/qt-embedded-4.4.0/qconfig-oe.h rename to packages/qt4/qt-embedded-4.4.1/qconfig-oe.h diff --git a/packages/qt4/qt-embedded_4.4.0.bb b/packages/qt4/qt-embedded_4.4.1.bb similarity index 98% rename from packages/qt4/qt-embedded_4.4.0.bb rename to packages/qt4/qt-embedded_4.4.1.bb index f83b2516d7..70a461d2d2 100644 --- a/packages/qt4/qt-embedded_4.4.0.bb +++ b/packages/qt4/qt-embedded_4.4.1.bb @@ -3,7 +3,7 @@ require qtopia-core.inc PROVIDES += "qtopia-core" RPROVIDES_${PN} = "qtopia-core" -PR = "r4" +PR = "r0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ file://qconfig-oe.h \ diff --git a/packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.4.1/.mtn2git_empty similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/.mtn2git_empty rename to packages/qt4/qt4-x11-free-4.4.1/.mtn2git_empty diff --git a/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch b/packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch similarity index 70% rename from packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch rename to packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch index 310f1931bc..f20576b45e 100644 --- a/packages/qt4/qt4-x11-free-4.4.0/0001-cross-compile.patch +++ b/packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch @@ -1,6 +1,6 @@ ---- /tmp/configure 2008-07-08 10:01:36.000000000 +0200 -+++ qt-embedded-linux-opensource-src-4.4.0/configure 2008-07-08 10:23:04.000000000 +0200 -@@ -762,7 +762,7 @@ +--- /tmp/configure 2008-08-01 20:59:48.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/configure 2008-08-01 21:02:05.000000000 +0200 +@@ -765,7 +765,7 @@ UNKNOWN_ARG=yes fi ;; @@ -9,7 +9,7 @@ VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" -@@ -1179,7 +1179,10 @@ +@@ -1182,7 +1182,10 @@ xplatform) XPLATFORM="$VAL" ;; @@ -21,12 +21,12 @@ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" else -@@ -2417,6 +2420,8 @@ - ARCH=$HOST_ARCH +@@ -2437,6 +2440,8 @@ + CFG_ARCH=$CFG_HOST_ARCH fi -+ARCH="$CROSSARCH" ++CFG_ARCH="$CROSSARCH" + - if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$ARCH' is supported" + echo " '$CFG_ARCH' is supported" diff --git a/packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.4.1/0002-fix-resinit-declaration.patch similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/0002-fix-resinit-declaration.patch rename to packages/qt4/qt4-x11-free-4.4.1/0002-fix-resinit-declaration.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch b/packages/qt4/qt4-x11-free-4.4.1/0003-no-tools.patch similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/0003-no-tools.patch rename to packages/qt4/qt4-x11-free-4.4.1/0003-no-tools.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.4.1/0004-no-qmake.patch similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/0004-no-qmake.patch rename to packages/qt4/qt4-x11-free-4.4.1/0004-no-qmake.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.4.1/0005-fix-mkspecs.patch similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/0005-fix-mkspecs.patch rename to packages/qt4/qt4-x11-free-4.4.1/0005-fix-mkspecs.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.4.1/0006-freetype-host-includes.patch similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/0006-freetype-host-includes.patch rename to packages/qt4/qt4-x11-free-4.4.1/0006-freetype-host-includes.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.4.1/0007-openssl-host-includes.patch similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/0007-openssl-host-includes.patch rename to packages/qt4/qt4-x11-free-4.4.1/0007-openssl-host-includes.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch b/packages/qt4/qt4-x11-free-4.4.1/allow-configure-plugins.patch similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/allow-configure-plugins.patch rename to packages/qt4/qt4-x11-free-4.4.1/allow-configure-plugins.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/build-tools.patch b/packages/qt4/qt4-x11-free-4.4.1/build-tools.patch similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/build-tools.patch rename to packages/qt4/qt4-x11-free-4.4.1/build-tools.patch diff --git a/packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf b/packages/qt4/qt4-x11-free-4.4.1/linux-oe-qmake.conf similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/linux-oe-qmake.conf rename to packages/qt4/qt4-x11-free-4.4.1/linux-oe-qmake.conf diff --git a/packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h b/packages/qt4/qt4-x11-free-4.4.1/qconfig-oe.h similarity index 100% rename from packages/qt4/qt4-x11-free-4.4.0/qconfig-oe.h rename to packages/qt4/qt4-x11-free-4.4.1/qconfig-oe.h diff --git a/packages/qt4/qt4-x11-free_4.4.0.bb b/packages/qt4/qt4-x11-free_4.4.1.bb similarity index 100% rename from packages/qt4/qt4-x11-free_4.4.0.bb rename to packages/qt4/qt4-x11-free_4.4.1.bb diff --git a/packages/qt4/qtopia-core_4.4.0.bb b/packages/qt4/qtopia-core_4.4.1.bb similarity index 66% rename from packages/qt4/qtopia-core_4.4.0.bb rename to packages/qt4/qtopia-core_4.4.1.bb index 71a702b965..158e29c432 100644 --- a/packages/qt4/qtopia-core_4.4.0.bb +++ b/packages/qt4/qtopia-core_4.4.1.bb @@ -2,5 +2,5 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" -#keep in sync with qt-embedded_4.4.0.bb -PR = "r4" +#keep in sync with qt-embedded_${PV}.bb +PR = "r0" -- 2.39.5