summaryrefslogtreecommitdiff
path: root/sci-astronomy/siril/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-01-04 12:06:28 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-01-04 12:06:28 +0000
commit4551b41523452c0d743a71cca34e4dca2ca7538c (patch)
tree2b9ae4a442d7c2810f92833363fd36db073888f0 /sci-astronomy/siril/files
parent27e5574c9ed56a2633e25f7fa8f591554266a1b4 (diff)
gentoo auto-resync : 04:01:2023 - 12:06:28
Diffstat (limited to 'sci-astronomy/siril/files')
-rw-r--r--sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch (renamed from sci-astronomy/siril/files/siril-1.0-execinfo.patch)0
-rw-r--r--sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch45
2 files changed, 45 insertions, 0 deletions
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
index c9c7cd81c19f..c9c7cd81c19f 100644
--- a/sci-astronomy/siril/files/siril-1.0-execinfo.patch
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
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>