Package: gnomad2 Version: 2.9.6-5 Followup-For: Bug #957281 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu hirsute ubuntu-patch Control: tags -1 patch
Hi, In Ubuntu, the attached patch was applied to achieve the following: * d/p/gcc-10.patch: Fix FTBFS with GCC 10 due to multiple definitions. Thanks for considering the patch. Logan
diff -Nru gnomad2-2.9.6/debian/patches/gcc-10.patch gnomad2-2.9.6/debian/patches/gcc-10.patch --- gnomad2-2.9.6/debian/patches/gcc-10.patch 1969-12-31 19:00:00.000000000 -0500 +++ gnomad2-2.9.6/debian/patches/gcc-10.patch 2021-01-18 14:01:39.000000000 -0500 @@ -0,0 +1,56 @@ +--- a/src/common.h ++++ b/src/common.h +@@ -130,25 +130,25 @@ + } playlist_widgets_t; + + /* Globally known widgets */ +-transfer_widgets_t transfer_widgets; +-data_widgets_t data_widgets; +-playlist_widgets_t playlist_widgets; ++extern transfer_widgets_t transfer_widgets; ++extern data_widgets_t data_widgets; ++extern playlist_widgets_t playlist_widgets; + + /* Global progress bar - not so good but... */ +-GtkWidget *progress_bar; ++extern GtkWidget *progress_bar; + + /* Global playlist selection for the popup, not good either ... */ +-GList *jukebox_playlist; +-GList *selected_target_playlists; ++extern GList *jukebox_playlist; ++extern GList *selected_target_playlists; + + /* Global lock variable for the jukebox */ +-gboolean volatile jukebox_locked; ++extern gboolean volatile jukebox_locked; + + /* Global cancellation variable for jukebox operations */ +-gboolean volatile cancel_jukebox_operation; ++extern gboolean volatile cancel_jukebox_operation; + + /* Global debug level variable (standard = 7) */ +-gint gnomad_debug; ++extern gint gnomad_debug; + + /* A proc for hiding dialog windows */ + GCallback dispose_of_dialog_window(GtkButton * button, gpointer data); +--- a/src/gnomad2.c ++++ b/src/gnomad2.c +@@ -34,7 +34,15 @@ + guint uevent_device_hooked = 0; + #endif + +-/* This one should be global really */ ++transfer_widgets_t transfer_widgets; ++data_widgets_t data_widgets; ++playlist_widgets_t playlist_widgets; ++GtkWidget *progress_bar; ++GList *jukebox_playlist; ++GList *selected_target_playlists; ++gboolean volatile jukebox_locked; ++gboolean volatile cancel_jukebox_operation; ++gint gnomad_debug; + GtkWidget *main_window; + + /* Local variables */ diff -Nru gnomad2-2.9.6/debian/patches/series gnomad2-2.9.6/debian/patches/series --- gnomad2-2.9.6/debian/patches/series 2016-06-02 03:22:31.000000000 -0400 +++ gnomad2-2.9.6/debian/patches/series 2021-01-18 13:57:38.000000000 -0500 @@ -1,3 +1,4 @@ 0001-werror_format_security.patch 1001-gtk_set_can_default.patch 1002-gtk2_to_gtk3.patch +gcc-10.patch
