[Pkg-voip-commits] r4490 - in /pwlib/trunk/debian: changelog patches/00list patches/backported/ patches/backported/critsec.h.dpatch

[kilian at alioth.debian.org]

Author: kilian
Date: Tue Sep 11 16:36:07 2007
New Revision: 4490

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4490
Log:
* Remove last ignore make clean error.
* Fix build of OPAL with gcc-4.2: error: 'PAtomicInteger&
  PAtomicInteger::operator=(const PAtomicInteger&)' is private

Added:
    pwlib/trunk/debian/patches/backported/
    pwlib/trunk/debian/patches/backported/critsec.h.dpatch   (with props)
Modified:
    pwlib/trunk/debian/changelog
    pwlib/trunk/debian/patches/00list

Modified: pwlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/changelog?rev=4490&op=diff
==============================================================================
--- pwlib/trunk/debian/changelog (original)
+++ pwlib/trunk/debian/changelog Tue Sep 11 16:36:07 2007
@@ -9,14 +9,16 @@
     website again.
   * Fixup debian/watch.
   * Don't set DH_COMPAT, use debian/compat
-  * Remove last ignore make clean error. 
+  * Remove last ignore make clean error.
+  * Fix build of OPAL with gcc-4.2: error: 'PAtomicInteger&
+    PAtomicInteger::operator=(const PAtomicInteger&)' is private
 
   [ Faidon Liambotis ]
   * Adapt shlibs to depend on the upstream's version number and not the Debian
     version number, since we don't extend the ABI. This also imitates
     debhelper's behavior.
 
- -- Kilian Krause <kilian at debian.org>  Sun,  9 Sep 2007 17:25:59 +0200
+ -- Kilian Krause <kilian at debian.org>  Tue, 11 Sep 2007 18:35:27 +0200
 
 pwlib (1.10.7~dfsg1-4) unstable; urgency=high
 

Modified: pwlib/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/patches/00list?rev=4490&op=diff
==============================================================================
--- pwlib/trunk/debian/patches/00list (original)
+++ pwlib/trunk/debian/patches/00list Tue Sep 11 16:36:07 2007
@@ -4,3 +4,7 @@
 05_hppa
 06_plugins_shared
 v4l2_plugin_on_i386
+
+### backports from upstream CVS
+# fix FTBFS in OPAL on sparc
+backported/critsec.h.dpatch

Added: pwlib/trunk/debian/patches/backported/critsec.h.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/patches/backported/critsec.h.dpatch?rev=4490&op=file
==============================================================================
--- pwlib/trunk/debian/patches/backported/critsec.h.dpatch (added)
+++ pwlib/trunk/debian/patches/backported/critsec.h.dpatch Tue Sep 11 16:36:07 2007
@@ -1,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## critsec.h.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pwlib-1.10.7~dfsg1~/include/ptlib/critsec.h pwlib-1.10.7~dfsg1/include/ptlib/critsec.h
+--- pwlib-1.10.7~dfsg1~/include/ptlib/critsec.h	2006-01-27 04:43:24.000000000 +0100
++++ pwlib-1.10.7~dfsg1/include/ptlib/critsec.h	2007-09-11 18:30:51.000000000 +0200
+@@ -24,6 +24,9 @@
+  * Contributor(s): ______________________________________.
+  *
+  * $Log: critsec.h,v $
+++  * Revision 1.19  2006/09/22 00:32:21  csoutheren
+++  * Forced PAtomicInteger::operator= to be private in all compile paths
+++  *
+  * Revision 1.15.2.1  2006/01/27 03:43:24  csoutheren
+  * Backported changes to CVS head into Phobos
+  *
+@@ -230,11 +233,11 @@
+       inline int operator--()            { PWaitAndSignal m(critSec); value--; return value;}
+       inline operator int () const       { return value; }
+       inline void SetValue(int v)        { value = v; }
+-   private:
+-      PAtomicInteger & operator=(const PAtomicInteger & ref) { value = (int)ref; return *this; }
+     protected:
+       int value;
+ #endif
++    private:
++      PAtomicInteger & operator=(const PAtomicInteger & ref) { value = (int)ref; return *this; }
+ };
+ 
+ #endif

Propchange: pwlib/trunk/debian/patches/backported/critsec.h.dpatch
------------------------------------------------------------------------------
    svn:executable = *