Hello community, here is the log from the commit of package kphotoalbum for openSUSE:Factory checked in at 2019-01-05 14:42:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kphotoalbum (Old) and /work/SRC/openSUSE:Factory/.kphotoalbum.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kphotoalbum" Sat Jan 5 14:42:27 2019 rev:4 rq:662734 version:5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kphotoalbum/kphotoalbum.changes 2018-10-15 09:48:03.251062467 +0200 +++ /work/SRC/openSUSE:Factory/.kphotoalbum.new.28833/kphotoalbum.changes 2019-01-05 14:42:27.836474855 +0100 @@ -1,0 +2,7 @@ +Thu Jan 3 21:44:37 UTC 2019 - wba...@tmo.at + +- Add upstream patches to fix build with exiv2-0.27: + * Use-Exiv2-0.27-if-available.patch + * Fix-compilation-with-exiv2-0.27.patch + +------------------------------------------------------------------- New: ---- Fix-compilation-with-exiv2-0.27.patch Use-Exiv2-0.27-if-available.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kphotoalbum.spec ++++++ --- /var/tmp/diff_new_pack.IXUSJC/_old 2019-01-05 14:42:28.636474175 +0100 +++ /var/tmp/diff_new_pack.IXUSJC/_new 2019-01-05 14:42:28.640474172 +0100 @@ -26,6 +26,9 @@ Source: http://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch: 0001-Fix-build-with-Qt-5.7-and-lower.patch +# PATCH-FIX-UPSTREAM +Patch1: Use-Exiv2-0.27-if-available.patch +Patch2: Fix-compilation-with-exiv2-0.27.patch BuildRequires: cmake >= 3.2.0 BuildRequires: fdupes BuildRequires: kf5-filesystem ++++++ Fix-compilation-with-exiv2-0.27.patch ++++++ >From cf4f7645b3c94246a1fcf664f1c865a93ae2b684 Mon Sep 17 00:00:00 2001 From: Johannes Zarl-Zierl <johan...@zarl-zierl.at> Date: Sun, 30 Dec 2018 23:43:14 +0100 Subject: Fix compilation with exiv2 0.27 --- Exif/Info.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Exif/Info.cpp b/Exif/Info.cpp index be4c88f..9545360 100644 --- a/Exif/Info.cpp +++ b/Exif/Info.cpp @@ -28,7 +28,8 @@ #include <QFile> #include <exiv2/image.hpp> -#include <exiv2/exif.hpp> +#include <exiv2/exv_conf.h> +#include <exiv2/version.hpp> using namespace Exif; -- cgit v1.1 ++++++ Use-Exiv2-0.27-if-available.patch ++++++ >From 41c7da0531c8a1eb7046345c2b991e7a5d1e6657 Mon Sep 17 00:00:00 2001 From: Johannes Zarl-Zierl <johan...@zarl-zierl.at> Date: Sun, 30 Dec 2018 23:36:24 +0100 Subject: Use Exiv2 0.27 if available. Beginning with version 0.27, Exiv2 ships with cmake package config files. --- CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3012f7a..5dcc29c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,17 @@ if(JPEG_FOUND) include_directories(${JPEG_INCLUDE_DIR}) endif() -find_package(Exiv2 REQUIRED) +### 2018-12-30 jzarl +# When Exiv2 0.26 can be deprecated, FindExiv2.cmake should be removed +# and only find_package(exiv2) should be used +find_package(exiv2 CONFIG QUIET) +if(exiv2_FOUND) + # search againg with REQUIRED, so that the feature summary correctly shows exiv as required dependency + find_package(exiv2 CONFIG REQUIRED) + set(EXIV2_LIBRARIES exiv2lib) +else() + find_package(Exiv2 REQUIRED) +endif() find_package(KF5Kipi 5.1.0) set_package_properties(KF5Kipi -- cgit v1.1
