rpm/libqt5-qtwebengine
SHA256
1
0
Fork 0
forked from pool/libqt5-qtwebengine
Code Pull Requests Activity

Accepting request 612996 from KDE:Qt5

Browse Source 
- Fix %postun: Comment in wrong section

- Update to 5.11.0
  * New bugfix release
  * For more details please see:
  * http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.11.0/?h=v5.11.0

- Use %autopatch
- Use %license

- Update to 5.11.0-rc
  * New bugfix release
  * No changelog available

- Update to 5.11.0-beta4
  * New bugfix release
  * No changelog available

- Update to 5.11.0-beta3
  * New bugfix release
  * No changelog available
- Refresh patches:
  * no-return-in-nonvoid-function.diff

- Update to 5.11.0-beta2
  * New bugfix release
  * No changelog available
- Remove patches, now upstream:
  * qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch
  * qtwebengine-everywhere-src-5.10.1-CVE-2018-6033.patch

OBS-URL: https://build.opensuse.org/request/show/612996
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2018-06-02 09:53:21 +00:00 committed by Git OBS Bridge
parent 4caf6c8860
commit dd6fcc2b84
8 changed files with 126 additions and 1343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
armv6-ffmpeg-no-thumb.patch
View File

@ -1,11 +1,11 @@
Index: qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
Index: qtwebengine-everywhere-src-5.11.0-alpha/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
===================================================================
--- qtwebengine-everywhere-src-5.10.0.orig/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
+++ qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
@@ -560,7 +560,7 @@
--- qtwebengine-everywhere-src-5.11.0-alpha.orig/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
+++ qtwebengine-everywhere-src-5.11.0-alpha/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
@@ -566,7 +566,7 @@
#define CONFIG_NEON_CLOBBER_TEST 0
#define CONFIG_OSSFUZZ 0
#define CONFIG_PIC 1
#define CONFIG_RAISE_MAJOR 0
-#define CONFIG_THUMB 1
+#define CONFIG_THUMB 0
#define CONFIG_VALGRIND_BACKTRACE 0

75
libqt5-qtwebengine.changes
View File

@ -1,13 +1,55 @@
-------------------------------------------------------------------
Wed May 30 07:54:28 UTC 2018 - fabian@ritter-vogt.de
- Fix %postun: Comment in wrong section
-------------------------------------------------------------------
Tue May 22 16:59:28 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0
* New bugfix release
* For more details please see:
* http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.11.0/?h=v5.11.0
-------------------------------------------------------------------
Thu May 17 15:21:39 UTC 2018 - fabian@ritter-vogt.de
- Use %autopatch
- Use %license
-------------------------------------------------------------------
Tue May 8 11:02:00 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-rc
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Mon May 7 12:13:15 UTC 2018 - guillaume.gardet@opensuse.org
- Fix armv6 by removing unneeded additionnal RPM_OPT_FLAGS
-------------------------------------------------------------------
Mon Apr 23 08:59:37 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-beta4
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Wed Apr 11 11:00:17 UTC 2018 - mliska@suse.cz
- Add no-return-in-nonvoid-function.diff in order to fix boo#1087068.
-------------------------------------------------------------------
Wed Apr 11 09:15:40 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-beta3
* New bugfix release
* No changelog available
- Refresh patches:
* no-return-in-nonvoid-function.diff
-------------------------------------------------------------------
Thu Mar 29 13:20:53 UTC 2018 - kamikazow@opensuse.org
@ -18,6 +60,16 @@ Thu Mar 29 13:20:53 UTC 2018 - kamikazow@opensuse.org
back to KHTML), therefore no "with-Qt-Company-Qt-exception-1.1"
because those 3rd parties never granted them.
-------------------------------------------------------------------
Wed Mar 28 09:18:01 CEST 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-beta2
* New bugfix release
* No changelog available
- Remove patches, now upstream:
* qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch
* qtwebengine-everywhere-src-5.10.1-CVE-2018-6033.patch
-------------------------------------------------------------------
Tue Mar 27 15:34:51 UTC 2018 - wbauer@tmo.at
@ -51,6 +103,29 @@ Sun Mar 18 22:57:09 UTC 2018 - kamikazow@opensuse.org
* qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch from Fedora
* qtwebengine-everywhere-src-5.10.1-CVE-2018-6033.patch from Fedora
-------------------------------------------------------------------
Tue Mar 13 13:40:53 UTC 2018 - christophe@krop.fr
- Fix the license tag.
-------------------------------------------------------------------
Thu Mar 1 09:56:21 CET 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-beta1
* New feature release
* For more details please see:
* http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.11.0-beta1/?h=v5.11.0-beta1
-------------------------------------------------------------------
Tue Feb 20 14:32:19 CET 2018 - fabian@ritter-vogt.de
- Update to 5.11.0-alpha
* New feature release
* For more details please see:
* https://wiki.qt.io/New_Features_in_Qt_5.11
- Refresh patches:
* armv6-ffmpeg-no-thumb.patch
-------------------------------------------------------------------
Wed Feb 14 15:47:56 CET 2018 - fabian@ritter-vogt.de

59
libqt5-qtwebengine.spec
View File

@ -13,6 +13,9 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define qt5_snapshot 0
@ -50,27 +53,22 @@
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
Name: libqt5-qtwebengine
Version: 5.10.1
Version: 5.11.0
Release: 0
Summary: Qt 5 WebEngine Library
License: LGPL-3.0-only or GPL-2.0-only or GPL-3.0-only
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
%define real_version 5.10.1
%define so_version 5.10.1
%define tar_version qtwebengine-everywhere-src-5.10.1
Source: https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz
%define real_version 5.11.0
%define so_version 5.11.0
%define tar_version qtwebengine-everywhere-src-5.11.0
Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
Patch1: armv6-ffmpeg-no-thumb.patch
# PATCH-FIX-UPSTREAM disable-gpu-when-using-nouveau-boo-1005323.diff
Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff
# PATCH-FIX-UPSTREAM qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch
# - forward-port security backports from 5.9.5 LTS (up to Chromium 65.0.3325.146)
# see the patch metadata for the list of fixed CVEs and Chromium bug IDs
Patch3: qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch
Patch4: qtwebengine-everywhere-src-5.10.1-CVE-2018-6033.patch
# PATCH-FIX-UPSTREAM harmony-fix.diff -- Show the patent-free LCD rendering. Without this patch, only grayscale rendering is used. (for freetype-2.8.1) boo#1061344
Patch5: harmony-fix.diff
Patch6: no-return-in-nonvoid-function.diff
@ -133,6 +131,10 @@ BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gthread-2.0)
BuildRequires: pkgconfig(jsoncpp)
BuildRequires: binutils-gold
%if 0%{?suse_version} < 1330
# It does not build with the default compiler (GCC 4.8) on Leap 42.x
BuildRequires: gcc7-c++
%endif
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libevent)
@ -244,12 +246,8 @@ Examples for the libqt5-qtwebengine module.
%prep
%setup -q -n %{tar_version}
sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%autopatch -p1
# QTBUG-61128
sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
@ -260,6 +258,15 @@ sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
mkdir .git
%endif
%if 0%{?suse_version} < 1330
# WE checks the version of GCC qtbase was built with, not the version it's building with.
# ARGH!
echo "QT_GCC_MAJOR_VERSION = 7" > qtwebengine_new.pro
echo "QT_GCC_MINOR_VERSION = 2" >> qtwebengine_new.pro
cat qtwebengine.pro >> qtwebengine_new.pro
mv qtwebengine{_new,}.pro
%endif
%ifnarch x86_64
RPM_OPT_FLAGS="$RPM_OPT_FLAGS "
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
@ -267,6 +274,9 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
# It does not actually include proprietary codecs, it only makes it attempt to use ffmpeg
%qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \
QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads" \
%if 0%{?suse_version} < 1330
QMAKE_CC=gcc-7 QMAKE_CXX=g++-7 CONFIG+=c++14 \
%endif
qtwebengine.pro -- \
-webengine-alsa -no-webengine-embedded-build \
%if %{with system_icu}
@ -298,6 +308,11 @@ fi
# processess instead of its defaults.
export NINJAFLAGS="-j $makeproc"
%if 0%{?suse_version} < 1330
export CC=gcc-7
export CXX=g++-7
%endif
make -j$makeproc VERBOSE=1
%install
@ -316,7 +331,7 @@ rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
sed -i -r '/ EXACT\)/d' \
%{buildroot}%{_libqt5_libdir}/cmake/Qt5WebEngine*/Qt5WebEngine*Config.cmake
sed -i '/find_package/!b;n;s/'%{version}/$(rpm -q --qf %%{version} libQt5Core5)/ \
sed -i '/find_package/!b;n;s/'%{so_version}/$(rpm -q --qf %%{version} libQt5Core5 | sed 's/~.*$//')/ \
%{buildroot}%{_libqt5_libdir}/cmake/Qt5WebEngine*/Qt5WebEngine*Config.cmake
# Hunspell dictionaries will be converted and put here on package installation
@ -327,8 +342,8 @@ mkdir -p %{buildroot}%{_qtwebengine_dictionaries_dir}
%postun -p /sbin/ldconfig
%if 0%{?suse_version} >= 1500
# Convert Hunspell dictionaries on package installation
%filetriggerin -- %{_datadir}/hunspell
# Convert Hunspell dictionaries on package installation
while read filename ; do
case "$filename" in
*.dic)
@ -341,7 +356,7 @@ done
%files
%defattr(-,root,root,755)
%doc LICENSE.*
%license LICENSE.*
%{_libqt5_libdir}/libQt*Web*.so.*
%{_datadir}/qt5/
%dir %{_libqt5_libexecdir}
@ -353,12 +368,12 @@ done
%files private-headers-devel
%defattr(-,root,root,755)
%doc LICENSE.*
%license LICENSE.*
%{_libqt5_includedir}/*/%{so_version}
%files devel
%defattr(-,root,root,755)
%doc LICENSE.*
%license LICENSE.*
%exclude %{_libqt5_includedir}/*/%{so_version}
%{_libqt5_includedir}/*/
%{_libqt5_libdir}/cmake/Qt5*/
@ -369,7 +384,7 @@ done
%files examples
%defattr(-,root,root,755)
%doc LICENSE.*
%license LICENSE.*
%{_libqt5_examplesdir}/
%changelog

10
no-return-in-nonvoid-function.diff
View File

@ -1,10 +1,12 @@
--- a/src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc 2018-04-11 10:36:36.215724331 +0000
+++ b/src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc 2018-04-11 10:37:01.204216307 +0000
@@ -488,6 +488,7 @@
Index: qtwebengine-everywhere-src-5.11.0-rc/src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc
===================================================================
--- qtwebengine-everywhere-src-5.11.0-rc.orig/src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc
+++ qtwebengine-everywhere-src-5.11.0-rc/src/3rdparty/chromium/third_party/protobuf/src/google/protobuf/compiler/js/js_generator.cc
@@ -505,6 +505,7 @@ string JSByteGetterSuffix(BytesMode byte
return "U8";
default:
assert(false);
+ __builtin_unreachable ();
}
return "";
}

64
qtwebengine-everywhere-src-5.10.1-CVE-2018-6033.patch
View File

@ -1,64 +0,0 @@
From 1fd21185614dcae0c7a6e5647ba56cff0120f563 Mon Sep 17 00:00:00 2001
Message-Id: <1fd21185614dcae0c7a6e5647ba56cff0120f563.1521386919.git.kevin.kofler@chello.at>
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 7 Mar 2018 18:36:25 +0100
Subject: [PATCH] Implement IsMostRecentDownloadItemAtFilePath call
Implement IsMostRecentDownloadItemAtFilePath
for download_manager_delegate_qt. This is required for
CVE-2018-6033.
Change-Id: I9f48dfa159d684f0fda894e68b81ff622aceaae2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
src/core/download_manager_delegate_qt.cpp | 20 ++++++++++++++++++++
src/core/download_manager_delegate_qt.h | 2 ++
2 files changed, 22 insertions(+)
diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp
index 40df9b3a..487a831e 100644
--- a/src/core/download_manager_delegate_qt.cpp
+++ b/src/core/download_manager_delegate_qt.cpp
@@ -293,6 +293,26 @@ void DownloadManagerDelegateQt::ChooseSavePath(content::WebContents *web_content
m_weakPtrFactory.GetWeakPtr()));
}
+bool DownloadManagerDelegateQt::IsMostRecentDownloadItemAtFilePath(content::DownloadItem *download)
+{
+ content::BrowserContext *context = download->GetBrowserContext();
+ std::vector<content::DownloadItem*> all_downloads;
+
+ content::DownloadManager* manager =
+ content::BrowserContext::GetDownloadManager(context);
+ if (manager)
+ manager->GetAllDownloads(&all_downloads);
+
+ for (const auto* item : all_downloads) {
+ if (item->GetGuid() == download->GetGuid() ||
+ item->GetTargetFilePath() != download->GetTargetFilePath())
+ continue;
+ if (item->GetState() == content::DownloadItem::IN_PROGRESS)
+ return false;
+ }
+ return true;
+}
+
void DownloadManagerDelegateQt::savePackageDownloadCreated(content::DownloadItem *item)
{
OnDownloadUpdated(item);
diff --git a/src/core/download_manager_delegate_qt.h b/src/core/download_manager_delegate_qt.h
index df43211e..7563d5d3 100644
--- a/src/core/download_manager_delegate_qt.h
+++ b/src/core/download_manager_delegate_qt.h
@@ -81,6 +81,8 @@ public:
const base::FilePath::StringType &default_extension,
bool can_save_as_complete,
const content::SavePackagePathPickedCallback &callback) override;
+ bool IsMostRecentDownloadItemAtFilePath(content::DownloadItem* download) override;
+
void cancelDownload(quint32 downloadId);
void pauseDownload(quint32 downloadId);
--
2.14.3

1245
qtwebengine-everywhere-src-5.10.1-security-5.9.5.patch
View File

File diff suppressed because it is too large Load Diff

3
qtwebengine-everywhere-src-5.10.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12644f8d2ba8354a2a533d5a7f3f5139c6ff168c2f51aa3e21b701db6dbc01de
size 209844952

3
qtwebengine-everywhere-src-5.11.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5dd754d603c66d36e93b96b4f7c24a6e6269ae6a1682a524b8baa664d5c44b45
size 233619512