diff --git a/0001-Fix-compilation-with-Exiv-0.28.patch b/0001-Fix-compilation-with-Exiv-0.28.patch new file mode 100644 index 0000000..45972c4 --- /dev/null +++ b/0001-Fix-compilation-with-Exiv-0.28.patch @@ -0,0 +1,26 @@ +From 15d475774e4f9e0498618466f8e349070688f4dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Fri, 23 Jun 2023 16:35:09 +0200 +Subject: [PATCH] Fix compilation with Exiv 0.28 + +Extracted from commit a593c2b10c9090b5f991718148d61c0fa156fb41. +--- + src/core/exif.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/exif.cpp b/src/core/exif.cpp +index 6bc5c52..266abec 100644 +--- a/src/core/exif.cpp ++++ b/src/core/exif.cpp +@@ -108,7 +108,7 @@ int siril_get_thumbnail_exiv(const char *path, uint8_t **buffer, size_t *size, c + //std::cerr << "[exiv2] "<< path << ": found thumbnail "<< preview.width() << "x" << preview.height() << std::endl; + memcpy(*buffer, tmp, _size); + return 0; +- } catch (Exiv2::AnyError &e) { ++ } catch (Exiv2::Error &e) { + std::string s(e.what()); + std::cerr << "[exiv2]: " << s << std::endl; + return 1; +-- +2.41.0 + diff --git a/siril.changes b/siril.changes index 42de768..5506917 100644 --- a/siril.changes +++ b/siril.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 23 14:36:11 UTC 2023 - Stefan BrĂ¼ns + +- Add 0001-Fix-compilation-with-Exiv-0.28.patch + ------------------------------------------------------------------- Tue Oct 18 09:25:14 UTC 2022 - Paolo Stivanin diff --git a/siril.spec b/siril.spec index 54a18ac..5402fc1 100644 --- a/siril.spec +++ b/siril.spec @@ -1,7 +1,7 @@ # # spec file for package siril # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ License: BSL-1.0 AND GPL-3.0-or-later Group: Productivity/Scientific/Physics URL: https://www.siril.org/ Source: https://gitlab.com/free-astro/siril/-/archive/%{version}/siril-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM -- https://gitlab.com/free-astro/siril/-/commit/a593c2b10c9090b5f991718148d61c0fa156fb41 +Patch0: 0001-Fix-compilation-with-Exiv-0.28.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: meson >= 0.53.0