commit digikam for openSUSE:Factory
Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2018-10-31 13:21:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Wed Oct 31 13:21:55 2018 rev:174 rq:645711 version:5.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2018-10-18 15:40:11.334034335 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2018-10-31 13:22:15.847011302 +0100 @@ -1,0 +2,11 @@ +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 + +------------------------------------------------------------------- New: ---- Lower-minimum-exiv2-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.QlNSG3/_old 2018-10-31 13:22:18.315009007 +0100 +++ /var/tmp/diff_new_pack.QlNSG3/_new 2018-10-31 13:22:18.319009003 +0100 @@ -30,12 +30,13 @@ Patch1: 0001-Revert-replace-obsolete-qSort-function.patch # PATCH-FIX-OPENSUSE 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 %ifarch %ix86 x86_64 %arm aarch64 mips mips64 BuildRequires: akonadi-contact-devel %endif -BuildRequires: QtAV-devel >= 1.11 -BuildRequires: baloo5-devel +BuildRequires: QtAV-devel >= 1.12 BuildRequires: bison BuildRequires: boost-devel BuildRequires: doxygen @@ -44,21 +45,16 @@ BuildRequires: graphviz-devel BuildRequires: gtk2-devel BuildRequires: kfilemetadata5-devel -BuildRequires: khtml-devel BuildRequires: ki18n-devel -BuildRequires: kitemmodels-devel BuildRequires: knotifyconfig-devel BuildRequires: lensfun BuildRequires: lensfun-devel BuildRequires: libeigen3-devel -BuildRequires: libexiv2-devel >= 0.26 +BuildRequires: libexiv2-devel >= 0.25 BuildRequires: libexpat-devel BuildRequires: libgcrypt-devel BuildRequires: libgpod-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: libksane-devel >= 15.12.0 BuildRequires: liblcms2-devel @@ -172,6 +168,7 @@ %if 0%{?suse_version} < 1320 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %endif # Remove build time references so build-compare can do its work @@ -186,14 +183,7 @@ rm -f po/*/kipiplugin_vkontakte.po %build -%if 0%{?suse_version} < 1320 && !0%{?is_opensuse} -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 - +%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON %make_jobs VERBOSE=1 %install ++++++ Lower-minimum-exiv2-version.patch ++++++
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
participants (1)
-
root