diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2015-07-15 20:06:12 +0200 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2015-07-15 20:06:12 +0200 |
| commit | f79385285cd949beb34ee04efc1215c16286d779 (patch) | |
| tree | ae4c6fa3c265815771c0fba222a93e1647c221da /p/darcs | |
| parent | d57ede0ac9d969786a4cb4f101a589289c3d750c (diff) | |
| download | DHG_packages-f79385285cd949beb34ee04efc1215c16286d779.tar.gz | |
darcs: Try to improve powerpc patch
Diffstat (limited to 'p/darcs')
| -rw-r--r-- | p/darcs/debian/changelog | 6 | ||||
| -rw-r--r-- | p/darcs/debian/patches/Num-constraint | 31 |
2 files changed, 36 insertions, 1 deletions
diff --git a/p/darcs/debian/changelog b/p/darcs/debian/changelog index 403b5ad51..9544c2b7c 100644 --- a/p/darcs/debian/changelog +++ b/p/darcs/debian/changelog @@ -1,3 +1,9 @@ +darcs (2.10.1-3) unstable; urgency=medium + + * Try to improve powerpc patch + + -- Joachim Breitner <nomeata@debian.org> Wed, 15 Jul 2015 20:05:57 +0200 + darcs (2.10.1-2) unstable; urgency=medium * New patch, trying to fix buiding on powerpc diff --git a/p/darcs/debian/patches/Num-constraint b/p/darcs/debian/patches/Num-constraint index 52a00e4cd..5245fee6a 100644 --- a/p/darcs/debian/patches/Num-constraint +++ b/p/darcs/debian/patches/Num-constraint @@ -1,7 +1,18 @@ Index: darcs/hashed-storage/Storage/Hashed/Utils.hs =================================================================== --- darcs.orig/hashed-storage/Storage/Hashed/Utils.hs 2015-07-09 18:48:56.000000000 +0200 -+++ darcs/hashed-storage/Storage/Hashed/Utils.hs 2015-07-15 19:35:55.341427506 +0200 ++++ darcs/hashed-storage/Storage/Hashed/Utils.hs 2015-07-15 20:05:09.425950430 +0200 +@@ -91,8 +91,8 @@ + x -> i + boundary - x + {-# INLINE align #-} + +-xlate32 :: (Bits a) => a -> a +-xlate64 :: (Bits a) => a -> a ++xlate32 :: (Num a, Bits a) => a -> a ++xlate64 :: (Num a, Bits a) => a -> a + + #ifdef LITTLEENDIAN + xlate32 = id @@ -100,7 +100,7 @@ #endif @@ -11,3 +22,21 @@ Index: darcs/hashed-storage/Storage/Hashed/Utils.hs bytemask = 255 xlate32 a = ((a .&. (bytemask `shift` 0)) `shiftL` 24) .|. +Index: darcs/hashed-storage/Storage/Hashed/Index.hs +=================================================================== +--- darcs.orig/hashed-storage/Storage/Hashed/Index.hs 2015-07-09 18:48:56.000000000 +0200 ++++ darcs/hashed-storage/Storage/Hashed/Index.hs 2015-07-15 20:05:52.470960853 +0200 +@@ -166,11 +166,11 @@ + itemIsDir i = unsafeHead (iDescriptor i) == c2w 'D' + + -- xlatePeek32 = fmap xlate32 . peek +-xlatePeek64 :: (Storable a, Bits a) => Ptr a -> IO a ++xlatePeek64 :: (Storable a, Num a, Bits a) => Ptr a -> IO a + xlatePeek64 = fmap xlate64 . peek + + -- xlatePoke32 ptr v = poke ptr (xlate32 v) +-xlatePoke64 :: (Storable a, Bits a) => Ptr a -> a -> IO () ++xlatePoke64 :: (Storable a, Num a, Bits a) => Ptr a -> a -> IO () + xlatePoke64 ptr v = poke ptr (xlate64 v) + + -- | Lay out the basic index item structure in memory. The memory location is |