Bug#957326: gwc: ftbfs with GCC-10
Package: gwc
Version: 0.22.04-1
Followup-For: Bug #957326
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: logan@ubuntu.com
Control: tags -1 patch
Hi,
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/gcc-10.patch: Fix compilation with GCC 10.
Thanks for considering the patch.
Logan
diff -Nru gwc-0.22.04/debian/patches/gcc-10.patch gwc-0.22.04/debian/patches/gcc-10.patch
--- gwc-0.22.04/debian/patches/gcc-10.patch 1969-12-31 19:00:00.000000000 -0500
+++ gwc-0.22.04/debian/patches/gcc-10.patch 2021-01-07 20:00:50.000000000 -0500
@@ -0,0 +1,50 @@
+--- a/gwc.h
++++ b/gwc.h
+@@ -185,12 +185,12 @@
+ int ready ;
+ } DENOISE_DATA ;
+
+-gchar *tmpdir;
+-gchar *CLIPBOARD_FILE ;
++extern gchar *tmpdir;
++extern gchar *CLIPBOARD_FILE ;
+
+ void print_denoise(char *header, struct denoise_prefs *pDnprefs) ;
+
+-GtkWidget *main_window;
++extern GtkWidget *main_window;
+
+ GtkWidget *add_number_entry_with_label(char *entry_text, char *label_text, GtkWidget *table, int row) ;
+ GtkWidget *add_number_entry_with_label_int(int value, char *label_text, GtkWidget *table, int row) ;
+--- a/gwc.c
++++ b/gwc.c
+@@ -84,6 +84,7 @@
+ GtkWidget *hscrollbar;
+ GtkWidget *detect_only_widget;
+ GtkWidget *leave_click_marks_widget;
++GtkWidget *main_window;
+
+ GtkWidget *l_file_time;
+ GtkWidget *l_file_samples;
+@@ -147,6 +148,8 @@
+ gchar wave_filename[PATH_MAX+1];
+ gchar last_filename[PATH_MAX+1];
+ gchar *file_extension;
++gchar *tmpdir;
++gchar *CLIPBOARD_FILE;
+
+ long markers[MAX_MARKERS];
+ long n_markers = 0;
+--- a/markers.c
++++ b/markers.c
+@@ -39,8 +39,8 @@
+
+ /* The file selection widget and the string to store the chosen filename */
+
+-GtkWidget *file_selector;
+-gchar *selected_filename;
++extern GtkWidget *file_selector;
++extern gchar *selected_filename;
+ gchar save_cdrdao_toc_filename[PATH_MAX+1];
+ extern long num_song_markers, song_markers[] ;
+ extern gchar wave_filename[] ;
diff -Nru gwc-0.22.04/debian/patches/series gwc-0.22.04/debian/patches/series
--- gwc-0.22.04/debian/patches/series 2019-09-15 12:47:29.000000000 -0400
+++ gwc-0.22.04/debian/patches/series 2021-01-07 19:57:21.000000000 -0500
@@ -1 +1,2 @@
02-no_extra_docs.patch
+gcc-10.patch
Reply to: