diff options
author | Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> | 2022-12-27 16:27:11 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-01-04 05:48:13 +0000 |
commit | 9e5efd3a4fb8564e7bb06e69953bd59882124bf4 (patch) | |
tree | a29896df1f1c464fd47a3b6f87c2c8fc1c9b7eed /sci-astronomy | |
parent | net-misc/icaclient: fix broken BDEPEND and add error handling (diff) | |
download | gentoo-9e5efd3a4fb8564e7bb06e69953bd59882124bf4.tar.gz gentoo-9e5efd3a4fb8564e7bb06e69953bd59882124bf4.tar.bz2 gentoo-9e5efd3a4fb8564e7bb06e69953bd59882124bf4.zip |
sci-astronomy/siril: fix call to undeclared function
Closes: https://bugs.gentoo.org/883121
Signed-off-by: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/28853
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-astronomy')
-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.patch | 45 | ||||
-rw-r--r-- | sci-astronomy/siril/siril-1.0.5-r1.ebuild | 2 | ||||
-rw-r--r-- | sci-astronomy/siril/siril-1.0.6-r2.ebuild (renamed from sci-astronomy/siril/siril-1.0.6-r1.ebuild) | 2 |
4 files changed, 47 insertions, 2 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> diff --git a/sci-astronomy/siril/siril-1.0.5-r1.ebuild b/sci-astronomy/siril/siril-1.0.5-r1.ebuild index 17294e54b727..fc3329c88116 100644 --- a/sci-astronomy/siril/siril-1.0.5-r1.ebuild +++ b/sci-astronomy/siril/siril-1.0.5-r1.ebuild @@ -49,7 +49,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-docfiles.patch" "${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch" + "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo-r1.patch" ) DOCS=( README.md NEWS ChangeLog AUTHORS ) diff --git a/sci-astronomy/siril/siril-1.0.6-r1.ebuild b/sci-astronomy/siril/siril-1.0.6-r2.ebuild index 46032d77f26c..a198b6fb965f 100644 --- a/sci-astronomy/siril/siril-1.0.6-r1.ebuild +++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild @@ -50,7 +50,7 @@ BDEPEND="x11-base/xorg-proto" PATCHES=( "${FILESDIR}/${PN}-docfiles.patch" "${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch" + "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo-r2.patch" ) DOCS=( README.md NEWS ChangeLog AUTHORS ) |