From 981d54ee0281c9d042051b83c5ee198f39803d0a65e584d85012e7a05a11181e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Apr 2018 10:46:29 +0000 Subject: [PATCH] Accepting request 595594 from KDE:Qt5 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 --- libqt5-qtwebengine.changes | 22 ++++++++++++++++++++++ libqt5-qtwebengine.spec | 27 +++++++++++++-------------- no-return-in-nonvoid-function.diff | 10 ++++++++++ 3 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 no-return-in-nonvoid-function.diff diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 2c383c7..7c46dd5 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -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 diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index ecf1647..5c61bcc 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -3,20 +3,15 @@ # # Copyright © 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright © 2017 Kevin Kofler -# Copyright © 2018 Markus S. # -# 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 . +# 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) diff --git a/no-return-in-nonvoid-function.diff b/no-return-in-nonvoid-function.diff new file mode 100644 index 0000000..af2380a --- /dev/null +++ b/no-return-in-nonvoid-function.diff @@ -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 (); + } + } +