Accepting request 379851 from KDE:Qt5

Update to 5.6.0

OBS-URL: https://build.opensuse.org/request/show/379851
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=10

gyp_conf.patch

@@ -1,35 +0,0 @@
---- qtwebengine-opensource-src-5.4.0-alpha.orig/src/core/config/desktop_linux.pri	2014-09-18 09:09:54.658799702 +0200
-+++ qtwebengine-opensource-src-5.4.0-alpha/src/core/config/desktop_linux.pri	2014-09-18 21:28:38.174679500 +0200
-@@ -15,6 +15,32 @@ GYP_CONFIG += \
-     use_pango=0 \
-     host_clang=0 \
-     clang=0 \
-+    use_pulseaudio=1 \
-+    linux_link_libpci=1 \
-+    linux_link_gsettings=1 \
-+    linux_link_libspeechd=1 \
-+    use_system_re2=1 \
-+    use_system_yasm=1 \
-+    use_system_opus=1 \
-+    use_system_zlib=1 \
-+    use_system_speex=1 \
-+    use_system_expat=1 \
-+    use_system_snappy=1 \
-+    use_system_libpng=1 \
-+    use_system_libxml=1 \
-+    use_system_libjpeg=1 \
-+    use_system_libwebp=1 \
-+    use_system_libxslt=1 \
-+    use_system_libsrtp=1 \
-+    use_system_jsoncpp=1 \
-+    use_system_libevent=1 \
-+    use_system_protobuf=1 \
-+    use_system_harfbuzz=1 \
-+    use_system_xdg_utils=1 \
-+    use_system_ffmpeg=0 \
-+    build_ffmpegsumo=1 \
-+    fastbuild=1 \
-+    remove_webcore_debug_symbols=1 \
- 
- contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
- 

libqt5-qtwebengine.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Mar 18 19:03:33 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.6.0
+  * For more details please see:
+    http://blog.qt.io/blog/2016/03/16/qt-5-6-released/
+    and https://wiki.qt.io/New_Features_in_Qt_5.6
+- Drop upstreamed and/or obsolete patches:
+  gyp-arm64.patch, gyp_conf.patch, sandbox-linux-arm64.patch and
+  strip.diff
+
 -------------------------------------------------------------------
 Thu Dec  3 07:24:43 UTC 2015 - mlin@suse.com
 

libqt5-qtwebengine.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libqt5-qtwebengine
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,26 +19,22 @@
 %define qt5_snapshot 0
 
 Name:           libqt5-qtwebengine
-Version:        5.5.1
+Version:        5.6.0
 Release:        0
 Summary:        Qt 5 WebEngine Library
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
 Group:          Development/Libraries/X11
 Url:            http://qt.digia.com
 %define base_name libqt5
-%define real_version 5.5.1
+%define real_version 5.6.0
-%define so_version 5.5.1
+%define so_version 5.6.0
 %define tar_version qtwebengine-opensource-src-%{real_version}
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
 # http://www.chromium.org/blink not ported to PowerPC
 ExcludeArch:    ppc ppc64 ppc64le s390 s390x
-Patch0:         strip.diff
-Patch1:         gyp_conf.patch
 # PATCH-FIX-OPENSUSE gcc50-fixes.diff -- Fix the detection of the Gcc 5.x compiler
 Patch2:         gcc50-fixes.diff
-Patch3:         gyp-arm64.patch
-Patch4:         sandbox-linux-arm64.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flac-devel
@@ -75,6 +71,7 @@ BuildRequires:  xz
 BuildRequires:  yasm
 BuildRequires:  perl(Switch)
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(dbus-1)
@@ -88,6 +85,7 @@ BuildRequires:  pkgconfig(gthread-2.0)
 %if 0%{?suse_version} >= 1315
 BuildRequires:  pkgconfig(jsoncpp)
 %endif
+BuildRequires:  binutils-gold
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libevent)
@@ -137,15 +135,9 @@ Qt is a set of libraries for developing applications.
 
 %prep
 %setup -q -n qtwebengine-opensource-src-%{real_version}
-%patch1 -p1
 %patch2 -p0
-%patch3 -p1
-%patch4 -p1
 sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
 
-#pushd src/3rdparty/chromium/third_party/
-#popd
-
 %package devel
 Summary:        Qt Development Kit
 Group:          Development/Libraries/X11
@@ -181,6 +173,7 @@ Examples for libqt5-qtwebengine module.
 %postun -p /sbin/ldconfig
 
 %build
+sed -i 's|contains(QT_CONFIG, system-jpeg): REQUIRED_PACKAGES += libjpeg||g' tools/qmake/mkspecs/features/configure.prf
 %if %qt5_snapshot
 #force the configure script to generate the forwarding headers (it checks whether .git directory exists)
 mkdir .git
@@ -220,16 +213,13 @@ pushd src/3rdparty/chromium/
 build/linux/unbundle/replace_gyp_files.py $myconf
 popd
 
-%if 0
-sed -i 's|<(harfbuzz_libraries)|harfbuzz-icu|g' src/3rdparty/chromium/third_party/harfbuzz-ng/harfbuzz.gyp
-sed -i 's|<(libraries)|libwebpdemux|g' src/3rdparty/chromium/third_party/libwebp/libwebp.gyp
-%endif
-
 %ifnarch x86_64
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS "
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
 %endif
-%qmake5 QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads"
+%qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \
+        QMAKE_CFLAGS+="$RPM_OPT_FLAGS" \
+        QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads"
 
 %make_jobs
 
@@ -243,14 +233,13 @@ sed -i '/^Libs.private/d' %{buildroot}%{_libdir}/pkgconfig/Qt*Web*.pc
 # kill .la files
 rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
 # webenginecore expects icudatl.dat at this location
-ln -sf %{_datadir}/icu/*/icudt*l.dat %{buildroot}%{_datadir}/qt5/icudtl.dat
+# ln -sf %{_datadir}/icu/*/icudt*l.dat %{buildroot}%{_datadir}/qt5/icudtl.dat
 
 %files
 %defattr(-,root,root,755)
 %doc LICENSE.*
 %{_libqt5_libdir}/libQt*Web*.so.*
 %{_datadir}/qt5/
-%{_libqt5_plugindir}/qtwebengine/
 %dir %{_libqt5_libexecdir}
 %{_libqt5_libexecdir}/QtWebEngineProcess
 %{_libqt5_archdatadir}/qml/QtWebEngine/

qtwebengine-opensource-src-5.5.1.tar.xz

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

qtwebengine-opensource-src-5.6.0.tar.xz

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

sandbox-linux-arm64.patch

@@ -1,117 +0,0 @@
-From c37fb8efaecfd3ca87725466de4abdeae86ad343 Mon Sep 17 00:00:00 2001
-From: parkch98 <parkch98@gmail.com>
-Date: Sat, 13 Dec 2014 09:47:10 -0800
-Subject: [PATCH] content: bpf: exclude the syscalls if arm64
-
-__NR_open, __NR_access are not defined on arm64. So, I just blocked
-the syscall to build properly on arm64.
-
-BUG=None
-
-Review URL: https://codereview.chromium.org/784733002
-
-Cr-Commit-Position: refs/heads/master@{#308281}
-
-Index: qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc
-===================================================================
---- qtwebengine-opensource-src-5.5.0.orig/src/3rdparty/chromium/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc
-+++ qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc
-@@ -46,7 +46,7 @@ inline bool IsChromeOS() {
- }
- 
- inline bool IsArchitectureArm() {
--#if defined(__arm__)
-+#if defined(__arm__) || defined(__aarch64__)
-   return true;
- #else
-   return false;
-@@ -113,8 +113,11 @@ class CrosArmGpuBrokerProcessPolicy : pu
- // openat allowed.
- ResultExpr CrosArmGpuBrokerProcessPolicy::EvaluateSyscall(int sysno) const {
-   switch (sysno) {
-+#if !defined(__aarch64__)
-     case __NR_access:
-     case __NR_open:
-+#endif  // !defined(__aarch64__)
-+    case __NR_faccessat:
-     case __NR_openat:
-       return Allow();
-     default:
-@@ -130,13 +133,13 @@ CrosArmGpuProcessPolicy::CrosArmGpuProce
- CrosArmGpuProcessPolicy::~CrosArmGpuProcessPolicy() {}
- 
- ResultExpr CrosArmGpuProcessPolicy::EvaluateSyscall(int sysno) const {
--#if defined(__arm__)
-+#if defined(__arm__) || defined(__aarch64__)
-   if (allow_shmat_ && sysno == __NR_shmat)
-     return Allow();
--#endif  // defined(__arm__)
-+#endif  // defined(__arm__) || defined(__aarch64__)
- 
-   switch (sysno) {
--#if defined(__arm__)
-+#if defined(__arm__) || defined(__aarch64__)
-     // ARM GPU sandbox is started earlier so we need to allow networking
-     // in the sandbox.
-     case __NR_connect:
-@@ -151,7 +154,7 @@ ResultExpr CrosArmGpuProcessPolicy::Eval
-       const Arg<int> domain(0);
-       return If(domain == AF_UNIX, Allow()).Else(Error(EPERM));
-     }
--#endif  // defined(__arm__)
-+#endif  // defined(__arm__) || defined(__aarch64__)
-     default:
-       // Default to the generic GPU policy.
-       return GpuProcessPolicy::EvaluateSyscall(sysno);
-Index: qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
-===================================================================
---- qtwebengine-opensource-src-5.5.0.orig/src/3rdparty/chromium/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
-+++ qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/content/common/sandbox_linux/bpf_gpu_policy_linux.cc
-@@ -92,6 +92,7 @@ intptr_t GpuSIGSYS_Handler(const struct
-   BrokerProcess* broker_process =
-       static_cast<BrokerProcess*>(aux_broker_process);
-   switch (args.nr) {
-+#if !defined(__aarch64__)
-     case __NR_access:
-       return broker_process->Access(reinterpret_cast<const char*>(args.args[0]),
-                                     static_cast<int>(args.args[1]));
-@@ -102,6 +103,15 @@ intptr_t GpuSIGSYS_Handler(const struct
- #endif
-       return broker_process->Open(reinterpret_cast<const char*>(args.args[0]),
-                                   static_cast<int>(args.args[1]));
-+#endif  // !defined(__aarch64__)
-+    case __NR_faccessat:
-+      if (static_cast<int>(args.args[0]) == AT_FDCWD) {
-+        return
-+            broker_process->Access(reinterpret_cast<const char*>(args.args[1]),
-+                                    static_cast<int>(args.args[2]));
-+      } else {
-+        return -EPERM;
-+      }
-     case __NR_openat:
-       // Allow using openat() as open().
-       if (static_cast<int>(args.args[0]) == AT_FDCWD) {
-@@ -136,8 +146,11 @@ class GpuBrokerProcessPolicy : public Gp
- // openat allowed.
- ResultExpr GpuBrokerProcessPolicy::EvaluateSyscall(int sysno) const {
-   switch (sysno) {
-+#if !defined(__aarch64__)
-     case __NR_access:
-     case __NR_open:
-+#endif  // !defined(__aarch64__)
-+    case __NR_faccessat:
-     case __NR_openat:
-       return Allow();
-     default:
-@@ -201,8 +214,11 @@ ResultExpr GpuProcessPolicy::EvaluateSys
-     // TODO(jln): restrict prctl.
-     case __NR_prctl:
-       return Allow();
-+#if !defined(__aarch64__)
-     case __NR_access:
-     case __NR_open:
-+#endif  // !defined(__aarch64__)
-+    case __NR_faccessat:
-     case __NR_openat:
-       DCHECK(broker_process_);
-       return Trap(GpuSIGSYS_Handler, broker_process_);

strip.diff

@@ -1,10 +0,0 @@
---- a/src/core/core_module.pro	2014-08-24 03:29:27.168702560 +0200
---- b/src/core/core_module.pro	2014-08-24 03:30:02.431261717 +0200
-@@ -22,5 +22,5 @@ CONFIG -= bsymbolic_functions
- contains(QT_CONFIG, egl): CONFIG += egl
- 
- linux {
--    CONFIG(release, debug|release) | contains(QT_CONFIG, separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
-+    CONFIG(release, debug|release) | contains(QT_CONFIG, separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && strip --strip-unneeded $(TARGET)"
- }
-\ No newline at end of file