Hello community, here is the log from the commit of package choqok for openSUSE:Factory checked in at 2019-08-13 13:22:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/choqok (Old) and /work/SRC/openSUSE:Factory/.choqok.new.9556 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "choqok" Tue Aug 13 13:22:41 2019 rev:35 rq:722602 version:1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/choqok/choqok.changes 2017-02-16 16:42:56.267977984 +0100 +++ /work/SRC/openSUSE:Factory/.choqok.new.9556/choqok.changes 2019-08-13 13:23:04.461389807 +0200 @@ -1,0 +2,5 @@ +Mon Aug 12 08:31:12 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add Fix-build-with-Qt-5_13.patch + +------------------------------------------------------------------- New: ---- Fix-build-with-Qt-5_13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ choqok.spec ++++++ --- /var/tmp/diff_new_pack.cpvZBs/_old 2019-08-13 13:23:05.541389523 +0200 +++ /var/tmp/diff_new_pack.cpvZBs/_new 2019-08-13 13:23:05.541389523 +0200 @@ -1,7 +1,7 @@ # # spec file for package choqok # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,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/ # @@ -20,10 +20,12 @@ Version: 1.6.0 Release: 0 Summary: Micro-Blogging Client for KDE -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Networking/Other -Url: http://choqok.gnufolks.org -Source: http://download.kde.org/stable/%{name}/1.6/src/%{name}-%{version}.tar.xz +URL: https://www.kde.org +Source: https://download.kde.org/stable/%{name}/1.6/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: Fix-build-with-Qt-5_13.patch BuildRequires: attica-qt5-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -41,6 +43,7 @@ BuildRequires: kwidgetsaddons-devel BuildRequires: kxmlgui-devel BuildRequires: libqca-qt5-devel +BuildRequires: pkgconfig BuildRequires: qoauth-qt5-devel BuildRequires: sonnet-devel BuildRequires: telepathy-qt5-devel @@ -51,7 +54,6 @@ BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5Widgets) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description A micro-blogging client for the K Desktop Environment. @@ -69,7 +71,7 @@ It currently supports twitter.com and identi.ca services. %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build @@ -85,8 +87,8 @@ %postun -p /sbin/ldconfig %files -f %{name}.lang -%defattr(-,root,root) -%doc AUTHORS changelog COPYING README TODO +%license COPYING +%doc AUTHORS changelog README TODO %dir %{_kf5_appstreamdir} %{_datadir}/config.kcfg/ %{_datadir}/knotifications5/ @@ -111,7 +113,6 @@ %{_kf5_servicetypesdir}/choqok* %files devel -%defattr(-,root,root) %{_kf5_appsdir}/cmake/modules/ %{_includedir}/choqok/ %{_kf5_libdir}/libchoqok.so ++++++ Fix-build-with-Qt-5_13.patch ++++++ commit e13ab06f65a4e8b6259bccda1401abb9c1c9fdca Author: Luca Beltrame <[email protected]> Date: Sun Jul 21 09:04:56 2019 +0200 Add QMap include to fix building under Qt 5.13 Include is no longer added transitively. diff --git a/plugins/betternotify/notify.h b/plugins/betternotify/notify.h index 7d452341..8635f5d0 100644 --- a/plugins/betternotify/notify.h +++ b/plugins/betternotify/notify.h @@ -23,6 +23,7 @@ #ifndef NOTIFY_H #define NOTIFY_H +#include <QMap> #include <QQueue> #include <QPoint> #include <QPointer> commit 546ede9ef712bb1b156a55ce30df81c3203dde61 Author: Luca Beltrame <[email protected]> Date: Thu Jul 25 07:01:28 2019 +0200 One more build fix diff --git a/plugins/untiny/untiny.h b/plugins/untiny/untiny.h index 71fdc9bf..d6478ae9 100644 --- a/plugins/untiny/untiny.h +++ b/plugins/untiny/untiny.h @@ -27,6 +27,7 @@ #include "plugin.h" +#include <QMap> #include <QQueue> #include <QUrl> #include <QPointer> commit 08fb06b63a78888e6703de6ac1a4fd6a0e2791eb Author: Albert Astals Cid <[email protected]> Date: Sun Jul 28 00:14:30 2019 +0200 Fix compile on CI plugins/uploaders/flickr/flickr.h:50:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl> plugins/uploaders/imageshack/imageshack.h:48:24: error: field mUrlMap has incomplete type QMap<KJob*, QUrl> diff --git a/plugins/uploaders/flickr/flickr.h b/plugins/uploaders/flickr/flickr.h index 890219ae..7b26609e 100644 --- a/plugins/uploaders/flickr/flickr.h +++ b/plugins/uploaders/flickr/flickr.h @@ -26,6 +26,8 @@ #include "uploader.h" +#include <QMap> + /** @author Andrey Esin \<[email protected]\> */ diff --git a/plugins/uploaders/imageshack/imageshack.h b/plugins/uploaders/imageshack/imageshack.h index d9ddc88d..63d0e3fa 100644 --- a/plugins/uploaders/imageshack/imageshack.h +++ b/plugins/uploaders/imageshack/imageshack.h @@ -26,6 +26,8 @@ #include "uploader.h" +#include <QMap> + /** @author Mehrdad Momeny \<[email protected]\> */ commit bef6784596bf0b41287ebad81f138e1c8c2a6be2 Author: Albert Astals Cid <[email protected]> Date: Sun Jul 28 00:20:34 2019 +0200 Fix build on CI Even more missing QMap includes diff --git a/plugins/uploaders/mobypicture/mobypicture.h b/plugins/uploaders/mobypicture/mobypicture.h index 098f4119..86f61fda 100644 --- a/plugins/uploaders/mobypicture/mobypicture.h +++ b/plugins/uploaders/mobypicture/mobypicture.h @@ -26,6 +26,8 @@ #include "uploader.h" +#include <QMap> + class KJob; class Mobypicture : public Choqok::Uploader diff --git a/plugins/uploaders/posterous/posterous.h b/plugins/uploaders/posterous/posterous.h index c7f6fe18..5c9442d9 100644 --- a/plugins/uploaders/posterous/posterous.h +++ b/plugins/uploaders/posterous/posterous.h @@ -26,6 +26,8 @@ #include "uploader.h" +#include <QMap> + class KJob; class Posterous : public Choqok::Uploader diff --git a/plugins/uploaders/twitgoo/twitgoo.h b/plugins/uploaders/twitgoo/twitgoo.h index ee3f496d..020080e6 100644 --- a/plugins/uploaders/twitgoo/twitgoo.h +++ b/plugins/uploaders/twitgoo/twitgoo.h @@ -26,6 +26,8 @@ #include "uploader.h" +#include <QMap> + class KJob; class Twitgoo : public Choqok::Uploader
