diff --git a/Lower-minimum-exiv2-version.patch b/Lower-minimum-exiv2-version.patch deleted file mode 100644 index 262aa56..0000000 --- a/Lower-minimum-exiv2-version.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c50103269935cf74beae646dd0da1c7ec003f430 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Tue, 30 Oct 2018 14:12:36 +0100 -Subject: [PATCH] Lower minimum exiv2 version - -Digikam compiles fine with exiv2 0.25 as well, so make it accept that -version to be able to build it on openSUSE Leap 42.3. ---- - core/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 041865ffcc..4518ea1815 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -56,7 +56,7 @@ set(QT_MIN_VERSION "5.6.0") - set(KF5_MIN_VERSION "5.1.0") - set(QT_MIN_VERSION "5.6.0") - set(LENSFUN_MIN_VERSION "0.2.6.0") --set(EXIV2_MIN_VERSION "0.26") -+set(EXIV2_MIN_VERSION "0.25") - set(OPENCV_MIN_VERSION "3.1.0") - set(QTAV_MIN_VERSION "1.12.0") - set(KSANE_MIN_VERSION "5.0.0") # For digital scanner support. --- -2.16.4 - diff --git a/digikam.changes b/digikam.changes index 6266f7e..faec274 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 29 08:37:34 UTC 2019 - wbauer@tmo.at + +- Drop Lower-minimum-exiv2-version.patch, the latest digikam + version just crashes on start with exiv2-0.25 (kde#407022) + ------------------------------------------------------------------- Tue Apr 16 10:00:11 UTC 2019 - wbauer@tmo.at diff --git a/digikam.spec b/digikam.spec index 5aa35fe..13485f5 100644 --- a/digikam.spec +++ b/digikam.spec @@ -28,12 +28,10 @@ URL: http://www.digikam.org/ Source0: http://download.kde.org/stable/%{name}/%{version}/%{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-OPENSUSE -Patch1: Lower-minimum-exiv2-version.patch # PATCH-FIX-UPSTREAM -Patch2: Fix-compilation-with-Qt-5.6.patch +Patch1: Fix-compilation-with-Qt-5.6.patch # PATCH-FIX-UPSTREAM -Patch3: Fix-build-with-QtWebEngine-5.6.patch +Patch2: Fix-build-with-QtWebEngine-5.6.patch BuildRequires: QtAV-devel >= 1.12 BuildRequires: bison BuildRequires: boost-devel @@ -57,7 +55,7 @@ BuildRequires: kxmlgui-devel BuildRequires: lensfun BuildRequires: lensfun-devel BuildRequires: libeigen3-devel -BuildRequires: libexiv2-devel >= 0.25 +BuildRequires: libexiv2-devel >= 0.26 BuildRequires: libexpat-devel BuildRequires: libjasper-devel BuildRequires: libksane-devel >= 15.12.0 @@ -175,11 +173,8 @@ The main digikam libraries that are being shared between showfoto and digikam # Disable OpenGL slideshow on embedded platforms %patch0 -p1 %endif -%if 0%{?suse_version} < 1320 %patch1 -p1 -%endif %patch2 -p1 -%patch3 -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')