Accepting request 891210 from home:polslinux:branches:graphics

- Fix glib 2.68 compilation error
- Add fix_glib_2_68_error.patch

OBS-URL: https://build.opensuse.org/request/show/891210
OBS-URL: https://build.opensuse.org/package/show/graphics/siril?expand=0&rev=15

fix_glib_2_68_error.patch

@@ -0,0 +1,32 @@
+From d319fceca5b00f156e1c5e3512d3ac1f41beb16a Mon Sep 17 00:00:00 2001
+From: Cyril Richard <cyril.richard42@gmail.com>
+Date: Tue, 2 Mar 2021 13:46:32 +0100
+Subject: [PATCH] Should fix the bug in issue #680
+
+---
+ src/core/exif.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/exif.cpp b/src/core/exif.cpp
+index dd58b1dc..f3070198 100644
+--- a/src/core/exif.cpp
++++ b/src/core/exif.cpp
+@@ -25,7 +25,6 @@ extern "C" {
+ #include "config.h"
+ #endif
+ 
+-#include <glib.h>
+ #ifdef _OPENMP
+ #include <omp.h>
+ #endif
+@@ -33,6 +32,8 @@ extern "C" {
+ }
+ #endif
+ 
++#include <glib.h>
++
+ #include <cassert>
+ #include <fstream>
+ #include <iostream>
+-- 
+GitLab

siril.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May  7 07:26:48 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>
+
+- Fix glib 2.68 compilation error
+- Add fix_glib_2_68_error.patch
+
 -------------------------------------------------------------------
 Thu Feb 18 07:59:01 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>
 

siril.spec

@@ -24,6 +24,8 @@ License:        GPL-3.0-only
 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/d319fceca5b00f156e1c5e3512d3ac1f41beb16a
+Patch0:         fix_glib_2_68_error.patch
 BuildRequires:  gcc-c++
 # Remove git build dep when fixed upstream: https://gitlab.com/free-astro/siril/-/issues/583
 BuildRequires:  git
@@ -58,6 +60,7 @@ automatically or manually, stack them and enhance final images.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # override build directory, the default "build" is a regular source directory