Control: tags -1 forwarded wmaker-...@googlegroups.com On 7/31/20 7:25 AM, Sudip Mukherjee wrote: > I've prepared an NMU for wmcalclock (versioned as 1.25-16.1) and > uploaded it to DELAYED/5. Please feel free to tell me if I > should cancel it. > > Also added Douglas in Cc as he intends to adopt this package. > > -- > Regards > Sudip > > diff -Nru wmcalclock-1.25/debian/changelog wmcalclock-1.25/debian/changelog > --- wmcalclock-1.25/debian/changelog 2016-10-27 01:33:54.000000000 +0100 > +++ wmcalclock-1.25/debian/changelog 2020-07-31 12:11:07.000000000 +0100 > @@ -1,3 +1,10 @@ > +wmcalclock (1.25-16.1) unstable; urgency=medium > + > + * Non-maintainer upload. > + * Fix ftbfs with GCC-10. (Closes: #957941) > + > + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Fri, 31 Jul 2020 12:11:07 > +0100 > + > wmcalclock (1.25-16) unstable; urgency=low > > * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". > diff -Nru wmcalclock-1.25/debian/patches/05-fix-ftbfs.patch > wmcalclock-1.25/debian/patches/05-fix-ftbfs.patch > --- wmcalclock-1.25/debian/patches/05-fix-ftbfs.patch 1970-01-01 > 01:00:00.000000000 +0100 > +++ wmcalclock-1.25/debian/patches/05-fix-ftbfs.patch 2020-07-29 > 21:44:00.000000000 +0100 > @@ -0,0 +1,41 @@ > +Description: Fix ftbfs with GCC-10 > + > +Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> > +Bug-Debian: https://bugs.debian.org/957941 > +Forwarded: no > + > +--- > + > +--- wmcalclock-1.25.orig/Src/xutils.c > ++++ wmcalclock-1.25/Src/xutils.c > +@@ -53,6 +53,11 @@ GC NormalGC; > + XpmIcon wmgen; > + Pixmap pixmask; > + > ++Display *display; > ++Window Root; > ++Window iconwin, win; > ++int screen; > ++int DisplayDepth; > + > + /* > + * Colors for wmCalClock > +--- wmcalclock-1.25.orig/Src/xutils.h > ++++ wmcalclock-1.25/Src/xutils.h > +@@ -18,11 +18,11 @@ typedef struct { > + /* > + * Global variable > + */ > +-Display *display; > +-Window Root; > +-Window iconwin, win; > +-int screen; > +-int DisplayDepth; > ++extern Display *display; > ++extern Window Root; > ++extern Window iconwin, win; > ++extern int screen; > ++extern int DisplayDepth; > + > + > + > diff -Nru wmcalclock-1.25/debian/patches/series > wmcalclock-1.25/debian/patches/series > --- wmcalclock-1.25/debian/patches/series 2016-10-27 01:27:28.000000000 > +0100 > +++ wmcalclock-1.25/debian/patches/series 2020-07-29 21:42:34.000000000 > +0100 > @@ -3,3 +3,4 @@ > 02-30hr-patch.patch > 03-manapge-30hr-patch.patch > 04-makefile-modifications.patch > +05-fix-ftbfs.patch
I've forwarded your patch upstream. Thank you!
From 704cd8679f95fca7cce61ae4fe2e7b4ba203da5c Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee <sudipm.mukher...@gmail.com> Date: Fri, 31 Jul 2020 08:13:33 -0400 Subject: [PATCH] Description: Fix ftbfs with GCC-10 Bug-Debian: https://bugs.debian.org/957941 Forwarded: no --- wmCalClock/Src/xutils.c | 5 +++++ wmCalClock/Src/xutils.h | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/wmCalClock/Src/xutils.c b/wmCalClock/Src/xutils.c index 5426d4f..008afa5 100644 --- a/wmCalClock/Src/xutils.c +++ b/wmCalClock/Src/xutils.c @@ -53,6 +53,11 @@ GC NormalGC; XpmIcon wmgen; Pixmap pixmask; +Display *display; +Window Root; +Window iconwin, win; +int screen; +int DisplayDepth; /* * Colors for wmCalClock diff --git a/wmCalClock/Src/xutils.h b/wmCalClock/Src/xutils.h index 4ed615f..b8f3f77 100644 --- a/wmCalClock/Src/xutils.h +++ b/wmCalClock/Src/xutils.h @@ -18,11 +18,11 @@ typedef struct { /* * Global variable */ -Display *display; -Window Root; -Window iconwin, win; -int screen; -int DisplayDepth; +extern Display *display; +extern Window Root; +extern Window iconwin, win; +extern int screen; +extern int DisplayDepth; -- 2.25.1
