gentoo auto-resync : 25:03:2023 - 06:49:35

7 files changed, 113 insertions, 3 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index fb396d0eb2ef..643f7d2b6013 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 2839a9870be8..3c20b0814ee5 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,12 +1,14 @@
 AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e
-AUX siril-1.0-execinfo-r2.patch 1220 BLAKE2B 7e253e3ad1dd32bfcc1f5ba294617b18f06c51b8f37d9965fc9fdd46f5a227853858b8f9a1795081599d27a0718ba0f7bb574025fbb076a81610811c014cfdd1 SHA512 5f05502f089897f58cd08f7bb2ee8a272ef8bd799dae168f9072e21789989d0c002f6ceb341471aa3d71a44d13807a2b893ec2f7299ea5080be9bad5387f46f1
+AUX siril-1.0-execinfo-r2.patch 2493 BLAKE2B 5bd27710b0bc5eb942f40827a43ca1f8d70e48739daaf0cc16c85b7d50af46f7b08c21f8129d337099ac20beffff63c97b20a49c91b83d6131e6e161fb5531df SHA512 67d0bd524677c8700db2cf5eb2e65c774eb076b5cee0a3e24ea846c01ae63b06a5401eadfcd60d5b2b9f348312e093c679cb4a7c63db0fd316fdb533fd754143
+AUX siril-1.0-prototypes.patch 1436 BLAKE2B cee44f2c66cd00e29b4c1259c4be5fd6de9544fecfd1c41cea8aa735d23c0aad6b30479d4bee35131f7b1a5e0c9878ea67134a4a57658a49ef3d530f7fcbea2d SHA512 8b2f1673fc39153746496a23586ce6f9d76c24dbd648db4d943307ee4d3299cef7de425d709a342d3585783d22fa2fa6268c4f38676e5eb1d31e6ca0b762b422
 AUX siril-1.2-execinfo.patch 1273 BLAKE2B a70786b6cda34092d60e3651e015c6f54faa903a8c307c40d6fbec2b80ffe8bdf2b3ded3fdfbfb3a0c6a9ff4f48cefe9e5d15655c74d53b6f43fada8a5cf27d1 SHA512 9974f82dd964b5031619277a0de51d7afb0935e46b090e5ce5e54f2bbcede2c4212cdb48fe03ea06694eb7cfb367550cf76373cd72081574bc00a34794afc1be
 AUX siril-1.2-htmesh.patch 2036 BLAKE2B cc3fd4c31dcbde61976dfc9d84ce10576aeab2918bf6f7c7f24a765854f07b3a4e94cd77472d7e6f76f734aa6574b743582903de816e79e5d4808553867d4619 SHA512 eecc134f00d79e42450ec10b5ab11c2a9601a4435bd16f78d19efb93ed85e92e1e52c00a36099b8adb3c1d944a616de7155e82d3d6c9df9d0acaa349a73692a7
+AUX siril-1.2-openmp.patch 695 BLAKE2B f57296f6a8666c012cecb958de187c821c800287734512c12a4937de721899ff3509e4dfe605f0e06af3783906a81e98ccca0d6e55d85817e9a48f5553bcc57e SHA512 987a512a2c9fe4dbe50dc18b6d4e7d0bcaf971a4fd6cbbc273ddb105d51a3f6fa14927d5825949b655535bd83347c8dbff6981bde6803bb523dddf1a4c4d616f
 AUX siril-1.2-prototypes.patch 1436 BLAKE2B cee44f2c66cd00e29b4c1259c4be5fd6de9544fecfd1c41cea8aa735d23c0aad6b30479d4bee35131f7b1a5e0c9878ea67134a4a57658a49ef3d530f7fcbea2d SHA512 8b2f1673fc39153746496a23586ce6f9d76c24dbd648db4d943307ee4d3299cef7de425d709a342d3585783d22fa2fa6268c4f38676e5eb1d31e6ca0b762b422
 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72
 DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
 DIST siril-1.2.0-beta1.tar.bz2 3869827 BLAKE2B 4ba624e917234f389f3ac1f2baf7519aacf4da6494ff437491103491dcac60ff146665faf0daf700a4d2e375d098b3b9af75c60975b882600ab96700a4dff166 SHA512 e259f46e2792d59f53d1e9e5fd3b33c6a912a9c19b53c4d84a803f153e1c5c4395f2fb413a21887330f41e06b7d62996162e65e73774faadb47ff7edc9f4150d
-EBUILD siril-1.0.6-r2.ebuild 2070 BLAKE2B a80a8fa49ab6f168432b20b2607e4f9975efa795e8a5310d28e220a049a4ab2d8fd827f32a1833a873a52e43877367878c4396d49a11fd0a40ae30757b264121 SHA512 cc61c2381381690b60c3233c477d1419e540e7e10f5f436f602cf47885de11f32a3b49a9ec2754773063a560571f52c422d1aa3d75044208d8ceca07c9958699
-EBUILD siril-1.2.0_beta1.ebuild 2200 BLAKE2B 124c4a3951d8a88f38676b2c928d76de69eea17a6ecec28cf51354ab3d57f4161c7ed1259636b1d8a368d6bd0413efef9161fba33fbef28933c7492bbc98ff49 SHA512 450e3a60a3d60ac141619bb7caaa003ee4eb6b707858b3534447eef2ffd336d9a381e69c74d14755fca99d2b395d5ccdffc61e1f6be341792bb0d6bc692e4d52
+EBUILD siril-1.0.6-r2.ebuild 2123 BLAKE2B 8b4de91e2adfafd58a2b277233c148ce8bf25133eed8e8847fc697ef48b9b0714f43d5c8b6a7f066fe1cbd7f70ce8140b5ec0bec060292d69be78d8233f5a80c SHA512 dd50f25ab511b422361cdc0b7b15197a4d1c45c627b4550946c9168da6aabb50e4ab8f561d2e11600587065ca63f5ab6aae17fa0a2f730b3e883c2ae4861f9dc
+EBUILD siril-1.2.0_beta1.ebuild 2249 BLAKE2B 08c27717f74aa1159c4ce638e7df6cccb91c26df333917b091b8ff8ecfb30b647e6208d9e203d4eaa1eeb2614e7b0dc791341f3fa019a282ee76689c2e5ca67b SHA512 9338ea7c66e6ec2dd556e8d3b20a7e57a55273942096d590f619bb6daffb621bcce1288c053ca63619e6eaf73ff78f511c782b5c1c4802c8816b5dfc78b5fd10
 EBUILD siril-9999.ebuild 2026 BLAKE2B b48b513249493b5293063fb86c9f8f526e82d4f7f461b43671b31520a8ee1a31ab21ea2b1859b4b37c666e9ff09bf568db43c93a18c0e9e24bc6cd241e7cd77e SHA512 ed0b053f0f20d061b5562fae58afea32fb11304e8f1079c15595f43d53cce9c0db293a4d212b387f91c5faff3eb2e4ef5d783bbbd572b023abff27f7ff6c9a28
 MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
index ffef786d0d8e..55ce90558b64 100644
--- a/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
@@ -6,6 +6,8 @@ Date:   Thu Aug 4 00:27:08 2022 +0200
 
 Bug: https://bugs.gentoo.org/873016
 Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
+Bug: https://bugs.gentoo.org/898108
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/442
 
 diff --git a/src/core/signals.c b/src/core/signals.c
 index 74100b3a..0eefd460 100644
@@ -43,3 +45,47 @@ index 0eefd460..bbce5fa7 100644
  #include <signal.h>
  #ifdef _WIN32
  #include <windows.h>
+From 6f959a02d27fb507cda1898a3aa785766e77d404 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Mon, 27 Feb 2023 17:34:43 +0100
+Subject: [PATCH] fix HAVE_EXECINFO_H logic
+
+---
+ src/core/signals.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 42b369d6..d4745909 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -55,13 +55,7 @@ static void signal_handled(int s) {
+ 			g_printf(ANSI_COLOR_RED"%s"ANSI_COLOR_RESET"\n", visit);
+ 		}
+ 
+-#if (!defined _WIN32 && defined HAVE_EXECINFO_H)
+-		void *stack[STACK_DEPTH];
+-
+-		size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
+-
+-		backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
+-#else
++#ifdef _WIN32
+ 		unsigned int i;
+ 		void *stack[STACK_DEPTH];
+ 		unsigned short size;
+@@ -84,6 +78,12 @@ static void signal_handled(int s) {
+ 		}
+ 
+ 		free(symbol);
++#elif HAVE_EXECINFO_H
++		void *stack[STACK_DEPTH];
++
++		size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
++
++		backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
+ #endif
+ 	}
+ 	undo_flush();
+-- 
+2.39.2
+
diff --git a/sci-astronomy/siril/files/siril-1.0-prototypes.patch b/sci-astronomy/siril/files/siril-1.0-prototypes.patch
new file mode 100644
index 000000000000..8b72fef41b49
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-prototypes.patch
@@ -0,0 +1,41 @@
+From 6c06d62579234e1d0030bad985a9cfcf7249b5d7 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Mon, 27 Feb 2023 17:49:41 +0100
+Subject: [PATCH 1/2] fix prototypes for functions with parameters
+Bug: https://bugs.gentoo.org/898108
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/443
+
+---
+ src/core/processing.h | 2 +-
+ src/gui/save_dialog.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/processing.h b/src/core/processing.h
+index 1eba970b..89f24bd3 100644
+--- a/src/core/processing.h
++++ b/src/core/processing.h
+@@ -162,7 +162,7 @@ void wait_for_script_thread();
+ gboolean end_generic(gpointer arg);
+ guint siril_add_idle(GSourceFunc idle_function, gpointer data);
+ 
+-struct generic_seq_args *create_default_seqargs();
++struct generic_seq_args *create_default_seqargs(sequence *seq);
+ 
+ int check_threading(threading_type *threads);
+ int limit_threading(threading_type *threads, int min_iterations_per_thread, size_t total_iterations);
+diff --git a/src/gui/save_dialog.h b/src/gui/save_dialog.h
+index c724abb1..586a2ca3 100644
+--- a/src/gui/save_dialog.h
++++ b/src/gui/save_dialog.h
+@@ -20,7 +20,7 @@ enum {
+ };
+ 
+ void on_header_save_as_button_clicked();
+-void on_header_snapshot_button_clicked();
++void on_header_snapshot_button_clicked(gboolean clipboard);
+ void on_header_save_button_clicked();
+ 
+ #endif /* SRC_GUI_SAVE_DIALOG_H_ */
+-- 
+2.39.2
+
diff --git a/sci-astronomy/siril/files/siril-1.2-openmp.patch b/sci-astronomy/siril/files/siril-1.2-openmp.patch
new file mode 100644
index 000000000000..eba90448f422
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-openmp.patch
@@ -0,0 +1,19 @@
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri, 24 Mar 2023 18:24:26 +0100
+Subject: [PATCH] Add ifdef around openmp function
+Bug: https://bugs.gentoo.org/902833
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/482
+
+--- a/src/algos/quantize.c
++++ b/src/algos/quantize.c
+@@ -1396,8 +1396,10 @@ row of the image.
+ #pragma omp parallel num_threads(threads) if (threads>1)
+ #endif
+ 	{
++#ifdef _OPENMP
+ 		if (threads > 1 && omp_get_num_threads() != threads)
+ 			siril_debug_print("actual number of threads: %d of %d requested (level %d)\n", omp_get_num_threads(), threads, omp_get_level());
++#endif
+ 		float *rowpix, v1;
+ 		double mean, stdev;
+ 		float *differences;
diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
index 5de589b0f985..81e303d7c5dd 100644
--- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
 	"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
 	"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo-r2.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-prototypes.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )
diff --git a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
index 45dd80e9e5b2..e02693c80ab7 100644
--- a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-$(ver_cut 1-2)-htmesh.patch"
 	"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
 	"${FILESDIR}/${PN}-$(ver_cut 1-2)-prototypes.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-openmp.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )