Hello community, here is the log from the commit of package trojita for openSUSE:Factory checked in at 2020-06-05 20:19:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trojita (Old) and /work/SRC/openSUSE:Factory/.trojita.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trojita" Fri Jun 5 20:19:28 2020 rev:12 rq:811543 version:0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/trojita/trojita.changes 2020-03-29 14:28:05.470171002 +0200 +++ /work/SRC/openSUSE:Factory/.trojita.new.3606/trojita.changes 2020-06-05 20:24:51.092728629 +0200 @@ -1,0 +2,6 @@ +Thu Jun 4 15:05:22 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch: + * 0001-Fix-build-with-Qt-5.15.0.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.15.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trojita.spec ++++++ --- /var/tmp/diff_new_pack.s74dcE/_old 2020-06-05 20:24:52.448731049 +0200 +++ /var/tmp/diff_new_pack.s74dcE/_new 2020-06-05 20:24:52.452731057 +0200 @@ -39,6 +39,8 @@ Patch1: tests-Fix-build-with-Qt-5.13.patch # PATCH-FIX-UPSTREAM Patch2: 0001-Support-both-vanilla-gpgme-and-KDE-Frameworks-gpgmep.patch +# PATCH-FIX-UPSTREAM +Patch3: 0001-Fix-build-with-Qt-5.15.0.patch BuildRequires: cmake >= 2.8.11 BuildRequires: git BuildRequires: libgpgmepp-devel >= 1.8.0 @@ -72,8 +74,7 @@ * Plays well with the rest of the ecosystem. We don't like reinventing wheels, but when the existing wheels quite don't fit the tracks, we're not afraid of making them work. %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build export CXXFLAGS="%{optflags} -fPIC" ++++++ 0001-Fix-build-with-Qt-5.15.0.patch ++++++ >From cebd7ed5e66c479a7e10edf2eb7cb4a868433c9c Mon Sep 17 00:00:00 2001 From: Heiko Becker <[email protected]> Date: Tue, 24 Mar 2020 13:14:43 +0100 Subject: [PATCH] Fix build with Qt 5.15.0 QPainterPath is no longer included via qtransform.h (since 5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). Change-Id: Ibb59e769bba8514d86aa886afee26a2395d458ef --- src/Gui/Window.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp index 48a5b6f..5834637 100644 --- a/src/Gui/Window.cpp +++ b/src/Gui/Window.cpp @@ -32,6 +32,7 @@ #include <QKeyEvent> #include <QMenuBar> #include <QMessageBox> +#include <QPainterPath> #include <QProgressBar> #include <QScrollBar> #include <QSplitter> -- 2.26.2
