Hello community, here is the log from the commit of package rkward for openSUSE:Factory checked in at 2019-08-27 10:21:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rkward (Old) and /work/SRC/openSUSE:Factory/.rkward.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rkward" Tue Aug 27 10:21:06 2019 rev:22 rq:725942 version:0.7.0b Changes: -------- --- /work/SRC/openSUSE:Factory/rkward/rkward.changes 2018-04-22 14:40:44.998557064 +0200 +++ /work/SRC/openSUSE:Factory/.rkward.new.7948/rkward.changes 2019-08-27 10:21:23.399939552 +0200 @@ -1,0 +2,8 @@ +Fri Aug 23 17:42:02 UTC 2019 - [email protected] + +- Add upstream patches to fix build in Factory: + * Fix-compilation.patch + * Another-missing-include-file.patch + * Another-include-file-fix.patch + +------------------------------------------------------------------- New: ---- Another-include-file-fix.patch Another-missing-include-file.patch Fix-compilation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rkward.spec ++++++ --- /var/tmp/diff_new_pack.mJzTKQ/_old 2019-08-27 10:21:28.003939245 +0200 +++ /var/tmp/diff_new_pack.mJzTKQ/_new 2019-08-27 10:21:28.003939245 +0200 @@ -26,6 +26,12 @@ Url: http://rkward.sourceforge.net/ Source0: %{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: Fix-compilation.patch +# PATCH-FIX-UPSTREAM +Patch1: Another-missing-include-file.patch +# PATCH-FIX-UPSTREAM +Patch2: Another-include-file-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -72,6 +78,7 @@ %prep %setup -q +%autopatch -p1 %build %cmake_kf5 -d build -- -DNO_R_XML=1 ++++++ Another-include-file-fix.patch ++++++ >From 394128e8d58b58bbd7cef9a4523ae346f94cd456 Mon Sep 17 00:00:00 2001 From: Thomas Friedrichsmeier <[email protected]> Date: Sat, 27 Jul 2019 11:12:34 +0200 Subject: Another include file fix --- rkward/rkward.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp index 1a4a7e3..bb2f69c 100644 --- a/rkward/rkward.cpp +++ b/rkward/rkward.cpp @@ -2,7 +2,7 @@ rkward.cpp - description ------------------- begin : Tue Oct 29 20:06:08 CET 2002 - copyright : (C) 2002-2013 by Thomas Friedrichsmeier + copyright : (C) 2002-2019 by Thomas Friedrichsmeier email : [email protected] ***************************************************************************/ @@ -26,6 +26,9 @@ #include <QMenuBar> #include <QStatusBar> #include <QInputDialog> +#include <QVBoxLayout> +#include <QHBoxLayout> +#include <QIcon> // include files for KDE #include <kmessagebox.h> @@ -41,7 +44,6 @@ #include <krecentfilesaction.h> #include <ktoolbar.h> #include <kactionmenu.h> -#include <QIcon> #include <KSharedConfig> #include <KConfigGroup> -- cgit v1.1 ++++++ Another-missing-include-file.patch ++++++ >From d713ce77e077b426d9d81a22f558f71dfa832615 Mon Sep 17 00:00:00 2001 From: Thomas Friedrichsmeier <[email protected]> Date: Fri, 26 Jul 2019 22:32:42 +0200 Subject: Another missing include file --- rkward/windows/rktoolwindowbar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rkward/windows/rktoolwindowbar.cpp b/rkward/windows/rktoolwindowbar.cpp index a8f5cbd..03c405e 100644 --- a/rkward/windows/rktoolwindowbar.cpp +++ b/rkward/windows/rktoolwindowbar.cpp @@ -2,7 +2,7 @@ rktoolwindowbar - description ------------------- begin : Fri Oct 12 2007 - copyright : (C) 2007, 2011 by Thomas Friedrichsmeier + copyright : (C) 2007-2019 by Thomas Friedrichsmeier email : [email protected] ***************************************************************************/ @@ -27,6 +27,7 @@ #include <QSplitter> #include <QContextMenuEvent> +#include <QHBoxLayout> #include "rkworkplace.h" #include "rkworkplaceview.h" -- cgit v1.1 ++++++ Fix-compilation.patch ++++++ >From b51802243f478d1d89120edc343bec7eb5ef8285 Mon Sep 17 00:00:00 2001 From: Thomas Friedrichsmeier <[email protected]> Date: Wed, 24 Jul 2019 19:36:51 +0200 Subject: Fix compilation --- rkward/windows/rkworkplace.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp index 0dbf36a..94b3378 100644 --- a/rkward/windows/rkworkplace.cpp +++ b/rkward/windows/rkworkplace.cpp @@ -2,7 +2,7 @@ rkworkplace - description ------------------- begin : Thu Sep 21 2006 - copyright : (C) 2006-2016 by Thomas Friedrichsmeier + copyright : (C) 2006-2019 by Thomas Friedrichsmeier email : [email protected] ***************************************************************************/ @@ -31,6 +31,7 @@ #include <QDir> #include <QApplication> #include <QMimeDatabase> +#include <QLayout> #include "detachedwindowcontainer.h" #include "rkcommandeditorwindow.h" -- cgit v1.1
