Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package siril for openSUSE:Factory checked 
in at 2021-05-18 18:27:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/siril (Old)
 and      /work/SRC/openSUSE:Factory/.siril.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "siril"

Tue May 18 18:27:28 2021 rev:4 rq:894072 version:0.99.8.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/siril/siril.changes      2021-03-30 
21:06:26.861116564 +0200
+++ /work/SRC/openSUSE:Factory/.siril.new.2988/siril.changes    2021-05-18 
18:27:55.438577143 +0200
@@ -1,0 +2,6 @@
+Fri May  7 07:26:48 UTC 2021 - Paolo Stivanin <i...@paolostivanin.com>
+
+- Fix glib 2.68 compilation error
+- Add fix_glib_2_68_error.patch
+
+-------------------------------------------------------------------

New:
----
  fix_glib_2_68_error.patch

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

Other differences:
------------------
++++++ siril.spec ++++++
--- /var/tmp/diff_new_pack.qRh7wC/_old  2021-05-18 18:27:55.902575133 +0200
+++ /var/tmp/diff_new_pack.qRh7wC/_new  2021-05-18 18:27:55.906575115 +0200
@@ -24,6 +24,8 @@
 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 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # override build directory, the default "build" is a regular source directory

++++++ fix_glib_2_68_error.patch ++++++
>From d319fceca5b00f156e1c5e3512d3ac1f41beb16a Mon Sep 17 00:00:00 2001
From: Cyril Richard <cyril.richar...@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

Reply via email to