diff -Nru xphoon-20000613+0/debian/changelog xphoon-20000613+0/debian/changelog --- xphoon-20000613+0/debian/changelog 2019-01-10 18:15:21.000000000 +0000 +++ xphoon-20000613+0/debian/changelog 2019-01-10 22:47:09.000000000 +0000 @@ -1,3 +1,10 @@ +xphoon (20000613+0-7) unstable; urgency=medium + + * debian/patches/fix-time_t-args.patch + * Fix previous patch by removing function declarations + + -- Ricardo Mones Thu, 10 Jan 2019 23:47:09 +0100 + xphoon (20000613+0-6) unstable; urgency=medium * debian/patches/fix-time_t-args.patch diff -Nru xphoon-20000613+0/debian/patches/fix-time_t-args.patch xphoon-20000613+0/debian/patches/fix-time_t-args.patch --- xphoon-20000613+0/debian/patches/fix-time_t-args.patch 2019-01-10 18:15:21.000000000 +0000 +++ xphoon-20000613+0/debian/patches/fix-time_t-args.patch 2019-01-10 22:47:09.000000000 +0000 @@ -1,11 +1,18 @@ Description: Fix FTBFS in x32 architecture because of using long instead - time_t for time() and localtime(). + time_t for time() and localtime() and declaring functions with + conflicting types Author: Ricardo Mones Last-Update: 2019-01-10 --- a/dtime.c +++ b/dtime.c -@@ -32,7 +32,7 @@ struct tm* localtime(); +@@ -26,13 +26,10 @@ extern long timezone; + #include + #endif + +-extern long time(); +-struct tm* localtime(); +- struct tws* dtwstime() { @@ -14,7 +21,7 @@ (void) time( &clock ); return dlocaltime( &clock ); -@@ -40,7 +40,7 @@ dtwstime() +@@ -40,7 +37,7 @@ dtwstime() struct tws* dlocaltime( clock ) @@ -23,7 +30,7 @@ { register struct tm* tm; #ifndef SYS5 -@@ -48,7 +48,7 @@ dlocaltime( clock ) +@@ -48,7 +45,7 @@ dlocaltime( clock ) #endif static struct tws tw;