Hello community, here is the log from the commit of package falkon for openSUSE:Factory checked in at 2020-06-07 21:37:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/falkon (Old) and /work/SRC/openSUSE:Factory/.falkon.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "falkon" Sun Jun 7 21:37:58 2020 rev:8 rq:812129 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/falkon/falkon.changes 2020-01-28 10:57:26.089131999 +0100 +++ /work/SRC/openSUSE:Factory/.falkon.new.3606/falkon.changes 2020-06-07 21:38:20.377454149 +0200 @@ -1,0 +2,5 @@ +Thu Jun 4 12:28:24 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch 0001-Fix-build-with-Qt-5.15.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ falkon.spec ++++++ --- /var/tmp/diff_new_pack.Vmbejm/_old 2020-06-07 21:38:21.521457775 +0200 +++ /var/tmp/diff_new_pack.Vmbejm/_new 2020-06-07 21:38:21.525457788 +0200 @@ -1,8 +1,8 @@ # # spec file for package falkon # +# Copyright (c) 2020 SUSE LLC # Copyright © 2015 Mariusz Fik <[email protected]> -# Copyright © 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright © 2019 Markus S. <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -14,16 +14,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: falkon Version: 3.1.0 Release: 0 Summary: Modern web browser License: GPL-3.0-or-later Group: Productivity/Networking/Web/Browsers -Url: https://www.falkon.org/ +URL: https://www.falkon.org/ Source: %{name}-%{version}.tar.xz # Used to get a timestamp to override __DATE__ and __TIME__ with Source1: %{name}.changes @@ -34,8 +35,19 @@ Patch0: Add-missing-include-in-last-qt5.14.patch # PATCH-FIX-UPSTREAM Patch1: Fix-crash-when-KWallet-is-not-available.patch -BuildRequires: cmake(KF5Crash) >= 5.54.0 +# PATCH-FIX-UPSTREAM +Patch2: 0001-Fix-build-with-Qt-5.15.patch +BuildRequires: extra-cmake-modules +BuildRequires: fdupes +BuildRequires: hicolor-icon-theme +BuildRequires: ki18n-devel +BuildRequires: libQt5Gui-private-headers-devel +BuildRequires: libqt5-qttools-devel +BuildRequires: libressl-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files BuildRequires: cmake(KF5CoreAddons) >= 5.54.0 +BuildRequires: cmake(KF5Crash) >= 5.54.0 BuildRequires: cmake(KF5KIO) >= 5.54.0 BuildRequires: cmake(KF5Purpose) >= 5.54.0 BuildRequires: cmake(KF5Wallet) >= 5.54.0 @@ -57,23 +69,14 @@ BuildRequires: cmake(Qt5WebEngineWidgets) >= 5.9.0 BuildRequires: cmake(Qt5Widgets) >= 5.9.0 BuildRequires: cmake(Qt5X11Extras) >= 5.9.0 -BuildRequires: extra-cmake-modules -BuildRequires: fdupes -BuildRequires: hicolor-icon-theme -BuildRequires: ki18n-devel -BuildRequires: libQt5Gui-private-headers-devel -BuildRequires: libqt5-qttools-devel -BuildRequires: libressl-devel -BuildRequires: pkgconfig BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(xcb-atom) -BuildRequires: update-desktop-files Recommends: %{name}-kde Recommends: %{name}-lang # it doesn't start without it (boo#1067547) Requires: libQt5Sql5-sqlite -Provides: web_browser Provides: qupzilla = %{version} +Provides: web_browser Obsoletes: qupzilla < %{version} %lang_package @@ -114,8 +117,8 @@ such as storing passwords in KWallet. %prep -%setup -q -n %{name}-%{version} -%autopatch -p1 +%autosetup -p1 -n %{name}-%{version} + # Remove __DATE__ and __TIME__ FAKE_DATE="\"$(LC_ALL=C date -u -r %{SOURCE1} '+%%b %%e %%Y')\"" FAKE_TIME="\"$(LC_ALL=C date -u -r %{SOURCE1} '+%%H:%%M')\"" ++++++ 0001-Fix-build-with-Qt-5.15.patch ++++++ >From 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a Mon Sep 17 00:00:00 2001 From: Heiko Becker <[email protected]> Date: Sun, 29 Mar 2020 12:53:00 +0200 Subject: [PATCH] Fix build with Qt 5.15 QPainterPath is no longer included via qtransform.h (since 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). --- src/lib/tools/qztools.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp index 499b2250..04f19b71 100644 --- a/src/lib/tools/qztools.cpp +++ b/src/lib/tools/qztools.cpp @@ -25,6 +25,7 @@ #include <QByteArray> #include <QPixmap> #include <QPainter> +#include <QPainterPath> #include <QBuffer> #include <QFile> #include <QDir> -- 2.26.2
