[Pkg-haskell-commits] darcs: alex: Add patch to make tests actually build.

[Erik de Castro Lopo]

Wed May 29 21:45:15 UTC 2013  Erik de Castro Lopo <erikd at mega-nerd.com>
  * Add patch to make tests actually build.
  Ignore-this: f9e599b272af81be387553a99da060d6

    M ./changelog -2 +7
    A ./patches/cabal-test.diff
    R ./patches/fix-bang-pattern.diff
    M ./patches/series -1 +1

Wed May 29 21:45:15 UTC 2013  Erik de Castro Lopo <erikd at mega-nerd.com>
  * Add patch to make tests actually build.
  Ignore-this: f9e599b272af81be387553a99da060d6
diff -rN -u old-alex//changelog new-alex//changelog
--- old-alex//changelog	2013-05-29 21:48:15.294036520 +0000
+++ new-alex//changelog	2013-05-29 21:48:15.302036542 +0000
@@ -1,9 +1,14 @@
 alex (3.0.5-1) UNRELEASED; urgency=low
 
+  [Joachim Breitner]
   * New upstream release
-  * Enable tests 
+  * Enable tests
 
- -- Joachim Breitner <nomeata at debian.org>  Mon, 27 May 2013 15:20:51 +0200
+  [Erik de Castro Lopo]
+  * Drop patches/fix-bang-pattern.diff (not needed any longer)
+  * Add patches/cabal-test.diff to make the tests compile
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com>  Thu, 30 May 2013 07:42:45 +1000
 
 alex (3.0.2-2) unstable; urgency=low
 
diff -rN -u old-alex//patches/cabal-test.diff new-alex//patches/cabal-test.diff
--- old-alex//patches/cabal-test.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-alex//patches/cabal-test.diff	2013-05-29 21:48:15.305538578 +0000
@@ -0,0 +1,9 @@
+Index: alex-3.0.5/alex.cabal
+===================================================================
+--- alex-3.0.5.orig/alex.cabal	2013-03-10 23:19:13.000000000 +1100
++++ alex-3.0.5/alex.cabal	2013-05-30 07:25:49.000000000 +1000
+@@ -108,3 +108,4 @@
+   type: exitcode-stdio-1.0
+   main-is: test.hs
+   build-depends: process
++          , haskell2010
diff -rN -u old-alex//patches/fix-bang-pattern.diff new-alex//patches/fix-bang-pattern.diff
--- old-alex//patches/fix-bang-pattern.diff	2013-05-29 21:48:15.265803685 +0000
+++ new-alex//patches/fix-bang-pattern.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-# Author : Erik de Castro Lopo <erikd at mega-nerd.com>
-# Description : Fix generated haskell code so it doesn't fail with -Werror.
-# Debian Version : 2.3.5
-# Date : Sun, 17 Apr 2011 15:45:41 +1000
-
---- a/templates/GenericTemplate.hs
-+++ b/templates/GenericTemplate.hs
-@@ -9,7 +9,7 @@
- 
- #ifdef ALEX_GHC
- #define ILIT(n) n#
--#define FAST_INT_BINDING(n) (n)
-+#define FAST_INT_BINDING(n) (!(n))
- #define IBOX(n) (I# (n))
- #define FAST_INT Int#
- #define LT(n,m) (n <# m)
-@@ -57,10 +57,10 @@
- ALEX_IF_BIGENDIAN
-   narrow16Int# i
-   where
--        i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
--        high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
--        low  = int2Word# (ord# (indexCharOffAddr# arr off'))
--        off' = off *# 2#
-+        !i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
-+        !high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
-+        !low  = int2Word# (ord# (indexCharOffAddr# arr off'))
-+        !off' = off *# 2#
- ALEX_ELSE
-   indexInt16OffAddr# arr off
- ALEX_ENDIF
---- a/src/Scan.x
-+++ b/src/Scan.x
-@@ -11,7 +11,7 @@
- -------------------------------------------------------------------------------
- 
- {
--{-# OPTIONS_GHC -w #-}
-+{-# OPTIONS_GHC -w -XBangPatterns #-}
- 
- module Scan(lexer, AlexPosn(..), Token(..), Tkn(..), tokPosn) where
- 
---- a/src/Main.hs
-+++ b/src/Main.hs
-@@ -203,7 +203,7 @@
-   hPutStrLn hdl code
- 
- optsToInject :: Target -> [CLIFlags] -> String
--optsToInject GhcTarget _ = "{-# LANGUAGE CPP,MagicHash #-}\n"
-+optsToInject GhcTarget _ = "{-# LANGUAGE CPP,MagicHash,BangPatterns #-}\n"
- optsToInject _         _ = "{-# LANGUAGE CPP #-}\n"
- 
- importsToInject :: Target -> [CLIFlags] -> String
diff -rN -u old-alex//patches/series new-alex//patches/series
--- old-alex//patches/series	2013-05-29 21:48:15.265803685 +0000
+++ new-alex//patches/series	2013-05-29 21:48:15.305538578 +0000
@@ -1,2 +1,2 @@
-fix-bang-pattern.diff
+cabal-test.diff
 debian-changes-3.0.1-1