Package: w-scan Severity: minor Usertags: clang-ftbfs User: pkg-llvm-t...@lists.alioth.debian.org Tag: patch
Hello, Using the rebuild infrastructure, your package fails to build with clang (instead of gcc). Thanks, Arthur
diff -Naur w-scan.orig/w-scan-20130331/debian/changelog w-scan/w-scan-20130331/debian/changelog --- w-scan.orig/w-scan-20130331/debian/changelog 2014-04-12 16:30:24.757825365 -0500 +++ w-scan/w-scan-20130331/debian/changelog 2014-04-12 16:40:44.541836158 -0500 @@ -1,3 +1,11 @@ +w-scan (20130331-2) unstable; urgency=low + + * Fix FTBFS with clang: + - Fixed the Function definition is not allowed here in + descriptors.c + + -- Arthur Marble <art...@info9.net> Sat, 12 Apr 2014 16:40:44 -0500 + w-scan (20130331-1) unstable; urgency=low * New upstream release (Closes: #707435) diff -Naur w-scan.orig/w-scan-20130331/debian/patches/clang-ftbfs.diff w-scan/w-scan-20130331/debian/patches/clang-ftbfs.diff --- w-scan.orig/w-scan-20130331/debian/patches/clang-ftbfs.diff 1969-12-31 18:00:00.000000000 -0600 +++ w-scan/w-scan-20130331/debian/patches/clang-ftbfs.diff 2014-04-12 16:45:03.213840663 -0500 @@ -0,0 +1,36 @@ +--- a/descriptors.c ++++ b/descriptors.c +@@ -1000,6 +1000,16 @@ void parse_T2_delivery_system_descriptor + } + } + ++__u8 LeapYear(__u16 year) { ++ if ((year % 400) == 0) ++ return 1; ++ else if ((year % 100) == 0) ++ return 0; ++ else if ((year % 4) == 0) ++ return 1; ++ return 0; ++} ++ + + /* 300468 v011101 annex C, Conversion between time and date conventions + * NOTE: These formulas are applicable between the inclusive dates 1900 March 1 to 2100 February 28. +@@ -1011,16 +1021,6 @@ struct tm modified_julian_date_to_utc(__ + int _M = (int) (MJD - 14956.1 - (int) (_Y * 365.25)) / 30.6001; + int K = (_M == 14) ? 1 : (_M == 15) ? 1 : 0; + +- __u8 LeapYear(__u16 year) { +- if ((year % 400) == 0) +- return 1; +- else if ((year % 100) == 0) +- return 0; +- else if ((year % 4) == 0) +- return 1; +- return 0; +- } +- + memset(&utc, 0, sizeof(struct tm)); + utc.tm_mday = MJD - 14956 - (int) (_Y * 365.25) - (int) (_M * 30.6001); + utc.tm_year = _Y + K; diff -Naur w-scan.orig/w-scan-20130331/debian/patches/series w-scan/w-scan-20130331/debian/patches/series --- w-scan.orig/w-scan-20130331/debian/patches/series 1969-12-31 18:00:00.000000000 -0600 +++ w-scan/w-scan-20130331/debian/patches/series 2014-04-12 16:30:50.509825813 -0500 @@ -0,0 +1 @@ +clang-ftbfs.diff