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

Accepting request 404227 from KDE:Qt5

Browse Source 
- Add use-fno-delete-null-pointer-checks-with-gcc-6.diff: fix
  crashes with GCC 6 (https://codereview.qt-project.org/#/c/161965/)

- Update to 5.6.1
  * For more details please see:
    http://blog.qt.io/blog/2016/06/08/qt-5-6-1-released/
- Drop obsolete gcc50-fixes.diff

OBS-URL: https://build.opensuse.org/request/show/404227
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2016-06-29 13:10:40 +00:00 committed by Git OBS Bridge
parent efa90d6761
commit eef93b3fbf
7 changed files with 60 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_constraints
View File

@ -1,7 +1,7 @@
<constraints> <constraints>
<hardware> <hardware>
<memory> <memory>
<size unit="G">4</size> <size unit="G">6</size>
</memory> </memory>
<processors>4</processors> <processors>4</processors>
</hardware> </hardware>

26
gcc50-fixes.diff
View File

@ -1,26 +0,0 @@
Index: src/3rdparty/chromium/build/compiler_version.py
===================================================================
--- src/3rdparty/chromium/build/compiler_version.py.orig
+++ src/3rdparty/chromium/build/compiler_version.py
@@ -56,7 +56,7 @@ def GetVersion(compiler, tool):
if tool == "compiler":
compiler = compiler + " -dumpversion"
# 4.6
- version_re = re.compile(r"(\d+)\.(\d+)")
+ version_re = re.compile(r"(\d+)(?:\.(\d+))?")
elif tool == "assembler":
compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
# Unmodified: GNU assembler (GNU Binutils) 2.24
@@ -88,7 +88,11 @@ def GetVersion(compiler, tool):
raise subprocess.CalledProcessError(pipe.returncode, compiler)
parsed_output = version_re.match(tool_output)
- result = parsed_output.group(1) + parsed_output.group(2)
+ if parsed_output.group(2) == None:
+ result = parsed_output.group(1) + "1"
+ else:
+ result = parsed_output.group(1) + parsed_output.group(2)
+
compiler_version_cache[cache_key] = result
return result
except Exception, e:

14
libqt5-qtwebengine.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Jun 23 08:10:46 UTC 2016 - lbeltrame@kde.org
- Add use-fno-delete-null-pointer-checks-with-gcc-6.diff: fix
crashes with GCC 6 (https://codereview.qt-project.org/#/c/161965/)
-------------------------------------------------------------------
Wed Jun 8 14:15:23 UTC 2016 - hrvoje.senjan@gmail.com
- Update to 5.6.1
* For more details please see:
http://blog.qt.io/blog/2016/06/08/qt-5-6-1-released/
- Drop obsolete gcc50-fixes.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 18 19:03:33 UTC 2016 - hrvoje.senjan@gmail.com Fri Mar 18 19:03:33 UTC 2016 - hrvoje.senjan@gmail.com

16
libqt5-qtwebengine.spec
View File

@ -19,22 +19,22 @@
%define qt5_snapshot 0 %define qt5_snapshot 0
Name: libqt5-qtwebengine Name: libqt5-qtwebengine
Version: 5.6.0 Version: 5.6.1
Release: 0 Release: 0
Summary: Qt 5 WebEngine Library Summary: Qt 5 WebEngine Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Url: http://qt.digia.com Url: http://qt.digia.com
%define base_name libqt5 %define base_name libqt5
%define real_version 5.6.0 %define real_version 5.6.1
%define so_version 5.6.0 %define so_version 5.6.1
%define tar_version qtwebengine-opensource-src-%{real_version} %define tar_version qtwebengine-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz Source: %{tar_version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-UPSTREAM: use-fno-delete-null-pointer-checks-with-gcc-6.diff - Fix crashes when using GCC6
Patch0: use-fno-delete-null-pointer-checks-with-gcc-6.diff
# http://www.chromium.org/blink not ported to PowerPC # http://www.chromium.org/blink not ported to PowerPC
ExcludeArch: ppc ppc64 ppc64le s390 s390x ExcludeArch: ppc ppc64 ppc64le s390 s390x
# PATCH-FIX-OPENSUSE gcc50-fixes.diff -- Fix the detection of the Gcc 5.x compiler
Patch2: gcc50-fixes.diff
BuildRequires: bison BuildRequires: bison
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flac-devel BuildRequires: flac-devel
@ -50,6 +50,7 @@ BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: libqt5-qtbase-private-headers-devel >= %{version}
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version}
BuildRequires: libqt5-qttools-private-headers-devel >= %{version}
BuildRequires: libqt5-qtwebchannel-private-headers-devel >= %{version} BuildRequires: libqt5-qtwebchannel-private-headers-devel >= %{version}
BuildRequires: libqt5-qtxmlpatterns-private-headers-devel >= %{version} BuildRequires: libqt5-qtxmlpatterns-private-headers-devel >= %{version}
BuildRequires: pam-devel BuildRequires: pam-devel
@ -135,8 +136,8 @@ Qt is a set of libraries for developing applications.
%prep %prep
%setup -q -n qtwebengine-opensource-src-%{real_version} %setup -q -n qtwebengine-opensource-src-%{real_version}
%patch2 -p0
sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
%patch0 -p1
%package devel %package devel
Summary: Qt Development Kit Summary: Qt Development Kit
@ -243,6 +244,7 @@ rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
%dir %{_libqt5_libexecdir} %dir %{_libqt5_libexecdir}
%{_libqt5_libexecdir}/QtWebEngineProcess %{_libqt5_libexecdir}/QtWebEngineProcess
%{_libqt5_archdatadir}/qml/QtWebEngine/ %{_libqt5_archdatadir}/qml/QtWebEngine/
%{_libqt5_plugindir}/designer/
%files private-headers-devel %files private-headers-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
@ -254,7 +256,7 @@ rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
%doc LICENSE.* %doc LICENSE.*
%exclude %{_libqt5_includedir}/*/%{so_version} %exclude %{_libqt5_includedir}/*/%{so_version}
%{_libqt5_includedir}/*/ %{_libqt5_includedir}/*/
%{_libqt5_libdir}/cmake/Qt5Web*/ %{_libqt5_libdir}/cmake/Qt5*/
%{_libqt5_libdir}/libQt*Web*.so %{_libqt5_libdir}/libQt*Web*.so
%{_libqt5_libdir}/libQt*Web*.prl %{_libqt5_libdir}/libQt*Web*.prl
%{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_*.pri %{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_*.pri

3
qtwebengine-opensource-src-5.6.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8aa2b5ad6c9f98a781aa99303eab3a40bbe74d26a543eea6b4145f5f47c76a03
size 143433576

3
qtwebengine-opensource-src-5.6.1.tar.xz Normal file
View File

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

33
use-fno-delete-null-pointer-checks-with-gcc-6.diff Normal file
View File

@ -0,0 +1,33 @@
X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebengine-chromium.git;a=blobdiff_plain;f=chromium%2Fbuild%2Fcommon.gypi;h=fccfc7b309af18d41eecd98640aacd9424903f2b;hp=f02d100e30a559629b4857d28a4d3950d2130da5;hb=9fcd3f167e3f3fb5b4cfb62287a892628a8f7f26;hpb=29a5bf2486edb5804a18097684ae1660b7aa949e
diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi
index f02d100..fccfc7b 100644
--- a/src/3rdparty/chromium/build/common.gypi
+++ b/src/3rdparty/chromium/build/common.gypi
@@ -4716,6 +4716,26 @@
}],
],
}],
+ ['gcc_version>=60 and clang==0', {
+ 'target_conditions': [
+ ['_toolset=="target"', {
+ 'cflags_cc': [
+ # V8 needs this, see https://bugs.chromium.org/p/v8/issues/detail?id=3782
+ '-fno-delete-null-pointer-checks',
+ ],
+ }],
+ ],
+ }],
+ ['host_gcc_version>=60 and clang==0 and host_clang==0', {
+ 'target_conditions': [
+ ['_toolset=="host"', {
+ 'cflags_cc': [
+ # V8 needs this, see https://bugs.chromium.org/p/v8/issues/detail?id=3782
+ '-fno-delete-null-pointer-checks',
+ ],
+ }],
+ ],
+ }],
],
},
}],