- fix alsa version check for version >= 1.1.x
- fix webkit check using gcc6
This commit is contained in:
parent
8cf9135957
commit
6d0df2a0a4
|
@ -0,0 +1,12 @@
|
||||||
|
diff -up qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp
|
||||||
|
--- qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp.than 2016-02-10 16:31:02.450152334 +0100
|
||||||
|
+++ qt-everywhere-opensource-src-4.8.7/config.tests/unix/alsa/alsatest.cpp 2016-02-10 16:31:51.495307579 +0100
|
||||||
|
@@ -40,7 +40,7 @@
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <alsa/asoundlib.h>
|
||||||
|
-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
|
||||||
|
+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
|
||||||
|
#error "Alsa version found too old, require >= 1.0.10"
|
||||||
|
#endif
|
||||||
|
|
|
@ -12,3 +12,15 @@ diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
diff -up qt-everywhere-opensource-src-4.8.7/configure.than qt-everywhere-opensource-src-4.8.7/configure
|
||||||
|
--- qt-everywhere-opensource-src-4.8.7/configure.than 2016-02-10 16:19:31.763130618 +0100
|
||||||
|
+++ qt-everywhere-opensource-src-4.8.7/configure 2016-02-10 16:19:48.508500789 +0100
|
||||||
|
@@ -7741,7 +7741,7 @@ case "$XPLATFORM" in
|
||||||
|
*-g++*)
|
||||||
|
# Check gcc's version
|
||||||
|
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
|
||||||
|
- 5*|4*|3.4*)
|
||||||
|
+ 6*|5*|4*|3.4*)
|
||||||
|
;;
|
||||||
|
3.3*)
|
||||||
|
canBuildWebKit="no"
|
||||||
|
|
7
qt.spec
7
qt.spec
|
@ -175,6 +175,9 @@ Patch90: qt-everywhere-opensource-src-4.8.6-system-clucene.patch
|
||||||
# fix build issue with gcc6
|
# fix build issue with gcc6
|
||||||
Patch100: qt-everywhere-opensource-src-4.8.7-gcc6.patch
|
Patch100: qt-everywhere-opensource-src-4.8.7-gcc6.patch
|
||||||
|
|
||||||
|
# support alsa-1.1.x
|
||||||
|
Patch101: qt-everywhere-opensource-src-4.8.7-alsa-1.1.patch
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
# backported from Qt5 (essentially)
|
# backported from Qt5 (essentially)
|
||||||
# http://bugzilla.redhat.com/702493
|
# http://bugzilla.redhat.com/702493
|
||||||
|
@ -575,6 +578,7 @@ and invoke methods on those objects.
|
||||||
rm -rf src/3rdparty/clucene
|
rm -rf src/3rdparty/clucene
|
||||||
%endif
|
%endif
|
||||||
%patch100 -p1 -b .gcc6
|
%patch100 -p1 -b .gcc6
|
||||||
|
%patch101 -p1 -b .alsa1.1
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check
|
%patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check
|
||||||
|
@ -1342,8 +1346,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Feb 09 2016 Than Ngo <than@redhat.com> - 1:4.8.7-8
|
* Wed Feb 10 2016 Than Ngo <than@redhat.com> - 1:4.8.7-8
|
||||||
- fix build issue with gcc6
|
- fix build issue with gcc6
|
||||||
|
- fix alsa version check for version >= 1.1.x
|
||||||
|
|
||||||
* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.7-7
|
* Tue Feb 02 2016 Rex Dieter <rdieter@fedoraproject.org> 1:4.8.7-7
|
||||||
- macros.qt4 : cleanup, introduce %%_qt4_optflags, %%_qt4_ldflags, %%_qt4_qmake_flags
|
- macros.qt4 : cleanup, introduce %%_qt4_optflags, %%_qt4_ldflags, %%_qt4_qmake_flags
|
||||||
|
|
Loading…
Reference in New Issue