commit: 6c0c1e13093bed048bd46dec85e00d019b9becbc Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> AuthorDate: Fri Feb 7 08:31:05 2025 +0000 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> CommitDate: Fri Feb 7 08:32:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c0c1e13
media-radio/grig: Adapt to new media-radio/hamlib-4.6.1 Closes: https://bugs.gentoo.org/949337 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> media-radio/grig/files/grig-0.8.1-hamlib46.patch | 30 ++++++++++++++++++++++++ media-radio/grig/grig-0.8.1-r1.ebuild | 5 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/media-radio/grig/files/grig-0.8.1-hamlib46.patch b/media-radio/grig/files/grig-0.8.1-hamlib46.patch new file mode 100644 index 000000000000..ce6cc80c0123 --- /dev/null +++ b/media-radio/grig/files/grig-0.8.1-hamlib46.patch @@ -0,0 +1,30 @@ +# see discussion at https://github.com/fillods/grig/issues/22 +diff --git a/src/rig-selector.c b/src/rig-selector.c +index 53c7e7c..4b7a0de 100644 +--- a/src/rig-selector.c ++++ b/src/rig-selector.c +@@ -46,7 +46,7 @@ static void add (GtkWidget *, gpointer); + static void delete (GtkWidget *, gpointer); + static void edit (GtkWidget *, gpointer); + static void cancel (GtkWidget *, gpointer); +-static void connect (GtkWidget *, gpointer); ++static void connectrig(GtkWidget *, gpointer); + static void selection_changed (GtkTreeSelection *sel, gpointer data); + + static void render_civ (GtkTreeViewColumn *col, +@@ -191,7 +191,7 @@ rig_selector_execute () + g_signal_connect (G_OBJECT (cancbut), "clicked", + G_CALLBACK (cancel), window); + g_signal_connect (G_OBJECT (conbut), "clicked", +- G_CALLBACK (connect), window); ++ G_CALLBACK (connectrig), window); + g_signal_connect (G_OBJECT (delbut), "clicked", + G_CALLBACK (delete), NULL); + g_signal_connect (G_OBJECT (newbut), "clicked", +@@ -439,7 +439,7 @@ static void cancel (GtkWidget *button, gpointer window) + * simply destroys the rig selector window and whereby control is returned + * to the main() function. + */ +-static void connect (GtkWidget *button, gpointer window) ++static void connectrig(GtkWidget *button, gpointer window) + { diff --git a/media-radio/grig/grig-0.8.1-r1.ebuild b/media-radio/grig/grig-0.8.1-r1.ebuild index 04e2f3723d8c..7d8dd1f84b6d 100644 --- a/media-radio/grig/grig-0.8.1-r1.ebuild +++ b/media-radio/grig/grig-0.8.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,8 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/grig-0.8.1-hamlib4.patch - "${FILESDIR}"/grig-0.8.1-hamlib45.patch ) + "${FILESDIR}"/grig-0.8.1-hamlib45.patch + "${FILESDIR}"/grig-0.8.1-hamlib46.patch ) src_configure() { econf --enable-hardware
