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

Accepting request 595594 from KDE:Qt5

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/595594
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=33
This commit is contained in:
Dominique Leuenberger 2018-04-16 10:46:29 +00:00 committed by Git OBS Bridge
parent 936a710ca8
commit 981d54ee02
3 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libqt5-qtwebengine.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Wed Apr 11 11:00:17 UTC 2018 - mliska@suse.cz
- Add no-return-in-nonvoid-function.diff in order to fix boo#1087068.
-------------------------------------------------------------------
Thu Mar 29 13:20:53 UTC 2018 - kamikazow@opensuse.org
- Changed license header back to original template
* LGPL-2.1-or-later was wrong
- Package license is LGPL-3.0-only, GPL-2.0-only, GPL-3.0-only
* incorporates 3rd party code (Chromium, WebKit, even some dating
back to KHTML), therefore no "with-Qt-Company-Qt-exception-1.1"
because those 3rd parties never granted them.
-------------------------------------------------------------------
Tue Mar 27 15:34:51 UTC 2018 - wbauer@tmo.at
- Only automatically convert dictionaries on Leap 15 or higher,
%filetriggerin is not supported in Leap 42.3 which caused the
build to fail
-------------------------------------------------------------------
Sun Mar 25 15:58:52 UTC 2018 - kamikazow@opensuse.org

27
libqt5-qtwebengine.spec
View File

@ -3,20 +3,15 @@
#
# Copyright © 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright © 2017 Kevin Kofler <Kevin@tigcc.ticalc.org>
# Copyright © 2018 Markus S. <kamikazow@opensuse.org>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published
# by the Free Software Foundation, either version 2.1 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
%define qt5_snapshot 0
@ -58,7 +53,7 @@ Name: libqt5-qtwebengine
Version: 5.10.1
Release: 0
Summary: Qt 5 WebEngine Library
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-with-Qt-Company-Qt-exception-1.1
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
@ -78,6 +73,7 @@ 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
# http://www.chromium.org/blink not ported to PowerPC
ExcludeArch: ppc ppc64 ppc64le s390 s390x
# Try to fix i586 MemoryErrors with rpmlint
@ -253,6 +249,7 @@ sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
# QTBUG-61128
sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
@ -334,6 +331,7 @@ mkdir -p %{buildroot}%{_qtwebengine_dictionaries_dir}
%postun -p /sbin/ldconfig
%if 0%{?suse_version} >= 1500
# Convert Hunspell dictionaries on package installation
%filetriggerin -- %{_datadir}/hunspell
while read filename ; do
@ -344,6 +342,7 @@ while read filename ; do
;;
esac
done
%endif
%files
%defattr(-,root,root,755)

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

@ -0,0 +1,10 @@
--- 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 @@
return "U8";
default:
assert(false);
+ __builtin_unreachable ();
}
}