[w-scan] 01/01: Fix FTBFS with clang: Nested function definition not allowed (Closes: #744323)

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository w-scan.

commit c44df0b7fe41f166c9762f3c4e1b6eb62557032d
Author: etobi <git at e-tobi.net>
Date:   Mon Oct 27 23:12:56 2014 +0100

    Fix FTBFS with clang: Nested function definition not allowed (Closes: #744323)
---
 debian/changelog                 | 11 ++++++++++-
 debian/patches/clang-ftbfs.patch | 38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 295194b..75f8496 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,16 @@ w-scan (20140727-1) unstable; urgency=medium
   * New upstream release
   * Standards-Version: 3.9.5
 
- -- Tobias Grimm <etobi at debian.org>  Mon, 27 Oct 2014 19:34:18 +0100
+  [Arthur Marble]
+  * Fix FTBFS with clang: Nested function definition not allowed
+    (Closes: #744323)
+
+ -- Tobias Grimm <etobi at debian.org>  Mon, 27 Oct 2014 23:28:06 +0100
+
+w-scan (20130331-2) unstable; urgency=low
+
+
+ --  <arthur at info9.net>  Sat, 12 Apr 2014 16:40:44 -0500
 
 w-scan (20130331-1) unstable; urgency=low
 
diff --git a/debian/patches/clang-ftbfs.patch b/debian/patches/clang-ftbfs.patch
new file mode 100644
index 0000000..05b6d1c
--- /dev/null
+++ b/debian/patches/clang-ftbfs.patch
@@ -0,0 +1,38 @@
+Index: w-scan/descriptors.c
+===================================================================
+--- w-scan.orig/descriptors.c	2014-10-27 23:01:06.021735921 +0100
++++ w-scan/descriptors.c	2014-10-27 23:04:47.448805742 +0100
+@@ -965,6 +965,16 @@
+      }
+ }
+ 
++__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;
++}
++
+ 
+ /* DVB-T2: PRELIMINARY && UNTESTED CODE ONLY. I NEED SOMEBODY WITH ACCESS TO
+  *         DVB-T2. IF YOU WANT TO HELP PLS CONTACT ME. --20111204, wirbel--
+@@ -1202,16 +1212,6 @@
+   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 --git a/debian/patches/series b/debian/patches/series
index 1b287b5..0551a6c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_ldflags.patch
+clang-ftbfs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/w-scan.git