tag 667430 patch
thanks

Matthias Klose <d...@debian.org> (03/04/2012):
> Package: zthreads
> Version: 2.3.2-4
> Severity: important
> Tags: sid wheezy
> User: debian-...@lists.debian.org
> Usertags: ftbfs-gcc-4.7

Please find attach a patch to fix this FTBFS. I don't intend to upload
it myself though.

Mraw,
KiBi.
diff -Nru zthreads-2.3.2/debian/changelog zthreads-2.3.2/debian/changelog
--- zthreads-2.3.2/debian/changelog	2011-11-21 21:41:04.000000000 +0000
+++ zthreads-2.3.2/debian/changelog	2012-04-04 12:50:49.000000000 +0000
@@ -1,3 +1,12 @@
+zthreads (2.3.2-4.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with g++-4.7 by no longer relying on extra unqualified
+    lookups (Closes: #667430):
+    + fix-ftbfs-with-g++-4.7
+
+ -- Cyril Brulebois <k...@debian.org>  Wed, 04 Apr 2012 12:43:45 +0000
+
 zthreads (2.3.2-4) unstable; urgency=low
 
   * Adapting autotools files (Closes: #629679).
diff -Nru zthreads-2.3.2/debian/patches/fix-ftbfs-with-g++-4.7 zthreads-2.3.2/debian/patches/fix-ftbfs-with-g++-4.7
--- zthreads-2.3.2/debian/patches/fix-ftbfs-with-g++-4.7	1970-01-01 00:00:00.000000000 +0000
+++ zthreads-2.3.2/debian/patches/fix-ftbfs-with-g++-4.7	2012-04-04 12:49:31.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Make sure to use qualified lookups.
+Author: Cyril Brulebois <k...@debian.org>
+Bug-Debian: http://bugs.debian.org/667430
+
+--- zthreads-2.3.2.orig/include/zthread/Guard.h
++++ zthreads-2.3.2/include/zthread/Guard.h
+@@ -428,7 +428,7 @@ public:
+   template <class U, class V>
+   Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
+ 
+-    LockingPolicy::shareScope(*this, extract(g));
++    LockingPolicy::shareScope(*this, this->extract(g));
+ 
+   }
+ 
+@@ -458,7 +458,7 @@ public:
+   template <class U, class V>
+   Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
+ 
+-    LockingPolicy::transferScope(*this, extract(g));
++    LockingPolicy::transferScope(*this, this->extract(g));
+ 
+   }
+ 
diff -Nru zthreads-2.3.2/debian/patches/series zthreads-2.3.2/debian/patches/series
--- zthreads-2.3.2/debian/patches/series	2011-11-21 21:41:04.000000000 +0000
+++ zthreads-2.3.2/debian/patches/series	2012-04-04 12:48:54.000000000 +0000
@@ -2,3 +2,4 @@
 fix_g++4.4.diff
 executor_remove_thread_bug
 autotools
+fix-ftbfs-with-g++-4.7

Attachment: signature.asc
Description: Digital signature

Reply via email to