From 4551b41523452c0d743a71cca34e4dca2ca7538c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 4 Jan 2023 12:06:28 +0000
Subject: gentoo auto-resync : 04:01:2023 - 12:06:28

---
 .../siril/files/siril-1.0-execinfo-r1.patch        | 22 +++++++++++
 .../siril/files/siril-1.0-execinfo-r2.patch        | 45 ++++++++++++++++++++++
 sci-astronomy/siril/files/siril-1.0-execinfo.patch | 22 -----------
 3 files changed, 67 insertions(+), 22 deletions(-)
 create mode 100644 sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
 create mode 100644 sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
 delete mode 100644 sci-astronomy/siril/files/siril-1.0-execinfo.patch

(limited to 'sci-astronomy/siril/files')

diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
new file mode 100644
index 000000000000..c9c7cd81c19f
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
@@ -0,0 +1,22 @@
+commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
+Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date:   Thu Aug 4 00:27:08 2022 +0200
+
+    Include execinfo.h only if available
+
+Bug: https://bugs.gentoo.org/873016
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 74100b3a..0eefd460 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -25,7 +25,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <dbghelp.h>
+-#else
++#elif HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
+ 
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
new file mode 100644
index 000000000000..ffef786d0d8e
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
@@ -0,0 +1,45 @@
+commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
+Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date:   Thu Aug 4 00:27:08 2022 +0200
+
+    Include execinfo.h only if available
+
+Bug: https://bugs.gentoo.org/873016
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 74100b3a..0eefd460 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -25,7 +25,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <dbghelp.h>
+-#else
++#elif HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
+ 
+commit 13bafd227500018bef052cad1d73e9c681be1b8a
+Author: Cyril Richard <cyril.richard42@gmail.com>
+Date:   Thu Aug 4 11:29:23 2022 +0200
+
+    Fix for merge_requests/284
+
+Bug: https://bugs.gentoo.org/883121
+Upstream: https://gitlab.com/free-astro/siril/-/commit/13bafd227500018bef052cad1d73e9c681be1b8a
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 0eefd460..bbce5fa7 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -21,6 +21,9 @@
+ #define ANSI_COLOR_RED     "\e[1m\x1b[31m"
+ #define ANSI_COLOR_RESET   "\x1b[0m\e[0m"
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
+ #include <signal.h>
+ #ifdef _WIN32
+ #include <windows.h>
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo.patch b/sci-astronomy/siril/files/siril-1.0-execinfo.patch
deleted file mode 100644
index c9c7cd81c19f..000000000000
--- a/sci-astronomy/siril/files/siril-1.0-execinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
-Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date:   Thu Aug 4 00:27:08 2022 +0200
-
-    Include execinfo.h only if available
-
-Bug: https://bugs.gentoo.org/873016
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
-
-diff --git a/src/core/signals.c b/src/core/signals.c
-index 74100b3a..0eefd460 100644
---- a/src/core/signals.c
-+++ b/src/core/signals.c
-@@ -25,7 +25,7 @@
- #ifdef _WIN32
- #include <windows.h>
- #include <dbghelp.h>
--#else
-+#elif HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
- 
-- 
cgit v1.2.3