Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
a2f19dcc
Commit
a2f19dcc
authored
Jan 19, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: qt4: apply qt 4.8.0 patch
fix build with unmodified mingw32
parent
768cafce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
0 deletions
+19
-0
contrib/src/qt4/mingw32.patch
contrib/src/qt4/mingw32.patch
+18
-0
contrib/src/qt4/rules.mak
contrib/src/qt4/rules.mak
+1
-0
No files found.
contrib/src/qt4/mingw32.patch
0 → 100644
View file @
a2f19dcc
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. */
contrib/src/qt4/rules.mak
View file @
a2f19dcc
...
...
@@ -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)
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment