rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed FTBFS against gcc10

This commit is contained in:
Than Ngo 2020-01-31 12:37:47 +01:00
parent b30349c48a
commit 6c8e045afd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qt-everywhere-opensource-src-4.8.7-gcc6.patch
View File

@ -6,7 +6,7 @@ diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensou
# Check gcc's version
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
- 5*|4*|3.4*)
+ 9*|8*|7*|6*|5*|4*|3.4*)
+ 10*|9*|8*|7*|6*|5*|4*|3.4*)
;;
3.3*)
canBuildWebKit="no"
@ -15,7 +15,7 @@ diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensou
COMPILER_VERSION="3.*"
;;
- 5*|4.*)
+ 9*|8*|7*|6*|5*|4.*)
+ 10*|9*|8*|7*|6*|5*|4.*)
COMPILER_VERSION="4"
;;
*)

5
qt.spec
View File

@ -43,7 +43,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.8.7
Release: 51%{?dist}
Release: 52%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -1373,6 +1373,9 @@ fi
%changelog
* Fri Jan 31 2020 Than Ngo <than@redhat.com> - 4.8.7-52
- fixed FTBFS against gcc10
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.8.7-51
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild