Package: unclutter
Version: 8-25

Hi.  I've just NMU'd this package to fix the FTBFS bug #1075602 that
was threatening autoremoval.  I didn't make other changes.

I hope you find this helpful.  Here is the diff.

Regards,
Ian.

diff --git a/debian/changelog b/debian/changelog
index 20bffaf..9b18672 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+unclutter (8-25+nmu1) unstable; urgency=medium
+
+  * Fix implicit ints in function declarations.
+    Closes: #1075602.  [Report from Matthias Klose]
+
+ -- Ian Jackson <ijack...@chiark.greenend.org.uk>  Thu, 15 Aug 2024 20:12:12 
+0100
+
 unclutter (8-25) unstable; urgency=low
 
   * Upload to unstable again.
diff --git a/debian/patches/fix-implicit-ints-in-function-declaratio.patch 
b/debian/patches/fix-implicit-ints-in-function-declaratio.patch
new file mode 100644
index 0000000..66fe1b7
--- /dev/null
+++ b/debian/patches/fix-implicit-ints-in-function-declaratio.patch
@@ -0,0 +1,64 @@
+From: Ian Jackson <ijack...@chiark.greenend.org.uk>
+Date: Thu, 15 Aug 2024 20:10:04 +0100
+X-Dgit-Generated: 8-25+nmu1 5ec60ce56eb580acffd7b384a0e8b8a59b73b655
+Subject: Fix implicit ints in function declarations
+
+Closes: #1075602
+
+---
+
+diff --git a/unclutter.c b/unclutter.c
+index c016663..de5a971 100644
+--- a/unclutter.c
++++ b/unclutter.c
+@@ -32,10 +32,12 @@
+ #include <regex.h>
+ 
+ char *progname;
++void
+ pexit(str)char *str;{
+     fprintf(stderr,"%s: %s\n",progname,str);
+     exit(1);
+ }
++void
+ usage(){
+     pexit("usage:\n\
+       -display <display>\n\
+@@ -93,6 +95,7 @@ regex_t *nc_re = 0;     /* regex for list of classes/names 
to avoid */
+  * return true if window has a wm_name (class) and the start of it matches
+  * one of the given names (classes) to avoid
+  */
++int
+ nameinlist(display,window)
+ Display *display;
+ Window window;
+@@ -131,6 +134,7 @@ Window window;
+ /*
+  * create a small 1x1 curssor with all pixels masked out on the given screen.
+  */
++Cursor
+ createnullcursor(display,root)
+ Display *display;
+ Window root;
+@@ -155,7 +159,8 @@ Window root;
+     return cursor;
+ }
+ 
+-main(argc,argv)char **argv;{
++int
++main(argc,argv)char **argv; int argc;{
+     Display *display;
+     int screen,oldx = -99,oldy = -99,numscreens;
+     int doroot = 0, jitter = 0, usegrabmethod = 0, waitagain = 0,
+diff --git a/vroot.h b/vroot.h
+index 0f32668..cbe41dc 100644
+--- a/vroot.h
++++ b/vroot.h
+@@ -40,6 +40,7 @@
+ static Window
+ VirtualRootWindow(dpy, screen)
+ Display *dpy;
++int screen;
+ {
+       static Display *save_dpy = (Display *)0;
+       static int save_screen = -1;
diff --git a/debian/patches/series b/debian/patches/series
index f04419b..09c5c78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-pass-flags.patch
 03-fix-gtk-blinking.patch
 04-man-page-fixes.patch
+fix-implicit-ints-in-function-declaratio.patch
diff --git a/unclutter.c b/unclutter.c
index c016663..de5a971 100644
--- a/unclutter.c
+++ b/unclutter.c
@@ -32,10 +32,12 @@
 #include <regex.h>
 
 char *progname;
+void
 pexit(str)char *str;{
     fprintf(stderr,"%s: %s\n",progname,str);
     exit(1);
 }
+void
 usage(){
     pexit("usage:\n\
        -display <display>\n\
@@ -93,6 +95,7 @@ regex_t *nc_re = 0;     /* regex for list of classes/names to 
avoid */
  * return true if window has a wm_name (class) and the start of it matches
  * one of the given names (classes) to avoid
  */
+int
 nameinlist(display,window)
 Display *display;
 Window window;
@@ -131,6 +134,7 @@ Window window;
 /*
  * create a small 1x1 curssor with all pixels masked out on the given screen.
  */
+Cursor
 createnullcursor(display,root)
 Display *display;
 Window root;
@@ -155,7 +159,8 @@ Window root;
     return cursor;
 }
 
-main(argc,argv)char **argv;{
+int
+main(argc,argv)char **argv; int argc;{
     Display *display;
     int screen,oldx = -99,oldy = -99,numscreens;
     int doroot = 0, jitter = 0, usegrabmethod = 0, waitagain = 0,
diff --git a/vroot.h b/vroot.h
index 0f32668..cbe41dc 100644
--- a/vroot.h
+++ b/vroot.h
@@ -40,6 +40,7 @@
 static Window
 VirtualRootWindow(dpy, screen)
 Display *dpy;
+int screen;
 {
        static Display *save_dpy = (Display *)0;
        static int save_screen = -1;
-- 
Ian Jackson <ijack...@chiark.greenend.org.uk>   These opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.

Reply via email to