Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2017-03-02 19:36:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Thu Mar 2 19:36:24 2017 rev:155 rq:460533 version:5.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2017-02-03 17:35:42.205666164 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2017-03-02 19:36:25.343389450 +0100 @@ -1,0 +2,11 @@ +Sun Feb 26 13:00:27 UTC 2017 - [email protected] + +- Drop the useless Buildrequires on soprano + +------------------------------------------------------------------- +Sun Feb 19 02:32:27 UTC 2017 - [email protected] + +- Added fix-build-with-ecm-5.31.patch to fix build with the latest + KDE Frameworks 5.31.0 + +------------------------------------------------------------------- New: ---- fix-build-with-ecm-5.31.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.Ayo6bh/_old 2017-03-02 19:36:28.614926491 +0100 +++ /var/tmp/diff_new_pack.Ayo6bh/_new 2017-03-02 19:36:28.614926491 +0100 @@ -26,6 +26,8 @@ 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 #This pulls in QWebEngine, which is not available on ppc64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64 BuildRequires: akonadi-contact-devel @@ -72,7 +74,6 @@ BuildRequires: mysql BuildRequires: opencv-qt5-devel BuildRequires: QtAV-devel >= 1.11 -BuildRequires: soprano-backend-redland BuildRequires: threadweaver-devel >= 5.1.0 BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel @@ -169,6 +170,7 @@ # we renamed libastro to libastro-qt5 in Leap 42.1, make FindMARBLE.cmake find it %patch0 -p1 %endif +%patch1 -p1 # 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') ++++++ fix-build-with-ecm-5.31.patch ++++++ >From 3793b47b6f57a627911bcce819b1ecc2dc9e422a Mon Sep 17 00:00:00 2001 From: Kevin Funk <[email protected]> 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 <[email protected]> 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 <boost/random/variate_generator.hpp> // 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 <Eigen/LU> // 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 <QByteArray> // 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 <libraw.h> // Restore warnings -#if not defined(__APPLE__) && defined(__GNUC__) +#if !defined(__APPLE__) && defined(__GNUC__) #pragma GCC diagnostic pop #endif -- cgit v0.11.2
