[pktools] 05/19: Drop fann-va_list.patch, applied upstream.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository pktools.

commit 9ba62c4cf24c2e0ec62097089ae353c3e9671766
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Nov 8 20:00:56 2014 +0100

    Drop fann-va_list.patch, applied upstream.
---
 debian/changelog                  |  1 +
 debian/patches/fann-va_list.patch | 60 ---------------------------------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 842a9dc..52c7710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pktools (2.5.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Add myself to Uploaders.
+  * Drop fann-va_list.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 08 Nov 2014 19:57:34 +0100
 
diff --git a/debian/patches/fann-va_list.patch b/debian/patches/fann-va_list.patch
deleted file mode 100644
index 25c045c..0000000
--- a/debian/patches/fann-va_list.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Portable handling for va_list
- This patch is taken from libfann:
- http://sources.debian.net/src/libfann/2.1.0~beta~dfsg-10/debian/patches/0004-Portable-handling-for-va_list.patch/
- .
- The current code wrongly assumes va_list is always implemented as an array.
- va_list however is an opaque type, and may also be implemented as a struct,
- for example.
- This patch implements handling of va_list in a platform-independent way,
- fixing a FTBFS on alpha and armel.
-Author: Christian Kastner <debian at kvr.at>
-Bug-Debian: https://bugs.debian.org/757979
-Forwarded: https://savannah.nongnu.org/bugs/index.php?42974
-
---- a/src/algorithms/myfann_cpp.h
-+++ b/src/algorithms/myfann_cpp.h
-@@ -1061,9 +1061,12 @@ public:
-         bool create_standard(unsigned int num_layers, ...)
-         {
-             va_list layers;
-+            unsigned int arr[num_layers];
-+
-             va_start(layers, num_layers);
--            bool status = create_standard_array(num_layers,
--                reinterpret_cast<const unsigned int *>(layers));
-+            for (unsigned int ii = 0; ii < num_layers; ii++)
-+                arr[ii] = va_arg(layers, unsigned int);
-+            bool status = create_standard_array(num_layers, arr);
-             va_end(layers);
-             return status;
-         }
-@@ -1111,9 +1114,12 @@ public:
-         bool create_sparse(float connection_rate, unsigned int num_layers, ...)
-         {
-             va_list layers;
-+            unsigned int arr[num_layers];
-+
-             va_start(layers, num_layers);
--            bool status = create_sparse_array(connection_rate, num_layers,
--                reinterpret_cast<const unsigned int *>(layers));
-+            for (unsigned int ii = 0; ii < num_layers; ii++)
-+                arr[ii] = va_arg(layers, unsigned int);
-+            bool status = create_sparse_array(connection_rate, num_layers, arr);
-             va_end(layers);
-             return status;
-         }
-@@ -1158,9 +1164,12 @@ public:
-         bool create_shortcut(unsigned int num_layers, ...)
-         {
-             va_list layers;
-+            unsigned int arr[num_layers];
-+
-             va_start(layers, num_layers);
--            bool status = create_shortcut_array(num_layers,
--                reinterpret_cast<const unsigned int *>(layers));
-+            for (unsigned int ii = 0; ii < num_layers; ii++)
-+                arr[ii] = va_arg(layers, unsigned int);
-+            bool status = create_shortcut_array(num_layers, arr);
-             va_end(layers);
-             return status;
-         }
diff --git a/debian/patches/series b/debian/patches/series
index 20d56f7..e9e0975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 automake-subdir-objects.patch
-fann-va_list.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git