[Pkg-haskell-commits] darcs: tools: Add leksah patches (QuickCheck 2.6 compat still missing)

Joachim Breitner mail at joachim-breitner.de
Sat Jun 15 08:53:44 UTC 2013


Sat Jun 15 08:48:33 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Add leksah patches (QuickCheck 2.6 compat still missing)

    M ./all-packages/packages.txt -3 +3
    A ./all-packages/patches/leksah-0.12.1.3.patch
    A ./all-packages/patches/leksah-server-0.12.1.2.patch
    A ./all-packages/patches/ltk-0.12.1.0.patch

Sat Jun 15 08:48:33 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Add leksah patches (QuickCheck 2.6 compat still missing)
diff -rN -u old-tools/all-packages/packages.txt new-tools/all-packages/packages.txt
--- old-tools/all-packages/packages.txt	2013-06-15 08:53:43.914038729 +0000
+++ new-tools/all-packages/packages.txt	2013-06-15 08:53:44.002045786 +0000
@@ -317,8 +317,8 @@
 largeword 1.0.5
 lazysmallcheck 0.6
 LDAP 0.6.9
-leksah 0.12.1.3 patched to compile
-leksah-server 0.12.1.2 patched to compile
+leksah 0.12.1.3 todo: QuickCheck 2.6
+leksah-server 0.12.1.2
 lens 3.9.0.2
 lhs2tex 1.18.1
 libtagc 0.12.0
@@ -330,7 +330,7 @@
 llvm-base 3.2.0.0
 logict 0.5.0.2
 lrucache 1.1.1.3
-ltk 0.12.1.0 patched to compile
+ltk 0.12.1.0
 maccatcher 2.1.5
 magic 1.0.8
 markov-chain 0.0.3.2
diff -rN -u old-tools/all-packages/patches/leksah-0.12.1.3.patch new-tools/all-packages/patches/leksah-0.12.1.3.patch
--- old-tools/all-packages/patches/leksah-0.12.1.3.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-tools/all-packages/patches/leksah-0.12.1.3.patch	2013-06-15 08:53:43.958041795 +0000
@@ -0,0 +1,88 @@
+From 04bfcb664d3672adc06ed9646b337b2a8fe7784d Mon Sep 17 00:00:00 2001
+From: Hamish Mackenzie <Hamish.K.Mackenzie at googlemail.com>
+Date: Wed, 10 Oct 2012 17:25:06 +1300
+Subject: [PATCH] GHC 7.6 fixes
+
+---
+ leksah.cabal                 | 28 ++++++++++++++--------------
+ src/IDE/BufferMode.hs        |  9 ++++++++-
+ src/IDE/Core/Types.hs        |  8 +++++++-
+ src/IDE/Pane/SourceBuffer.hs |  5 +++--
+ src/IDE/Utils/GUIUtils.hs    |  7 ++++---
+ 5 files changed, 36 insertions(+), 21 deletions(-)
+
+Index: b/leksah.cabal
+===================================================================
+--- a/leksah.cabal
++++ b/leksah.cabal
+@@ -94,7 +94,7 @@
+         includes: windows.h
+ --        include-dirs: C:/cygwin/usr/include/w32api
+     else
+-        build-depends: unix >=2.3.1.0 && <2.6
++        build-depends: unix >=2.3.1.0 && <2.7
+ 
+     if os(osx)
+         build-depends: gtk-mac-integration >= 0.0.0.2 && <0.2
+@@ -113,17 +113,17 @@
+     hs-source-dirs: src
+     default-language: Haskell98
+ 
+-    build-depends: Cabal >=1.6.0.1 && <1.15, base >=4.0.0.0 && <4.6, binary >=0.5.0.0 && <0.6,
+-                       bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,
++    build-depends: Cabal >=1.6.0.1 && <1.17, base >=4.0.0.0 && <4.7, binary >=0.5.0.0 && <0.6,
++                       bytestring >=0.9.0.1 && <0.11, containers >=0.2.0.0 && <0.6, directory >=1.0.0.2 && <3.1,
+                        filepath >=1.1.0.1 && <1.4, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,
+                        gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.2, old-time >=1.0.0.1 && <1.2,
+                        parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
+                        regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.5,
+                        time >=0.1 && <1.5, ltk >= 0.12.1.0 && <0.13, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,
+-                       hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.2 && <0.13, network >= 2.2 && <3.0,
+-                       ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
++                       hslogger >= 1.0.7 && <1.3, leksah-server >=0.12.1.2 && <0.13, network >= 2.2 && <3.0,
++                       ghc >=6.10.1 && <7.7, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
+                        gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
+-                       QuickCheck >=2.4.2 && <2.5
++                       QuickCheck >=2.4.2 && <2.6
+ 
+     exposed-modules:
+         IDE.Leksah IDE.Completion IDE.ImportTool
+@@ -165,7 +165,7 @@
+         includes: windows.h
+ --        include-dirs: C:/cygwin/usr/include/w32api
+     else
+-        build-depends: unix >=2.3.1.0 && <2.6
++        build-depends: unix >=2.3.1.0 && <2.7
+ 
+     if os(osx)
+         build-depends: gtk-mac-integration >= 0.0.0.2 && <0.2
+@@ -187,17 +187,17 @@
+ 
+     if impl(ghc < 7.0)
+         hs-source-dirs: src, main
+-        build-depends: Cabal >=1.6.0.1 && <1.15, base >=4.0.0.0 && <4.6, binary >=0.5.0.0 && <0.6,
+-                       bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,
++        build-depends: Cabal >=1.6.0.1 && <1.17, base >=4.0.0.0 && <4.7, binary >=0.5.0.0 && <0.6,
++                       bytestring >=0.9.0.1 && <0.11, containers >=0.2.0.0 && <0.6, directory >=1.0.0.2 && <3.1,
+                        filepath >=1.1.0.1 && <1.4, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,
+                        gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.2, old-time >=1.0.0.1 && <1.2,
+                        parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
+                        regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.5,
+                        time >=0.1 && <1.5, ltk >=0.12.1.0 && <0.13, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.4,
+-                       hslogger >= 1.0.7 && <1.2, leksah-server >=0.12.1.2 && <0.13, network >= 2.2 && <3.0,
+-                       ghc >=6.10.1 && <7.5, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
++                       hslogger >= 1.0.7 && <1.3, leksah-server >=0.12.1.2 && <0.13, network >= 2.2 && <3.0,
++                       ghc >=6.10.1 && <7.7, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.5 && < 0.12,
+                        gio >=0.12.2 && <0.13, transformers >=0.2.2.0 && <0.4,
+-                       QuickCheck >=2.4.2 && <2.5
++                       QuickCheck >=2.4.2 && <2.6
+     else
+         hs-source-dirs: main
+         build-depends: leksah ==0.12.1.3, base >=4.0.0.0 && <= 5
+@@ -214,7 +214,7 @@
+     type:       exitcode-stdio-1.0
+     hs-source-dirs: tests
+     main-is:    Tests.hs
+-    build-depends: base >= 4.0.0.0 && <4.6, Cabal >=1.6.0.1 && <1.15, QuickCheck >=2.4.2 && <2.5,
++    build-depends: base >= 4.0.0.0 && <4.7, Cabal >=1.6.0.1 && <1.17, QuickCheck >=2.4.2 && <2.6,
+                    leksah ==0.12.1.3
diff -rN -u old-tools/all-packages/patches/leksah-server-0.12.1.2.patch new-tools/all-packages/patches/leksah-server-0.12.1.2.patch
--- old-tools/all-packages/patches/leksah-server-0.12.1.2.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-tools/all-packages/patches/leksah-server-0.12.1.2.patch	2013-06-15 08:53:43.958041795 +0000
@@ -0,0 +1,123 @@
+From dc892c956ce07b3386778fc1fe7597adb9f8505b Mon Sep 17 00:00:00 2001
+From: Hamish Mackenzie <Hamish.K.Mackenzie at googlemail.com>
+Date: Wed, 10 Oct 2012 17:24:49 +1300
+Subject: [PATCH] GHC 7.6 fixes (Iain Lane: slightly modified for Debian)
+
+---
+ leksah-server.cabal                    |  44 +++---
+ src/IDE/Core/CTypes.hs                 |   2 +
+ src/IDE/HeaderParser.hs                |  50 +++---
+ src/IDE/Metainfo/InterfaceCollector.hs | 122 +++++++++------
+ src/IDE/Metainfo/PackageCollector.hs   |  13 +-
+ src/IDE/Metainfo/SourceCollectorH.hs   | 271 ++++++++++++++++++++-------------
+ src/IDE/Metainfo/WorkspaceCollector.hs | 228 +++++++++++++++++----------
+ src/IDE/Utils/FileUtils.hs             |  41 ++---
+ src/IDE/Utils/GHCUtils.hs              |  38 ++++-
+ src/IDE/Utils/Server.hs                |   9 +-
+ src/IDE/Utils/VersionUtils.hs          |   9 +-
+ 11 files changed, 519 insertions(+), 308 deletions(-)
+
+Index: b/leksah-server.cabal
+===================================================================
+--- a/leksah-server.cabal
++++ b/leksah-server.cabal
+@@ -32,22 +32,25 @@
+ 
+ library
+     default-language: Haskell98
+-    build-depends: Cabal >=1.6.0.1 && <1.15, base >= 4.0.0.0 && <4.6, binary >=0.5.0.0 && <0.6,
+-               binary-shared >=0.8 && <0.9, bytestring >=0.9.0.1 && <0.10,
+-               containers >=0.2.0.0 && <0.5,
+-               directory >=1.0.0.2 && <1.2, filepath >=1.1.0.1 && <1.4, ghc >=6.10.1 && <7.5,
++    build-depends: Cabal >=1.6.0.1 && <1.17, base >= 4.0.0.0 && <4.7, binary >=0.5.0.0 && <0.6,
++               binary-shared >=0.8 && <0.9, bytestring >=0.9.0.1 && <0.11,
++               containers >=0.2.0.0 && <0.6,
++               directory >=1.0.0.2 && <1.3, filepath >=1.1.0.1 && <1.4, ghc >=6.10.1 && <7.7,
+                ltk >=0.12.1.0 && <0.13, parsec >=2.1.0.1 && <3.2,
+                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
+-               hslogger >= 1.0.7 && <1.2, network >=2.2 && <3.0, enumerator >=0.4.14 && < 0.5,
++               hslogger >= 1.0.7 && <1.3, network >=2.2 && <3.0, enumerator >=0.4.14 && < 0.5,
+                attoparsec-enumerator >=0.3 && <0.4, attoparsec >=0.10.0.3 && <0.11,
+                transformers >=0.2.2.0 && <0.4, strict >=0.3.2 && <0.4
+ 
+     if (impl(ghc >= 7.2))
+         binary-shared >=0.8.2
+ 
+-    if (impl(ghc >= 7.4))
+-       build-depends: haddock >= 2.7.2 && <2.11
++    if (impl(ghc >= 7.6))
++       build-depends: haddock >= 2.7.2 && <2.14
+     else
++     if (impl(ghc >= 7.4))
++        build-depends: haddock >= 2.7.2 && <2.11
++     else
+        if (impl(ghc >= 7.2))
+           build-depends: haddock >= 2.7.2 && <2.10
+        else
+@@ -68,7 +71,7 @@
+         build-depends: Win32 >=2.2.0.0 && <2.3
+         extra-libraries: kernel32  pango-1.0 glib-2.0
+     else
+-        build-depends: unix >=2.3.1.0 && <2.6
++        build-depends: unix >=2.3.1.0 && <2.7
+ 
+     if flag(curl) || os(osx)
+         cpp-options: -DUSE_CURL
+@@ -96,18 +99,21 @@
+ 
+ executable leksah-server
+     default-language: Haskell98
+-    build-depends: Cabal >=1.6.0.1 && <1.15, base >= 4.0.0.0 && <4.6, binary >=0.5.0.0 && <0.6,
+-               binary-shared >=0.8 && <0.9, bytestring >=0.9.0.1 && <0.10,
+-               containers >=0.2.0.0 && <0.5,
+-               directory >=1.0.0.2 && <1.2, filepath >=1.1.0.1 && <1.6, ghc >=6.10.1 && <7.5,
++    build-depends: Cabal >=1.6.0.1 && <1.17, base >= 4.0.0.0 && <4.7, binary >=0.5.0.0 && <0.6,
++               binary-shared >=0.8 && <0.9, bytestring >=0.9.0.1 && <0.11,
++               containers >=0.2.0.0 && <0.6,
++               directory >=1.0.0.2 && <1.3, filepath >=1.1.0.1 && <1.6, ghc >=6.10.1 && <7.7,
+                ltk >=0.12.1.0 && <0.13, parsec >=2.1.0.1 && <3.2,
+                pretty >=1.0.1.0 && <1.2, time >=1.1 && <1.5, deepseq >=1.1 && <1.4,
+-               hslogger >= 1.0.7 && <1.2, network >=2.2 && <3.0, enumerator >= 0.4.14 && <0.5,
++               hslogger >= 1.0.7 && <1.3, network >=2.2 && <3.0, enumerator >= 0.4.14 && <0.5,
+                attoparsec-enumerator >=0.3 && <0.4, attoparsec >=0.10.0.3 && <0.11,
+                transformers >=0.2.2.0 && <0.4, strict >=0.3.2 && <0.4
+-    if (impl(ghc >= 7.4))
+-       build-depends: haddock >= 2.7.2 && <2.11
++    if (impl(ghc >= 7.6))
++       build-depends: haddock >= 2.7.2 && <2.14
+     else
++     if (impl(ghc >= 7.4))
++        build-depends: haddock >= 2.7.2 && <2.11
++     else
+        if (impl(ghc >= 7.2))
+           build-depends: haddock >= 2.7.2 && <2.10
+        else
+@@ -128,7 +134,7 @@
+         build-depends: Win32 >=2.2.0.0 && <2.3
+         extra-libraries: kernel32 pango-1.0 glib-2.0
+     else
+-        build-depends: unix >=2.3.1.0 && <2.6
++        build-depends: unix >=2.3.1.0 && <2.7
+ 
+     if flag(curl) || os(osx)
+         cpp-options: -DUSE_CURL
+@@ -167,8 +173,8 @@
+     hs-source-dirs: src
+     ghc-prof-options: -auto-all -prof
+ --    ghc-shared-options: -auto-all -prof
+-    build-depends:  base >= 4.0.0.0 && <4.6, hslogger >= 1.0.7 && <1.2, deepseq >=1.1 && <1.4,
+-               bytestring >=0.9.0.1 && <0.10, enumerator >= 0.4.14 && <0.5,
++    build-depends:  base >= 4.0.0.0 && <4.7, hslogger >= 1.0.7 && <1.3, deepseq >=1.1 && <1.4,
++               bytestring >=0.9.0.1 && <0.11, enumerator >= 0.4.14 && <0.5,
+                attoparsec-enumerator >=0.3 && <0.4, attoparsec >=0.10.0.3 && <0.11,
+                transformers >=0.2.2.0 && <0.4
+ 
+@@ -190,7 +196,7 @@
+     type:       exitcode-stdio-1.0
+     hs-source-dirs: tests
+     main-is:    TestTool.hs
+-    build-depends: base >= 4.0.0.0 && <4.6,  hslogger >= 1.0.7 && <1.3,
++    build-depends: base >= 4.0.0.0 && <4.7,  hslogger >= 1.0.7 && <1.3,
+                leksah-server,
+                HUnit >=1.2 && <1.3, transformers >=0.2.2.0 && <0.4, enumerator >=0.4.14 && <0.5
+ 
diff -rN -u old-tools/all-packages/patches/ltk-0.12.1.0.patch new-tools/all-packages/patches/ltk-0.12.1.0.patch
--- old-tools/all-packages/patches/ltk-0.12.1.0.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-tools/all-packages/patches/ltk-0.12.1.0.patch	2013-06-15 08:53:43.958041795 +0000
@@ -0,0 +1,19 @@
+Description: Compile with the versions of some modules in GHC 7.6
+Forwarded: yes
+Author: Iain Lane <laney at debian.org>
+
+Index: b/ltk.cabal
+===================================================================
+--- a/ltk.cabal
++++ b/ltk.cabal
+@@ -16,8 +16,8 @@
+ tested-with: GHC ==6.10 || ==6.12 || ==7.0
+ 
+ Library
+-    build-depends: Cabal >=1.6.0 && <1.15, base >=4.0.0.0 && <4.6,
+-               containers >=0.2 && <0.5, filepath >=1.1.0 && <1.4,
++    build-depends: Cabal >=1.6.0 && <1.17, base >=4.0.0.0 && <4.7,
++               containers >=0.2 && <0.6, filepath >=1.1.0 && <1.4,
+                glib >=0.10.0 && <0.13, gtk >=0.10.0 && <0.13,
+                mtl >=1.1.0.2 && <2.2, parsec >=2.1.0.1 && <3.2,
+                pretty >=1.0.1.0 && <1.2, transformers >=0.2.2.0 && <0.4,




More information about the Pkg-haskell-commits mailing list