commit: d869640c70baf3d641600210646ed3bd4770c843 Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> AuthorDate: Sat Mar 25 07:03:19 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 25 07:16:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d869640c
sci-astronomy/siril: merge duplicate patches Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/30337 Signed-off-by: Sam James <sam <AT> gentoo.org> .../siril/files/siril-1.2-prototypes.patch | 41 ---------------------- ...1.0-prototypes.patch => siril-prototypes.patch} | 0 sci-astronomy/siril/siril-1.0.6-r2.ebuild | 2 +- sci-astronomy/siril/siril-1.2.0_beta1.ebuild | 2 +- 4 files changed, 2 insertions(+), 43 deletions(-) diff --git a/sci-astronomy/siril/files/siril-1.2-prototypes.patch b/sci-astronomy/siril/files/siril-1.2-prototypes.patch deleted file mode 100644 index 8b72fef41b49..000000000000 --- a/sci-astronomy/siril/files/siril-1.2-prototypes.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6c06d62579234e1d0030bad985a9cfcf7249b5d7 Mon Sep 17 00:00:00 2001 -From: Mario Haustein <mario.haust...@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.0-prototypes.patch b/sci-astronomy/siril/files/siril-prototypes.patch similarity index 100% rename from sci-astronomy/siril/files/siril-1.0-prototypes.patch rename to sci-astronomy/siril/files/siril-prototypes.patch diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild b/sci-astronomy/siril/siril-1.0.6-r2.ebuild index 81e303d7c5dd..bd365161a77b 100644 --- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild +++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild @@ -51,7 +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" + "${FILESDIR}/${PN}-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 e02693c80ab7..0c2bb48012a9 100644 --- a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild +++ b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild @@ -53,7 +53,7 @@ PATCHES=( "${FILESDIR}/${PN}-docfiles.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" + "${FILESDIR}/${PN}-prototypes.patch" "${FILESDIR}/${PN}-$(ver_cut 1-2)-openmp.patch" )
