From e2d56e5e7b9bc037d14fa2f00b5916d9f97abcda Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 26 Jul 2016 23:33:50 +0200 Subject: [PATCH] Restore system-icu54 patch, the fix was lost upstream * Tue Jul 26 2016 Kevin Kofler - 5.7.0-3 - Restore system-icu54 patch, the fix was lost upstream --- qt5-qtwebengine.spec | 8 +++++++- ...gine-opensource-src-5.6.0-beta-system-icu54.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 4a7da4d..364d63d 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -30,7 +30,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.7.0 -Release: 3%{?dist} +Release: 4%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -78,6 +78,8 @@ Patch6: qtwebengine-opensource-src-5.7.0-no-sse2.patch # requested (i.e., not if arm_neon=0 arm_neon_optional=0). # We still need to figure out why the flag tweaks from arm_neon.gypi don't work. Patch7: qtwebengine-opensource-src-5.7.0-webrtc-neon.patch +# don't require the time zone detection API backported from ICU 55 (thanks spot) +Patch8: qtwebengine-opensource-src-5.6.0-beta-system-icu54.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 @@ -305,6 +307,7 @@ BuildArch: noarch %patch5 -p1 -b .system-icu-utf %patch6 -p1 -b .no-sse2 %patch7 -p1 -b .webrtc-neon +%patch8 -p1 -b .system-icu54 # 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 @@ -450,6 +453,9 @@ popd %changelog +* Tue Jul 26 2016 Kevin Kofler - 5.7.0-4 +- Restore system-icu54 patch, the fix was lost upstream + * Sat Jul 23 2016 Christian Dersch - 5.7.0-3 - Rebuilt for libvpx.so.4 soname bump diff --git a/qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch b/qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch new file mode 100644 index 0000000..7366f6a --- /dev/null +++ b/qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch @@ -0,0 +1,12 @@ +diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/content/browser/time_zone_monitor.cc qtwebengine-opensource-src-5.6.0-beta-system-icu54/src/3rdparty/chromium/content/browser/time_zone_monitor.cc +--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/content/browser/time_zone_monitor.cc 2015-12-10 18:17:21.000000000 +0100 ++++ qtwebengine-opensource-src-5.6.0-beta-system-icu54/src/3rdparty/chromium/content/browser/time_zone_monitor.cc 2016-01-08 23:40:36.387525597 +0100 +@@ -22,7 +22,7 @@ + + void TimeZoneMonitor::NotifyRenderers() { + DCHECK_CURRENTLY_ON(BrowserThread::UI); +-#if defined(OS_CHROMEOS) || U_ICU_VERSION_MAJOR_NUM < 54 ++#if defined(OS_CHROMEOS) || U_ICU_VERSION_MAJOR_NUM < 55 + // On CrOS and older ICU versions, ICU's default tz is already set to a new zone. + // No need to redetect it with detectHostTimeZone(). + scoped_ptr new_zone(icu::TimeZone::createDefault());