Updating link to change in openSUSE:Factory/digikam revision 174.0
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=41989da1400214d1050bb4ee535acd53
This commit is contained in:
parent
43fab7fee7
commit
5f2bbac97b
27
Lower-minimum-exiv2-version.patch
Normal file
27
Lower-minimum-exiv2-version.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From c50103269935cf74beae646dd0da1c7ec003f430 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Wolfgang Bauer <wbauer@tmo.at>
|
||||||
|
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
|
||||||
|
@@ -58,7 +58,7 @@ set(QT_MIN_VERSION "5.6.0")
|
||||||
|
set(KIPI_MIN_VERSION "5.0.0")
|
||||||
|
set(KSANE_MIN_VERSION "5.0.0")
|
||||||
|
set(LENSFUN_MIN_VERSION "0.2.6.0")
|
||||||
|
-set(EXIV2_MIN_VERSION "0.26")
|
||||||
|
+set(EXIV2_MIN_VERSION "0.25")
|
||||||
|
set(AKONADI_MIN_VERSION "4.89.0") # Akonadi Contact dependency
|
||||||
|
set(CALENDAR_MIN_VERSION "4.81.0") # Calendar Core dependency
|
||||||
|
set(QTAV_MIN_VERSION "1.12.0")
|
||||||
|
--
|
||||||
|
2.16.4
|
||||||
|
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 30 13:17:52 UTC 2018 - wbauer@tmo.at
|
||||||
|
|
||||||
|
- Add Lower-minimum-exiv2-version.patch to make it build on Leap
|
||||||
|
42.3
|
||||||
|
- Remove some build requirements that are not used anymore since a
|
||||||
|
long time
|
||||||
|
- Remove unnecessary ENABLE_OPENCV3 and ENABLE_MYSQLSUPPORT cmake
|
||||||
|
options, they are ON by default since 5.7.0
|
||||||
|
- Remove obsolete ENABLE_LCMS2 option, LCMS2 is mandatory since 5.0
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Oct 16 18:52:03 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
|
Tue Oct 16 18:52:03 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
22
digikam.spec
22
digikam.spec
@ -30,12 +30,13 @@ Patch0: 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch
|
|||||||
Patch1: 0001-Revert-replace-obsolete-qSort-function.patch
|
Patch1: 0001-Revert-replace-obsolete-qSort-function.patch
|
||||||
# PATCH-FIX-OPENSUSE
|
# PATCH-FIX-OPENSUSE
|
||||||
Patch2: 0002-Revert-replace-obsolete-qSort-function.patch
|
Patch2: 0002-Revert-replace-obsolete-qSort-function.patch
|
||||||
|
# PATCH-FIX-OPENSUSE
|
||||||
|
Patch3: Lower-minimum-exiv2-version.patch
|
||||||
#This pulls in QWebEngine, which is not available on ppc64
|
#This pulls in QWebEngine, which is not available on ppc64
|
||||||
%ifarch %ix86 x86_64 %arm aarch64 mips mips64
|
%ifarch %ix86 x86_64 %arm aarch64 mips mips64
|
||||||
BuildRequires: akonadi-contact-devel
|
BuildRequires: akonadi-contact-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: QtAV-devel >= 1.11
|
BuildRequires: QtAV-devel >= 1.12
|
||||||
BuildRequires: baloo5-devel
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -44,21 +45,16 @@ BuildRequires: flex
|
|||||||
BuildRequires: graphviz-devel
|
BuildRequires: graphviz-devel
|
||||||
BuildRequires: gtk2-devel
|
BuildRequires: gtk2-devel
|
||||||
BuildRequires: kfilemetadata5-devel
|
BuildRequires: kfilemetadata5-devel
|
||||||
BuildRequires: khtml-devel
|
|
||||||
BuildRequires: ki18n-devel
|
BuildRequires: ki18n-devel
|
||||||
BuildRequires: kitemmodels-devel
|
|
||||||
BuildRequires: knotifyconfig-devel
|
BuildRequires: knotifyconfig-devel
|
||||||
BuildRequires: lensfun
|
BuildRequires: lensfun
|
||||||
BuildRequires: lensfun-devel
|
BuildRequires: lensfun-devel
|
||||||
BuildRequires: libeigen3-devel
|
BuildRequires: libeigen3-devel
|
||||||
BuildRequires: libexiv2-devel >= 0.26
|
BuildRequires: libexiv2-devel >= 0.25
|
||||||
BuildRequires: libexpat-devel
|
BuildRequires: libexpat-devel
|
||||||
BuildRequires: libgcrypt-devel
|
BuildRequires: libgcrypt-devel
|
||||||
BuildRequires: libgpod-devel
|
BuildRequires: libgpod-devel
|
||||||
BuildRequires: libjasper-devel
|
BuildRequires: libjasper-devel
|
||||||
BuildRequires: libkdcraw-devel >= 15.12.0
|
|
||||||
BuildRequires: libkexiv2-devel >= 15.12.0
|
|
||||||
BuildRequires: libkgeomap-devel > 15.12.0
|
|
||||||
BuildRequires: libkipi-devel >= 16.04.0
|
BuildRequires: libkipi-devel >= 16.04.0
|
||||||
BuildRequires: libksane-devel >= 15.12.0
|
BuildRequires: libksane-devel >= 15.12.0
|
||||||
BuildRequires: liblcms2-devel
|
BuildRequires: liblcms2-devel
|
||||||
@ -172,6 +168,7 @@ The main digikam libraries that are being shared between showfoto and digikam
|
|||||||
%if 0%{?suse_version} < 1320
|
%if 0%{?suse_version} < 1320
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Remove build time references so build-compare can do its work
|
# Remove build time references so build-compare can do its work
|
||||||
@ -186,14 +183,7 @@ sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" core/libs/dimg/filters/greycstoration/
|
|||||||
rm -f po/*/kipiplugin_vkontakte.po
|
rm -f po/*/kipiplugin_vkontakte.po
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?suse_version} < 1320 && !0%{?is_opensuse}
|
%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON
|
||||||
EXTRA_FLAGS="-DENABLE_LCMS2=OFF"
|
|
||||||
%else
|
|
||||||
EXTRA_FLAGS="-DENABLE_LCMS2=ON"
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MYSQLSUPPORT=on -DENABLE_OPENCV3=ON -DENABLE_MEDIAPLAYER=ON
|
|
||||||
|
|
||||||
%make_jobs VERBOSE=1
|
%make_jobs VERBOSE=1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
Loading…
Reference in New Issue
Block a user