r15428 - in /desktop/unstable/dasher/debian: changelog patches/04_lldiv_namespace.patch

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Sat Mar 29 10:44:55 2008
New Revision: 15428

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15428
Log:
* debian/patches/04_lldiv_namespace.patch: New patch taken from upstream,
  don't look for lldiv in `__gnu_cxx', hopefully fixes FTBFS on arm,
  armel, mips, mipsel.

Added:
    desktop/unstable/dasher/debian/patches/04_lldiv_namespace.patch
Modified:
    desktop/unstable/dasher/debian/changelog

Modified: desktop/unstable/dasher/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/changelog?rev=15428&op=diff
==============================================================================
--- desktop/unstable/dasher/debian/changelog (original)
+++ desktop/unstable/dasher/debian/changelog Sat Mar 29 10:44:55 2008
@@ -1,3 +1,11 @@
+dasher (4.7.0-2) unstable; urgency=low
+
+  * debian/patches/04_lldiv_namespace.patch: New patch taken from upstream,
+    don't look for lldiv in `__gnu_cxx', hopefully fixes FTBFS on arm,
+    armel, mips, mipsel.
+
+ -- Romain Francoise <rfrancoise at debian.org>  Sat, 29 Mar 2008 11:44:28 +0100
+
 dasher (4.7.0-1) unstable; urgency=low
 
   [ Romain Francoise ]

Added: desktop/unstable/dasher/debian/patches/04_lldiv_namespace.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/patches/04_lldiv_namespace.patch?rev=15428&op=file
==============================================================================
--- desktop/unstable/dasher/debian/patches/04_lldiv_namespace.patch (added)
+++ desktop/unstable/dasher/debian/patches/04_lldiv_namespace.patch Sat Mar 29 10:44:55 2008
@@ -1,0 +1,13 @@
+diff --git a/Src/DasherCore/DasherViewSquare.cpp b/Src/DasherCore/DasherViewSquare.cpp
+index 27a1991..30dcbe4 100644
+--- a/Src/DasherCore/DasherViewSquare.cpp
++++ b/Src/DasherCore/DasherViewSquare.cpp
+@@ -818,7 +818,7 @@ inline myint CDasherViewSquare::CustomIDiv(myint iNumerator, myint iDenominator)
+   else
+     return quot;
+ #else
+-  lldiv_t res = __gnu_cxx::lldiv(iNumerator, iDenominator);
++  lldiv_t res = ::lldiv(iNumerator, iDenominator);
+   
+   if(res.rem < 0)
+     return res.quot - 1;