diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-06-14 15:21:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-06-14 15:21:15 +0100 |
commit | 1c382dc5dbc52576ac2300fee0498af8af44e7b4 (patch) | |
tree | 45d2492f5c659cbb01120d4192c9be34841362bd /sci-astronomy/siril/files | |
parent | b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b (diff) |
Revert "gentoo auto-resync : 14:06:2023 - 15:13:45"
This reverts commit b9e8f3cc44aed3b6da71c7510c6287bf7bbbc66b.
Diffstat (limited to 'sci-astronomy/siril/files')
-rw-r--r-- | sci-astronomy/siril/files/siril-1.2-stdint.patch | 33 | ||||
-rw-r--r-- | sci-astronomy/siril/files/siril-1.2-tiff.patch | 56 |
2 files changed, 0 insertions, 89 deletions
diff --git a/sci-astronomy/siril/files/siril-1.2-stdint.patch b/sci-astronomy/siril/files/siril-1.2-stdint.patch deleted file mode 100644 index a8fb39c2bd5d..000000000000 --- a/sci-astronomy/siril/files/siril-1.2-stdint.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/525 ---- a/src/core/exif.h -+++ b/src/core/exif.h -@@ -20,6 +20,8 @@ - #ifndef SRC_CORE_EXIF_H_ - #define SRC_CORE_EXIF_H_ - -+#include <stdint.h> -+ - #ifdef __cplusplus - extern "C" { - #endif ---- a/src/io/avi_pipp/pipp_avi_write_dib.h -+++ b/src/io/avi_pipp/pipp_avi_write_dib.h -@@ -1,6 +1,8 @@ - #ifndef PIPP_AVI_WRITE_DIB_H - #define PIPP_AVI_WRITE_DIB_H - -+#include <cstdint> -+ - #include "pipp_video_write.h" - #include "pipp_avi_write.h" - ---- a/src/io/avi_pipp/pipp_buffer.h -+++ b/src/io/avi_pipp/pipp_buffer.h -@@ -19,7 +19,6 @@ - #ifndef PIPP_BUFFER_H - #define PIPP_BUFFER_H - --#include <cstdint> - #include <cstdint> - #include <cstddef> - diff --git a/sci-astronomy/siril/files/siril-1.2-tiff.patch b/sci-astronomy/siril/files/siril-1.2-tiff.patch deleted file mode 100644 index 9e84f12c645b..000000000000 --- a/sci-astronomy/siril/files/siril-1.2-tiff.patch +++ /dev/null @@ -1,56 +0,0 @@ -https://gitlab.com/free-astro/siril/-/commit/de5030991caa9490c510651868783faae2530089 -From: Cyril Richard <cyril.richard42@gmail.com> -Date: Sun, 11 Jun 2023 23:40:10 +0200 -Subject: [PATCH] Fixing compiler error with no libtiff -Upstream: https://gitlab.com/free-astro/siril/-/issues/1129 - ---- a/src/gui/preferences.c -+++ b/src/gui/preferences.c -@@ -299,6 +299,7 @@ void initialize_path_directory(const gchar *path) { - } - - void initialize_starnet_executable(const gchar *path) { -+#ifdef HAVE_LIBTIFF - GtkFileChooser *starnet_exe = GTK_FILE_CHOOSER(lookup_widget("filechooser_starnet")); - GtkWidget *starnet_weights_reset = GTK_WIDGET(lookup_widget("starnet_weights_clear")); - GtkWidget *starnet_weights = GTK_WIDGET(lookup_widget("filechooser_starnet_weights")); -@@ -315,6 +316,7 @@ void initialize_starnet_executable(const gchar *path) { - gtk_widget_set_sensitive(starnet_weights, FALSE); - gtk_widget_set_sensitive(starnet_weights_reset, FALSE); - } -+#endif - } - - void initialize_starnet_weights(const gchar *path) { -@@ -404,6 +406,7 @@ void on_filechooser_swap_file_set(GtkFileChooserButton *fileChooser, gpointer us - } - - void on_filechooser_starnet_file_set(GtkFileChooserButton *fileChooser, gpointer user_data) { -+#ifdef HAVE_LIBTIFF - GtkFileChooser *starnet_exe = GTK_FILE_CHOOSER(fileChooser); - gchar *path; - -@@ -429,7 +432,7 @@ void on_filechooser_starnet_file_set(GtkFileChooserButton *fileChooser, gpointer - gtk_widget_set_sensitive(starnet_weights, FALSE); - gtk_widget_set_sensitive(starnet_weights_reset, FALSE); - } -- -+#endif - } - - void on_starnet_weights_clear_clicked(GtkButton *button, gpointer user_data) { ---- a/src/io/sequence_export.c -+++ b/src/io/sequence_export.c -@@ -650,7 +650,9 @@ void on_buttonExportSeq_clicked(GtkButton *button, gpointer user_data) { - // add a trailing '_' for multiple-files sequences - args->basename = format_basename(args->basename, TRUE); - if (args->output == EXPORT_TIFF) { -+#ifdef HAVE_LIBTIFF - args->tiff_compression = get_tiff_compression(); -+#endif - } - } - // Display a useful warning because I always forget to remove selection --- -GitLab - |