From e4a839277f7d74104e25fb4fd846f9c2bf3f9c1e Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Tue, 17 Dec 2013 13:57:30 +0000 Subject: qt5: version bump -bump version to 5.2.0 -remove unneeded patches -remove invalid configure options [Peter: uclibc-no-lfs + qatomic patches still needed, new patch for uClibc] Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- ...igure-Parse-device-option-value-correctly.patch | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch (limited to 'package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch') diff --git a/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch b/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch deleted file mode 100644 index aaf1d35374..0000000000 --- a/package/qt5/qt5base/qt5base-0008-configure-Parse-device-option-value-correctly.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4723f3fd04edf1aad6750ca91fd4648216d8b408 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= -Date: Sat, 21 Sep 2013 00:14:39 +0300 -Subject: [PATCH] configure: Parse -device-option value correctly - -The regular expression does not parse correctly when a device option value -contains the character '=' (e.g. QMAKE_CFLAGS="-D_FILE_OFFSET_BITS=64"). - -In order to break string at the first equal sign and to simplify code, -use "cut" command as in other places in configure script. - -Task-number: QTBUG-33584 -Change-Id: I05b474d2ba6bff84c1e40d00475963bab36d94b6 -Reviewed-by: Oswald Buddenhagen -Signed-off-by: Fatih Aşıcı ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 64568dd..388899e 100755 ---- a/configure -+++ b/configure -@@ -1609,8 +1609,8 @@ while [ "$#" -gt 0 ]; do - [ "$XPLATFORM" = "undefined" ] && exit 101 - ;; - device-option) -- DEV_VAR=`echo $VAL | sed "s,^\(.*\)=.*,\1,"` -- DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` -+ DEV_VAR=`echo $VAL | cut -d '=' -f 1` -+ DEV_VAL=`echo $VAL | cut -d '=' -f 2-` - DeviceVar set $DEV_VAR "$DEV_VAL" - ;; - qpa) --- -1.8.4.rc3 - -- cgit v1.2.3