[Pkg-haskell-commits] darcs: haskell-lens: Fix patch?

[Joachim Breitner]

Tue May 13 15:34:37 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Fix patch?

    M ./patches/add-without-th-flag.patch -15 +15

Tue May 13 15:34:37 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Fix patch?
diff -rN -u old-haskell-lens/patches/add-without-th-flag.patch new-haskell-lens/patches/add-without-th-flag.patch
--- old-haskell-lens/patches/add-without-th-flag.patch	2014-05-13 21:36:51.655543961 +0000
+++ new-haskell-lens/patches/add-without-th-flag.patch	2014-05-13 21:36:51.655543961 +0000
@@ -1,8 +1,8 @@
 Index: haskell-lens-4.1.2/lens.cabal
 ===================================================================
---- haskell-lens-4.1.2.orig/lens.cabal
-+++ haskell-lens-4.1.2/lens.cabal
-@@ -121,6 +121,12 @@ flag benchmark-uniplate
+--- haskell-lens-4.1.2.orig/lens.cabal	2014-05-13 17:29:11.000000000 +0200
++++ haskell-lens-4.1.2/lens.cabal	2014-05-13 17:34:06.731912080 +0200
+@@ -121,6 +121,12 @@
    default: False
    manual: True
  
@@ -15,7 +15,7 @@
  -- Generate inline pragmas when using template-haskell. This defaults to enabled, but you can
  --
  -- > cabal install lens -f-inlining
-@@ -248,7 +254,6 @@ library
+@@ -248,7 +254,6 @@
      Control.Lens.Internal.Reflection
      Control.Lens.Internal.Review
      Control.Lens.Internal.Setter
@@ -23,7 +23,7 @@
      Control.Lens.Internal.Zoom
      Control.Lens.Iso
      Control.Lens.Lens
-@@ -260,7 +265,6 @@ library
+@@ -260,7 +265,6 @@
      Control.Lens.Reified
      Control.Lens.Review
      Control.Lens.Setter
@@ -31,7 +31,7 @@
      Control.Lens.Traversal
      Control.Lens.Tuple
      Control.Lens.Type
-@@ -301,11 +305,18 @@ library
+@@ -301,11 +305,18 @@
      Language.Haskell.TH.Lens
      Numeric.Lens
  
@@ -42,7 +42,7 @@
  
 +  if flag(without-th)
 +    cpp-options: -DDISABLE_TEMPLATE_HASKELL
-+  else:
++  else
 +    exposed-modules:
 +      Control.Lens.TH
 +      Control.Lens.Internal.TH
@@ -52,7 +52,7 @@
    if flag(safe)
      cpp-options: -DSAFE=1
  
-@@ -339,6 +350,9 @@ test-suite templates
+@@ -339,6 +350,9 @@
    ghc-options: -Wall -threaded
    hs-source-dirs: tests
  
@@ -64,8 +64,8 @@
  
 Index: haskell-lens-4.1.2/src/Control/Lens/At.hs
 ===================================================================
---- haskell-lens-4.1.2.orig/src/Control/Lens/At.hs
-+++ haskell-lens-4.1.2/src/Control/Lens/At.hs
+--- haskell-lens-4.1.2.orig/src/Control/Lens/At.hs	2014-05-13 17:28:14.000000000 +0200
++++ haskell-lens-4.1.2/src/Control/Lens/At.hs	2014-05-13 17:29:11.000000000 +0200
 @@ -2,7 +2,9 @@
  {-# LANGUAGE GADTs #-}
  {-# LANGUAGE Rank2Types #-}
@@ -76,7 +76,7 @@
  {-# LANGUAGE FlexibleContexts #-}
  {-# LANGUAGE DefaultSignatures #-}
  {-# LANGUAGE FlexibleInstances #-}
-@@ -45,7 +47,9 @@ import Control.Applicative
+@@ -45,7 +47,9 @@
  import Control.Lens.Lens
  import Control.Lens.Setter
  import Control.Lens.Type
@@ -86,7 +86,7 @@
  import Data.Aeson as Aeson
  import Data.Array.IArray as Array
  import Data.Array.Unboxed
-@@ -441,4 +445,6 @@ instance (Eq k, Hashable k) => At (HashS
+@@ -441,4 +445,6 @@
      where mv = if HashSet.member k m then Just () else Nothing
    {-# INLINE at #-}
  
@@ -95,14 +95,14 @@
 +#endif
 Index: haskell-lens-4.1.2/src/System/IO/Error/Lens.hs
 ===================================================================
---- haskell-lens-4.1.2.orig/src/System/IO/Error/Lens.hs
-+++ haskell-lens-4.1.2/src/System/IO/Error/Lens.hs
+--- haskell-lens-4.1.2.orig/src/System/IO/Error/Lens.hs	2014-05-13 17:28:14.000000000 +0200
++++ haskell-lens-4.1.2/src/System/IO/Error/Lens.hs	2014-05-13 17:29:11.000000000 +0200
 @@ -1,3 +1,4 @@
 +{-# LANGUAGE CPP #-}
  {-# LANGUAGE TemplateHaskell #-}
  {-# LANGUAGE FlexibleContexts #-}
  {-# LANGUAGE FlexibleInstances #-}
-@@ -62,4 +63,6 @@ errorType f s = f (ioe_type s) <&> \e ->
+@@ -62,4 +63,6 @@
  --
  -- (These prisms are generated automatically)