commit libqt5-qtwebkit for openSUSE:Factory
Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2020-05-29 21:13:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwebkit" Fri May 29 21:13:46 2020 rev:55 rq:789353 version:5.212~alpha4 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2019-11-17 19:21:50.730899361 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new.3606/libqt5-qtwebkit.changes 2020-05-29 21:13:55.482433078 +0200 @@ -1,0 +2,20 @@ +Sat Mar 14 22:51:36 UTC 2020 - Markus S <kamikazow@opensuse.org> + +- Use Ninja with CMake to improve build times by circa 300% +- Fix a few typos in libqt5-qtwebkit.spec + +------------------------------------------------------------------- +Wed Mar 11 22:55:32 UTC 2020 - Markus S <kamikazow@opensuse.org> + +- New upstream release +- Drop patches + * icu-build-fix.patch + * qt5.15-workaround.patch + +------------------------------------------------------------------- +Wed Mar 4 13:55:41 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de> + +- Add patch to fix build against Qt 5.15: + * qt5.15-workaround.patch + +------------------------------------------------------------------- Old: ---- icu-build-fix.patch qtwebkit-5.212.0-alpha3.tar.xz New: ---- qtwebkit-5.212.0-alpha4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.VETl2h/_old 2020-05-29 21:13:56.842437176 +0200 +++ /var/tmp/diff_new_pack.VETl2h/_new 2020-05-29 21:13:56.846437189 +0200 @@ -16,6 +16,7 @@ # %bcond_without avsupport +%define __builder ninja %define _cxx g++ %define _cc gcc @@ -28,9 +29,8 @@ %define so_version 5.212 %define full_version 5.212.0 %define required_qt5 5.2 -%define prerel_version alpha3 +%define prerel_version alpha4 %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 @@ -48,9 +48,6 @@ Patch1: tell-the-truth-about-private-api.patch # PATCH-FIX-UPSTREAM https://bugs.webkit.org/show_bug.cgi?id=141288 Patch2: webkit-bwo141288.patch -# PATCH-FIX-UPSTREAM https://bugs.webkit.org/show_bug.cgi?id=202600 -Patch3: icu-build-fix.patch - %if %{with avsupport} BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) @@ -85,6 +82,8 @@ BuildRequires: libicu-devel BuildRequires: libjpeg-devel BuildRequires: libxslt-devel +BuildRequires: memory-constraints +BuildRequires: ninja BuildRequires: python-xml BuildRequires: ruby BuildRequires: hyphen-devel @@ -111,17 +110,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -The Qt WebKit module provides the WebView API, which allows QML +The QtWebKit module provides the WebView API which allows QML applications to render regions of dynamic web content. A WebView component may share the screen with other QML components or encompass the full screen as specified within the QML application. %prep -%setup -q -n %{tar_version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n %{tar_version} %package -n %libname Summary: Qt 5 WebKit Widget library @@ -129,7 +124,7 @@ Requires: libQt5WebKit5 = %version %description -n %libname -The Qt WebKit module provides the WebView API, which allows QML +The QtWebKit module provides the WebView API which allows QML applications to render regions of dynamic web content. A WebView component may share the screen with other QML components or encompass the full screen as specified within the QML application. @@ -139,7 +134,7 @@ Group: Development/Libraries/X11 %description -n libQt5WebKit5 -You need this package if you want to compile programs with qtwebkit. +You need this package if you want to compile programs with QtWebKit. %package -n libQt5WebKit5-imports Summary: QML imports for the Qt5 WebKit library @@ -150,7 +145,7 @@ Requires: libQt5WebKit5 = %version %description -n libQt5WebKit5-imports -You need this package if you want to compile programs with qtwebkit. +You need this package if you want to compile programs with QtWebKit. %package -n libQt5WebKitWidgets-devel Summary: Development files for the Qt5 WebKit Widgets library @@ -161,7 +156,7 @@ Requires: libqt5-qtsensors-devel %description -n libQt5WebKitWidgets-devel -You need this package if you want to compile programs with qtwebkit. +You need this package if you want to compile programs with QtWebKit. %package -n libQt5WebKit5-devel Summary: Development files for the Qt5 WebKit library @@ -175,7 +170,7 @@ Requires: pkgconfig(Qt5Sensors) %description -n libQt5WebKit5-devel -You need this package if you want to compile programs with qtwebkit. +You need this package if you want to compile programs with QtWebKit. %package -n libQt5WebKitWidgets-private-headers-devel Summary: Non-ABI stable experimental API for the Qt5 WebKit Widgets library @@ -221,7 +216,7 @@ Requires: libQt5WebKitWidgets-private-headers-devel = %{version} %description private-headers-devel -You need this package if you want to compile programs with qtwebkit. +You need this package if you want to compile programs with QtWebKit. This package pulls in private headers for both libQt5WebKit and libQt5WebKitWidgets libraries. @@ -236,11 +231,16 @@ %build %define _lto_cflags %{nil} + +# Limit to 2GB mem per thread to avoid failure +%limit_build -m 2000 + %if %qt5_snapshot # 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 /') + %cmake -DPORT=Qt \ -DCMAKE_C_COMPILER=%{_cc} \ -DCMAKE_CXX_COMPILER=%{_cxx} \ @@ -255,10 +255,11 @@ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" -%make_jobs +%cmake_build %install %cmake_install + find %{buildroot}/%{_libqt5_libdir} -type f -name '*la' -print -exec perl -pi -e 's,-L%{_builddir}/\S+,,g' {} + # kill .la files ++++++ qtwebkit-5.212.0-alpha3.tar.xz -> qtwebkit-5.212.0-alpha4.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtwebkit/qtwebkit-5.212.0-alpha3.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new.3606/qtwebkit-5.212.0-alpha4.tar.xz differ: char 25, line 1
participants (1)
-
root