commit: 58d529eec174f6457a6a1b15dec1e3208977d25b Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Aug 13 13:39:13 2023 +0000 Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org> CommitDate: Sun Aug 13 14:02:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d529ee
media-sound/aqualung: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/32286 Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org> media-sound/aqualung/files/aqualung-1.1-ifp.patch | 41 ---------------------- .../files/aqualung-1.1-var-collision.patch | 31 ---------------- 2 files changed, 72 deletions(-) diff --git a/media-sound/aqualung/files/aqualung-1.1-ifp.patch b/media-sound/aqualung/files/aqualung-1.1-ifp.patch deleted file mode 100644 index 490999be9485..000000000000 --- a/media-sound/aqualung/files/aqualung-1.1-ifp.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001 -From: Adam Sampson <[email protected]> -Date: Tue, 8 Sep 2020 15:55:12 +0100 -Subject: [PATCH] Fix arr_strlcpy call in ifp_device. - -directory_chooser needs to know the length of the target. ---- - src/ifp_device.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/ifp_device.c b/src/ifp_device.c -index 9ef5741..42236cb 100644 ---- a/src/ifp_device.c -+++ b/src/ifp_device.c -@@ -824,7 +824,7 @@ gchar *npath; - - - void --directory_chooser(char * title, GtkWidget * parent, char * directory) { -+directory_chooser(char * title, GtkWidget * parent, char * directory, size_t directory_len) { - - GtkWidget * dialog; - const gchar * selected_directory; -@@ -855,7 +855,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) { - gtk_widget_destroy(dialog); - } - -- arr_strlcpy(directory, selected_directory); -+ g_strlcpy(directory, selected_directory, directory_len); - g_free(utf8); - } - -@@ -865,7 +865,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) { - - void - local_path_selected_cb(GtkButton * button, gpointer data) { -- directory_chooser(_("Please select a local path."), aifp_window, dest_dir); -+ directory_chooser(_("Please select a local path."), aifp_window, dest_dir, sizeof dest_dir); - gtk_entry_set_text(GTK_ENTRY(local_path_entry), dest_dir); - } - diff --git a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch b/media-sound/aqualung/files/aqualung-1.1-var-collision.patch deleted file mode 100644 index 2606a0bea00c..000000000000 --- a/media-sound/aqualung/files/aqualung-1.1-var-collision.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e49f31ba779c938fa6dd3eaf848c68735e3386f5 Mon Sep 17 00:00:00 2001 -From: Adam Sampson <[email protected]> -Date: Sun, 10 Jan 2021 22:32:04 +0000 -Subject: [PATCH] Don't call a variable "bool". - -If one of the headers happens to #include <stdbool.h>, this'll clash -with the C99 type definition. ---- - src/build_store.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/build_store.c b/src/build_store.c -index 56b0eaf..ed4bfca 100644 ---- a/src/build_store.c -+++ b/src/build_store.c -@@ -382,12 +382,12 @@ data_src_cell_toggled(GtkCellRendererToggle * cell, gchar * path, gpointer data) - data_src_gui_t * gui = (data_src_gui_t *)data; - - if (gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(gui->list), &iter, path)) { -- gboolean bool; -+ gboolean value; - int type; - -- gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &bool, 1, &type, -1); -+ gtk_tree_model_get(GTK_TREE_MODEL(gui->list), &iter, 0, &value, 1, &type, -1); - gtk_list_store_set(GTK_LIST_STORE(gui->list), &iter, -- 0, !bool && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1); -+ 0, !value && (type != DATA_SRC_CDDB || gui->model->cddb_mask), -1); - } - } -
