[vlc-commits] contrib: qt4: apply qt 4.8.0 patch

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jan 19 18:00:59 2012 -0500| [59f9709b87acfb4f165926121ca7700109550180] | committer: Jean-Baptiste Kempf

contrib: qt4: apply qt 4.8.0 patch

fix build with unmodified mingw32
(cherry picked from commit a2f19dccae747eb6271401c01ace3d6acd929fd8)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=59f9709b87acfb4f165926121ca7700109550180
---

 contrib/src/qt4/mingw32.patch |   18 ++++++++++++++++++
 contrib/src/qt4/rules.mak     |    1 +
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/contrib/src/qt4/mingw32.patch b/contrib/src/qt4/mingw32.patch
new file mode 100644
index 0000000..25dfba7
--- /dev/null
+++ b/contrib/src/qt4/mingw32.patch
@@ -0,0 +1,18 @@
+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 892b45d..d35fdef 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -25,6 +25,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	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 $@
 
 XTOOLS := XCC="$(CC)" XCXX="$(CXX)" XSTRIP="$(STRIP)" XAR="$(AR)"