Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2016-05-17 17:06:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2015-10-28 17:15:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2016-05-17 17:06:07.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Mar 18 19:03:35 UTC 2016 - [email protected] + +- 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 +- Swap link-qtcore.patch with 7dac8c2d5f743563df76c2347c6ad394b6779ffc.patch +- Added 05-fix-linker-errors.diff: Explicitly link pthread, before + it was pulled in via external deps + +------------------------------------------------------------------- Old: ---- link-qtcore.patch qtwebkit-opensource-src-5.5.1.tar.xz New: ---- 05-fix-linker-errors.diff 7dac8c2d5f743563df76c2347c6ad394b6779ffc.patch qtwebkit-opensource-src-5.6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.cQx7Rn/_old 2016-05-17 17:06:09.000000000 +0200 +++ /var/tmp/diff_new_pack.cQx7Rn/_new 2016-05-17 17:06:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtwebkit # -# 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 @@ -21,11 +21,11 @@ %define libname libQt5WebKitWidgets5 Name: libqt5-qtwebkit -Version: 5.5.1 +Version: 5.6.0 Release: 0 %define base_name libqt5 -%define real_version 5.5.1 -%define so_version 5.5.1 +%define real_version 5.6.0 +%define so_version 5.6.0 %define tar_version qtwebkit-opensource-src-%{real_version} # Workaround ppc64le build failures due to OOM issue, bnc#863533 %ifarch ppc64le @@ -42,10 +42,12 @@ # PATCH-FIX-OPENSUSE 03_hide_std_symbols.diff [email protected] -- Do not make the std:: symbols in webkit public (taken from Ubuntu) Patch2: 03_hide_std_symbols.diff Patch3: reduce-link-optimization.diff -# PATCH-FIX-UPSTREAM link-qtcore.patch -- link with QtCore to get versiontagging define -Patch4: link-qtcore.patch +Patch4: 7dac8c2d5f743563df76c2347c6ad394b6779ffc.patch +# PATCH-FIX-OPENSUSE 05-fix-linker-errors.diff [email protected] -- Fix linking errors +Patch5: 05-fix-linker-errors.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch130: no-Werror-rpath.diff + BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} BuildRequires: libQt5Widgets-private-headers-devel >= %{version} @@ -118,7 +120,8 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +%patch4 -Rp1 +%patch5 -p1 %patch130 -p1 %package -n %libname @@ -244,10 +247,10 @@ %postun -n libQt5WebKit5 -p /sbin/ldconfig %build -%if %qt5_snapshot +#if %qt5_snapshot #force the configure script to generate the forwarding headers (it checks whether .git directory exists) mkdir .git -%endif +#endif export QMAKEPATH=`pwd` RPM_OPT_FLAGS="$RPM_OPT_FLAGS " export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / /} ++++++ 05-fix-linker-errors.diff ++++++ diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri index 93ac2e5..095da48 100644 --- a/Source/WTF/WTF.pri +++ b/Source/WTF/WTF.pri @@ -7,6 +7,7 @@ # All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>). INCLUDEPATH += $$PWD +LIBS += -lpthread equals(QT_ARCH, arm)|equals(QT_ARCH, aarch64)|equals(QT_ARCH, i386)|equals(QT_ARCH, i686)|equals(QT_ARCH, x86_64)| equals(QT_ARCH, powerpc64)|equals(QT_ARCH, powerpc)|equals(QT_ARCH, s390)|equals(QT_ARCH, s390x) { message("WTF workaround for QtWebkit: do not build with -g, but with -g1") ++++++ 7dac8c2d5f743563df76c2347c6ad394b6779ffc.patch ++++++ >From 7dac8c2d5f743563df76c2347c6ad394b6779ffc Mon Sep 17 00:00:00 2001 From: Thiago Macieira <[email protected]> Date: Sun, 12 Jul 2015 10:25:45 -0700 Subject: Don't let qt_module.prf create a linker version script for QtWebKit We don't need it, since the API isn't changing and most likely won't be part of Qt 6 anyway. And most especially, this is hitting a bug in gold: /usr/bin/ld.gold: internal error in override_version, at ../../gold/resolve.cc:61 Reported-At: https://sourceware.org/bugzilla/show_bug.cgi?id=16504 Change-Id: Ib056b47dde3341ef9a52ffff13f043184aa93cec Reviewed-by: Allan Sandfeld Jensen <[email protected]> --- Source/api.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/api.pri b/Source/api.pri index e0a09e8..de04652 100644 --- a/Source/api.pri +++ b/Source/api.pri @@ -28,7 +28,7 @@ use?(3D_GRAPHICS): WEBKIT += angle use?(leveldb):!use?(system_leveldb) WEBKIT += leveldb MODULE = webkit -CONFIG += creating_module +CONFIG += creating_module no_linker_version_script # This is the canonical list of dependencies for the public API of # the QtWebKit library, and will end up in the library's prl file. -- cgit v0.11.0 ++++++ qtwebkit-opensource-src-5.5.1.tar.xz -> qtwebkit-opensource-src-5.6.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtwebkit/qtwebkit-opensource-src-5.5.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/qtwebkit-opensource-src-5.6.0.tar.xz differ: char 17, line 1
