Hello community, here is the log from the commit of package konversation for openSUSE:Factory checked in at 2019-08-19 21:26:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/konversation (Old) and /work/SRC/openSUSE:Factory/.konversation.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "konversation" Mon Aug 19 21:26:15 2019 rev:56 rq:722598 version:1.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/konversation/konversation.changes 2018-07-01 21:24:27.148920262 +0200 +++ /work/SRC/openSUSE:Factory/.konversation.new.22127/konversation.changes 2019-08-19 21:26:22.120658726 +0200 @@ -1,0 +2,5 @@ +Mon Aug 12 08:22:11 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Add 0001-Fix-build-with-Qt-5.13.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ konversation.spec ++++++ --- /var/tmp/diff_new_pack.LP8EQA/_old 2019-08-19 21:26:23.256658496 +0200 +++ /var/tmp/diff_new_pack.LP8EQA/_new 2019-08-19 21:26:23.256658496 +0200 @@ -1,7 +1,7 @@ # # spec file for package konversation # -# Copyright (c) 2018 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,20 +12,21 @@ # 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/ # %define kf5_version 5.25.0 - Name: konversation Version: 1.7.5 Release: 0 Summary: A graphical IRC client by KDE -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/IRC -Url: http://konversation.kde.org/ +URL: https://konversation.kde.org/ Source0: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Fix-build-with-Qt-5.13.patch BuildRequires: extra-cmake-modules BuildRequires: karchive-devel >= %{kf5_version} BuildRequires: kbookmarks-devel >= %{kf5_version} @@ -51,13 +52,13 @@ BuildRequires: kwindowsystem-devel >= %{kf5_version} BuildRequires: libqca-qt5-devel BuildRequires: phonon4qt5-devel +BuildRequires: pkgconfig BuildRequires: solid-devel >= %{kf5_version} BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) >= 5.5.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.5.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.5.0 Recommends: %{name}-lang = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Konversation is an Internet Relay Chat (IRC) client built on the @@ -79,7 +80,7 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build @@ -91,23 +92,22 @@ %find_lang %{name} %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README +%license COPYING +%doc AUTHORS COPYING-DOCS ChangeLog NEWS README +%dir %{_kf5_appstreamdir} +%dir %{_kf5_sharedir}/kconf_update/ +%doc %{_kf5_htmldir}/en/konversation/ %{_kf5_applicationsdir}/org.kde.konversation.desktop +%{_kf5_appstreamdir}/org.kde.konversation.appdata.xml %{_kf5_bindir}/konversation -%doc %{_kf5_htmldir}/en/konversation/ %{_kf5_iconsdir}/hicolor/*/actions/konv_message.* %{_kf5_iconsdir}/hicolor/*/apps/konversation.* %{_kf5_notifydir}/konversation.notifyrc -%dir %{_kf5_sharedir}/kconf_update/ %{_kf5_sharedir}/kconf_update/konversation* %{_kf5_sharedir}/konversation/ -%{_kf5_sharedir}/kxmlgui5/konversation/ -%dir %{_kf5_appstreamdir} -%{_kf5_appstreamdir}/org.kde.konversation.appdata.xml +%{_kf5_kxmlguidir}/konversation/ %files lang -f %{name}.lang -%defattr(-,root,root,-) %dir %{_kf5_htmldir}/pt_BR/ %doc %{_kf5_htmldir}/*/konversation/ %exclude %{_kf5_htmldir}/en/konversation ++++++ 0001-Fix-build-with-Qt-5.13.patch ++++++ >From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001 From: Luca Beltrame <[email protected]> Date: Sun, 21 Jul 2019 09:14:32 +0200 Subject: [PATCH] Fix build with Qt 5.13 --- src/irc/outputfilter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp index f9e6253f..45d11fb2 100644 --- a/src/irc/outputfilter.cpp +++ b/src/irc/outputfilter.cpp @@ -32,6 +32,7 @@ #include <QStringList> #include <QFile> +#include <QMetaMethod> #include <QRegExp> #include <QTextCodec> #include <QByteArray> -- 2.22.0
