Hello community, here is the log from the commit of package kphotoalbum for openSUSE:Factory checked in at 2018-06-04 13:23:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kphotoalbum (Old) and /work/SRC/openSUSE:Factory/.kphotoalbum.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kphotoalbum" Mon Jun 4 13:23:06 2018 rev:2 rq:613950 version:5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kphotoalbum/kphotoalbum.changes 2018-03-26 13:15:16.622998252 +0200 +++ /work/SRC/openSUSE:Factory/.kphotoalbum.new/kphotoalbum.changes 2018-06-04 13:24:00.009390585 +0200 @@ -1,0 +2,6 @@ +Mon Jun 4 09:54:35 UTC 2018 - christo...@krop.fr + +- Add Fix-build-with-Qt-511.patch +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- Fix-build-with-Qt-511.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kphotoalbum.spec ++++++ --- /var/tmp/diff_new_pack.n1gco3/_old 2018-06-04 13:24:01.073351624 +0200 +++ /var/tmp/diff_new_pack.n1gco3/_new 2018-06-04 13:24:01.073351624 +0200 @@ -20,16 +20,19 @@ Version: 5.3 Release: 0 Summary: A photo administration utility -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Graphics/Viewers -Url: http://www.kphotoalbum.org/ +URL: http://www.kphotoalbum.org/ Source: http://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch +Patch0: Fix-build-with-Qt-511.patch BuildRequires: cmake >= 3.2.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libexiv2-devel BuildRequires: libjpeg-devel BuildRequires: phonon4qt5-devel +BuildRequires: update-desktop-files BuildRequires: cmake(KF5Archive) BuildRequires: cmake(KF5Completion) BuildRequires: cmake(KF5Config) @@ -49,10 +52,8 @@ BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) -BuildRequires: update-desktop-files Requires: kipi-plugins Requires: sqlite3 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description KPhotoAlbum is a tool to help describe images, and to search in the pile @@ -60,10 +61,10 @@ in less than 5 seconds, let that be an image with a special person, an image from a special place, or even both. - %lang_package + %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build @@ -78,8 +79,8 @@ %fdupes -s %{buildroot} %files -%defattr(-,root,root) -%doc ChangeLog COPYING README +%license COPYING +%doc ChangeLog README %{_kf5_applicationsdir}/* %{_kf5_bindir}/* %{_kf5_iconsdir}/??color/*/*/*.png @@ -91,7 +92,6 @@ %{_kf5_appstreamdir}/org.kde.*.appdata.xml %files lang -f %{name}.lang -%defattr(-,root,root) %doc %lang(de) %{_kf5_htmldir}/de/ %doc %lang(fr) %{_kf5_htmldir}/fr/ %doc %lang(it) %{_kf5_htmldir}/it/ ++++++ Fix-build-with-Qt-511.patch ++++++ commit 2f9ee33ae20eeb1d3217307e0515a3c8213bc69c Author: Christophe Giboudeaux <christo...@krop.fr> Date: Mon Jun 4 11:52:50 2018 +0200 Fix build with Qt 5.11. 'id' is an int, it doesn't need qPrintable. diff --git a/RemoteControl/RemoteConnection.cpp b/RemoteControl/RemoteConnection.cpp index 1dacb727..8bc18d00 100644 --- a/RemoteControl/RemoteConnection.cpp +++ b/RemoteControl/RemoteConnection.cpp @@ -105,7 +105,7 @@ void RemoteConnection::dataReceived() std::unique_ptr<RemoteCommand> command = RemoteCommand::create(static_cast<CommandType>(id)); command->decode(stream); protocolDebug() << qPrintable(QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss.zzz"))) - << ": Received " << qPrintable(id); + << ": Received " << id; emit gotCommand(*command); }
