From bf835045af15f21a188751711a2cfcfb3805cae767abfbb146f4e85b925ce698 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 16 Mar 2017 08:42:22 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 157.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=f6c04c70fbbc92241fbb91dc4953364f --- digikam-5.4.0.tar.xz | 3 - digikam-5.5.0.tar.xz | 3 + digikam.changes | 32 +++ digikam.spec | 15 +- fix-build-with-ecm-5.31.patch | 235 ------------------ ...nctions-that-are-no-longer-available.patch | 30 --- 6 files changed, 38 insertions(+), 280 deletions(-) delete mode 100644 digikam-5.4.0.tar.xz create mode 100644 digikam-5.5.0.tar.xz delete mode 100644 fix-build-with-ecm-5.31.patch delete mode 100644 hide-functions-that-are-no-longer-available.patch diff --git a/digikam-5.4.0.tar.xz b/digikam-5.4.0.tar.xz deleted file mode 100644 index a264646..0000000 --- a/digikam-5.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f0e906e2780a0504f792bd9b57476da2584ae76199ae16ddfbf5012a27cfa35 -size 120442612 diff --git a/digikam-5.5.0.tar.xz b/digikam-5.5.0.tar.xz new file mode 100644 index 0000000..9f5539c --- /dev/null +++ b/digikam-5.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252 +size 129499600 diff --git a/digikam.changes b/digikam.changes index ab2c447..eadf8a3 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Tue Mar 14 12:13:07 UTC 2017 - fabian@ritter-vogt.de + +- Update to 5.5.0: + * https://www.digikam.org/node/765 +- New features (from NEWS): +Database : Add new options to ignore some kind of directories while scanning collections. +Database : We introduced garbage collection for databases as maintenance stage. This stage removes stale image, + thumbnail and face entries gut does not shrink Databases automatically. +Faces : It is now possible to remove face tags from people sidebar but preserve them in tags sidebar. +Faces : Recognised but unconfirmed faces are now visible both in the recognised face tag and also in a special tag called Unconfirmed. +Faces : The list of proposed names for name assignment in people sidebar can now be reduced to face tags with a setup option. +Faces : Tags in tags sidebar can now be marked as face tags via context menu if they are not already. +Maintenance : The maintenance now does not generate massive amounts of threads anymore. Instead, we use a queue based approach to + level the load on the CPUs more appropriate. This should improve the reactiveness during maintenance. +Searches : Improved the exactness of similarity recognition for external images dropped in fuzzy search. +Searches : Introduced a configurable lower bound for the minimum similarity in fuzzy and duplicates search. +Searches : The results of duplicates searches can now be restricted. It is now possible to restrict the duplicates to the ones that + are in the same album as the reference image or in another album. This feature is also usable in maintenance. +Searches : In duplicates view, the reference image is more clearly identified by the description reference image in the image information. +BQM : Several usability improvements in Watermark tool. +General : Unsharp Mask filter can now reduce color noise to process image in HSL color space. +General : Update internal Libraw to 0.18.2 : new camera supported: Sigma Quattro H. + Fixed bug in exposure computation for Fuji camera. Fix wrong black level in Sony A350. + Fix Sony metadata parser. Fix Phase One decoding. + +- Many bugs fixed +- Remove patches, now upstream: + * fix-build-with-ecm-5.31.patch + * hide-functions-that-are-no-longer-available.patch +- Disable building docs, those are broken upstream (kde#377597) + ------------------------------------------------------------------- Thu Mar 2 07:48:20 UTC 2017 - jslaby@suse.com diff --git a/digikam.spec b/digikam.spec index 3902c05..090e59d 100644 --- a/digikam.spec +++ b/digikam.spec @@ -17,7 +17,7 @@ Name: digikam -Version: 5.4.0 +Version: 5.5.0 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0+ @@ -26,10 +26,6 @@ Url: http://www.digikam.org/ Source0: http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE find_libastro-qt5.patch -- fix build of geolocation support in Leap 42.1 Patch0: find_libastro-qt5.patch -# PATCH-FIX-UPSTREAM fix-build-with-ecm-5.31.patch -- fix build with -fno-operator-names as used by default by extra-cmake-modules 5.31.0 -Patch1: fix-build-with-ecm-5.31.patch -# PATCH-FIX-UPSTREAM hide-functions-that-are-no-longer-available.patch -- hide functions that are no longer available in the current Google -Patch2: hide-functions-that-are-no-longer-available.patch #This pulls in QWebEngine, which is not available on ppc64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64 BuildRequires: akonadi-contact-devel @@ -55,6 +51,7 @@ BuildRequires: libexpat-devel BuildRequires: libgcrypt-devel BuildRequires: libgphoto2-devel >= 2.4.0 # It invokes "gphoto2" for determining the API version +BuildRequires: QtAV-devel >= 1.11 BuildRequires: gphoto BuildRequires: libgpod-devel BuildRequires: libjasper-devel @@ -75,7 +72,6 @@ BuildRequires: libusb-devel BuildRequires: marble-devel BuildRequires: mysql BuildRequires: opencv-qt5-devel -BuildRequires: QtAV-devel >= 1.11 BuildRequires: threadweaver-devel >= 5.1.0 BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel @@ -172,10 +168,6 @@ The main digikam libraries that are being shared between showfoto and digikam # we renamed libastro to libastro-qt5 in Leap 42.1, make FindMARBLE.cmake find it %patch0 -p1 %endif -%patch1 -p1 -pushd extra/kipi-plugins -%patch2 -p1 -popd # 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') @@ -196,7 +188,7 @@ EXTRA_FLAGS="-DENABLE_LCMS2=OFF" EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif -%cmake_kf5 -d build -- -DKFACE_EXTERNAL_FINDOPENCV:BOOL=TRUE -DENABLE_APPSTYLES=ON -DENABLE_MYSQLSUPPORT=on -DENABLE_KINOTIFY=ON -DENABLE_OPENCV3=ON -DENABLE_MEDIAPLAYER=ON +%cmake_kf5 -d build -- -DKFACE_EXTERNAL_FINDOPENCV:BOOL=TRUE -DENABLE_APPSTYLES=ON -DENABLE_MYSQLSUPPORT=on -DENABLE_KINOTIFY=ON -DENABLE_OPENCV3=ON -DENABLE_MEDIAPLAYER=ON -DDIGIKAMSC_COMPILE_DOC=OFF %make_jobs VERBOSE=1 @@ -277,7 +269,6 @@ done %doc doc/COPYING.DOC %doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man} %doc %{_mandir}/man1/digitaglinktree.1%{ext_man} -%doc %{_kf5_htmldir}/*/ %files lang -f %{name}.lang %defattr(-,root,root,-) diff --git a/fix-build-with-ecm-5.31.patch b/fix-build-with-ecm-5.31.patch deleted file mode 100644 index 9cc314d..0000000 --- a/fix-build-with-ecm-5.31.patch +++ /dev/null @@ -1,235 +0,0 @@ -From 3793b47b6f57a627911bcce819b1ecc2dc9e422a Mon Sep 17 00:00:00 2001 -From: Kevin Funk -Date: Wed, 18 Jan 2017 13:34:55 +0100 -Subject: Fix compilation with new KDECompilerSettings.cmake - ---- - app/utils/libopencv.h.cmake.in | 4 ++-- - libs/database/CMakeLists.txt | 3 +++ - libs/dimg/CMakeLists.txt | 3 +++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/core/app/utils/libopencv.h.cmake.in b/core/app/utils/libopencv.h.cmake.in -index cc58b7c..6abf642 100644 ---- a/core/app/utils/libopencv.h.cmake.in -+++ b/core/app/utils/libopencv.h.cmake.in -@@ -27,7 +27,7 @@ - #define LIB_OPEN_CV_H - - // Pragma directives to reduce warnings from OpenCV header files. --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" - #pragma GCC diagnostic ignored "-Woverloaded-virtual" -@@ -82,7 +82,7 @@ - #endif - - // Restore warnings --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - -diff --git a/core/libs/database/CMakeLists.txt b/core/libs/database/CMakeLists.txt -index c5d9c27..14a7180 100644 ---- a/core/libs/database/CMakeLists.txt -+++ b/core/libs/database/CMakeLists.txt -@@ -10,6 +10,9 @@ if (POLICY CMP0063) - cmake_policy(SET CMP0063 NEW) - endif (POLICY CMP0063) - -+# Boost uses operator names (and, not, ...) -+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ - set(libdatabasecore_SRCS - server/databaseserverstarter.cpp - server/databaseservererror.cpp -diff --git a/core/libs/dimg/CMakeLists.txt b/core/libs/dimg/CMakeLists.txt -index 3bcada5..04a0a22 100644 ---- a/core/libs/dimg/CMakeLists.txt -+++ b/core/libs/dimg/CMakeLists.txt -@@ -11,6 +11,9 @@ endif (POLICY CMP0063) - - kde_enable_exceptions() - -+# Boost uses operator names (and, not, ...) -+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -+ - set(libdimg_SRCS - dimg.cpp - drawdecoding.cpp --- -cgit v0.11.2 - -From 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758 Mon Sep 17 00:00:00 2001 -From: Gilles Caulier -Date: Wed, 18 Jan 2017 10:13:20 +0100 -Subject: Fix compilation with clang - ---- - libs/database/imagehistory/imagehistorygraph_boost.h | 4 ++-- - libs/dimg/filters/greycstoration/greycstorationfilter.cpp | 4 ++-- - libs/dimg/filters/randomnumbergenerator.cpp | 4 ++-- - libs/dimg/filters/sharp/matrix.cpp | 4 ++-- - libs/dmetadata/metaengine_p.cpp | 4 ++-- - libs/jpegutils/jpegutils.cpp | 4 ++-- - libs/rawengine/drawdecoder_p.h | 4 ++-- - 7 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/core/libs/database/imagehistory/imagehistorygraph_boost.h b/core/libs/database/imagehistory/imagehistorygraph_boost.h -index 4ba89c9..d7e6c77 100644 ---- a/core/libs/database/imagehistory/imagehistorygraph_boost.h -+++ b/core/libs/database/imagehistory/imagehistorygraph_boost.h -@@ -28,7 +28,7 @@ - #include "digikam_config.h" - - // Pragma directives to reduce warnings from Boost header files. --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-local-typedefs" - #endif -@@ -1554,7 +1554,7 @@ protected: - } // namespace Digikam - - // Restore warnings --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - -diff --git a/core/libs/dimg/filters/greycstoration/greycstorationfilter.cpp b/core/libs/dimg/filters/greycstoration/greycstorationfilter.cpp -index f5d0640..91e443d 100644 ---- a/core/libs/dimg/filters/greycstoration/greycstorationfilter.cpp -+++ b/core/libs/dimg/filters/greycstoration/greycstorationfilter.cpp -@@ -52,7 +52,7 @@ - #define GREYSTORATION_USING_GFACT 1 - - // Pragma directives to reduce warnings from CImg header files. --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-local-typedefs" - #pragma GCC diagnostic ignored "-Wunused-but-set-variable" -@@ -71,7 +71,7 @@ - #include "cimg/CImg.h" - - // Restore warnings --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - -diff --git a/libs/dimg/filters/randomnumbergenerator.cpp b/libs/dimg/filters/randomnumbergenerator.cpp -index 93d7cc4..d7b2ed8 100644 ---- a/core/libs/dimg/filters/randomnumbergenerator.cpp -+++ b/core/libs/dimg/filters/randomnumbergenerator.cpp -@@ -26,7 +26,7 @@ - // Boost includes - - // Pragma directives to reduce warnings from Boost header files. --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wundef" - #endif -@@ -44,7 +44,7 @@ - #include - - // Restore warnings --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - -diff --git a/libs/dimg/filters/sharp/matrix.cpp b/libs/dimg/filters/sharp/matrix.cpp -index 4f32aa3..1a3c65a 100644 ---- a/core/libs/dimg/filters/sharp/matrix.cpp -+++ b/core/libs/dimg/filters/sharp/matrix.cpp -@@ -43,7 +43,7 @@ - // Eigen includes - - // Pragma directives to reduce warnings from Eigen header files. --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-local-typedefs" - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -@@ -53,7 +53,7 @@ - #include - - // Restore warnings --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - -diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp -index 2c83b58..2b44e06 100644 ---- a/core/libs/dmetadata/metaengine_p.cpp -+++ b/core/libs/dmetadata/metaengine_p.cpp -@@ -49,7 +49,7 @@ extern "C" - #include "digikam_debug.h" - - // Pragma directives to reduce warnings from Exiv2. --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar) - } // namespace Digikam - - // Restore warnings --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - -diff --git a/core/libs/jpegutils/jpegutils.cpp b/core/libs/jpegutils/jpegutils.cpp -index c823f40..60c7469 100644 ---- a/core/libs/jpegutils/jpegutils.cpp -+++ b/core/libs/jpegutils/jpegutils.cpp -@@ -53,7 +53,7 @@ extern "C" - } - - // Pragma directives to reduce warnings from libjpeg transupp header file. --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-parameter" - #endif -@@ -69,7 +69,7 @@ extern "C" - } - - // Restore warnings --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - -diff --git a/core/libs/rawengine/drawdecoder_p.h b/core/libs/rawengine/drawdecoder_p.h -index a27e199..ea653b4 100644 ---- a/core/libs/rawengine/drawdecoder_p.h -+++ b/core/libs/rawengine/drawdecoder_p.h -@@ -31,7 +31,7 @@ - #include - - // Pragma directives to reduce warnings from LibRaw header files. --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #endif -@@ -46,7 +46,7 @@ - #include - - // Restore warnings --#if not defined(__APPLE__) && defined(__GNUC__) -+#if !defined(__APPLE__) && defined(__GNUC__) - #pragma GCC diagnostic pop - #endif - --- -cgit v0.11.2 diff --git a/hide-functions-that-are-no-longer-available.patch b/hide-functions-that-are-no-longer-available.patch deleted file mode 100644 index 0b3486a..0000000 --- a/hide-functions-that-are-no-longer-available.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f1f3c15931dbc6b8e05451ba23508debac202d96 Mon Sep 17 00:00:00 2001 -From: Maik Qualmann -Date: Sun, 26 Feb 2017 11:24:25 +0100 -Subject: hide functions that are no longer available in the current Google - Data API V3 CCBUGS: 376913 -Git-commit: f1f3c15931dbc6b8e05451ba23508debac202d96 -References: kde#376913 - ---- - googleservices/gswidget.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/googleservices/gswidget.cpp b/googleservices/gswidget.cpp -index 149a6a5..fc89c9a 100644 ---- a/googleservices/gswidget.cpp -+++ b/googleservices/gswidget.cpp -@@ -93,8 +93,10 @@ GoogleServicesWidget::GoogleServicesWidget(QWidget* const parent, KIPI::Interfac - m_LeafBox->hide(); - break; - default: -+ getNewAlbmBtn()->hide(); // Google has removed this function in the current API V3. - getUploadBox()->hide(); - getSizeBox()->hide(); -+ m_LeafBox->hide(); // Google has removed this function in the current API V3. - break; - } - } --- -cgit v0.11.2 -