Date: Tuesday, October 25, 2016 @ 15:00:36
Author: lcarlier
Revision: 193303
upgpkg: lib32-qt4 4.8.7-6
fix FS#51523
Added:
lib32-qt4/trunk/qt-everywhere-opensource-src-4.8.7-gcc6.patch
Modified:
lib32-qt4/trunk/PKGBUILD
-----------------------------------------------+
PKGBUILD | 11 +++++--
qt-everywhere-opensource-src-4.8.7-gcc6.patch | 35 ++++++++++++++++++++++++
2 files changed, 43 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-25 15:00:13 UTC (rev 193302)
+++ PKGBUILD 2016-10-25 15:00:36 UTC (rev 193303)
@@ -6,7 +6,7 @@
_pkgbasename=qt4
pkgname=lib32-$_pkgbasename
pkgver=4.8.7
-pkgrel=5
+pkgrel=6
pkgdesc='A cross-platform application and UI framework (32-bit)'
arch=('x86_64')
url='http://qt-project.org/'
@@ -25,10 +25,12 @@
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz";
"kubuntu_14_systemtrayicon.diff"
- "disable-sslv3.patch")
+ "disable-sslv3.patch"
+ "qt-everywhere-opensource-src-4.8.7-gcc6.patch")
md5sums=('d990ee66bf7ab0c785589776f35ba6ad'
'a523644faa8f98a73f55c4aa23c114a6'
- '1803ab6313df762d807678e58fc85f53')
+ '1803ab6313df762d807678e58fc85f53'
+ '8ba77cd8f325c38daca8eadc982395a4')
export CC='clang'
export CXX='clang++'
@@ -46,6 +48,9 @@
# disable SSLv3
patch -p1 -i "${srcdir}"/disable-sslv3.patch
+ # patch from Fedora, otherwise webkit will not be built (FS#51523)
+ patch -p1 -i "${srcdir}"/qt-everywhere-opensource-src-4.8.7-gcc6.patch
+
# some of those are likely unnecessary, but I'm too lazy to find and remove
them
sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf
sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf
Added: qt-everywhere-opensource-src-4.8.7-gcc6.patch
===================================================================
--- qt-everywhere-opensource-src-4.8.7-gcc6.patch
(rev 0)
+++ qt-everywhere-opensource-src-4.8.7-gcc6.patch 2016-10-25 15:00:36 UTC
(rev 193303)
@@ -0,0 +1,35 @@
+diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6
qt-everywhere-opensource-src-4.8.7/configure
+--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15
07:04:19.430268222 -0500
++++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15
07:05:22.157568689 -0500
+@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
+ *-g++*)
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 5*|4*|3.4*)
++ 8*|7*|6*|5*|4*|3.4*)
+ ;;
+ 3.3*)
+ canBuildWebKit="no"
+@@ -8060,7 +8060,7 @@ g++*)
+ 3.*)
+ COMPILER_VERSION="3.*"
+ ;;
+- 5*|4.*)
++ 8*|7*|6*|5*|4.*)
+ COMPILER_VERSION="4"
+ ;;
+ *)
+diff -up
qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6
qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
+---
qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6
2015-05-07 09:14:48.000000000 -0500
++++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
2016-04-15 07:04:19.431268227 -0500
+@@ -70,8 +70,8 @@ namespace QPatternist
+ ForegroundShift = 10,
+ BackgroundShift = 20,
+ SpecialShift = 20,
+- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
+- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
++ ForegroundMask = 0x1f << ForegroundShift,
++ BackgroundMask = 0x7 << BackgroundShift
+ };
+
+ public:
