From 871ac3de8a9ec1a1d160ae38198760d7c30096a3cb9770e3d8bf385a967dcf46 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 27 Sep 2015 06:37:48 +0000 Subject: [PATCH] Accepting request 323373 from KDE:Qt5 Update to 5.5.0 OBS-URL: https://build.opensuse.org/request/show/323373 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=6 --- gyp_conf.patch | 11 +++++++---- libqt5-qtwebengine.changes | 15 +++++++++++++++ libqt5-qtwebengine.spec | 25 ++++++++++++++++--------- qtwebengine-opensource-src-5.4.2.tar.xz | 3 --- qtwebengine-opensource-src-5.5.0.tar.xz | 3 +++ 5 files changed, 41 insertions(+), 16 deletions(-) delete mode 100644 qtwebengine-opensource-src-5.4.2.tar.xz create mode 100644 qtwebengine-opensource-src-5.5.0.tar.xz diff --git a/gyp_conf.patch b/gyp_conf.patch index 79216f5..3e8946c 100644 --- a/gyp_conf.patch +++ b/gyp_conf.patch @@ -1,9 +1,9 @@ --- 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 -@@ -13,5 +13,29 @@ GYP_CONFIG += \ - use_gnome_keyring=0 \ - use_kerberos=0 \ +@@ -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 \ @@ -28,5 +28,8 @@ + 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 - !contains(QT_CONFIG, pulseaudio): GYP_CONFIG += use_pulseaudio=0 diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 95a88bc..90f846c 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Aug 16 08:32:10 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.5.0 + * For more details please see: + http://blog.qt.io/blog/2015/07/01/qt-5-5-released/ + and https://wiki.qt.io/New_Features_in_Qt_5.5 +- Enable jsoncpp support on Leap + +------------------------------------------------------------------- +Fri Aug 14 13:33:36 UTC 2015 - normand@linux.vnet.ibm.com + +- ExcludeArch: ppc ppc64 ppc64le + http://www.chromium.org/blink not ported to PowerPC + ------------------------------------------------------------------- Mon Jun 29 15:23:43 UTC 2015 - schwab@suse.de diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 17b9a85..e0dfcde 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -19,18 +19,20 @@ %define qt5_snapshot 0 Name: libqt5-qtwebengine -Version: 5.4.2 +Version: 5.5.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.4.2 -%define so_version 5.4.2 +%define real_version 5.5.0 +%define so_version 5.5.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 Patch0: strip.diff Patch1: gyp_conf.patch # PATCH-FIX-OPENSUSE gcc50-fixes.diff -- Fix the detection of the Gcc 5.x compiler @@ -51,6 +53,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} +BuildRequires: libqt5-qtwebchannel-private-headers-devel >= %{version} BuildRequires: libqt5-qtxmlpatterns-private-headers-devel >= %{version} BuildRequires: pam-devel BuildRequires: pciutils-devel @@ -81,7 +84,7 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gthread-2.0) -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1315 BuildRequires: pkgconfig(jsoncpp) %endif BuildRequires: pkgconfig(libcrypto) @@ -182,8 +185,7 @@ mkdir .git %endif myconf+=" -Duse_system_expat=1 -Duse_system_flac=1 - -Duse_system_icu=1 -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1315 -Duse_system_jsoncpp=1 %endif -Duse_system_libevent=1 @@ -192,7 +194,6 @@ myconf+=" -Duse_system_expat=1 -Duse_system_libusb=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 - -Duse_system_openssl=1 -Duse_system_opus=1 -Duse_system_snappy=1 -Duse_system_speex=1" @@ -204,8 +205,10 @@ myconf+=" -Duse_system_expat=1 # /home/abuild/rpmbuild/BUILD/qtwebengine-opensource-src-5.4.1/src/core/Release/../../../src/3rdparty/chromium/third_party/WebKit/Source/modules/webdatabase/sqlite/SQLiteFileSystemPosix.cpp:79: undefined reference to `chromium_sqlite3_destroy_reusable_file_handle' %if 0 myconf+=" -Duse_system_harfbuzz=1 + -Duse_system_icu=1 -Duse_system_libwebp=1 -Duse_system_libvpx=1 + -Duse_system_openssl=1 -Duse_system_re2=1 -Duse_system_zlib=1 -Duse_system_sqlite=1" @@ -220,8 +223,12 @@ sed -i 's|<(harfbuzz_libraries)|harfbuzz-icu|g' src/3rdparty/chromium/third_part sed -i 's|<(libraries)|libwebpdemux|g' src/3rdparty/chromium/third_party/libwebp/libwebp.gyp %endif -export LDFLAGS="$LDFLAGS -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--as-needed" -%qmake5 +%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" + %make_jobs %install diff --git a/qtwebengine-opensource-src-5.4.2.tar.xz b/qtwebengine-opensource-src-5.4.2.tar.xz deleted file mode 100644 index 8aaa112..0000000 --- a/qtwebengine-opensource-src-5.4.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:084601956755f82c236b52fbba458d6552460f404d239b71b453e53bc6a19e19 -size 113993924 diff --git a/qtwebengine-opensource-src-5.5.0.tar.xz b/qtwebengine-opensource-src-5.5.0.tar.xz new file mode 100644 index 0000000..f23bb45 --- /dev/null +++ b/qtwebengine-opensource-src-5.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d703e60838744283f9a3419bdd8708f2e01d3ed81f18aaadd713342033cbd65a +size 122814288