Package: hdate-applet
Version: 0.15.11-3
Followup-For: Bug #968131
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: Fix FTBFS with GCC 10 due to multiple definitions.
Thanks for considering the patch.
Logan
diff -Nru hdate-applet-0.15.11/debian/patches/gcc-10
hdate-applet-0.15.11/debian/patches/gcc-10
--- hdate-applet-0.15.11/debian/patches/gcc-10 1969-12-31 19:00:00.000000000
-0500
+++ hdate-applet-0.15.11/debian/patches/gcc-10 2021-01-17 22:00:18.000000000
-0500
@@ -0,0 +1,51 @@
+--- a/src/ghcal-interface.c
++++ b/src/ghcal-interface.c
+@@ -33,6 +33,18 @@
+ #include "ghcal-callbacks.h"
+ #include "ghcal-interface.h"
+
++hdate_struct today;
++GtkWidget *label_month;
++GtkWidget *label_year;
++GtkWidget *combobox_month;
++GtkWidget *spinbutton_year;
++GtkWidget *label_hebrew_month_and_year;
++int index_day_of_month[42];
++hdate_struct hdate_day_of_month[42];
++GtkWidget *label_day_of_month[42];
++GtkWidget *event_box_day_of_month[42];
++GtkTooltips *tooltip_day_of_month[42];
++
+ GtkWidget *
+ create_window (void)
+ {
+--- a/src/ghcal-interface.h
++++ b/src/ghcal-interface.h
+@@ -42,16 +42,16 @@
+ # define N_(String) (String)
+ #endif
+
+-hdate_struct today;
+-GtkWidget *label_month;
+-GtkWidget *label_year;
+-GtkWidget *combobox_month;
+-GtkWidget *spinbutton_year;
+-GtkWidget *label_hebrew_month_and_year;
+-int index_day_of_month[42];
+-hdate_struct hdate_day_of_month[42];
+-GtkWidget *label_day_of_month[42];
+-GtkWidget *event_box_day_of_month[42];
+-GtkTooltips *tooltip_day_of_month[42];
++extern hdate_struct today;
++extern GtkWidget *label_month;
++extern GtkWidget *label_year;
++extern GtkWidget *combobox_month;
++extern GtkWidget *spinbutton_year;
++extern GtkWidget *label_hebrew_month_and_year;
++extern int index_day_of_month[42];
++extern hdate_struct hdate_day_of_month[42];
++extern GtkWidget *label_day_of_month[42];
++extern GtkWidget *event_box_day_of_month[42];
++extern GtkTooltips *tooltip_day_of_month[42];
+
+ GtkWidget *create_window (void);
diff -Nru hdate-applet-0.15.11/debian/patches/series
hdate-applet-0.15.11/debian/patches/series
--- hdate-applet-0.15.11/debian/patches/series 2018-07-30 02:28:28.000000000
-0400
+++ hdate-applet-0.15.11/debian/patches/series 2021-01-17 21:58:42.000000000
-0500
@@ -3,3 +3,4 @@
swedish-translation
use-locale
no-bonobo.patch
+gcc-10
