summaryrefslogtreecommitdiff
path: root/recipes/qt4/files
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2009-03-26 17:19:32 +0100
committerJeremy Lainé <jeremy.laine@m4x.org>2009-03-26 17:19:32 +0100
commit31a8edfb706e86ee9532ab16bc4b925b708371cf (patch)
tree8a8a073881fcb2fdb8c82e6a0d40e65d2f41f4ee /recipes/qt4/files
parent0f8afdb545bbac27832589e9b566025c5f314450 (diff)
qt4: refresh some patches against qt 4.4.3
Diffstat (limited to 'recipes/qt4/files')
-rw-r--r--recipes/qt4/files/0001-cross-compile.patch16
-rw-r--r--recipes/qt4/files/0002-fix-resinit-declaration.patch13
-rw-r--r--recipes/qt4/files/0004-no-qmake.patch13
3 files changed, 18 insertions, 24 deletions
diff --git a/recipes/qt4/files/0001-cross-compile.patch b/recipes/qt4/files/0001-cross-compile.patch
index f20576b45e..0cf1b8c304 100644
--- a/recipes/qt4/files/0001-cross-compile.patch
+++ b/recipes/qt4/files/0001-cross-compile.patch
@@ -1,6 +1,8 @@
---- /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 @@
+Index: qt-embedded-linux-opensource-src-4.4.3/configure
+===================================================================
+--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:02:45.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:03:43.000000000 +0100
+@@ -726,7 +726,7 @@
UNKNOWN_ARG=yes
fi
;;
@@ -9,19 +11,17 @@
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
shift
VAL="$1"
-@@ -1182,7 +1182,10 @@
+@@ -1143,6 +1143,9 @@
xplatform)
XPLATFORM="$VAL"
;;
-- debug-and-release)
+ crossarch)
+ CROSSARCH="$VAL"
+ ;;
-+ debug-and-release)
+ debug-and-release)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_DEBUG_RELEASE="$VAL"
- else
-@@ -2437,6 +2440,8 @@
+@@ -2405,6 +2408,8 @@
CFG_ARCH=$CFG_HOST_ARCH
fi
diff --git a/recipes/qt4/files/0002-fix-resinit-declaration.patch b/recipes/qt4/files/0002-fix-resinit-declaration.patch
index e479a64a2b..be4d5c0e22 100644
--- a/recipes/qt4/files/0002-fix-resinit-declaration.patch
+++ b/recipes/qt4/files/0002-fix-resinit-declaration.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] fix resinit declaration
src/qt3support/network/q3dns.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp
-index 9bc7b16..bfc333e 100644
---- a/src/qt3support/network/q3dns.cpp
-+++ b/src/qt3support/network/q3dns.cpp
-@@ -30,7 +30,7 @@
+Index: qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp
+===================================================================
+--- qt-embedded-linux-opensource-src-4.4.3.orig/src/qt3support/network/q3dns.cpp 2008-09-27 11:01:28.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.3/src/qt3support/network/q3dns.cpp 2009-03-26 17:04:05.000000000 +0100
+@@ -44,7 +44,7 @@
# include <netinet/in.h>
# include <arpa/nameser.h>
# include <resolv.h>
@@ -20,6 +20,3 @@ index 9bc7b16..bfc333e 100644
#endif
// POSIX Large File Support redefines open -> open64
---
-1.5.0.7
-
diff --git a/recipes/qt4/files/0004-no-qmake.patch b/recipes/qt4/files/0004-no-qmake.patch
index 28f8d3ad9d..86613587a1 100644
--- a/recipes/qt4/files/0004-no-qmake.patch
+++ b/recipes/qt4/files/0004-no-qmake.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] no qmake
configure | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/configure b/configure
-index b3c2a52..1901e57 100755
---- a/configure
-+++ b/configure
-@@ -3517,7 +3517,7 @@ END {
+Index: qt-embedded-linux-opensource-src-4.4.3/configure
+===================================================================
+--- qt-embedded-linux-opensource-src-4.4.3.orig/configure 2009-03-26 17:03:43.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.4.3/configure 2009-03-26 17:04:17.000000000 +0100
+@@ -3786,7 +3786,7 @@
}
# build qmake
@@ -20,6 +20,3 @@ index b3c2a52..1901e57 100755
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
---
-1.5.0.7
-