From a6f722327423880968bac926c39f052b267c7d9f Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 9 Jan 2016 04:34:32 +0100 Subject: [PATCH] Use more specific BuildRequires for docs, fix FTBFS against ICU 54 (F22/F23) * Sat Jan 09 2016 Kevin Kofler - 5.6.0-0.4.beta1.1 - Use more specific BuildRequires for docs (thanks to rdieter) - Fix FTBFS against ICU 54 (F22/F23), thanks to spot for the Chromium fix --- qt5-qtwebengine.spec | 13 ++++++++++--- ...ine-opensource-src-5.6.0-beta-system-icu54.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 3c68646..6ce8958 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -15,7 +15,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.6.0 -Release: 0.4.beta%{?dist} +Release: 0.4.beta%{?dist}.1 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -34,6 +34,8 @@ Source3: process_ffmpeg_gyp.py Patch0: qtwebengine-opensource-src-5.6.0-beta-no-format.patch # some tweaks to linux.pri (system libs, link libpci, run unbundling script) Patch1: qtwebengine-opensource-src-5.6.0-beta-linux-pri.patch +# don't require the time zone detection API backported from ICU 55 (thanks spot) +Patch2: qtwebengine-opensource-src-5.6.0-beta-system-icu54.patch BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtdeclarative-devel >= %{version} @@ -217,8 +219,8 @@ Summary: Example files for %{name} %if 0%{?docs} %package doc Summary: API documentation for %{name} -# for qhelpgenerator -BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qhelpgenerator +BuildRequires: qt5-qdoc BuildArch: noarch %description doc %{summary}. @@ -229,6 +231,7 @@ BuildArch: noarch %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} %patch0 -p1 -b .no-format %patch1 -p1 -b .linux-pri +%patch2 -p1 -b .system-icu54 %build export STRIP=strip @@ -298,6 +301,10 @@ popd %changelog +* Sat Jan 09 2016 Kevin Kofler - 5.6.0-0.4.beta1.1 +- Use more specific BuildRequires for docs (thanks to rdieter) +- Fix FTBFS against ICU 54 (F22/F23), thanks to spot for the Chromium fix + * Fri Jan 08 2016 Kevin Kofler - 5.6.0-0.4.beta1 - Fix License tag - Use %%_qt5_examplesdir macro 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());