[SCM] QCA2 library packaging branch, master, updated. debian/2.0.3-2-5-g88dd82d

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=88dd82d

The following commit has been merged in the master branch:
commit 88dd82d13243e0126140c4b295429e3b17a79b96
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Thu Apr 5 15:52:51 2012 +0200

    Fix FTBFS with gcc 4.7.
    
    Add fix_build_gcc4.7.diff, cherry-picked from upstream.
---
 debian/changelog                     |    2 +
 debian/patches/fix_build_gcc4.7.diff |   62 ++++++++++++++++++++++++++++++++++
 debian/patches/series                |    1 +
 3 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 574945a..9037965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qca2 (2.0.3-3) UNRELEASED; urgency=low
     changes are not overwritten.
   * Pass $CPPFLAGS to the build system.
   * Update symbols file.
+  * Fix FTBFS with gcc 4.7.
+    - Add fix_build_gcc4.7.diff, cherry-picked from upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 23 Oct 2011 16:03:44 +0200
 
diff --git a/debian/patches/fix_build_gcc4.7.diff b/debian/patches/fix_build_gcc4.7.diff
new file mode 100644
index 0000000..8b69b11
--- /dev/null
+++ b/debian/patches/fix_build_gcc4.7.diff
@@ -0,0 +1,62 @@
+Description: Fix FTBFS with gc 4.7.
+Origin: upstream, http://websvn.kde.org/?view=revision&sortby=date&revision=1273508
+
+--- a/src/botantools/botan/botan/secmem.h
++++ b/src/botantools/botan/botan/secmem.h
+@@ -191,15 +191,15 @@
+    {
+    public:
+       MemoryVector<T>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       MemoryVector(u32bit n = 0) { MemoryRegion<T>::init(false, n); }
+       MemoryVector(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(false); set(in, n); }
++         { MemoryRegion<T>::init(false); this->set(in, n); }
+       MemoryVector(const MemoryRegion<T>& in)
+-         { MemoryRegion<T>::init(false); set(in); }
++         { MemoryRegion<T>::init(false); this->set(in); }
+       MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+-         { MemoryRegion<T>::init(false); set(in1); append(in2); }
++         { MemoryRegion<T>::init(false); this->set(in1); append(in2); }
+    };
+ 
+ /*************************************************
+@@ -210,15 +210,15 @@
+    {
+    public:
+       SecureVector<T>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
+       SecureVector(const T in[], u32bit n)
+-         { MemoryRegion<T>::init(true); set(in, n); }
++         { MemoryRegion<T>::init(true); this->set(in, n); }
+       SecureVector(const MemoryRegion<T>& in)
+-         { MemoryRegion<T>::init(true); set(in); }
++         { MemoryRegion<T>::init(true); this->set(in); }
+       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
+-         { MemoryRegion<T>::init(true); set(in1); append(in2); }
++         { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
+    };
+ 
+ /*************************************************
+@@ -229,14 +229,14 @@
+    {
+    public:
+       SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+ 
+       SecureBuffer() { MemoryRegion<T>::init(true, L); }
+       SecureBuffer(const T in[], u32bit n)
+          { MemoryRegion<T>::init(true, L); copy(in, n); }
+    private:
+       SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
+-         { if(this != &in) set(in); return (*this); }
++         { if(this != &in) this->set(in); return (*this); }
+    };
+ 
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 784f168..21f86d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 define_qca_export.diff
 disable_randomunittest.diff
+fix_build_gcc4.7.diff

-- 
QCA2 library packaging