summaryrefslogtreecommitdiff
path: root/packages/qt
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2007-10-23 14:31:11 +0000
committerHolger Freyther <zecke@selfish.org>2007-10-23 14:31:11 +0000
commit92d1fb2c780cc5787e7bca3c81086948e853ca5f (patch)
treed76bdb8c9fef9d1a3b65852899a91dcf320a0bc7 /packages/qt
parent36cdf38f87512a1358e15245cf5eeaa9cdcb044b (diff)
packages/{qt,qte,uicmoc,qmake}: Update to Qt(opiaCore) 4.3.2
-Update PREFERRED_VERSION -Update checksums -Update patches
Diffstat (limited to 'packages/qt')
-rw-r--r--packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty (renamed from packages/qt/qt4-x11-free-4.3.0/.mtn2git_empty)0
-rw-r--r--packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch (renamed from packages/qt/qt4-x11-free-4.3.0/0001-cross-compile.patch)31
-rw-r--r--packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch (renamed from packages/qt/qt4-x11-free-4.3.0/0002-fix-resinit-declaration.patch)0
-rw-r--r--packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch (renamed from packages/qt/qt4-x11-free-4.3.0/0003-no-tools.patch)0
-rw-r--r--packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch (renamed from packages/qt/qt4-x11-free-4.3.0/0004-no-qmake.patch)0
-rw-r--r--packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch (renamed from packages/qt/qt4-x11-free-4.3.0/0005-fix-mkspecs.patch)0
-rw-r--r--packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch (renamed from packages/qt/qt4-x11-free-4.3.0/0006-freetype-host-includes.patch)0
-rw-r--r--packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch (renamed from packages/qt/qt4-x11-free-4.3.0/0007-openssl-host-includes.patch)0
-rw-r--r--packages/qt/qt4-x11-free_4.3.2.bb (renamed from packages/qt/qt4-x11-free_4.3.0.bb)0
9 files changed, 20 insertions, 11 deletions
diff --git a/packages/qt/qt4-x11-free-4.3.0/.mtn2git_empty b/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qt/qt4-x11-free-4.3.0/.mtn2git_empty
+++ b/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty
diff --git a/packages/qt/qt4-x11-free-4.3.0/0001-cross-compile.patch b/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
index 42f7b5575c..6e2b8e755e 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0001-cross-compile.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] cross compile
configure | 137 ++----------------------------------------------------------
1 files changed, 5 insertions(+), 132 deletions(-)
-diff --git a/configure b/configure
-index 6b3ccd2..b3c2a52 100755
---- a/configure
-+++ b/configure
-@@ -733,7 +733,7 @@ while [ "$#" -gt 0 ]; do
+Index: qt-x11-opensource-src-4.3.2/configure
+===================================================================
+--- qt-x11-opensource-src-4.3.2.orig/configure 2007-10-01 15:06:03.000000000 +0200
++++ qt-x11-opensource-src-4.3.2/configure 2007-10-23 09:32:25.000000000 +0200
+@@ -735,7 +735,7 @@
UNKNOWN_ARG=yes
fi
;;
@@ -20,7 +20,7 @@ index 6b3ccd2..b3c2a52 100755
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL="$1"
-@@ -1109,6 +1109,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1124,6 +1124,9 @@
xplatform)
XPLATFORM="$VAL"
;;
@@ -30,7 +30,7 @@ index 6b3ccd2..b3c2a52 100755
debug-and-release)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_DEBUG_RELEASE="$VAL"
-@@ -2092,137 +2095,7 @@ if [ "$OPT_VERBOSE" = "yes" ]; then
+@@ -2119,149 +2122,7 @@
echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)"
fi
@@ -116,7 +116,7 @@ index 6b3ccd2..b3c2a52 100755
- ARCH=i386
- ;;
- *:*:x86_64|*:*:amd64)
-- if [ "$PLATFORM" = "linux-g++-32" ]; then
+- if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32 bit on 64-bit AMD 80x86 (i386)"
- fi
@@ -146,6 +146,18 @@ index 6b3ccd2..b3c2a52 100755
- fi
- ARCH=s390
- ;;
+- *:*:arm*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " ARM (arm)"
+- fi
+- ARCH=arm
+- ;;
+- Linux:*:sparc*)
+- if [ "$OPT_VERBOSE" = "yes" ]; then
+- echo " Linux on SPARC"
+- fi
+- ARCH=sparc
+- ;;
- *:*:*)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " Trying '$UNAME_MACHINE'..."
@@ -169,6 +181,3 @@ index 6b3ccd2..b3c2a52 100755
if [ "$OPT_VERBOSE" = "yes" ]; then
echo "System architecture: '$ARCH'"
---
-1.5.0.7
-
diff --git a/packages/qt/qt4-x11-free-4.3.0/0002-fix-resinit-declaration.patch b/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch
index e479a64a2b..e479a64a2b 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0002-fix-resinit-declaration.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0003-no-tools.patch b/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch
index 5412c90377..5412c90377 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0003-no-tools.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0004-no-qmake.patch b/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch
index 359f6df9d5..359f6df9d5 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0004-no-qmake.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0005-fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch
index 93692699dc..93692699dc 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0005-fix-mkspecs.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0006-freetype-host-includes.patch b/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch
index cc8e115fee..cc8e115fee 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0006-freetype-host-includes.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch
diff --git a/packages/qt/qt4-x11-free-4.3.0/0007-openssl-host-includes.patch b/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch
index 35b71d9694..35b71d9694 100644
--- a/packages/qt/qt4-x11-free-4.3.0/0007-openssl-host-includes.patch
+++ b/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch
diff --git a/packages/qt/qt4-x11-free_4.3.0.bb b/packages/qt/qt4-x11-free_4.3.2.bb
index a097c4e9ca..a097c4e9ca 100644
--- a/packages/qt/qt4-x11-free_4.3.0.bb
+++ b/packages/qt/qt4-x11-free_4.3.2.bb