Hello community,
here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory
checked in at 2019-07-13 13:47:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit"
Sat Jul 13 13:47:12 2019 rev:52 rq:713438 version:5.212~alpha3
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes
2019-05-17 23:40:38.521995905 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new.4615/libqt5-qtwebkit.changes
2019-07-13 14:00:19.258899403 +0200
@@ -1,0 +2,27 @@
+Thu Jul 4 13:46:33 UTC 2019 - [email protected]
+
+- Don't modify the pkgconfig files, they have been fixed upstream
+ and the sed commands actually break them now
+
+-------------------------------------------------------------------
+Mon Jul 1 19:39:50 UTC 2019 - Markus S <[email protected]>
+
+- Fix for pkgconfig error
+- Drop Leap 42.x support
+
+-------------------------------------------------------------------
+Sat Jun 29 23:58:02 UTC 2019 - Markus S <[email protected]>
+
+- New upstream release
+- Drop patches
+ * fix-build-with-cmake-3.10.diff
+ * fix-gles-detection.patch
+ * fix-nullptr-crash-in-QWebPage-selectedHtml-when-selectedRange.patch
+ * fix-nullTerminatedWCharToString-loses-last-character.patch
+ * fix_armv6.patch
+ * qt5webkit-symver.patch
+ * run-adjustViewSize-after-relayout.patch
+ * Trigger-layout-after-resizing-the-FrameView.patch
+ * webkit-fix-WTF-StringImpl-copyChars-segfaults-with-gcc7.patch
+
+-------------------------------------------------------------------
Old:
----
Trigger-layout-after-resizing-the-FrameView.patch
fix-build-with-cmake-3.10.diff
fix-gles-detection.patch
fix-nullTerminatedWCharToString-loses-last-character.patch
fix-nullptr-crash-in-QWebPage-selectedHtml-when-selectedRange.patch
fix_armv6.patch
qt5webkit-symver.patch
qtwebkit-5.212.0-alpha2.tar.xz
run-adjustViewSize-after-relayout.patch
webkit-fix-WTF-StringImpl-copyChars-segfaults-with-gcc7.patch
New:
----
qtwebkit-5.212.0-alpha3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebkit.spec ++++++
--- /var/tmp/diff_new_pack.WLgsl6/_old 2019-07-13 14:00:21.730898647 +0200
+++ /var/tmp/diff_new_pack.WLgsl6/_new 2019-07-13 14:00:21.766898636 +0200
@@ -16,6 +16,8 @@
#
%bcond_without avsupport
+%define _cxx g++
+%define _cc gcc
%define qt5_snapshot 0
@@ -26,62 +28,25 @@
%define so_version 5.212
%define full_version 5.212.0
%define required_qt5 5.2
-%define prerel_version alpha2
+%define prerel_version alpha3
%define tar_version %{base_name}-%{full_version}-%{prerel_version}
%define make_jobs /usr/bin/make -j4 VERBOSE=1
Name: libqt5-qtwebkit
Version: 5.212~%{prerel_version}
Release: 0
Summary: Qt 5 WebKit Library
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: Development/Libraries/X11
-Url: https://www.qt.io
-Source:
https://github.com/annulen/webkit/releases/download/%{tar_version}/%{tar_version}.tar.xz
+Url: https://qtwebkit.github.io/
+Source:
https://github.com/qtwebkit/qtwebkit/releases/download/%{tar_version}/%{tar_version}.tar.xz
Source1: baselibs.conf
Source99: libqt5-qtwebkit-rpmlintrc
-# openSUSE specific patches
+# openSUSE-specific patches
# PATCH-FIX-OPENSUSE Enable X11 target build always as we didn't ship Xcb
Plugin cmake file - [email protected]
Patch0: enable_x11_target_always.patch
# PATCH-FIX-OPENSUSE
Patch1: tell-the-truth-about-private-api.patch
-# PATCH-FIX-OPENSUSE
-Patch2: qt5webkit-symver.patch
-# Upstream patches
-# PATCH-FIX-UPSTREAM Fix segfaults when built with gcc7 - [email protected]
-Patch100: webkit-fix-WTF-StringImpl-copyChars-segfaults-with-gcc7.patch
-# PATCH-FIX-UPSTREAM Fix build when Qt uses OpenGL ES 2
-Patch101: fix-gles-detection.patch
-# PATCH-FIX-UPSTREAM
https://github.com/annulen/webkit/commit/f51554bf104ab0491370f66631fe46143a23d5c2
-Patch102: fix-build-with-cmake-3.10.diff
-Patch103: fix-nullTerminatedWCharToString-loses-last-character.patch
-Patch104:
fix-nullptr-crash-in-QWebPage-selectedHtml-when-selectedRange.patch
-# PATCH-FIX-UPSTREAM https://github.com/annulen/webkit/issues/511
-Patch105: Trigger-layout-after-resizing-the-FrameView.patch
-Patch106: run-adjustViewSize-after-relayout.patch
-# PATCH-FIX-UPSTREAM https://bugs.webkit.org/show_bug.cgi?id=141288
-Patch107: fix_armv6.patch
-
-# openSUSE Leap 42.x defaults to GCC 4
-%if 0%{?suse_version} == 1315
-%if 0%{?sle_version} <= 120200
-%define _cxx g++-6
-%define _cc gcc-6
-BuildRequires: gcc6
-BuildRequires: gcc6-c++
-%else
-%define _cxx g++-7
-%define _cc gcc-7
-BuildRequires: gcc7
-BuildRequires: gcc7-c++
-%endif
-#!BuildIgnore: libgcc_s1
-%else
-%define _cxx g++
-%define _cc gcc
-BuildRequires: gcc
-BuildRequires: gcc-c++
-%endif
%if %{with avsupport}
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-app-1.0)
@@ -110,6 +75,8 @@
BuildRequires: pkgconfig(Qt5Widgets) >= %{required_qt5}
BuildRequires: bison
BuildRequires: flex
+BuildRequires: gcc
+BuildRequires: gcc-c++
BuildRequires: gperf
BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
@@ -117,6 +84,7 @@
BuildRequires: python-xml
BuildRequires: ruby
BuildRequires: hyphen-devel
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0)
@@ -130,7 +98,7 @@
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(zlib)
%if %qt5_snapshot
-#to create the forwarding headers
+# to create the forwarding headers
BuildRequires: perl
%endif
BuildRequires: procps
@@ -148,15 +116,6 @@
%setup -q -n %{tar_version}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
%package -n %libname
Summary: Qt 5 WebKit Widget library
@@ -180,7 +139,7 @@
Summary: QML imports for the Qt5 WebKit library
Group: Development/Libraries/X11
Supplements: packageand(libQt5WebKit5:libQtQuick5)
-# imports splited with 5.4.1
+# imports split with 5.4.1
Conflicts: libQt5WebKit5 < 5.4.1
Requires: libQt5WebKit5 = %version
@@ -272,7 +231,7 @@
%build
%define _lto_cflags %{nil}
%if %qt5_snapshot
-#force the configure script to generate the forwarding headers (it checks
whether .git directory exists)
+# force the configure script to generate the forwarding headers (it checks
whether .git directory exists)
mkdir .git
%endif
%global optflags %(echo %{optflags} -fpermissive -Wl,--no-keep-memory
-Wl,--reduce-memory-overheads | sed 's/-g /-g1 /')
@@ -296,13 +255,6 @@
%cmake_install
find %{buildroot}/%{_libqt5_libdir} -type f -name '*la' -print -exec perl -pi
-e 's,-L%{_builddir}/\S+,,g' {} +
-# fix pkgconfig file
-sed -i '/Name/a Description: Qt5 WebKit module'
%{buildroot}%{_libqt5_libdir}/pkgconfig/Qt5WebKit.pc
-sed -i "s,Cflags: -I%{_libqt5_includedir}/Qt5WebKit,Cflags:
-I%{_libqt5_includedir}/QtWebKit,g"
%{buildroot}%{_libqt5_libdir}/pkgconfig/Qt5WebKit.pc
-
-sed -i '/Name/a Description: Qt5 WebKitWidgets module'
%{buildroot}%{_libqt5_libdir}/pkgconfig/Qt5WebKitWidgets.pc
-sed -i "s,Cflags: -I%{_libqt5_includedir}/Qt5WebKitWidgets,Cflags:
-I%{_libqt5_includedir}/QtWebKitWidgets,g"
%{buildroot}%{_libqt5_libdir}/pkgconfig/Qt5WebKitWidgets.pc
-
# kill .la files
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
@@ -317,9 +269,9 @@
%defattr(-,root,root,755)
%doc LICENSE.*
%{_libqt5_libdir}/libQt5WebKit.so.*
-%{_libqt5_libexecdir}/QtWebDatabaseProcess
-%{_libqt5_libexecdir}/QtWebPluginProcess
%{_libqt5_libexecdir}/QtWebNetworkProcess
+%{_libqt5_libexecdir}/QtWebPluginProcess
+%{_libqt5_libexecdir}/QtWebStorageProcess
%files -n libQt5WebKit5-imports
%defattr(-,root,root,755)
@@ -345,6 +297,7 @@
%{_libqt5_libdir}/libQt5WebKit.so
%{_libqt5_libdir}/pkgconfig/Qt5WebKit.pc
%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_webkit.pri
+%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_webkit_private.pri
%files -n libQt5WebKitWidgets-devel
%defattr(-,root,root,755)
@@ -355,5 +308,6 @@
%{_libqt5_libdir}/libQt5WebKitWidgets.so
%{_libqt5_libdir}/pkgconfig/Qt5WebKitWidgets.pc
%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_webkitwidgets.pri
+%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_webkitwidgets_private.pri
%changelog
++++++ enable_x11_target_always.patch ++++++
--- /var/tmp/diff_new_pack.WLgsl6/_old 2019-07-13 14:00:22.286898477 +0200
+++ /var/tmp/diff_new_pack.WLgsl6/_new 2019-07-13 14:00:22.314898469 +0200
@@ -1,16 +1,18 @@
From: Max Lin <[email protected]>
Subject: Enable X11 target build always
-openSUSE didn't ship Xcb Plugin's cmake file, it need to make sure
-X11 target build is on always.
+openSUSE didn't ship Xcb Plugin's cmake file. It needs to make sure X11 target
build is on always.
+---
+ Source/cmake/OptionsQt.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: qtwebkit-5.212.0-alpha2/Source/cmake/OptionsQt.cmake
-===================================================================
---- qtwebkit-5.212.0-alpha2.orig/Source/cmake/OptionsQt.cmake
-+++ qtwebkit-5.212.0-alpha2/Source/cmake/OptionsQt.cmake
-@@ -154,7 +154,7 @@ endif ()
- # FIXME: Move Qt handling here
- find_package(Qt5Gui QUIET)
+diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
+index ac1065d929c2..6791e093096d 100644
+--- a/Source/cmake/OptionsQt.cmake
++++ b/Source/cmake/OptionsQt.cmake
+@@ -223,7 +223,7 @@ else ()
+ set(ENABLE_WEBKIT2_DEFAULT ON)
+ endif ()
-if (UNIX AND TARGET Qt5::QXcbIntegrationPlugin AND NOT APPLE)
+if (UNIX AND NOT APPLE)
++++++ qtwebkit-5.212.0-alpha2.tar.xz -> qtwebkit-5.212.0-alpha3.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtwebkit/qtwebkit-5.212.0-alpha2.tar.xz
/work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new.4615/qtwebkit-5.212.0-alpha3.tar.xz
differ: char 25, line 1
