Hello community,

here is the log from the commit of package darktable for openSUSE:Factory 
checked in at 2019-07-24 20:35:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/darktable (Old)
 and      /work/SRC/openSUSE:Factory/.darktable.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "darktable"

Wed Jul 24 20:35:06 2019 rev:79 rq:718073 version:2.6.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/darktable/darktable.changes      2019-03-26 
22:35:07.749662095 +0100
+++ /work/SRC/openSUSE:Factory/.darktable.new.4126/darktable.changes    
2019-07-24 20:35:07.558576779 +0200
@@ -1,0 +2,11 @@
+Mon Jul 15 22:51:48 UTC 2019 - Stefan BrĂ¼ns <stefan.bru...@rwth-aachen.de>
+
+- Fix compilation failure due to stricter OpenMP 4.0 handling in GCC 9,
+  add Fix-OpenMP-4_0-issues-with-GCC9.patch
+- Fix build with exiv2 >= 0.27, add
+  0001-Fix-build-with-exiv2-0.27.patch
+- Remove obsolete (since 2.2.0) SDL BuildRequires
+- Specify minimum versions for GTK3 (3.14), glib (2.40) and
+  exiv2 (0.24) in BuildRequires, matching upstream
+
+-------------------------------------------------------------------

New:
----
  0001-Fix-build-with-exiv2-0.27.patch
  Fix-OpenMP-4_0-issues-with-GCC9.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ darktable.spec ++++++
--- /var/tmp/diff_new_pack.4MXzSV/_old  2019-07-24 20:35:08.926576630 +0200
+++ /var/tmp/diff_new_pack.4MXzSV/_new  2019-07-24 20:35:08.930576629 +0200
@@ -91,7 +91,10 @@
 Source99:       README.openSUSE
 Patch:          darktable-old-glib.patch
 Patch1:         basecurve.readme.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# PATCH-FIX-UPSTREAM Backported from upcoming 2.8.0 version, 
https://patch-diff.githubusercontent.com/raw/darktable-org/darktable/pull/2550.patch
+Patch2:         Fix-OpenMP-4_0-issues-with-GCC9.patch
+# PATCH-FIX-UPSTREAM Fixed (differently) in 2.8.0
+Patch3:         0001-Fix-build-with-exiv2-0.27.patch
 
 ExclusiveArch:  x86_64 aarch64
 # build time tools
@@ -139,14 +142,14 @@
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(colord)
 BuildRequires:  pkgconfig(colord-gtk)
-BuildRequires:  pkgconfig(exiv2)
+BuildRequires:  pkgconfig(exiv2) > 0.24
 %if %{with flickcurl}
 BuildRequires:  pkgconfig(flickcurl)
 %endif
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(glib-2.0) > 2.40
+BuildRequires:  pkgconfig(gtk+-3.0) > 3.14
 BuildRequires:  pkgconfig(iso-codes)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(lcms2)
@@ -160,7 +163,6 @@
 BuildRequires:  pkgconfig(osmgpsmap-1.0)
 %endif
 BuildRequires:  pkgconfig(pango)
-BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(sqlite3)
 %if %{with opencl} && %{with system_opencl}
 BuildRequires:  opencl-headers
@@ -224,6 +226,8 @@
 %setup -q -n %{pkg_name}-%{version}
 %patch -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 chmod -x tools/basecurve/* tools/noise/*
 
 cp %{S:1} %{S:2} %{S:3} %{S:4} .
@@ -369,7 +373,6 @@
 %endif
 
 %files -f darktable.lang
-%defattr(-,root,root)
 %doc %{_defaultdocdir}/%{pkg_name}
 %exclude %{_defaultdocdir}/%{pkg_name}/*.pdf
 %if %{with basecurve_tool}
@@ -400,7 +403,6 @@
 
 %if %{with basecurve_tool}
 %files tools-basecurve
-%defattr(-,root,root)
 %{_bindir}/dt-curve-tool
 %{_bindir}/dt-curve-tool-helper
 %{_datadir}/%{pkg_name}/tools/basecurve/
@@ -408,14 +410,12 @@
 %endif
 
 %files tools-noise
-%defattr(-,root,root)
 %{_libexecdir}/darktable/tools/darktable-gen-noiseprofile
 %{_libexecdir}/darktable/tools/darktable-noiseprofile
 %{_libexecdir}/darktable/tools/profiling-shot.xmp
 %{_libexecdir}/darktable/tools/subr.sh
 
 %files doc
-%defattr(-,root,root)
 %{_defaultdocdir}/%{pkg_name}/*.pdf
 
 %changelog

++++++ 0001-Fix-build-with-exiv2-0.27.patch ++++++
>From c5e131d33f1148a37e7ea0226670ecac188acbce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de>
Date: Mon, 15 Jul 2019 22:55:08 +0200
Subject: [PATCH] Fix build with exiv2 0.27

Use exiv2.hpp as recommended by upstream
---
 tools/basecurve/exif-wrapper.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
index 7255072..4281e1d 100644
--- a/tools/basecurve/exif-wrapper.cpp
+++ b/tools/basecurve/exif-wrapper.cpp
@@ -16,8 +16,7 @@
     along with darktable.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
+#include <exiv2/exiv2.hpp>
 
 #include <cstdio>
 #include <cassert>
-- 
2.22.0

++++++ Fix-OpenMP-4_0-issues-with-GCC9.patch ++++++
++++ 5170 lines (skipped)



Reply via email to