gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

app-emulation/vice: fix build with USE="mpg123 gtk -curl"

Browse Source 
Closes: https://bugs.gentoo.org/970962
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
2026-03-06 21:00:04 -05:00
parent 94d3fae13e
commit 33f7d7a84c
2 changed files with 173 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
app-emulation/vice/files/vice-3.10-mpg123-without-curl.patch Normal file
View File

@@ -0,0 +1,169 @@
https://bugs.gentoo.org/970962
https://sourceforge.net/p/vice-emu/code/45964/
--- a/src/arch/gtk3/widgets/settings_userport.c
+++ b/src/arch/gtk3/widgets/settings_userport.c
@@ -442,81 +441,0 @@
-#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
-/* FunMP3 path selection widget */
-#include "mainlock.h"
-
-/** \brief Callback for the directory-select dialog
- *
- * \param[in] dialog directory-select dialog
- * \param[in] filename filename (NULL if canceled)
- * \param[in] entry entry box for the filename
- */
-static void funmp3dir_browse_callback(GtkDialog *dialog, gchar *filename, gpointer entry)
-{
- if (filename != NULL) {
- vice_gtk3_resource_entry_set(GTK_WIDGET(entry), filename);
- g_free(filename);
- }
- gtk_widget_destroy(GTK_WIDGET(dialog));
-}
-
-/** \brief Handler for the 'clicked' event of the FunMP3 directory browse button
- *
- * \param[in] button FunMP3 directory browse button (unused)
- * \param[in] entry FunMP3 directory text entry
- */
-static void on_funmp3dir_browse_clicked(GtkWidget *button, gpointer entry)
-{
- GtkWidget *dialog;
-
- mainlock_assert_is_not_vice_thread();
-
- dialog = vice_gtk3_select_directory_dialog("Select FunMP3 directory",
- NULL,
- TRUE,
- NULL,
- funmp3dir_browse_callback,
- entry);
- gtk_widget_show_all(dialog);
-}
-
-/** \brief Create FunMP3 path selection entry widget
- *
- */
-static GtkWidget *create_funmp3dir_entry_widget(void)
-{
- GtkWidget *entry;
- entry = vice_gtk3_resource_entry_new("FunMP3Dir");
- gtk_widget_set_tooltip_text(entry,
- "Select the host directory for MP3 files");
- gtk_widget_set_hexpand(entry, TRUE);
- return entry;
-}
-
-/** \brief Create FunMP3 path selection widget
- *
- */
-static GtkWidget *create_funmp3dir_widget(void)
-{
- GtkWidget *grid;
- GtkWidget *entry;
- GtkWidget *label;
- GtkWidget *browse;
-
- grid = vice_gtk3_grid_new_spaced(8, 0);
-
- label = gtk_label_new("FunMP3 directory");
- gtk_widget_set_halign(label, GTK_ALIGN_START);
- entry = create_funmp3dir_entry_widget();
- browse = gtk_button_new_with_label("Browse ...");
- g_signal_connect_unlocked(browse,
- "clicked",
- G_CALLBACK(on_funmp3dir_browse_clicked),
- (gpointer)entry);
- gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1);
- gtk_grid_attach(GTK_GRID(grid), entry, 1, 1, 1, 1);
- gtk_grid_attach(GTK_GRID(grid), browse, 2, 1, 1, 1);
-
- gtk_widget_show_all(grid);
- return grid;
-}
-
-#endif /* MPG123 && HAVE_GLOB_H */
@@ -684,0 +604,82 @@
+
+#if defined(USE_MPG123) && defined (HAVE_GLOB_H)
+/* FunMP3 path selection widget */
+#include "mainlock.h"
+
+/** \brief Callback for the directory-select dialog
+ *
+ * \param[in] dialog directory-select dialog
+ * \param[in] filename filename (NULL if canceled)
+ * \param[in] entry entry box for the filename
+ */
+static void funmp3dir_browse_callback(GtkDialog *dialog, gchar *filename, gpointer entry)
+{
+ if (filename != NULL) {
+ vice_gtk3_resource_entry_set(GTK_WIDGET(entry), filename);
+ g_free(filename);
+ }
+ gtk_widget_destroy(GTK_WIDGET(dialog));
+}
+
+/** \brief Handler for the 'clicked' event of the FunMP3 directory browse button
+ *
+ * \param[in] button FunMP3 directory browse button (unused)
+ * \param[in] entry FunMP3 directory text entry
+ */
+static void on_funmp3dir_browse_clicked(GtkWidget *button, gpointer entry)
+{
+ GtkWidget *dialog;
+
+ mainlock_assert_is_not_vice_thread();
+
+ dialog = vice_gtk3_select_directory_dialog("Select FunMP3 directory",
+ NULL,
+ TRUE,
+ NULL,
+ funmp3dir_browse_callback,
+ entry);
+ gtk_widget_show_all(dialog);
+}
+
+/** \brief Create FunMP3 path selection entry widget
+ *
+ */
+static GtkWidget *create_funmp3dir_entry_widget(void)
+{
+ GtkWidget *entry;
+ entry = vice_gtk3_resource_entry_new("FunMP3Dir");
+ gtk_widget_set_tooltip_text(entry,
+ "Select the host directory for MP3 files");
+ gtk_widget_set_hexpand(entry, TRUE);
+ return entry;
+}
+
+/** \brief Create FunMP3 path selection widget
+ *
+ */
+static GtkWidget *create_funmp3dir_widget(void)
+{
+ GtkWidget *grid;
+ GtkWidget *entry;
+ GtkWidget *label;
+ GtkWidget *browse;
+
+ grid = vice_gtk3_grid_new_spaced(8, 0);
+
+ label = gtk_label_new("FunMP3 directory");
+ gtk_widget_set_halign(label, GTK_ALIGN_START);
+ entry = create_funmp3dir_entry_widget();
+ browse = gtk_button_new_with_label("Browse ...");
+ g_signal_connect_unlocked(browse,
+ "clicked",
+ G_CALLBACK(on_funmp3dir_browse_clicked),
+ (gpointer)entry);
+ gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), entry, 1, 1, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), browse, 2, 1, 1, 1);
+
+ gtk_widget_show_all(grid);
+ return grid;
+}
+
+#endif /* MPG123 && HAVE_GLOB_H */

4
app-emulation/vice/vice-3.10.ebuild
View File

@@ -78,6 +78,10 @@ BDEPEND="
gtk? ( x11-misc/xdg-utils )
"
PATCHES=(
"${FILESDIR}"/${P}-mpg123-without-curl.patch
)
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}