|
|
@@ -28,8 +28,8 @@
|
|
|
%global __requires_exclude ^libv8\\.so$
|
|
|
|
|
|
%global qt5_minorver 5.6
|
|
|
-%global qt5_version 5.6.1
|
|
|
-%global qt5_patchlevel 1
|
|
|
+%global qt5_version 5.6.3
|
|
|
+#global qt5_patchlevel 1
|
|
|
|
|
|
Summary: Qt5 - QtWebEngine components
|
|
|
Name: qt5-qtwebengine
|
|
|
@@ -53,11 +53,10 @@ Source0: %{qt_module}-opensource-src-%{qt5_version}%{?qt5_patchlevel:-%{qt5_patc
|
|
|
# cleanup scripts used above
|
|
|
Source1: clean_qtwebengine.sh
|
|
|
Source2: clean_ffmpeg.sh
|
|
|
-Source3: process_ffmpeg_gyp.py
|
|
|
-# do not compile with -Wno-format, which also bypasses -Werror-format-security
|
|
|
-Patch0: qtwebengine-opensource-src-5.6.0-beta-no-format.patch
|
|
|
+Source3: get_free_ffmpeg_source_files.py
|
|
|
+
|
|
|
# some tweaks to linux.pri (system libs, link libpci, run unbundling script)
|
|
|
-Patch1: qtwebengine-opensource-src-5.6.1-linux-pri.patch
|
|
|
+Patch1: qtwebengine-opensource-src-5.6.3-linux-pri.patch
|
|
|
# quick hack to avoid checking for the nonexistent icudtl.dat and silence the
|
|
|
# resulting warnings - not upstreamable as is because it removes the fallback
|
|
|
# mechanism for the ICU data directory (which is not used in our builds because
|
|
|
@@ -66,24 +65,26 @@ Patch2: qtwebengine-opensource-src-5.6.0-no-icudtl-dat.patch
|
|
|
# fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the
|
|
|
# ARM flags with our %%qmake_qt5 macro, including for the next patch
|
|
|
Patch3: qtwebengine-opensource-src-5.6.0-beta-fix-extractcflag.patch
|
|
|
-# disable NEON vector instructions on ARM for now, the NEON code FTBFS due to
|
|
|
-# GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
|
|
|
-Patch4: qtwebengine-opensource-src-5.6.0-beta-no-neon.patch
|
|
|
# use the system NSPR prtime (based on Debian patch)
|
|
|
# We already depend on NSPR, so it is useless to copy these functions here.
|
|
|
# Debian uses this just fine, and I don't see relevant modifications either.
|
|
|
-Patch5: qtwebengine-opensource-src-5.6.0-beta-system-nspr-prtime.patch
|
|
|
+Patch5: qtwebengine-opensource-src-5.6.3-system-nspr-prtime.patch
|
|
|
# use the system ICU UTF functions
|
|
|
# We already depend on ICU, so it is useless to copy these functions here.
|
|
|
# I checked the history of that directory, and other than the renames I am
|
|
|
# undoing, there were no modifications at all. Must be applied after Patch5.
|
|
|
-Patch6: qtwebengine-opensource-src-5.6.0-beta-system-icu-utf.patch
|
|
|
+Patch6: qtwebengine-opensource-src-5.7.0-system-icu-utf.patch
|
|
|
# do not require SSE2 on i686
|
|
|
# cumulative revert of upstream reviews 187423002, 308003004, 511773002 (parts
|
|
|
# relevant to QtWebEngine only), 516543004, 1152053004 and 1161853008, along
|
|
|
# with some custom fixes and improvements
|
|
|
# also build V8 shared and twice on i686 (once for x87, once for SSE2)
|
|
|
-Patch7: qtwebengine-opensource-src-5.6.1-no-sse2.patch
|
|
|
+Patch7: qtwebengine-opensource-src-5.7.0-no-sse2.patch
|
|
|
+
|
|
|
+
|
|
|
+# to build with icu > 59
|
|
|
+Patch1000: qtwebengine-5.7.1-icu-59.patch
|
|
|
+Patch1001: qtwebengine-5.6.3-icu60.patch
|
|
|
|
|
|
# the architectures theoretically supported by the version of V8 used (#1298011)
|
|
|
# You may need some minor patching to build on one of the secondary
|
|
|
@@ -298,14 +299,17 @@ BuildArch: noarch
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n %{qt_module}-opensource-src-%{qt5_version}
|
|
|
-%patch0 -p1 -b .no-format
|
|
|
+
|
|
|
%patch1 -p1 -b .linux-pri
|
|
|
%patch2 -p1 -b .no-icudtl-dat
|
|
|
%patch3 -p1 -b .fix-extractcflag
|
|
|
-%patch4 -p1 -b .no-neon
|
|
|
%patch5 -p1 -b .system-nspr-prtime
|
|
|
%patch6 -p1 -b .system-icu-utf
|
|
|
%patch7 -p1 -b .no-sse2
|
|
|
+
|
|
|
+%patch1000 -p1 -b .icu59
|
|
|
+%patch1001 -p1 -b .icu60
|
|
|
+
|
|
|
# fix // in #include in content/renderer/gpu to avoid debugedit failure
|
|
|
sed -i -e 's!gpu//!gpu/!g' \
|
|
|
src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
|
|
|
@@ -328,16 +332,28 @@ export STRIP=strip
|
|
|
export NINJAFLAGS="-v %{_smp_mflags}"
|
|
|
export NINJA_PATH=%{_bindir}/ninja-build
|
|
|
export RE2_INCLUDE=$(pwd)/src/3rdparty/chromium/third_party/re2
|
|
|
-export CXXFLAGS="%{optflags} -fno-delete-null-pointer-checks -I$RE2_INCLUDE"
|
|
|
+export CFLAGS="%{optflags}"
|
|
|
+#ifnarch x86_64
|
|
|
+# most arches run out of memory with full debuginfo, so use -g1 on non-x86_64
|
|
|
+export CFLAGS=`echo "$CFLAGS" | sed -e 's/ -g / -g1 /g'`
|
|
|
+#endif
|
|
|
+export CXXFLAGS="%{optflags} -fno-delete-null-pointer-checks"
|
|
|
#ifnarch x86_64
|
|
|
# most arches run out of memory with full debuginfo, so use -g1 on non-x86_64
|
|
|
export CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ -g / -g1 /g'`
|
|
|
#endif
|
|
|
|
|
|
+
|
|
|
mkdir %{_target_platform}
|
|
|
pushd %{_target_platform}
|
|
|
|
|
|
-%{qmake_qt5} CONFIG+="webcore_debug v8base_debug force_debug_info" WEBENGINE_CONFIG+="use_system_icu" ..
|
|
|
+%{qmake_qt5} CONFIG+="webcore_debug v8base_debug force_debug_info" WEBENGINE_CONFIG+="use_system_icu use_system_protobuf" ..
|
|
|
+
|
|
|
+# if we keep these set here, gyp picks up duplicate flags
|
|
|
+unset CFLAGS
|
|
|
+export CFLAGS
|
|
|
+unset CXXFLAGS
|
|
|
+export CXXFLAGS
|
|
|
|
|
|
# workaround, disable parallel compilation as it fails to compile in brew
|
|
|
make %{?_smp_mflags}
|
|
|
@@ -452,6 +468,9 @@ popd
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.3-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Mon Jul 11 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.6.1.1-1
|
|
|
- new upstream release.
|
|
|
- initial build for Vine Linux.
|
tomop