[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#957326: gwc: diff for NMU version 0.22.04-1.1



Dear maintainer,

I've prepared an NMU for gwc (versioned as 0.22.04-1.1). The diff is 
attached to this message.

cu
Adrian
diff -Nru gwc-0.22.04/debian/changelog gwc-0.22.04/debian/changelog
--- gwc-0.22.04/debian/changelog	2019-09-15 19:49:52.000000000 +0300
+++ gwc-0.22.04/debian/changelog	2021-02-07 08:35:50.000000000 +0200
@@ -1,3 +1,10 @@
+gwc (0.22.04-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add fix from Logan Rosen for FTBFS with gcc 10. (Closes: #957326)
+
+ -- Adrian Bunk <bunk@debian.org>  Sun, 07 Feb 2021 08:35:50 +0200
+
 gwc (0.22.04-1) unstable; urgency=medium
 
   * Team upload.
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	1970-01-01 02:00:00.000000000 +0200
+++ gwc-0.22.04/debian/patches/gcc-10.patch	2021-02-07 08:35:45.000000000 +0200
@@ -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 19:47:29.000000000 +0300
+++ gwc-0.22.04/debian/patches/series	2021-02-07 08:35:45.000000000 +0200
@@ -1 +1,2 @@
 02-no_extra_docs.patch
+gcc-10.patch

Reply to: