Hello community,

here is the log from the commit of package fotowall for openSUSE:Factory 
checked in at 2020-06-05 20:21:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fotowall (Old)
 and      /work/SRC/openSUSE:Factory/.fotowall.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "fotowall"

Fri Jun  5 20:21:21 2020 rev:4 rq:811680 version:1.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/fotowall/fotowall.changes        2018-07-28 
12:40:27.848432886 +0200
+++ /work/SRC/openSUSE:Factory/.fotowall.new.3606/fotowall.changes      
2020-06-05 20:27:47.681091604 +0200
@@ -1,0 +2,6 @@
+Thu Jun  4 19:41:34 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Add patch to fix build with Qt 5.15:
+  * 0001-Fix-build-with-Qt-5.15.patch
+
+-------------------------------------------------------------------

New:
----
  0001-Fix-build-with-Qt-5.15.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fotowall.spec ++++++
--- /var/tmp/diff_new_pack.fm7PTO/_old  2020-06-05 20:27:49.233096450 +0200
+++ /var/tmp/diff_new_pack.fm7PTO/_new  2020-06-05 20:27:49.237096463 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package fotowall
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 # Copyright (c) 2007-2014 Packman Team <[email protected]>
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,7 +13,7 @@
 # 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/
 #
 
 
@@ -26,18 +26,19 @@
 Group:          Productivity/Graphics/Other
 URL:            https://www.enricoros.com/opensource/fotowall
 Source0:        
https://github.com/enricoros/fotowall/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  libqt5-qtbase-common-devel
+# PATCH-FIX-UPSTREAM https://github.com/enricoros/fotowall/issues/20
+Patch0:         fotowall-1.0-fix-build-against-qt-5.11.0.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-Fix-build-with-Qt-5.15.patch
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5OpenGL)
 BuildRequires:  pkgconfig(Qt5PrintSupport)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Xml)
 BuildRequires:  pkgconfig(libv4l2)
-#PATCHFIX 
fotowall-1.0-fix-build-against-qt-5.11.0.patch?view=markup&pathrev=1233772
-# picked up from Mageia to fix build against Qt 5.11.0
-Patch0:         fotowall-1.0-fix-build-against-qt-5.11.0.patch
 
 %description
 FotoWall is a wallpaper generator rendering pictures
@@ -51,12 +52,11 @@
 - move the mouse on the corners to change various colors in an extremely cool 
way
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %build
 %qmake5
-make %{?_smp_mflags}
+%make_build
 
 %install
 %qmake5_install
@@ -66,7 +66,7 @@
 %doc README.markdown
 %license GPL_V2
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/%{name}.1%{?ext_man}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
 

++++++ 0001-Fix-build-with-Qt-5.15.patch ++++++
>From 3177d8610981f2a80f3472270f44c3a8ae0c253d Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <[email protected]>
Date: Thu, 4 Jun 2020 21:41:07 +0200
Subject: [PATCH] Fix build with Qt 5.15

---
 3rdparty/posterazor/paintcanvas.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/3rdparty/posterazor/paintcanvas.cpp 
b/3rdparty/posterazor/paintcanvas.cpp
index df33b8a..fd0f319 100644
--- a/3rdparty/posterazor/paintcanvas.cpp
+++ b/3rdparty/posterazor/paintcanvas.cpp
@@ -23,6 +23,7 @@
 #include "paintcanvas.h"
 #include <QImage>
 #include <QPainter>
+#include <QPainterPath>
 
 PaintCanvas::PaintCanvas(QWidget *parent)
     : QWidget(parent)
-- 
2.26.2


Reply via email to