Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2018-01-17 21:57:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Wed Jan 17 21:57:12 2018 rev:165 rq:565891 version:5.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2017-12-10 18:17:32.530916934 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2018-01-17 21:58:35.178440320 +0100 @@ -1,0 +2,28 @@ +Mon Jan 15 19:33:44 UTC 2018 - [email protected] + +- Update to 5.8.0: + * https://www.digikam.org/news/2018-01-14-5.8.0_release_announcement/ +- New features (from NEWS): +General : Add support to OpenCV 3.4.x. +General : Updated internal Libraw to last 0.18.6. +General : New Upnp/Dlna media server to share collections on local network. +Image Editor : New clone tool to replace old CImg in-painting tool. +DropBox : tool ported AuthO2 API. + +- 231 bugs fixed +- Remove unneeded libkface-devel build requirement, it's not used + anymore since over 2 years +- Add 0001-Revert-replace-obsolete-qSort-function.patch and + 0002-Revert-replace-obsolete-qSort-function.patch to fix build + with gcc 4.8 on Leap 42 +- Add fix-italian-docs-with-older-kdoctools.patch to make it build + on Leap 42.2 +- Pass --without-kde to %find_lang to prevent the docs being added + to the lang package, we have a separate docs subpackage + (it supports the KF5 docs location starting with rpm 4.14.0, and + that would break the build) +- Drop upstream patches: + * Adapt-to-KCalCore-API-changes.patch + * fix-Qt-5.9.3-empty-album-problem.patch + +------------------------------------------------------------------- Old: ---- Adapt-to-KCalCore-API-changes.patch digikam-5.7.0.tar.xz fix-Qt-5.9.3-empty-album-problem.patch New: ---- 0001-Revert-replace-obsolete-qSort-function.patch 0002-Revert-replace-obsolete-qSort-function.patch digikam-5.8.0.tar.xz fix-italian-docs-with-older-kdoctools.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.fXVXga/_old 2018-01-17 21:58:42.866079979 +0100 +++ /var/tmp/diff_new_pack.fXVXga/_new 2018-01-17 21:58:42.870079791 +0100 @@ -1,7 +1,7 @@ # # spec file for package digikam # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,7 +17,7 @@ Name: digikam -Version: 5.7.0 +Version: 5.8.0 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0+ @@ -26,10 +26,12 @@ Source0: http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch -- The OpenGL slideshow depends on Desktop GL, see kde#383715 Patch0: 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch -# PATCH-FIX-UPSTREAM -Patch1: Adapt-to-KCalCore-API-changes.patch -# PATCH-FIX-UPSTREAM -Patch2: fix-Qt-5.9.3-empty-album-problem.patch +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-replace-obsolete-qSort-function.patch +# PATCH-FIX-OPENSUSE +Patch2: 0002-Revert-replace-obsolete-qSort-function.patch +# PATCH-FIX-OPENSUSE fix-italian-docs-with-older-kdoctools.patch -- fix build with the old kdoctools in Leap 42.2 that misses two necessary entities for italian +Patch3: fix-italian-docs-with-older-kdoctools.patch #This pulls in QWebEngine, which is not available on ppc64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64 BuildRequires: akonadi-contact-devel @@ -61,7 +63,6 @@ BuildRequires: libjasper-devel BuildRequires: libkdcraw-devel >= 15.12.0 BuildRequires: libkexiv2-devel >= 15.12.0 -BuildRequires: libkface-devel >= 15.12.0 BuildRequires: libkgeomap-devel > 15.12.0 BuildRequires: libkipi-devel >= 16.04.0 BuildRequires: libksane-devel >= 15.12.0 @@ -173,8 +174,13 @@ # Disable OpenGL slideshow on embedded platforms %patch0 -p1 %endif +%if 0%{?suse_version} < 1320 %patch1 -p1 %patch2 -p1 +%if 0%{?sle_version} <= 120200 +%patch3 -p1 +%endif +%endif # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -216,8 +222,8 @@ %suse_update_desktop_file -r org.kde.showfoto Qt KDE Graphics Photography %endif -%find_lang %{name} -%find_lang kipiplugins kipiplugin.lang +%find_lang %{name} --without-kde +%find_lang kipiplugins kipiplugin.lang --without-kde for i in dropbox googleservices sendimages facebook flashexport flickr imageshack imgur kmlexport piwigo printimages rajce remotestorage sendimages smug vkontakte yandexfotki do @@ -236,7 +242,7 @@ %files %defattr(-,root,root,-) -%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README} +%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README.md} %{_bindir}/digikam %{_bindir}/digitaglinktree %{_bindir}/cleanup_digikamdb ++++++ 0001-Revert-replace-obsolete-qSort-function.patch ++++++ ++++ 635 lines (skipped) ++++++ 0002-Revert-replace-obsolete-qSort-function.patch ++++++ >From d19d149b55c3f25c3c7f1c69c0b777acf0c83024 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Sun, 14 Jan 2018 01:47:45 +0100 Subject: [PATCH] Revert "replace obsolete qSort() function" This reverts commit 734b9d685f458e5f4dadc61216fbf12f9dc59ca6. It breaks compilation with GCC 4.8. --- facebook/fbtalker.cpp | 3 ++- flashexport/simpleviewer.cpp | 2 +- googleservices/gdtalker.cpp | 2 +- googleservices/gptalker.cpp | 2 +- piwigo/piwigotalker.cpp | 2 +- smug/smugtalker.cpp | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/extra/kipi-plugins/facebook/fbtalker.cpp b/extra/kipi-plugins/facebook/fbtalker.cpp index 24d8b9723..71d704ee0 100644 --- a/extra/kipi-plugins/facebook/fbtalker.cpp +++ b/extra/kipi-plugins/facebook/fbtalker.cpp @@ -43,6 +43,7 @@ #include <QPlainTextEdit> #include <QList> #include <QDesktopServices> +#include <QDebug> #include <QApplication> #include <QPushButton> #include <QDialog> @@ -863,7 +864,7 @@ void FbTalker::parseResponseListAlbums(const QByteArray& data) errMsg = obj[QString::fromLatin1("message")].toString(); } - std::sort(albumsList.begin(), albumsList.end()); + qSort(albumsList.begin(), albumsList.end()); emit signalBusy(false); emit signalListAlbumsDone(errCode, errorToText(errCode, errMsg), diff --git a/extra/kipi-plugins/flashexport/simpleviewer.cpp b/extra/kipi-plugins/flashexport/simpleviewer.cpp index 618f1b30a..b60f7fdda 100644 --- a/extra/kipi-plugins/flashexport/simpleviewer.cpp +++ b/extra/kipi-plugins/flashexport/simpleviewer.cpp @@ -530,7 +530,7 @@ void SimpleViewer::processQUrlList(QList<QUrl>& images, QDomDocument& xmlDoc, QUrl imagesDir = QUrl::fromLocalFile(d->tempDir->path()); imagesDir.setPath(imagesDir.path() + QLatin1String("/images/")); - std::sort(images.begin(), images.end(), cmpUrl); + qSort(images.begin(), images.end(), cmpUrl); for (QList<QUrl>::ConstIterator it = images.constBegin(); !d->canceled && (it != images.constEnd()) ; ++it) diff --git a/extra/kipi-plugins/googleservices/gdtalker.cpp b/extra/kipi-plugins/googleservices/gdtalker.cpp index b7ba5295f..d719089f1 100644 --- a/extra/kipi-plugins/googleservices/gdtalker.cpp +++ b/extra/kipi-plugins/googleservices/gdtalker.cpp @@ -355,7 +355,7 @@ void GDTalker::parseResponseListFolders(const QByteArray& data) albumList.append(fps); } - std::sort(albumList.begin(), albumList.end(), gdriveLessThan); + qSort(albumList.begin(), albumList.end(), gdriveLessThan); emit signalBusy(false); emit signalListAlbumsDone(1,QString(),albumList); } diff --git a/extra/kipi-plugins/googleservices/gptalker.cpp b/extra/kipi-plugins/googleservices/gptalker.cpp index fe839a7d2..264acfa79 100644 --- a/extra/kipi-plugins/googleservices/gptalker.cpp +++ b/extra/kipi-plugins/googleservices/gptalker.cpp @@ -745,7 +745,7 @@ void GPTalker::parseResponseListAlbums(const QByteArray& data) node = node.nextSibling(); } - std::sort(albumList.begin(), albumList.end(), gphotoLessThan); + qSort(albumList.begin(), albumList.end(), gphotoLessThan); emit signalListAlbumsDone(1, QString::fromLatin1(""), albumList); } diff --git a/extra/kipi-plugins/piwigo/piwigotalker.cpp b/extra/kipi-plugins/piwigo/piwigotalker.cpp index 3fbfbec66..81c8368e0 100644 --- a/extra/kipi-plugins/piwigo/piwigotalker.cpp +++ b/extra/kipi-plugins/piwigo/piwigotalker.cpp @@ -569,7 +569,7 @@ void PiwigoTalker::parseResponseListAlbums(const QByteArray& data) } // We need parent albums to come first for rest of the code to work - std::sort(albumList.begin(), albumList.end()); + qSort(albumList); emit signalAlbums(albumList); } diff --git a/extra/kipi-plugins/smug/smugtalker.cpp b/extra/kipi-plugins/smug/smugtalker.cpp index 873a1f061..9349be00f 100644 --- a/extra/kipi-plugins/smug/smugtalker.cpp +++ b/extra/kipi-plugins/smug/smugtalker.cpp @@ -846,7 +846,7 @@ void SmugTalker::parseResponseListAlbums(const QByteArray& data) if (errCode == 15) // 15: empty list errCode = 0; - std::sort(albumsList.begin(), albumsList.end(), SmugAlbum::lessThan); + qSort(albumsList.begin(), albumsList.end(), SmugAlbum::lessThan); emit signalBusy(false); emit signalListAlbumsDone(errCode, errorToText(errCode, errMsg), albumsList); -- 2.13.6 ++++++ digikam-5.7.0.tar.xz -> digikam-5.8.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/digikam/digikam-5.7.0.tar.xz /work/SRC/openSUSE:Factory/.digikam.new/digikam-5.8.0.tar.xz differ: char 27, line 1 ++++++ fix-italian-docs-with-older-kdoctools.patch ++++++ diff -ur a/doc-translated/it/digikam/menu-mainwindow.docbook b/doc-translated/it/digikam/menu-mainwindow.docbook --- a/doc-translated/it/digikam/menu-mainwindow.docbook 2018-01-09 15:13:48.000000000 +0100 +++ b/doc-translated/it/digikam/menu-mainwindow.docbook 2018-01-15 17:11:37.000000000 +0100 @@ -578,7 +578,7 @@ >Voce del menu per ruotare senza perdita l'immagine attualmente selezionata ><menuchoice > <shortcut ><keycombo action="press" ->&Ctrl;&Shift;&Left;</keycombo +>&Ctrl;&Shift;<keysym>←</keysym></keycombo ></shortcut > <guimenu >Sinistra</guimenu @@ -586,7 +586,7 @@ > oppure <menuchoice > <shortcut ><keycombo action="press" ->&Ctrl;&Shift;&Right;</keycombo +>&Ctrl;&Shift;<keysym>→</keysym></keycombo ></shortcut > <guimenu >Destra</guimenu
