gentoo auto-resync : 08:03:2023 - 18:00:26

7 files changed, 167 insertions, 34 deletions

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 382522a05c04..2839a9870be8 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,10 +1,12 @@
 AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e
-AUX siril-1.0-execinfo-r1.patch 567 BLAKE2B 852e3491139a6ab38d0490c57b5c90f553fba76319048cf2c3dd395bc403c10bff15ebc302904b4275b5956e38eb10dbc598dfba24bea656777540db12755d51 SHA512 2e2cc76a2a95f5d3e9bad8c710900344cd10534b70f9c36a5c1232b69adda937efac2eb7f8e0c3f86314ca11a95196e734ae114c18c47d8aaae7707968f412f8
 AUX siril-1.0-execinfo-r2.patch 1220 BLAKE2B 7e253e3ad1dd32bfcc1f5ba294617b18f06c51b8f37d9965fc9fdd46f5a227853858b8f9a1795081599d27a0718ba0f7bb574025fbb076a81610811c014cfdd1 SHA512 5f05502f089897f58cd08f7bb2ee8a272ef8bd799dae168f9072e21789989d0c002f6ceb341471aa3d71a44d13807a2b893ec2f7299ea5080be9bad5387f46f1
+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-prototypes.patch 1436 BLAKE2B cee44f2c66cd00e29b4c1259c4be5fd6de9544fecfd1c41cea8aa735d23c0aad6b30479d4bee35131f7b1a5e0c9878ea67134a4a57658a49ef3d530f7fcbea2d SHA512 8b2f1673fc39153746496a23586ce6f9d76c24dbd648db4d943307ee4d3299cef7de425d709a342d3585783d22fa2fa6268c4f38676e5eb1d31e6ca0b762b422
 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72
-DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
 DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
-EBUILD siril-1.0.5-r1.ebuild 2017 BLAKE2B 490e2aec30486ae9059443088ed9af21c4265b79731ac4c0e891255d34a6c0d280383329e4cb6f7b2659b5130e378af249005666981ef00abd9486f6f99f7718 SHA512 d5cfc1385fa8c4295247075da10333dbb1cec2bb71e001b14366feae12035aa2888f982391b8ff4705cf4784da1d4080bb86476616befc807d167d458d72c4b1
+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-9999.ebuild 1960 BLAKE2B fbb8be0a40cf3d416dd52fc5e5273b00bd63b312043ddd22c7747517faa1a64d74c6036d853ce72174c33ff5dcaea4d8242aec834e46737d04796ef8ab512e86 SHA512 f9a5f7e79f151400da38d433d4802ec621cb2224925df91a73a24201a10741ee2d8ec4bd43963901d8949609d7061d139c864a9cf3c595c7af336232e8a3798f
+EBUILD siril-1.2.0_beta1.ebuild 2200 BLAKE2B 124c4a3951d8a88f38676b2c928d76de69eea17a6ecec28cf51354ab3d57f4161c7ed1259636b1d8a368d6bd0413efef9161fba33fbef28933c7492bbc98ff49 SHA512 450e3a60a3d60ac141619bb7caaa003ee4eb6b707858b3534447eef2ffd336d9a381e69c74d14755fca99d2b395d5ccdffc61e1f6be341792bb0d6bc692e4d52
+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-r1.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
deleted file mode 100644
index c9c7cd81c19f..000000000000
--- a/sci-astronomy/siril/files/siril-1.0-execinfo-r1.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
- 
diff --git a/sci-astronomy/siril/files/siril-1.2-execinfo.patch b/sci-astronomy/siril/files/siril-1.2-execinfo.patch
new file mode 100644
index 000000000000..82f29b290f63
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-execinfo.patch
@@ -0,0 +1,46 @@
+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
+Bug: https://bugs.gentoo.org/898108
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/442
+
+---
+ 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.2-htmesh.patch b/sci-astronomy/siril/files/siril-1.2-htmesh.patch
new file mode 100644
index 000000000000..83f389267c40
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-htmesh.patch
@@ -0,0 +1,57 @@
+From 915d01b7e94ff0a597685976838ab707917428db Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri, 24 Feb 2023 19:00:52 +0100
+Subject: [PATCH] Don't install bundled htmesh static library system wide.
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/438
+
+---
+ subprojects/htmesh/CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/subprojects/htmesh/CMakeLists.txt b/subprojects/htmesh/CMakeLists.txt
+index 5c197a9e..189acd3e 100644
+--- a/subprojects/htmesh/CMakeLists.txt
++++ b/subprojects/htmesh/CMakeLists.txt
+@@ -49,9 +49,10 @@ set_target_properties(htmesh PROPERTIES
+     VERSION 1.0.0
+     SOVERSION 1)
+ 
+-if (NOT ANDROID)
+-    install(TARGETS htmesh ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+-endif ()
++# It is not necessary to install the static library as we just link against it.
++#if (NOT ANDROID)
++#    install(TARGETS htmesh ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
++#endif ()
+ 
+ # If you wish to compile the HTMesh perl wrapper, uncomment this, rebuild and copy the library into /usr/lib/, because we will use it as a shared object. See README in the perl wrapper directory (kstars/kstars/data/tools/HTMesh-*) for more details.
+ #set_property(TARGET htmesh PROPERTY POSITION_INDEPENDENT_CODE YES)
+-- 
+2.39.2
+
+From 42a12b852f4146aa104350587c456a35501a9707 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri, 24 Feb 2023 18:40:26 +0100
+Subject: [PATCH] Fix typo in htmesh build configuration
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/437
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 886f3697..1ed39a98 100644
+--- a/meson.build
++++ b/meson.build
+@@ -270,7 +270,7 @@ endif
+   htmesh_dep = sub_proj.dependency('htmesh')
+   htmesh_inc = sub_proj.include_directories('htmesh')
+ else
+-  siril_cpp_flag += '-DHAVE_LIBRTPROCESS'
++  siril_cpp_flag += '-DHAVE_HTMESH'
+ endif
+ 
+ ## Optional dependencies
+-- 
+2.39.2
+
diff --git a/sci-astronomy/siril/files/siril-1.2-prototypes.patch b/sci-astronomy/siril/files/siril-1.2-prototypes.patch
new file mode 100644
index 000000000000..8b72fef41b49
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-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/siril-1.0.5-r1.ebuild b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
index fc3329c88116..45dd80e9e5b2 100644
--- a/sci-astronomy/siril/siril-1.0.5-r1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,18 +13,18 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
 LICENSE="GPL-3+ Boost-1.0"
 SLOT="0"
-IUSE="curl ffmpeg heif jpeg openmp png raw tiff wcs"
+IUSE="curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
 	>=dev-libs/json-glib-1.2.6
-	>=dev-libs/libconfig-1.4[cxx]
+	dev-libs/sleef:=
 	>=media-gfx/exiv2-0.25
 	media-libs/librtprocess:=
 	>=media-libs/opencv-4.4.0:=
@@ -36,6 +36,7 @@ DEPEND="
 	curl? ( net-misc/curl )
 	ffmpeg? ( media-video/ffmpeg:= )
 	heif? ( media-libs/libheif )
+	libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	png? ( >=media-libs/libpng-1.6.0 )
 	raw? ( media-libs/libraw )
@@ -45,11 +46,14 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
+BDEPEND="dev-util/cmake
+	x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
-	"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo-r1.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-htmesh.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
+	"${FILESDIR}/${PN}-$(ver_cut 1-2)-prototypes.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )
@@ -69,6 +73,7 @@ src_configure() {
 		$(meson_use ffmpeg)
 		$(meson_use heif libheif)
 		$(meson_use jpeg libjpeg)
+		$(meson_use libconfig)
 		$(meson_use openmp)
 		$(meson_use png libpng)
 		$(meson_use raw libraw)
@@ -81,6 +86,7 @@ src_configure() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	optfeature "gnuplot support" sci-visualization/gnuplot
 }
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index 40c1b926aa34..eeffd9b1d7ed 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi
 
@@ -24,6 +24,7 @@ IUSE="curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
 	>=dev-libs/json-glib-1.2.6
+	dev-libs/sleef:=
 	>=media-gfx/exiv2-0.25
 	media-libs/librtprocess:=
 	>=media-libs/opencv-4.4.0:=
@@ -45,6 +46,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 "
+BDEPEND="x11-base/xorg-proto"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
@@ -80,6 +82,7 @@ src_configure() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	optfeature "gnuplot support" sci-visualization/gnuplot
 }