diff --git a/debian/changelog b/debian/changelog index 73dde35..e7d65f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wmcalclock (1.25-16.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix ftbfs with GCC-10. (Closes: #957941) + + -- Sudip Mukherjee 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 --git a/debian/patches/05-fix-ftbfs.patch b/debian/patches/05-fix-ftbfs.patch new file mode 100644 index 0000000..dcf38d7 --- /dev/null +++ b/debian/patches/05-fix-ftbfs.patch @@ -0,0 +1,41 @@ +Description: Fix ftbfs with GCC-10 + +Author: Sudip Mukherjee +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 --git a/debian/patches/series b/debian/patches/series index 7f8ba94..1e030c2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 02-30hr-patch.patch 03-manapge-30hr-patch.patch 04-makefile-modifications.patch +05-fix-ftbfs.patch