[vlc-commits] contrib: update Qt4 to 4.8.1
Rafaël Carré
git at videolan.org
Sun Jul 1 13:26:58 CEST 2012
vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Sun Apr 29 14:17:56 2012 -0400| [470a346767b0d8473128b47913c16878fc477d0c] | committer: Jean-Baptiste Kempf
contrib: update Qt4 to 4.8.1
cross.patch update by John Freed
(cherry picked from commit cd0148a5a1d5e5875f525c04225add1975a9dd78)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=470a346767b0d8473128b47913c16878fc477d0c
---
contrib/src/qt4/SHA512SUMS | 2 +-
contrib/src/qt4/chroot.patch | 4 ++--
contrib/src/qt4/cross.patch | 29 ++++++++++++++---------------
contrib/src/qt4/imageformats.patch | 4 ++--
contrib/src/qt4/mingw32.patch | 18 ------------------
contrib/src/qt4/rules.mak | 14 +++++++-------
contrib/src/qt4/styles.patch | 4 ++--
7 files changed, 28 insertions(+), 47 deletions(-)
diff --git a/contrib/src/qt4/SHA512SUMS b/contrib/src/qt4/SHA512SUMS
index 02026d8..910a450 100644
--- a/contrib/src/qt4/SHA512SUMS
+++ b/contrib/src/qt4/SHA512SUMS
@@ -1 +1 @@
-8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c qt-4.7.4.tar.gz
+a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 qt-4.8.1.tar.gz
diff --git a/contrib/src/qt4/chroot.patch b/contrib/src/qt4/chroot.patch
index 328874c..fd85060 100644
--- a/contrib/src/qt4/chroot.patch
+++ b/contrib/src/qt4/chroot.patch
@@ -1,7 +1,7 @@
Fix build when using a 32-bit chroot with a x86_64 kernel
Native tools would be built with -m64
---- qt-everywhere-opensource-src-4.7.4/configure.orig 2011-11-11 14:48:12.944666802 -0500
-+++ qt-everywhere-opensource-src-4.7.4/configure 2011-11-11 14:48:55.108875882 -0500
+--- configure.orig 2011-11-11 14:48:12.944666802 -0500
++++ configure 2011-11-11 14:48:55.108875882 -0500
@@ -168,7 +168,7 @@
#-------------------------------------------------------------------------------
diff --git a/contrib/src/qt4/cross.patch b/contrib/src/qt4/cross.patch
index bbbd7e7..36c7ca5 100644
--- a/contrib/src/qt4/cross.patch
+++ b/contrib/src/qt4/cross.patch
@@ -1,5 +1,5 @@
---- qt-everywhere-opensource-src-4.7.4/mkspecs/win32-g++/qmake.conf.orig 2011-09-28 14:32:02.709958498 -0400
-+++ qt-everywhere-opensource-src-4.7.4/mkspecs/win32-g++/qmake.conf 2011-09-28 14:36:32.529954583 -0400
+--- mkspecs/win32-g++/qmake.conf.orig 2011-09-28 14:32:02.709958498 -0400
++++ mkspecs/win32-g++/qmake.conf 2011-09-28 14:36:32.529954583 -0400
@@ -14,7 +14,7 @@
QMAKE_EXT_OBJ = .o
QMAKE_EXT_RES = _res.o
@@ -42,22 +42,21 @@
+QMAKE_STRIP = $(XSTRIP)
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
load(qt_config)
---- qt-everywhere-opensource-src-4.7.4/configure.orig 2011-11-10 18:48:29.351058392 -0500
-+++ qt-everywhere-opensource-src-4.7.4/configure 2011-11-10 18:50:40.971711056 -0500
-@@ -7767,6 +7767,7 @@
+--- configure.orig 2011-11-10 18:48:29.351058392 -0500
++++ configure 2011-11-10 18:50:40.971711056 -0500
+@@ -8255,11 +8255,13 @@
fi
-
+
# X11/Unix/Mac only configs
+if [ "$XPLATFORM_MINGW" != "yes" ]; then
- [ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
[ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
[ "$CFG_GLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GLIB"
-@@ -7807,6 +7808,8 @@
- [ "$CFG_COREWLAN" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN"
- [ "$CFG_ICD" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICD"
-
+ [ "$CFG_QGTKSTYLE" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_GTK"
+-if [ "$XPLATFORM_SYMBIAN" = "no" ]; then
+- # Do not apply following negative X11/Unix/Mac only flags on Symbian, so that
+fi
-+
- # sort QCONFIG_FLAGS for neatness if we can
- [ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq`
- QCONFIG_FLAGS=`echo $QCONFIG_FLAGS`
++if [ "$XPLATFORM_SYMBIAN" = "no" -a "$XPLATFORM_MINGW" != "yes" ]; then
++ # Do not apply following negative X11/Unix/Mac only flags on Symbian or MinGW, so that
+ # configuration matches with the one generated by configure executable tool
+ [ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
+ [ "$CFG_GSTREAMER" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_GSTREAMER"
diff --git a/contrib/src/qt4/imageformats.patch b/contrib/src/qt4/imageformats.patch
index 6e15cb7..3b96c92 100644
--- a/contrib/src/qt4/imageformats.patch
+++ b/contrib/src/qt4/imageformats.patch
@@ -1,5 +1,5 @@
---- qt-everywhere-opensource-src-4.7.4/src/plugins/imageformats/imageformats.pro.orig 2011-11-10 18:56:04.617315921 -0500
-+++ qt-everywhere-opensource-src-4.7.4/src/plugins/imageformats/imageformats.pro 2011-11-10 18:56:39.269487754 -0500
+--- src/plugins/imageformats/imageformats.pro.orig 2011-11-10 18:56:04.617315921 -0500
++++ src/plugins/imageformats/imageformats.pro 2011-11-10 18:56:39.269487754 -0500
@@ -1,8 +1,8 @@
TEMPLATE = subdirs
diff --git a/contrib/src/qt4/mingw32.patch b/contrib/src/qt4/mingw32.patch
deleted file mode 100644
index 25dfba7..0000000
--- a/contrib/src/qt4/mingw32.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove me after qt4 4.8.0
---- qt-everywhere-opensource-src-4.7.4.orig/src/corelib/tools/qlocale.cpp 2012-01-19 23:34:18.000000000 +0100
-+++ qt-everywhere-opensource-src-4.7.4/src/corelib/tools/qlocale.cpp 2012-01-19 23:37:41.000000000 +0100
-@@ -6614,6 +6614,14 @@
- * calculation.
- */
-
-+#if defined(Q_OS_WIN) && defined (Q_CC_GNU) && !defined(_clear87) // See QTBUG-7576
-+extern "C" {
-+__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask);
-+__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */
-+# define _clear87 _clearfp
-+}
-+#endif
-+
-
- /* This actually sometimes returns a pointer to a string literal
- cast to a char*. Do NOT try to modify the return value. */
diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index d35fdef..c5c0102 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -1,6 +1,6 @@
# qt4
-QT4_VERSION = 4.7.4
+QT4_VERSION = 4.8.1
QT4_URL := http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-$(QT4_VERSION).tar.gz
ifdef HAVE_MACOSX
@@ -21,12 +21,12 @@ $(TARBALLS)/qt-$(QT4_VERSION).tar.gz:
qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
$(UNPACK)
- patch -p0 < $(SRC)/qt4/cross.patch
- patch -p0 < $(SRC)/qt4/styles.patch
- patch -p0 < $(SRC)/qt4/chroot.patch
- patch -p0 < $(SRC)/qt4/imageformats.patch
- patch -p0 < $(SRC)/qt4/mingw32.patch
- mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@
+ cd qt-everywhere-opensource-src-$(QT4_VERSION) && \
+ patch -p0 < ../$(SRC)/qt4/cross.patch && \
+ patch -p0 < ../$(SRC)/qt4/styles.patch && \
+ patch -p0 < ../$(SRC)/qt4/chroot.patch && \
+ patch -p0 < ../$(SRC)/qt4/imageformats.patch
+ mv qt-everywhere-opensource-src-$(QT4_VERSION) $@ && touch $@
XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"
diff --git a/contrib/src/qt4/styles.patch b/contrib/src/qt4/styles.patch
index aa9a307..3ed800f 100644
--- a/contrib/src/qt4/styles.patch
+++ b/contrib/src/qt4/styles.patch
@@ -1,5 +1,5 @@
---- qt-everywhere-opensource-src-4.7.4/configure.orig 2011-11-10 17:44:02.427883340 -0500
-+++ qt-everywhere-opensource-src-4.7.4/configure 2011-11-10 17:44:13.915940309 -0500
+--- configure.orig 2011-11-10 17:44:02.427883340 -0500
++++ configure 2011-11-10 17:44:13.915940309 -0500
@@ -584,7 +584,7 @@
rm -f "$outpath/config.tests/.qmake.cache"
cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
More information about the vlc-commits
mailing list