rpms/qt5-qtbase
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix build issue with gcc6

Browse Source 
- fix check for alsa 1.1.x
This commit is contained in:
Than Ngo 2016-02-11 13:35:11 +01:00
parent d4e18227d7
commit 4334573c94
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt5-qtbase.spec
View File

@ -44,7 +44,7 @@
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
Version: 5.6.0 Version: 5.6.0
Release: 0.23.%{prerelease}%{?dist} Release: 0.24.%{prerelease}%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -83,6 +83,9 @@ Patch50: qt5-poll.patch
# https://bugreports.qt.io/browse/QTBUG-49972 # https://bugreports.qt.io/browse/QTBUG-49972
Patch52: qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch Patch52: qtbase-opensource-src-5.6.0-moc_WORDSIZE.patch
# correct check for alsa-1.1
Patch53: qtbase-opensource-src-5.6.0-alsa-1.1.patch
## upstream patches ## upstream patches
# recently passed code review, not integrated yet # recently passed code review, not integrated yet
@ -333,6 +336,7 @@ RPM macros for building Qt5 packages.
%patch12 -p1 -b .enable_ft_lcdfilter %patch12 -p1 -b .enable_ft_lcdfilter
%patch52 -p1 -b .moc_WORDSIZE %patch52 -p1 -b .moc_WORDSIZE
%patch53 -p1 -b .alsa1.1
%patch150 -p1 -b .moc_system_defines %patch150 -p1 -b .moc_system_defines
%patch184 -p1 -b .0084 %patch184 -p1 -b .0084
@ -342,7 +346,7 @@ RPM macros for building Qt5 packages.
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
# add -fno-delete-null-pointer-checks for f24/gcc6 # add -fno-delete-null-pointer-checks for f24/gcc6
%if 0%{?fedora} > 23 %if 0%{?fedora} > 23
QT5_RPM_OPT_FLAGS="-fno-delete-null-pointer-checks" QT5_RPM_OPT_FLAGS="-fno-delete-null-pointer-checks -std=gnu++11"
RPM_OPT_FLAGS="$RPM_OPT_FLAGS $QT5_RPM_OPT_FLAGS" RPM_OPT_FLAGS="$RPM_OPT_FLAGS $QT5_RPM_OPT_FLAGS"
%endif %endif
@ -391,7 +395,7 @@ test -x configure || chmod +x configure
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
# add -fno-delete-null-pointer-checks for f24/gcc6 # add -fno-delete-null-pointer-checks for f24/gcc6
%if 0%{?fedora} > 23 %if 0%{?fedora} > 23
QT5_RPM_OPT_FLAGS="-fno-delete-null-pointer-checks" QT5_RPM_OPT_FLAGS="-fno-delete-null-pointer-checks -std=gnu++11"
RPM_OPT_FLAGS="$RPM_OPT_FLAGS $QT5_RPM_OPT_FLAGS" RPM_OPT_FLAGS="$RPM_OPT_FLAGS $QT5_RPM_OPT_FLAGS"
%endif %endif
@ -916,6 +920,10 @@ fi
%changelog %changelog
* Thu Feb 11 2016 Than Ngo <than@redhat.com> - 5.6.0-0.24.beta
- fix build issue with gcc6
- fix check for alsa 1.1.x
* Wed Feb 03 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.23.beta * Wed Feb 03 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.0-0.23.beta
- qt5-rpm-macros pkg - qt5-rpm-macros pkg

12
qtbase-opensource-src-5.6.0-alsa-1.1.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up qtbase-opensource-src-5.6.0-beta/config.tests/unix/alsa/alsatest.cpp.than qtbase-opensource-src-5.6.0-beta/config.tests/unix/alsa/alsatest.cpp
--- qtbase-opensource-src-5.6.0-beta/config.tests/unix/alsa/alsatest.cpp.than 2015-12-14 21:49:46.000000000 +0100
+++ qtbase-opensource-src-5.6.0-beta/config.tests/unix/alsa/alsatest.cpp 2016-02-11 13:29:59.249275394 +0100
@@ -32,7 +32,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