Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updates 2012-11-12

    SHA
    blaze-builder-conduit
    bytestring-show
    cairo
    conduit
    glib
    gtk
    gtk2hs-buildtools
    pango
    resourcet
    warp

Signed-off-by: Magnus Therning <magnus@therning.org>
  • Loading branch information...
commit c599e4690db4bafddde161f3e4f7fe1a12caf928 1 parent ebd10f4
@magthe magthe authored
View
38 cblrepo.db
@@ -40,7 +40,7 @@
["SDL",{"RepoPkg":[{"Version":"0.6.4"},[{"Dependency":"base >=3 && <5"}],"25"]}]
["SDL-image",{"RepoPkg":[{"Version":"0.6.1"},[{"Dependency":"SDL -any"},{"Dependency":"base >=3 && <5"}],"25"]}]
["SDL-ttf",{"RepoPkg":[{"Version":"0.6.1"},[{"Dependency":"SDL -any"},{"Dependency":"base >=3 && <=5"}],"25"]}]
-["SHA",{"RepoPkg":[{"Version":"1.5.1"},[{"Dependency":"array -any && -any && -any && -any"},{"Dependency":"base >=4 && <6 && >=4 && <6 && >=4 && <6 && >=4 && <6"},{"Dependency":"binary -any && -any && -any && -any"},{"Dependency":"bytestring -any && -any && -any && -any"}],"25"]}]
+["SHA",{"RepoPkg":[{"Version":"1.6.0"},[{"Dependency":"QuickCheck ==2.*"},{"Dependency":"array -any && -any && -any && -any"},{"Dependency":"base >=4 && <6 && >=4 && <6 && >=4 && <6 && >=4 && <6"},{"Dependency":"binary -any && -any && -any && -any"},{"Dependency":"bytestring -any && -any && -any && -any"},{"Dependency":"directory -any && -any"},{"Dependency":"test-framework >=0.3"},{"Dependency":"test-framework-quickcheck2 >=0.2"}],"1"]}]
["StateVar",{"RepoPkg":[{"Version":"1.0.0.0"},[{"Dependency":"base >=3 && <5"}],"25"]}]
["Tensor",{"RepoPkg":[{"Version":"1.0.0.1"},[{"Dependency":"base >=3 && <5"}],"25"]}]
["Unixutils",{"RepoPkg":[{"Version":"1.50"},[{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"directory -any"},{"Dependency":"filepath -any"},{"Dependency":"process -any"},{"Dependency":"pureMD5 -any"},{"Dependency":"regex-tdfa -any"},{"Dependency":"unix -any"},{"Dependency":"zlib -any"}],"25"]}]
@@ -56,15 +56,15 @@
["base-unicode-symbols",{"RepoPkg":[{"Version":"0.2.2.4"},[{"Dependency":"base >=3.0.3.1 && <5"}],"25"]}]
["base64-bytestring",{"RepoPkg":[{"Version":"1.0.0.0"},[{"Dependency":"base ==4.*"},{"Dependency":"bytestring >=0.9.0"}],"1"]}]
["blaze-builder",{"RepoPkg":[{"Version":"0.3.1.0"},[{"Dependency":"base ==4.*"},{"Dependency":"bytestring >=0.9 && <1.0"},{"Dependency":"text >=0.10 && <0.13"}],"25"]}]
-["blaze-builder-conduit",{"RepoPkg":[{"Version":"0.5.0.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"blaze-builder >=0.2.1.4 && <0.4"},{"Dependency":"bytestring >=0.9"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"containers -any"},{"Dependency":"text >=0.11"},{"Dependency":"transformers >=0.2.2 && <0.4"}],"5"]}]
+["blaze-builder-conduit",{"RepoPkg":[{"Version":"0.5.0.2"},[{"Dependency":"base >=4 && <5"},{"Dependency":"blaze-builder >=0.2.1.4 && <0.4"},{"Dependency":"bytestring >=0.9"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"containers -any"},{"Dependency":"text >=0.11"},{"Dependency":"transformers >=0.2.2 && <0.4"}],"1"]}]
["blaze-html",{"RepoPkg":[{"Version":"0.5.1.0"},[{"Dependency":"base >=4 && <5"},{"Dependency":"blaze-builder >=0.2 && <0.4"},{"Dependency":"blaze-markup >=0.5.1 && <0.6"},{"Dependency":"bytestring >=0.9 && <0.11"},{"Dependency":"text >=0.10 && <0.12"}],"25"]}]
["blaze-markup",{"RepoPkg":[{"Version":"0.5.1.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"blaze-builder >=0.2 && <0.4"},{"Dependency":"bytestring >=0.9 && <0.11"},{"Dependency":"text >=0.10 && <0.12"}],"25"]}]
["bloomfilter",{"RepoPkg":[{"Version":"1.2.6.10"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring >=0.9"},{"Dependency":"deepseq -any"}],"25"]}]
["buildwrapper",{"RepoPkg":[{"Version":"0.6.2"},[{"Dependency":"Cabal -any && -any"},{"Dependency":"aeson >=0.4 && >=0.4"},{"Dependency":"attoparsec -any"},{"Dependency":"base <5 && <5"},{"Dependency":"buildwrapper -any"},{"Dependency":"bytestring -any && -any"},{"Dependency":"cmdargs -any"},{"Dependency":"containers -any && -any"},{"Dependency":"cpphs -any && -any"},{"Dependency":"directory -any && -any"},{"Dependency":"filepath -any && -any"},{"Dependency":"ghc -any && -any"},{"Dependency":"ghc-paths -any && -any"},{"Dependency":"haskell-src-exts -any && -any"},{"Dependency":"mtl -any && -any"},{"Dependency":"old-time -any && -any"},{"Dependency":"process -any && -any"},{"Dependency":"regex-tdfa -any && -any"},{"Dependency":"syb -any && -any"},{"Dependency":"text -any && -any"},{"Dependency":"time -any && -any"},{"Dependency":"transformers -any && -any"},{"Dependency":"unordered-containers -any"},{"Dependency":"utf8-string -any"},{"Dependency":"vector >=0.8 && >=0.8"}],"1"]}]
["bytestring-lexing",{"RepoPkg":[{"Version":"0.4.0"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && <5 && (<2.0 || >=3) && >=3 && <5"},{"Dependency":"bytestring -any && -any"}],"25"]}]
-["bytestring-show",{"RepoPkg":[{"Version":"0.3.5.3"},[{"Dependency":"array <0.5"},{"Dependency":"base <5"},{"Dependency":"binary <0.6"},{"Dependency":"bytestring >=0.9 && <=1"},{"Dependency":"containers <0.6"},{"Dependency":"integer-gmp >=0.2 && <0.6"}],"25"]}]
+["bytestring-show",{"RepoPkg":[{"Version":"0.3.5.4"},[{"Dependency":"array <0.5"},{"Dependency":"base <5"},{"Dependency":"binary <0.6"},{"Dependency":"bytestring >=0.9 && <=1"},{"Dependency":"containers <0.6"},{"Dependency":"integer-gmp >=0.2"}],"1"]}]
["cabal-file-th",{"RepoPkg":[{"Version":"0.2.3"},[{"Dependency":"Cabal >=1.10 && <1.17"},{"Dependency":"base >=4 && <5"},{"Dependency":"directory -any"},{"Dependency":"template-haskell -any"}],"25"]}]
-["cairo",{"RepoPkg":[{"Version":"0.12.3.1"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"mtl -any"}],"25"]}]
+["cairo",{"RepoPkg":[{"Version":"0.12.4"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"mtl -any"}],"1"]}]
["case-insensitive",{"RepoPkg":[{"Version":"0.4.0.3"},[{"Dependency":"base >=3 && <4.7"},{"Dependency":"bytestring >=0.9 && <0.11"},{"Dependency":"hashable >=1.0 && <1.2"},{"Dependency":"text >=0.3 && <0.12"}],"25"]}]
["cblrepo",{"RepoPkg":[{"Version":"0.7.0"},[{"Dependency":"Cabal ==1.16.*"},{"Dependency":"Unixutils ==1.50.*"},{"Dependency":"ansi-wl-pprint ==0.6.*"},{"Dependency":"base ==4.6.*"},{"Dependency":"bytestring ==0.10.*"},{"Dependency":"cmdargs ==0.10.*"},{"Dependency":"directory ==1.2.*"},{"Dependency":"filepath ==1.3.*"},{"Dependency":"json ==0.7.*"},{"Dependency":"mtl >=2.0 && <2.2"},{"Dependency":"process ==1.1.*"},{"Dependency":"tar ==0.4.*"},{"Dependency":"unix ==2.6.*"},{"Dependency":"zlib ==0.5.*"}],"1"]}]
["cereal",{"RepoPkg":[{"Version":"0.3.5.2"},[{"Dependency":"array -any"},{"Dependency":"base ==4.*"},{"Dependency":"bytestring -any"},{"Dependency":"containers -any"},{"Dependency":"ghc-prim >=0.2"}],"25"]}]
@@ -72,7 +72,7 @@
["citeproc-hs",{"RepoPkg":[{"Version":"0.3.6"},[{"Dependency":"HTTP >=4000.0.9"},{"Dependency":"base >=4"},{"Dependency":"bytestring -any"},{"Dependency":"containers -any"},{"Dependency":"directory -any"},{"Dependency":"filepath -any"},{"Dependency":"json -any"},{"Dependency":"mtl -any"},{"Dependency":"network >=2"},{"Dependency":"old-locale -any"},{"Dependency":"pandoc-types >=1.8 && <1.11"},{"Dependency":"parsec -any"},{"Dependency":"syb -any"},{"Dependency":"time -any"},{"Dependency":"utf8-string -any"},{"Dependency":"xml -any"}],"1"]}]
["cmdargs",{"RepoPkg":[{"Version":"0.10"},[{"Dependency":"base ==4.*"},{"Dependency":"filepath -any"},{"Dependency":"process >=1.0 && <1.2"},{"Dependency":"template-haskell -any"},{"Dependency":"transformers >=0.2 && <0.4"}],"25"]}]
["cmdlib",{"RepoPkg":[{"Version":"0.3.5"},[{"Dependency":"base >=4 && <5"},{"Dependency":"mtl >=2"},{"Dependency":"split -any"},{"Dependency":"syb -any"},{"Dependency":"transformers >=0.2.2"}],"25"]}]
-["conduit",{"RepoPkg":[{"Version":"0.5.4"},[{"Dependency":"base >=4.3 && <5"},{"Dependency":"bytestring >=0.9"},{"Dependency":"containers -any"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"monad-control >=0.3.1 && <0.4"},{"Dependency":"resourcet >=0.4.2 && <0.5"},{"Dependency":"text >=0.11"},{"Dependency":"transformers >=0.2.2 && <0.4"},{"Dependency":"transformers-base >=0.4.1 && <0.5"},{"Dependency":"void >=0.5.5 && <0.6"}],"1"]}]
+["conduit",{"RepoPkg":[{"Version":"0.5.4.1"},[{"Dependency":"base >=4.3 && <5"},{"Dependency":"bytestring >=0.9"},{"Dependency":"containers -any"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"monad-control >=0.3.1 && <0.4"},{"Dependency":"resourcet >=0.4.3 && <0.5"},{"Dependency":"text >=0.11"},{"Dependency":"transformers >=0.2.2 && <0.4"},{"Dependency":"transformers-base >=0.4.1 && <0.5"},{"Dependency":"void >=0.5.5 && <0.6"}],"1"]}]
["convertible",{"RepoPkg":[{"Version":"1.0.11.1"},[{"Dependency":"base >=3 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"containers -any"},{"Dependency":"mtl -any"},{"Dependency":"old-locale -any"},{"Dependency":"old-time -any"},{"Dependency":"text >=0.7"},{"Dependency":"time >=1.1.3 && >=1.1.2.4"}],"1"]}]
["cpphs",{"RepoPkg":[{"Version":"1.14"},[{"Dependency":"base >3 && <6 && >3 && <6"},{"Dependency":"directory -any && -any"},{"Dependency":"old-locale -any && -any"},{"Dependency":"old-time -any && -any"}],"25"]}]
["crypto-api",{"RepoPkg":[{"Version":"0.10.2"},[{"Dependency":"array -any"},{"Dependency":"base ==4.*"},{"Dependency":"bytestring >=0.9 && <0.11"},{"Dependency":"cereal >=0.2 && <0.4"},{"Dependency":"entropy -any"},{"Dependency":"largeword >=1.0.0"},{"Dependency":"tagged >=0.1 && <0.5"}],"25"]}]
@@ -92,9 +92,9 @@
["ghc-mod",{"RepoPkg":[{"Version":"1.11.2"},[{"Dependency":"Cabal >=1.10"},{"Dependency":"base >=4.0 && <5"},{"Dependency":"containers -any"},{"Dependency":"convertible -any"},{"Dependency":"directory -any"},{"Dependency":"filepath -any"},{"Dependency":"ghc -any"},{"Dependency":"ghc-paths -any"},{"Dependency":"ghc-syb-utils -any"},{"Dependency":"hlint >=1.7.1"},{"Dependency":"io-choice -any"},{"Dependency":"old-time -any"},{"Dependency":"process -any"},{"Dependency":"regex-posix -any"},{"Dependency":"syb -any"},{"Dependency":"time -any"},{"Dependency":"transformers -any"}],"2"]}]
["ghc-paths",{"RepoPkg":[{"Version":"0.1.0.8"},[{"Dependency":"base >=3 && <5"}],"25"]}]
["ghc-syb-utils",{"RepoPkg":[{"Version":"0.2.1.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"ghc -any"},{"Dependency":"syb >=0.1.0"}],"25"]}]
-["glib",{"RepoPkg":[{"Version":"0.12.3.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"containers -any"}],"25"]}]
-["gtk",{"RepoPkg":[{"Version":"0.12.3.1"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"cairo >=0.12.0 && <0.13"},{"Dependency":"containers -any"},{"Dependency":"glib >=0.12.0 && <0.13"},{"Dependency":"mtl -any"},{"Dependency":"pango >=0.12.0 && <0.13"}],"25"]}]
-["gtk2hs-buildtools",{"RepoPkg":[{"Version":"0.12.3.1"},[{"Dependency":"array -any"},{"Dependency":"base -any && -any && >=4 && <5"},{"Dependency":"containers -any"},{"Dependency":"directory -any"},{"Dependency":"filepath -any"},{"Dependency":"pretty -any"},{"Dependency":"process -any"},{"Dependency":"random -any"}],"25"]}]
+["glib",{"RepoPkg":[{"Version":"0.12.4"},[{"Dependency":"base >=4 && <5"},{"Dependency":"containers -any"}],"1"]}]
+["gtk",{"RepoPkg":[{"Version":"0.12.4"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"cairo >=0.12.0 && <0.13"},{"Dependency":"containers -any"},{"Dependency":"glib >=0.12.0 && <0.13"},{"Dependency":"mtl -any"},{"Dependency":"pango >=0.12.0 && <0.13"}],"1"]}]
+["gtk2hs-buildtools",{"RepoPkg":[{"Version":"0.12.4"},[{"Dependency":"array -any"},{"Dependency":"base -any && -any && >=4 && <5"},{"Dependency":"containers -any"},{"Dependency":"directory -any"},{"Dependency":"filepath -any"},{"Dependency":"pretty -any"},{"Dependency":"process -any"},{"Dependency":"random -any"}],"1"]}]
["hS3",{"RepoPkg":[{"Version":"0.5.6"},[{"Dependency":"Crypto >=4.1.0"},{"Dependency":"HTTP >=4000.0.0"},{"Dependency":"MissingH >=0.18.6"},{"Dependency":"base >=3 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"dataenc -any"},{"Dependency":"hxt >=9.0.0 && <10"},{"Dependency":"network -any"},{"Dependency":"old-locale -any"},{"Dependency":"old-time -any"},{"Dependency":"random -any"},{"Dependency":"regex-compat -any"},{"Dependency":"utf8-string -any"}],"28"]}]
["haddock",{"RepoPkg":[{"Version":"2.13.1"},[{"Dependency":"Cabal >=1.10"},{"Dependency":"array -any"},{"Dependency":"base >=4.3 && <4.7 && >=4.3 && <4.7"},{"Dependency":"containers -any"},{"Dependency":"deepseq -any"},{"Dependency":"directory -any"},{"Dependency":"filepath -any"},{"Dependency":"ghc ==7.6.*"},{"Dependency":"ghc-paths -any"},{"Dependency":"haddock -any"},{"Dependency":"xhtml >=3000.2 && <3000.3"}],"1"]}]
["happy",{"RepoPkg":[{"Version":"1.18.10"},[{"Dependency":"array -any"},{"Dependency":"base >=2.1 && <5"},{"Dependency":"containers -any"},{"Dependency":"mtl >=1.0"}],"25"]}]
@@ -125,23 +125,23 @@
["lifted-base",{"RepoPkg":[{"Version":"0.2"},[{"Dependency":"base >=3 && <4.7"},{"Dependency":"base-unicode-symbols >=0.1.1 && <0.3"},{"Dependency":"monad-control >=0.3 && <0.4"},{"Dependency":"transformers-base >=0.4 && <0.5"}],"1"]}]
["mmap",{"RepoPkg":[{"Version":"0.5.8"},[{"Dependency":"base <5"},{"Dependency":"bytestring -any"}],"25"]}]
["monad-control",{"RepoPkg":[{"Version":"0.3.1.4"},[{"Dependency":"base >=3 && <4.7"},{"Dependency":"base-unicode-symbols >=0.1.1 && <0.3"},{"Dependency":"transformers >=0.2 && <0.4"},{"Dependency":"transformers-base >=0.4.1 && <0.5"}],"25"]}]
-["monad-logger",{"RepoPkg":[{"Version":"0.2.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"fast-logger >=0.2 && <0.4"},{"Dependency":"resourcet >=0.3 && <0.5"},{"Dependency":"template-haskell -any"},{"Dependency":"text -any"},{"Dependency":"transformers -any"}],"5"]}]
+["monad-logger",{"RepoPkg":[{"Version":"0.2.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"fast-logger >=0.2 && <0.4"},{"Dependency":"resourcet >=0.3 && <0.5"},{"Dependency":"template-haskell -any"},{"Dependency":"text -any"},{"Dependency":"transformers -any"}],"6"]}]
["monads-tf",{"RepoPkg":[{"Version":"0.1.0.1"},[{"Dependency":"base <6"},{"Dependency":"transformers >=0.2.0.0 && <0.4"}],"25"]}]
["mtl",{"RepoPkg":[{"Version":"2.1.2"},[{"Dependency":"base <6"},{"Dependency":"transformers ==0.3.*"}],"25"]}]
["network",{"RepoPkg":[{"Version":"2.4.0.1"},[{"Dependency":"base >=3 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"parsec >=3.0"},{"Dependency":"unix >=2"}],"1"]}]
-["network-conduit",{"RepoPkg":[{"Version":"0.6.1.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring >=0.9"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"monad-control >=0.3 && <0.4"},{"Dependency":"network >=2.3"},{"Dependency":"transformers >=0.2.2 && <0.4"}],"5"]}]
+["network-conduit",{"RepoPkg":[{"Version":"0.6.1.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring >=0.9"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"monad-control >=0.3 && <0.4"},{"Dependency":"network >=2.3"},{"Dependency":"transformers >=0.2.2 && <0.4"}],"6"]}]
["pandoc",{"RepoPkg":[{"Version":"1.9.4.5"},[{"Dependency":"HTTP >=4000.0.5 && <4000.3 && >=4000.0.5 && <4000.3"},{"Dependency":"base >=4 && <5 && >=4 && <5 && >=4.2 && <5"},{"Dependency":"base64-bytestring >=0.1 && <1.1 && >=0.1 && <1.1"},{"Dependency":"blaze-html >=0.5 && <0.6 && >=0.5 && <0.6"},{"Dependency":"blaze-markup >=0.5.1 && <0.6 && >=0.5.1 && <0.6"},{"Dependency":"bytestring >=0.9 && <1.0 && >=0.9 && <1.0"},{"Dependency":"citeproc-hs >=0.3.4 && <0.4 && >=0.3.4 && <0.4"},{"Dependency":"containers >=0.1 && <0.6 && >=0.1 && <0.6"},{"Dependency":"directory >=1 && <1.3 && >=1 && <1.3 && >=1 && <1.3"},{"Dependency":"extensible-exceptions >=0.1 && <0.2 && >=0.1 && <0.2"},{"Dependency":"filepath >=1.1 && <1.4 && >=1.1 && <1.4 && >=1.1 && <1.4"},{"Dependency":"highlighting-kate >=0.5.1 && <0.6 && >=0.5.1 && <0.6"},{"Dependency":"json >=0.4 && <0.8 && >=0.4 && <0.8"},{"Dependency":"mtl >=1.1 && <2.2 && >=1.1 && <2.2"},{"Dependency":"network >=2 && <2.5 && >=2 && <2.5"},{"Dependency":"old-locale >=1 && <1.1 && >=1 && <1.1"},{"Dependency":"old-time >=1.1 && <1.2"},{"Dependency":"pandoc -any"},{"Dependency":"pandoc-types >=1.9.0.2 && <1.10 && >=1.9.0.2 && <1.10"},{"Dependency":"parsec >=3.1 && <3.2 && >=3.1 && <3.2"},{"Dependency":"process >=1 && <1.2 && >=1 && <1.2"},{"Dependency":"random >=1 && <1.1 && >=1 && <1.1"},{"Dependency":"syb >=0.1 && <0.4 && >=0.1 && <0.4"},{"Dependency":"tagsoup >=0.12.5 && <0.13 && >=0.12.5 && <0.13"},{"Dependency":"temporary >=1.1 && <1.2 && >=1.1 && <1.2"},{"Dependency":"texmath >=0.6.0.2 && <0.7 && >=0.6.0.2 && <0.7"},{"Dependency":"time >=1.2 && <1.5 && >=1.2 && <1.5 && >=1.2 && <1.5"},{"Dependency":"utf8-string >=0.3 && <0.4 && >=0.3 && <0.4"},{"Dependency":"xml >=1.3.12 && <1.4 && >=1.3.12 && <1.4"},{"Dependency":"zip-archive >=0.1.1.7 && <0.2 && >=0.1.1.7 && <0.2"},{"Dependency":"zlib >=0.5 && <0.6 && >=0.5 && <0.6"}],"5"]}]
["pandoc-types",{"RepoPkg":[{"Version":"1.9.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"containers >=0.3"},{"Dependency":"ghc-prim >=0.2"},{"Dependency":"syb -any"}],"25"]}]
-["pango",{"RepoPkg":[{"Version":"0.12.3"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && >=4 && <5"},{"Dependency":"cairo >=0.12.0 && <0.13"},{"Dependency":"containers -any"},{"Dependency":"directory -any"},{"Dependency":"glib >=0.12.0 && <0.13"},{"Dependency":"mtl -any"},{"Dependency":"pretty -any"},{"Dependency":"process -any"}],"25"]}]
+["pango",{"RepoPkg":[{"Version":"0.12.4"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && >=4 && <5"},{"Dependency":"cairo >=0.12.0 && <0.13"},{"Dependency":"containers -any"},{"Dependency":"directory -any"},{"Dependency":"glib >=0.12.0 && <0.13"},{"Dependency":"mtl -any"},{"Dependency":"pretty -any"},{"Dependency":"process -any"}],"1"]}]
["parallel",{"RepoPkg":[{"Version":"3.2.0.3"},[{"Dependency":"array >=0.1 && <0.5"},{"Dependency":"base >=3 && <5"},{"Dependency":"containers >=0.1 && <0.6"},{"Dependency":"deepseq >=1.1 && <1.4"}],"25"]}]
["parallel-io",{"RepoPkg":[{"Version":"0.3.2.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"containers >=0.2 && <0.6"},{"Dependency":"extensible-exceptions >0.1.0.1"},{"Dependency":"random >=1.0 && <1.1"}],"1"]}]
["parsec",{"RepoPkg":[{"Version":"3.1.3"},[{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"mtl -any"},{"Dependency":"text >=0.2 && <0.12"}],"25"]}]
["path-pieces",{"RepoPkg":[{"Version":"0.1.2"},[{"Dependency":"base >=4 && <5"},{"Dependency":"text >=0.5 && <0.12"},{"Dependency":"time -any"}],"25"]}]
["pcre-light",{"RepoPkg":[{"Version":"0.4"},[{"Dependency":"base >=3 && <=5"},{"Dependency":"bytestring >=0.9"}],"25"]}]
-["persistent",{"RepoPkg":[{"Version":"1.0.1.3"},[{"Dependency":"aeson >=0.5 && <0.7"},{"Dependency":"attoparsec -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"base64-bytestring -any"},{"Dependency":"blaze-html >=0.5 && <0.6"},{"Dependency":"blaze-markup >=0.5.1 && <0.6"},{"Dependency":"bytestring >=0.9"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"containers >=0.2"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"monad-control >=0.3 && <0.4"},{"Dependency":"monad-logger >=0.2.1 && <0.3"},{"Dependency":"path-pieces >=0.1 && <0.2"},{"Dependency":"pool-conduit >=0.1 && <0.2"},{"Dependency":"resourcet >=0.3 && <0.5"},{"Dependency":"template-haskell -any"},{"Dependency":"text >=0.8"},{"Dependency":"time >=1.1.4"},{"Dependency":"transformers >=0.2.1"},{"Dependency":"transformers-base -any"},{"Dependency":"unordered-containers -any"},{"Dependency":"vector -any"}],"4"]}]
-["persistent-sqlite",{"RepoPkg":[{"Version":"1.0.0"},[{"Dependency":"aeson >=0.5"},{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring >=0.9.1"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"containers >=0.2"},{"Dependency":"monad-control >=0.2 && <0.4"},{"Dependency":"persistent >=1.0 && <1.1"},{"Dependency":"text >=0.7 && <1"},{"Dependency":"transformers >=0.2.1 && <0.4"}],"6"]}]
-["persistent-template",{"RepoPkg":[{"Version":"1.0.0.2"},[{"Dependency":"aeson -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"containers -any"},{"Dependency":"monad-control >=0.2 && <0.4"},{"Dependency":"persistent >=1.0 && <1.1"},{"Dependency":"template-haskell -any"},{"Dependency":"text >=0.5 && <1.0"},{"Dependency":"transformers >=0.2 && <0.4"}],"5"]}]
-["pool-conduit",{"RepoPkg":[{"Version":"0.1.0.3"},[{"Dependency":"base >=4 && <5"},{"Dependency":"resource-pool >=0.2.1 && <0.3"},{"Dependency":"resourcet >=0.3 && <0.5"},{"Dependency":"transformers >=0.2.1"}],"29"]}]
+["persistent",{"RepoPkg":[{"Version":"1.0.1.3"},[{"Dependency":"aeson >=0.5 && <0.7"},{"Dependency":"attoparsec -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"base64-bytestring -any"},{"Dependency":"blaze-html >=0.5 && <0.6"},{"Dependency":"blaze-markup >=0.5.1 && <0.6"},{"Dependency":"bytestring >=0.9"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"containers >=0.2"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"monad-control >=0.3 && <0.4"},{"Dependency":"monad-logger >=0.2.1 && <0.3"},{"Dependency":"path-pieces >=0.1 && <0.2"},{"Dependency":"pool-conduit >=0.1 && <0.2"},{"Dependency":"resourcet >=0.3 && <0.5"},{"Dependency":"template-haskell -any"},{"Dependency":"text >=0.8"},{"Dependency":"time >=1.1.4"},{"Dependency":"transformers >=0.2.1"},{"Dependency":"transformers-base -any"},{"Dependency":"unordered-containers -any"},{"Dependency":"vector -any"}],"5"]}]
+["persistent-sqlite",{"RepoPkg":[{"Version":"1.0.0"},[{"Dependency":"aeson >=0.5"},{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring >=0.9.1"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"containers >=0.2"},{"Dependency":"monad-control >=0.2 && <0.4"},{"Dependency":"persistent >=1.0 && <1.1"},{"Dependency":"text >=0.7 && <1"},{"Dependency":"transformers >=0.2.1 && <0.4"}],"7"]}]
+["persistent-template",{"RepoPkg":[{"Version":"1.0.0.2"},[{"Dependency":"aeson -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"containers -any"},{"Dependency":"monad-control >=0.2 && <0.4"},{"Dependency":"persistent >=1.0 && <1.1"},{"Dependency":"template-haskell -any"},{"Dependency":"text >=0.5 && <1.0"},{"Dependency":"transformers >=0.2 && <0.4"}],"6"]}]
+["pool-conduit",{"RepoPkg":[{"Version":"0.1.0.3"},[{"Dependency":"base >=4 && <5"},{"Dependency":"resource-pool >=0.2.1 && <0.3"},{"Dependency":"resourcet >=0.3 && <0.5"},{"Dependency":"transformers >=0.2.1"}],"30"]}]
["primitive",{"RepoPkg":[{"Version":"0.5.0.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"ghc-prim -any"}],"1"]}]
["pureMD5",{"RepoPkg":[{"Version":"2.1.2.1"},[{"Dependency":"base ==4.*"},{"Dependency":"binary >=0.4.0"},{"Dependency":"bytestring >=0.9"},{"Dependency":"cereal >=0.2"},{"Dependency":"crypto-api -any"},{"Dependency":"tagged -any"}],"25"]}]
["pxsl-tools",{"RepoPkg":[{"Version":"1.0.1"},[{"Dependency":"base -any"},{"Dependency":"containers -any"},{"Dependency":"mtl >=1.0"},{"Dependency":"parsec >=2.0"}],"25"]}]
@@ -152,8 +152,8 @@
["regex-posix",{"RepoPkg":[{"Version":"0.95.2"},[{"Dependency":"array -any"},{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"containers -any"},{"Dependency":"regex-base >=0.93"}],"25"]}]
["regex-tdfa",{"RepoPkg":[{"Version":"1.1.8"},[{"Dependency":"array -any"},{"Dependency":"base >=4.0 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"containers -any"},{"Dependency":"ghc-prim -any"},{"Dependency":"mtl -any"},{"Dependency":"parsec -any"},{"Dependency":"regex-base >=0.93.1"}],"25"]}]
["resource-pool",{"RepoPkg":[{"Version":"0.2.1.1"},[{"Dependency":"base ==4.*"},{"Dependency":"hashable -any"},{"Dependency":"monad-control >=0.2.0.1"},{"Dependency":"stm -any"},{"Dependency":"time -any"},{"Dependency":"transformers -any"},{"Dependency":"transformers-base >=0.4"},{"Dependency":"vector >=0.7"}],"27"]}]
-["resourcet",{"RepoPkg":[{"Version":"0.4.2"},[{"Dependency":"base >=4.3 && <5"},{"Dependency":"containers -any"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"monad-control >=0.3.1 && <0.4"},{"Dependency":"mtl >=2.0 && <2.2"},{"Dependency":"transformers >=0.2.2 && <0.4"},{"Dependency":"transformers-base >=0.4.1 && <0.5"}],"1"]}]
-["scion-browser",{"RepoPkg":[{"Version":"0.2.12"},[{"Dependency":"Cabal >=0.10 && >=0.10"},{"Dependency":"HTTP >=4000 && <5000 && >=4000 && <5000"},{"Dependency":"aeson >=0.4 && >=0.4"},{"Dependency":"attoparsec >=0.10 && >=0.10"},{"Dependency":"base ==4.* && ==4.*"},{"Dependency":"bytestring -any && -any"},{"Dependency":"conduit -any && -any"},{"Dependency":"containers >=0.2 && >=0.2"},{"Dependency":"deepseq >=1.1 && <2 && >=1.1 && <2"},{"Dependency":"derive >=2.5 && <3 && >=2.5 && <3"},{"Dependency":"directory >=1.1 && >=1.1"},{"Dependency":"filepath >=1.2 && >=1.2"},{"Dependency":"ghc >=7 && >=7"},{"Dependency":"ghc-paths ==0.1.* && ==0.1.*"},{"Dependency":"haskeline >=0.7"},{"Dependency":"haskell-src-exts >=1.11 && <2 && >=1.11 && <2"},{"Dependency":"mtl >=2 && >=2"},{"Dependency":"parallel-io >=0.3 && >=0.3"},{"Dependency":"parsec >=3 && <4 && >=3 && <4"},{"Dependency":"persistent >=0.7 && >=0.7"},{"Dependency":"persistent-sqlite >=0.7 && >=0.7"},{"Dependency":"persistent-template >=0.7 && >=0.7"},{"Dependency":"process >=1 && <2 && >=1 && <2"},{"Dependency":"tar >=0.3 && <0.5 && >=0.3 && <0.5"},{"Dependency":"text ==0.11.* && ==0.11.*"},{"Dependency":"transformers -any && -any"},{"Dependency":"unix >=2 && <3 && >=2 && <3"},{"Dependency":"unordered-containers >=0.1.3 && >=0.1.3"},{"Dependency":"utf8-string -any && -any"},{"Dependency":"zlib -any && ==0.5.* && -any && ==0.5.*"}],"2"]}]
+["resourcet",{"RepoPkg":[{"Version":"0.4.3"},[{"Dependency":"base >=4.3 && <5"},{"Dependency":"containers -any"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"monad-control >=0.3.1 && <0.4"},{"Dependency":"mtl >=2.0 && <2.2"},{"Dependency":"transformers >=0.2.2 && <0.4"},{"Dependency":"transformers-base >=0.4.1 && <0.5"}],"1"]}]
+["scion-browser",{"RepoPkg":[{"Version":"0.2.12"},[{"Dependency":"Cabal >=0.10 && >=0.10"},{"Dependency":"HTTP >=4000 && <5000 && >=4000 && <5000"},{"Dependency":"aeson >=0.4 && >=0.4"},{"Dependency":"attoparsec >=0.10 && >=0.10"},{"Dependency":"base ==4.* && ==4.*"},{"Dependency":"bytestring -any && -any"},{"Dependency":"conduit -any && -any"},{"Dependency":"containers >=0.2 && >=0.2"},{"Dependency":"deepseq >=1.1 && <2 && >=1.1 && <2"},{"Dependency":"derive >=2.5 && <3 && >=2.5 && <3"},{"Dependency":"directory >=1.1 && >=1.1"},{"Dependency":"filepath >=1.2 && >=1.2"},{"Dependency":"ghc >=7 && >=7"},{"Dependency":"ghc-paths ==0.1.* && ==0.1.*"},{"Dependency":"haskeline >=0.7"},{"Dependency":"haskell-src-exts >=1.11 && <2 && >=1.11 && <2"},{"Dependency":"mtl >=2 && >=2"},{"Dependency":"parallel-io >=0.3 && >=0.3"},{"Dependency":"parsec >=3 && <4 && >=3 && <4"},{"Dependency":"persistent >=0.7 && >=0.7"},{"Dependency":"persistent-sqlite >=0.7 && >=0.7"},{"Dependency":"persistent-template >=0.7 && >=0.7"},{"Dependency":"process >=1 && <2 && >=1 && <2"},{"Dependency":"tar >=0.3 && <0.5 && >=0.3 && <0.5"},{"Dependency":"text ==0.11.* && ==0.11.*"},{"Dependency":"transformers -any && -any"},{"Dependency":"unix >=2 && <3 && >=2 && <3"},{"Dependency":"unordered-containers >=0.1.3 && >=0.1.3"},{"Dependency":"utf8-string -any && -any"},{"Dependency":"zlib -any && ==0.5.* && -any && ==0.5.*"}],"3"]}]
["semigroups",{"RepoPkg":[{"Version":"0.8.4.1"},[{"Dependency":"base >=3 && <5"},{"Dependency":"containers >=0.3 && <0.6"}],"25"]}]
["shellish",{"RepoPkg":[{"Version":"0.1.4"},[{"Dependency":"base >=4 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"directory -any"},{"Dependency":"filepath -any"},{"Dependency":"mtl -any"},{"Dependency":"process -any"},{"Dependency":"strict -any"},{"Dependency":"time -any"},{"Dependency":"unix-compat -any"}],"26"]}]
["shelltestrunner",{"RepoPkg":[{"Version":"1.2.1"},[{"Dependency":"Diff >=0.1 && <0.2"},{"Dependency":"HUnit <1.3"},{"Dependency":"base >=4 && <5"},{"Dependency":"cabal-file-th -any"},{"Dependency":"cmdargs >=0.7 && <0.11"},{"Dependency":"directory >=1.0"},{"Dependency":"filemanip >=0.3 && <0.4"},{"Dependency":"filepath >=1.0"},{"Dependency":"parsec <3.2"},{"Dependency":"process <1.2"},{"Dependency":"regex-tdfa >=1.1 && <1.2"},{"Dependency":"test-framework >=0.3.2 && <0.7"},{"Dependency":"test-framework-hunit >=0.2 && <0.3"},{"Dependency":"utf8-string >=0.3.5 && <0.4"}],"26"]}]
@@ -186,8 +186,8 @@
["vault",{"RepoPkg":[{"Version":"0.2.0.1"},[{"Dependency":"base ==4.*"},{"Dependency":"containers >=0.4 && <0.6"},{"Dependency":"hashable ==1.1.*"},{"Dependency":"unordered-containers >=0.2.1.0 && <0.3"}],"25"]}]
["vector",{"RepoPkg":[{"Version":"0.10.0.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"deepseq >=1.1 && <1.4"},{"Dependency":"ghc-prim -any"},{"Dependency":"primitive >=0.5.0.1 && <0.6"}],"1"]}]
["void",{"RepoPkg":[{"Version":"0.5.8"},[{"Dependency":"base >=3 && <10"},{"Dependency":"semigroups >=0.8.2 && <0.9"}],"25"]}]
-["wai",{"RepoPkg":[{"Version":"1.3.0.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"blaze-builder >=0.2.1.4 && <0.4"},{"Dependency":"bytestring >=0.9.1.4"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"http-types >=0.7 && <0.8"},{"Dependency":"network >=2.2.1.5"},{"Dependency":"text >=0.7 && <0.12"},{"Dependency":"transformers >=0.2.2 && <0.4"},{"Dependency":"vault >=0.1 && <0.3"}],"6"]}]
-["warp",{"RepoPkg":[{"Version":"1.3.4.2"},[{"Dependency":"base >=3 && <5"},{"Dependency":"blaze-builder >=0.2.1.4 && <0.4"},{"Dependency":"blaze-builder-conduit >=0.5 && <0.6"},{"Dependency":"bytestring >=0.9.1.4"},{"Dependency":"case-insensitive >=0.2"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"ghc-prim -any"},{"Dependency":"hashable -any"},{"Dependency":"http-types >=0.7 && <0.8"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"network >=2.3"},{"Dependency":"network-conduit >=0.5 && <0.7"},{"Dependency":"simple-sendfile >=0.2.7 && <0.3"},{"Dependency":"transformers >=0.2.2 && <0.4"},{"Dependency":"unix -any"},{"Dependency":"unix-compat >=0.2"},{"Dependency":"void -any"},{"Dependency":"wai >=1.3 && <1.4"}],"3"]}]
+["wai",{"RepoPkg":[{"Version":"1.3.0.1"},[{"Dependency":"base >=4 && <5"},{"Dependency":"blaze-builder >=0.2.1.4 && <0.4"},{"Dependency":"bytestring >=0.9.1.4"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"http-types >=0.7 && <0.8"},{"Dependency":"network >=2.2.1.5"},{"Dependency":"text >=0.7 && <0.12"},{"Dependency":"transformers >=0.2.2 && <0.4"},{"Dependency":"vault >=0.1 && <0.3"}],"7"]}]
+["warp",{"RepoPkg":[{"Version":"1.3.4.4"},[{"Dependency":"base >=3 && <5"},{"Dependency":"blaze-builder >=0.2.1.4 && <0.4"},{"Dependency":"blaze-builder-conduit >=0.5 && <0.6"},{"Dependency":"bytestring >=0.9.1.4"},{"Dependency":"case-insensitive >=0.2"},{"Dependency":"conduit >=0.5 && <0.6"},{"Dependency":"ghc-prim -any"},{"Dependency":"hashable -any"},{"Dependency":"http-types >=0.7 && <0.8"},{"Dependency":"lifted-base >=0.1"},{"Dependency":"network >=2.3"},{"Dependency":"network-conduit >=0.5 && <0.7"},{"Dependency":"simple-sendfile >=0.2.7 && <0.3"},{"Dependency":"transformers >=0.2.2 && <0.4"},{"Dependency":"unix -any"},{"Dependency":"unix-compat >=0.2"},{"Dependency":"void -any"},{"Dependency":"wai >=1.3 && <1.4"}],"1"]}]
["xhtml",{"RepoPkg":[{"Version":"3000.2.1"},[{"Dependency":"base >=4.0 && <5.0"}],"25"]}]
["xml",{"RepoPkg":[{"Version":"1.3.12"},[{"Dependency":"base >=3 && <5"},{"Dependency":"bytestring -any"},{"Dependency":"text -any"}],"25"]}]
["xmonad",{"RepoPkg":[{"Version":"0.10"},[{"Dependency":"X11 >=1.5.0.0 && <1.7"},{"Dependency":"base <5 && >=3"},{"Dependency":"containers -any"},{"Dependency":"directory -any"},{"Dependency":"extensible-exceptions -any"},{"Dependency":"filepath -any"},{"Dependency":"mtl -any"},{"Dependency":"process -any"},{"Dependency":"unix -any"},{"Dependency":"utf8-string >=0.3 && <0.4"}],"25"]}]
View
13 patches/bytestring-show.cabal
@@ -1,13 +0,0 @@
-Index: archhaskell-habs/bytestring-show.cabal
-===================================================================
---- archhaskell-habs.orig/bytestring-show.cabal
-+++ archhaskell-habs/bytestring-show.cabal
-@@ -45,7 +45,7 @@ library
-
- if impl(ghc >= 6.11) && !flag(integer-simple)
- cpp-options: -DINTEGER_GMP
-- build-depends: integer-gmp >= 0.2 && < 0.5
-+ build-depends: integer-gmp >= 0.2 && < 0.6
-
- if impl(ghc >= 6.9) && impl(ghc < 6.11) && !flag(integer-simple)
- cpp-options: -DINTEGER_GMP
View
8 patches/cairo.pkgbuild
@@ -1,14 +1,14 @@
-Index: archhaskell-habs/haskell-cairo/PKGBUILD
+Index: archhaskell/haskell-cairo/PKGBUILD
===================================================================
---- archhaskell-habs.orig/haskell-cairo/PKGBUILD
-+++ archhaskell-habs/haskell-cairo/PKGBUILD
+--- archhaskell.orig/haskell-cairo/PKGBUILD
++++ archhaskell/haskell-cairo/PKGBUILD
@@ -10,9 +10,10 @@ pkgdesc="Binding to the Cairo library."
url="http://projects.haskell.org/gtk2hs/"
license=("BSD3")
arch=('i686' 'x86_64')
-makedepends=()
+makedepends=("gtk2hs-buildtools")
- depends=("ghc=7.4.2-1"
+ depends=("ghc=7.6.1-1"
- "haskell-mtl=2.1.2-25")
+ "haskell-mtl=2.1.2-25"
+ "cairo")
View
13 patches/glib.pkgbuild
@@ -1,16 +1,15 @@
-Index: archhaskell-habs/haskell-glib/PKGBUILD
+Index: archhaskell/haskell-glib/PKGBUILD
===================================================================
---- archhaskell-habs.orig/haskell-glib/PKGBUILD
-+++ archhaskell-habs/haskell-glib/PKGBUILD
-@@ -10,8 +10,9 @@ pkgdesc="Binding to the GLIB library for
+--- archhaskell.orig/haskell-glib/PKGBUILD
++++ archhaskell/haskell-glib/PKGBUILD
+@@ -10,8 +10,8 @@ pkgdesc="Binding to the GLIB library for
url="http://projects.haskell.org/gtk2hs/"
license=("LGPL-2.1")
arch=('i686' 'x86_64')
-makedepends=()
--depends=("ghc=7.4.2-1")
+-depends=("ghc=7.6.1-1")
+makedepends=("gtk2hs-buildtools")
-+depends=("ghc=7.4.2-1"
-+ "glib2")
++depends=("ghc=7.6.1-1" "glib2")
options=('strip')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install="${pkgname}.install"
View
42 patches/glib.source
@@ -1,42 +0,0 @@
-Index: archhaskell-habs/haskell-glib/src/glib-0.12.3.1/System/Glib/GObject.chs
-===================================================================
---- archhaskell-habs.orig/haskell-glib/src/glib-0.12.3.1/System/Glib/GObject.chs
-+++ archhaskell-habs/haskell-glib/src/glib-0.12.3.1/System/Glib/GObject.chs
-@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) gen
-
- {#pointer GDestroyNotify as DestroyNotify#}
-
--foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
--
- -- | This function wraps any newly created objects that derives from
- -- GInitiallyUnowned also known as objects with
- -- \"floating-references\". The object will be refSink (for glib
-@@ -225,4 +223,4 @@ isA obj gType =
- -- at this point we would normally implement the notify signal handler;
- -- I've moved this definition into the Object class of the gtk package
- -- since there's a quite a bit of machinery missing here (generated signal
---- register functions and the problem of recursive modules)
-\ No newline at end of file
-+-- register functions and the problem of recursive modules)
-Index: archhaskell-habs/haskell-glib/src/glib-0.12.3.1/System/Glib/MainLoop.chs
-===================================================================
---- archhaskell-habs.orig/haskell-glib/src/glib-0.12.3.1/System/Glib/MainLoop.chs
-+++ archhaskell-habs/haskell-glib/src/glib-0.12.3.1/System/Glib/MainLoop.chs
-@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotif
-
- {#pointer SourceFunc#}
-
--foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
-+foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
-
- type HandlerId = {#type guint#}
-
-@@ -79,7 +79,7 @@ type HandlerId = {#type guint#}
- --
- makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
- makeCallback fun = do
-- funPtr <- mkSourceFunc fun
-+ funPtr <- mkSourceFunc (const fun)
- return (funPtr, destroyFunPtr)
-
- -- | Sets a function to be called at regular intervals, with the default
View
16 patches/gtk.pkgbuild
@@ -1,19 +1,19 @@
-Index: archhaskell-habs/haskell-gtk/PKGBUILD
+Index: archhaskell/haskell-gtk/PKGBUILD
===================================================================
---- archhaskell-habs.orig/haskell-gtk/PKGBUILD
-+++ archhaskell-habs/haskell-gtk/PKGBUILD
+--- archhaskell.orig/haskell-gtk/PKGBUILD
++++ archhaskell/haskell-gtk/PKGBUILD
@@ -10,12 +10,13 @@ pkgdesc="Binding to the Gtk+ graphical u
url="http://projects.haskell.org/gtk2hs/"
license=("LGPL-2.1")
arch=('i686' 'x86_64')
-makedepends=()
+makedepends=("gtk2hs-buildtools")
- depends=("ghc=7.4.2-1"
- "haskell-cairo=0.12.3.1-25"
- "haskell-glib=0.12.3.1-25"
+ depends=("ghc=7.6.1-1"
+ "haskell-cairo=0.12.4-1"
+ "haskell-glib=0.12.4-1"
"haskell-mtl=2.1.2-25"
-- "haskell-pango=0.12.3-25")
-+ "haskell-pango=0.12.3-25"
+- "haskell-pango=0.12.4-1")
++ "haskell-pango=0.12.4-1"
+ "gtk2")
options=('strip')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
View
590 patches/gtk.source
@@ -1,590 +0,0 @@
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs
-@@ -126,7 +126,8 @@ makeNewObject (constr, objectUnref) gene
-
- {#pointer GWeakNotify#}
-
--foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify
-+foreign import ccall "wrapper" mkDestructor
-+ :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify
-
- -- | Attach a callback that will be called after the
- -- destroy hooks have been called
-@@ -134,7 +135,7 @@ foreign import ccall "wrapper" mkDestruc
- objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify
- objectWeakref obj uFun = do
- funPtrContainer <- newIORef nullFunPtr
-- uFunPtr <- mkDestructor $ do
-+ uFunPtr <- mkDestructor $ \_ _ -> do
- uFun
- funPtr <- readIORef funPtrContainer
- freeHaskellFunPtr funPtr
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs
-@@ -78,6 +78,10 @@ module Graphics.UI.Gtk.Entry.Entry (
- entrySetCompletion,
- entryGetCompletion,
- #endif
-+#if GTK_CHECK_VERSION (2,18,0)
-+ entryGetBuffer,
-+ entrySetBuffer,
-+#endif
- #if GTK_CHECK_VERSION(2,20,0)
- entryGetIconWindow,
- entryGetTextWindow,
-@@ -104,6 +108,9 @@ module Graphics.UI.Gtk.Entry.Entry (
- entryAlignment,
- entryCompletion,
- #endif
-+#if GTK_CHECK_VERSION (2,18,0)
-+ entryBuffer,
-+#endif
-
- -- * Signals
- entryActivate,
-@@ -157,6 +164,9 @@ import Graphics.UI.Gtk.General.Enums (De
- import Graphics.UI.Gtk.Gdk.EventM (EventM, EButton, EKey)
- import Control.Monad.Reader ( ask )
- import Control.Monad.Trans ( liftIO )
-+#if GTK_CHECK_VERSION (2,18,0)
-+import Graphics.UI.Gtk.Entry.EntryBuffer
-+#endif
- {#import Graphics.UI.Gtk.Types#}
- {#import Graphics.UI.Gtk.Signals#}
-
-@@ -429,6 +439,23 @@ entryGetCompletion self =
- (toEntry self)
- #endif
-
-+#if GTK_CHECK_VERSION(2,18,0)
-+-- | Get the 'EntryBuffer' object which holds the text for this widget.
-+entryGetBuffer :: EntryClass self => self
-+ -> IO EntryBuffer
-+entryGetBuffer self =
-+ makeNewGObject mkEntryBuffer $
-+ {# call gtk_entry_get_buffer #}
-+ (toEntry self)
-+
-+-- | Set the 'EntryBuffer' object which holds the text for this widget.
-+entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self
-+ -> buffer -> IO ()
-+entrySetBuffer self =
-+ {# call gtk_entry_set_buffer #}
-+ (toEntry self) . toEntryBuffer
-+#endif
-+
- #if GTK_CHECK_VERSION(2,20,0)
- -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when
- -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to
-@@ -623,6 +650,15 @@ entryCompletion = newAttr
- entrySetCompletion
- #endif
-
-+#if GTK_CHECK_VERSION(2,18,0)
-+entryBuffer :: (EntryClass self, EntryBufferClass buffer) =>
-+ ReadWriteAttr self EntryBuffer buffer
-+entryBuffer = newAttr
-+ entryGetBuffer
-+ entrySetBuffer
-+#endif
-+
-+
- --------------------
- -- Signals
-
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc
-@@ -639,14 +639,16 @@ eventGrabWindow = do
-
-
- -- | Execute an event handler and assume it handled the event unless it
---- threw a pattern match exception.
-+-- threw a pattern match exception or calls mzero (e.g. via guard).
- tryEvent :: EventM any () -> EventM any Bool
- tryEvent act = do
- ptr <- ask
- liftIO $ (runReaderT (act >> return True) ptr)
- #if __GLASGOW_HASKELL__ >= 610
- `catches` [ Handler (\ (PatternMatchFail _) -> return False)
-- , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e
-+ , Handler (\ e -> if isUserError e &&
-+ ("Pattern" `isPrefixOf` ioeGetErrorString e ||
-+ "mzero" == ioeGetErrorString e)
- then return False
- else throw e) ]
- #else
-@@ -654,6 +656,8 @@ tryEvent act = do
- IOException e
- | "user error (Pattern" `isPrefixOf` show e ->
- return False
-+ | "user error (mzero" `isPrefixOf` show e ->
-+ return False
- PatternMatchFail _ -> return False
- _ -> throw e)
- #endif
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs
-@@ -69,6 +69,7 @@ module Graphics.UI.Gtk.Gdk.Pixbuf (
-
- -- * Constructors
- pixbufNew,
-+ pixbufNewFromData,
- pixbufNewFromFile,
- #if GTK_CHECK_VERSION(2,4,0)
- pixbufNewFromFileAtSize,
-@@ -402,6 +403,19 @@ pixbufNew colorspace hasAlpha bitsPerSam
- (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width)
- (fromIntegral height)
-
-+pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf
-+pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride
-+ = wrapNewGObject mkPixbuf $
-+ {#call pixbuf_new_from_data #}
-+ imData
-+ (fromIntegral . fromEnum $ cSpace)
-+ (fromBool hasAlpha)
-+ (fromIntegral bitsPerSample)
-+ (fromIntegral width)
-+ (fromIntegral height)
-+ (fromIntegral rowStride)
-+ nullFunPtr nullPtr
-+
- -- | Create a new image from a String.
- --
- -- * Creates a new pixbuf from a string description.
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs
-@@ -260,7 +260,7 @@ clipboardSetWithData :: ClipboardClass s
- -- data succeeded.
- clipboardSetWithData self targets getFunc clearFunc = do
- gFunPtr <- mkClipboardGetFunc
-- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
-+ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
- cFunPtr <- mkClipboardClearFunc
- (\_ _ -> clearFunc)
- res <- withTargetEntries targets $ \nTargets targets ->
-@@ -282,7 +282,7 @@ clipboardSetWithData self targets getFun
- {#pointer ClipboardClearFunc#}
-
- foreign import ccall "wrapper" mkClipboardGetFunc ::
-- (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc
-+ (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc
-
- foreign import ccall "wrapper" mkClipboardClearFunc ::
- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc
-@@ -313,7 +313,7 @@ clipboardSetWithOwner :: (ClipboardClass
- -- ignored.
- clipboardSetWithOwner self targets getFunc clearFunc owner = do
- gFunPtr <- mkClipboardGetFunc
-- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
-+ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
- cFunPtr <- mkClipboardClearFunc
- (\_ _ -> clearFunc)
- res <- withTargetEntries targets $ \nTargets targets ->
-@@ -404,7 +404,7 @@ clipboardRequestContents :: ClipboardCla
- clipboardRequestContents self (Atom target) callback = do
- cbRef <- newIORef nullFunPtr
- cbPtr <- mkClipboardReceivedFunc
-- (\_ sPtr -> do
-+ (\_ sPtr _ -> do
- freeHaskellFunPtr =<< readIORef cbRef
- runReaderT callback sPtr
- return ())
-@@ -418,7 +418,7 @@ clipboardRequestContents self (Atom targ
- {#pointer ClipboardReceivedFunc#}
-
- foreign import ccall "wrapper" mkClipboardReceivedFunc ::
-- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
-+ (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
-
- -- %hash c:7bb1 d:4ef1
- -- | Requests the contents of the clipboard as text. When the text is later
-@@ -439,7 +439,7 @@ clipboardRequestText :: ClipboardClass s
- clipboardRequestText self callback = do
- cbRef <- newIORef nullFunPtr
- cbPtr <- mkClipboardTextReceivedFunc
-- (\_ sPtr -> do
-+ (\_ sPtr _ -> do
- freeHaskellFunPtr =<< readIORef cbRef
- mStr <- if sPtr==nullPtr then return Nothing else
- liftM Just $ peekUTFString sPtr
-@@ -453,7 +453,7 @@ clipboardRequestText self callback = do
- {#pointer ClipboardTextReceivedFunc#}
-
- foreign import ccall "wrapper" mkClipboardTextReceivedFunc ::
-- (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc
-+ (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc
-
-
- #if GTK_CHECK_VERSION(2,6,0)
-@@ -477,7 +477,7 @@ clipboardRequestImage :: ClipboardClass
- clipboardRequestImage self callback = do
- cbRef <- newIORef nullFunPtr
- cbPtr <- mkClipboardImageReceivedFunc
-- (\_ sPtr -> do
-+ (\_ sPtr _ -> do
- freeHaskellFunPtr =<< readIORef cbRef
- mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr)
- callback mPixbuf)
-@@ -490,7 +490,7 @@ clipboardRequestImage self callback = do
- {#pointer ClipboardImageReceivedFunc#}
-
- foreign import ccall "wrapper" mkClipboardImageReceivedFunc ::
-- (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc
-+ (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc
-
- #endif
-
-@@ -513,7 +513,7 @@ clipboardRequestTargets :: ClipboardClas
- clipboardRequestTargets self callback = do
- cbRef <- newIORef nullFunPtr
- cbPtr <- mkClipboardTargetsReceivedFunc
-- (\_ tPtr len -> do
-+ (\_ tPtr len _ -> do
- -- We must free Haskell pointer *in* the callback to avoid segfault.
- freeHaskellFunPtr =<< readIORef cbRef
- mTargets <- if tPtr==nullPtr then return Nothing else
-@@ -528,7 +528,7 @@ clipboardRequestTargets self callback =
- {#pointer ClipboardTargetsReceivedFunc#}
-
- foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc ::
-- (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc
-+ (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc
-
- #if GTK_CHECK_VERSION(2,10,0)
- -- %hash c:5601 d:d6a6
-@@ -552,10 +552,10 @@ clipboardRequestRichText :: (ClipboardCl
- clipboardRequestRichText self buffer callback = do
- cbRef <- newIORef nullFunPtr
- cbPtr <- mkClipboardRichTextReceivedFunc
-- (\_ tPtr sPtr len -> do
-+ (\_ tPtr sPtr len _ -> do
- freeHaskellFunPtr =<< readIORef cbRef
- mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do
-- str <- peekUTFStringLen (sPtr,fromIntegral len)
-+ str <- peekUTFStringLen (castPtr sPtr,fromIntegral len)
- return (Atom tPtr, str)
- callback mRes)
- writeIORef cbRef cbPtr
-@@ -568,7 +568,7 @@ clipboardRequestRichText self buffer cal
- {#pointer ClipboardRichTextReceivedFunc#}
-
- foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc ::
-- (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) ->
-+ (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) ->
- IO ClipboardRichTextReceivedFunc
- #endif
- #endif
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs
-@@ -202,7 +202,7 @@ postGUIAsync action = do
- -- their arguments from the main loop, that is, from the OS thread of Gtk,
- -- thereby ensuring that any Gtk and OS function can be called.
- --
--{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #}
-+{#fun gdk_threads_enter as threadsEnter {} -> `()' #}
-
- -- | Release the global Gtk lock.
- --
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs
-@@ -493,17 +493,17 @@ comboBoxSetRowSeparatorSource self Nothi
- {# call gtk_combo_box_set_row_separator_func #}
- (toComboBox self) nullFunPtr nullPtr nullFunPtr
- comboBoxSetRowSeparatorSource self (Just (model, extract)) = do
-- funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do
-+ funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do
- iter <- peek iterPtr
- value <- customStoreGetRow model iter
-- return (extract value)
-+ return (fromBool $ extract value)
- {# call gtk_combo_box_set_row_separator_func #}
- (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr
-
- {#pointer TreeViewRowSeparatorFunc#}
-
- foreign import ccall "wrapper" mkRowSeparatorFunc ::
-- (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc
-+ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc
-
- -- %hash c:5bf8
- -- | Sets whether the popup menu should have a tearoff menu item.
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs
-@@ -76,6 +76,12 @@ module Graphics.UI.Gtk.MenuComboToolbar.
- menuItemNewWithMnemonic,
-
- -- * Methods
-+#if GTK_CHECK_VERSION(2,16,0)
-+ menuItemSetLabel,
-+ menuItemGetLabel,
-+ menuItemSetUseUnderline,
-+ menuItemGetUseUnderline,
-+#endif
- menuItemSetSubmenu,
- menuItemGetSubmenu,
- menuItemRemoveSubmenu,
-@@ -89,6 +95,10 @@ module Graphics.UI.Gtk.MenuComboToolbar.
- -- * Attributes
- menuItemSubmenu,
- menuItemRightJustified,
-+#if GTK_CHECK_VERSION(2,16,0)
-+ menuItemLabel,
-+ menuItemUseUnderline,
-+#endif
-
- -- * Signals
- menuItemActivateItem,
-@@ -163,7 +173,36 @@ menuItemNewWithMnemonic label =
-
- --------------------
- -- Methods
-+#if GTK_CHECK_VERSION(2,16,0)
-+-- | Sets text on the MenuItem label
-+
-+menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO ()
-+menuItemSetLabel self label =
-+ withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self)
-+
-+-- | Gets text on the MenuItem label
-+menuItemGetLabel :: (MenuItemClass self) => self -> IO String
-+menuItemGetLabel self =
-+ {# call gtk_menu_item_get_label #}
-+ (toMenuItem self)
-+ >>= \strPtr -> if strPtr == nullPtr
-+ then return ""
-+ else peekUTFString strPtr
-+
-+-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key.
-+--
-+menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO ()
-+menuItemSetUseUnderline self =
-+ {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool
-
-+-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key.
-+--
-+menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool
-+menuItemGetUseUnderline self =
-+ liftM toBool $ {# call gtk_menu_item_get_use_underline #}
-+ (toMenuItem self)
-+
-+#endif
- -- | Sets the item's submenu, or changes it.
- --
- menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO ()
-@@ -278,6 +317,22 @@ menuItemRightJustified = newAttr
- menuItemGetRightJustified
- menuItemSetRightJustified
-
-+#if GTK_CHECK_VERSION(2,16,0)
-+-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel'
-+--
-+menuItemLabel :: MenuItemClass self => Attr self String
-+menuItemLabel = newAttr
-+ menuItemGetLabel
-+ menuItemSetLabel
-+
-+-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and
-+-- 'menuItemGetUseEUnderline'
-+--
-+menuItemUseUnderline :: MenuItemClass self => Attr self Bool
-+menuItemUseUnderline = newAttr
-+ menuItemGetUseUnderline
-+ menuItemSetUseUnderline
-+#endif
- --------------------
- -- Signals
-
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs
-@@ -239,7 +239,7 @@ customStoreNew priv con tmIface mDragSou
- customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource,
- customTreeDragDestIface = fromMaybe dummyDragDest mDragDest }
- privPtr <- newStablePtr priv
-- liftM con $ makeNewGObject (CustomStore, objectUnref) $
-+ liftM con $ wrapNewGObject (CustomStore, objectUnref) $
- gtk2hs_store_new implPtr privPtr
-
- foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new"
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs
-@@ -427,7 +427,7 @@ treeModelForeach self fun = do
- {#pointer TreeModelForeachFunc#}
-
- foreign import ccall "wrapper" mkTreeModelForeachFunc ::
-- (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) ->
-+ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) ->
- IO TreeModelForeachFunc
-
- #if GTK_CHECK_VERSION(2,2,0)
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs
-@@ -160,7 +160,7 @@ treeModelFilterSetVisibleFunc self func
- {#pointer TreeModelFilterVisibleFunc #}
-
- foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc ::
-- (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
-+ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
- IO TreeModelFilterVisibleFunc
-
- -- %hash c:a56d d:b42e
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs
-@@ -151,7 +151,7 @@ treeSelectionGetMode self =
- treeSelectionSetSelectFunction :: TreeSelectionClass self => self
- -> TreeSelectionCB -> IO ()
- treeSelectionSetSelectFunction ts fun = do
-- fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do
-+ fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do
- path <- peekTreePath (castPtr tp)
- liftM fromBool $ fun path
- )
-@@ -168,7 +168,7 @@ type TreeSelectionCB = TreePath -> IO Bo
- {#pointer TreeSelectionFunc#}
-
- foreign import ccall "wrapper" mkTreeSelectionFunc ::
-- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)->
-+ (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)->
- IO TreeSelectionFunc
-
- -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on.
-@@ -199,7 +199,7 @@ treeSelectionSelectedForeach :: TreeSele
- -> TreeSelectionForeachCB
- -> IO ()
- treeSelectionSelectedForeach self fun = do
-- fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do
-+ fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do
- -- make a deep copy of the iterator. This makes it possible to store this
- -- iterator in Haskell land somewhere. The TreeModel parameter is not
- -- passed to the function due to performance reasons. But since it is
-@@ -219,7 +219,7 @@ type TreeSelectionForeachCB = TreeIter -
- {#pointer TreeSelectionForeachFunc#}
-
- foreign import ccall "wrapper" mkTreeSelectionForeachFunc ::
-- (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc
-+ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc
-
- #if GTK_CHECK_VERSION(2,2,0)
- -- | Creates a list of paths of all selected rows.
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs
-@@ -582,7 +582,7 @@ treeViewSetColumnDragFunction self (Just
- {#pointer TreeViewColumnDropFunc#}
-
- foreign import ccall "wrapper" mkTreeViewColumnDropFunc ::
-- (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
-+ (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
- Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc
-
- -- | Scroll to a coordinate.
-@@ -798,7 +798,7 @@ treeViewMapExpandedRows self func = do
- {#pointer TreeViewMappingFunc#}
-
- foreign import ccall "wrapper" mkTreeViewMappingFunc ::
-- (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
-+ (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
- IO TreeViewMappingFunc
-
- -- | Check if row is expanded.
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs
-@@ -1251,16 +1251,26 @@ endUserAction = Signal (connect_NONE__NO
-
- -- | A 'Pixbuf' is inserted into the buffer.
- --
-+-- * See note in 'bufferInsertText'.
-+--
- insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ())
- insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy)
-
- -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'.
- -- Insertion actually occurs in the default handler.
- --
-+-- * See note in 'bufferInsertText'.
-+--
- insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ())
- insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy)
-
---- | Some text was inserted.
-+-- | Some text is inserted. Insertion actually occurs in the default handler.
-+--
-+-- * The function connected to this handler may not modify the buffer since
-+-- this would invalidate the iterator. If this function replaces the
-+-- default handler, it needs to stop the emission of this signal in order
-+-- to prevent the default handler from running. If additional text should
-+-- be inserted, this can be done using the 'after' function to connect.
- --
- bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ())
- bufferInsertText = Signal $ \after obj handler ->
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs
-@@ -797,7 +797,7 @@ type TextCharPredicateCB = Char -> Bool
- {#pointer TextCharPredicate#}
-
- foreign import ccall "wrapper" mkTextCharPredicate ::
-- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate
-+ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate
-
- -- | Move 'TextIter' forward until a
- -- predicate function returns True.
-@@ -810,7 +810,7 @@ foreign import ccall "wrapper" mkTextCha
- textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
- IO Bool
- textIterForwardFindChar ti pred limit = do
-- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
-+ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
- res <- liftM toBool $ {#call text_iter_forward_find_char#}
- ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
- freeHaskellFunPtr fPtr
-@@ -827,7 +827,7 @@ textIterForwardFindChar ti pred limit =
- textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
- IO Bool
- textIterBackwardFindChar ti pred limit = do
-- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
-+ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
- res <- liftM toBool $ {#call text_iter_backward_find_char#}
- ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
- freeHaskellFunPtr fPtr
-Index: archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs
-===================================================================
---- archhaskell-habs.orig/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs
-+++ archhaskell-habs/haskell-gtk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs
-@@ -274,7 +274,7 @@ assistantSetForwardPageFunc self (Just p
- {#pointer AssistantPageFunc#}
-
- foreign import ccall "wrapper" mkAssistantPageFunc ::
-- ({#type glong#} -> Ptr () -> IO {#type glong#})
-+ ({#type gint#} -> Ptr () -> IO {#type gint#})
- -> IO AssistantPageFunc
-
- -- | Sets the page type for @page@. The page type determines the page behavior
View
8 patches/gtk2hs-buildtools.pkgbuild
@@ -1,11 +1,11 @@
-Index: archhaskell-habs/gtk2hs-buildtools/PKGBUILD
+Index: archhaskell/gtk2hs-buildtools/PKGBUILD
===================================================================
---- archhaskell-habs.orig/gtk2hs-buildtools/PKGBUILD
-+++ archhaskell-habs/gtk2hs-buildtools/PKGBUILD
+--- archhaskell.orig/gtk2hs-buildtools/PKGBUILD
++++ archhaskell/gtk2hs-buildtools/PKGBUILD
@@ -11,6 +11,8 @@ url="http://projects.haskell.org/gtk2hs/
license=("GPL-2")
arch=('i686' 'x86_64')
- makedepends=("ghc=7.4.2-1"
+ makedepends=("ghc=7.6.1-1"
+ "alex"
+ "happy"
"haskell-random=1.0.1.1-25")
View
52 patches/gtk2hs-buildtools.source
@@ -1,52 +0,0 @@
-Index: archhaskell-habs/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/base/general/FileOps.hs
-===================================================================
---- archhaskell-habs.orig/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/base/general/FileOps.hs
-+++ archhaskell-habs/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/base/general/FileOps.hs
-@@ -1,3 +1,5 @@
-+{-# LANGUAGE ScopedTypeVariables #-}
-+
- -- Compiler Toolkit: operations on file
- --
- -- Author : Manuel M T Chakravarty
-@@ -32,6 +34,7 @@ module FileOps (fileFindIn, mktemp)
- where
-
- -- standard libs
-+import Control.Exception (catch, SomeException)
- import Data.Char (chr, ord)
- import System.Directory (doesFileExist)
- import System.IO (Handle, IOMode(..), openFile)
-@@ -89,7 +92,7 @@ mktemp pre post =
- in do
- h <- openFile fname ReadWriteMode
- return (h, fname)
-- `catch` \_ -> createLoop (attempts - 1) rs'
-+ `catch` \(_ :: SomeException) -> createLoop (attempts - 1) rs'
- --
- sixChars :: [Int] -> ([Int], String)
- sixChars is =
-Index: archhaskell-habs/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/base/state/StateTrans.hs
-===================================================================
---- archhaskell-habs.orig/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/base/state/StateTrans.hs
-+++ archhaskell-habs/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/base/state/StateTrans.hs
-@@ -80,6 +80,7 @@ module StateTrans (-- the monad and the
- where
-
- import Control.Monad (liftM)
-+import Control.Exception (catch)
- import System.IO (fixIO)
- import Data.IORef (IORef, newIORef, readIORef, writeIORef)
-
-Index: archhaskell-habs/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/toplevel/C2HSConfig.hs
-===================================================================
---- archhaskell-habs.orig/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/toplevel/C2HSConfig.hs
-+++ archhaskell-habs/gtk2hs-buildtools/src/gtk2hs-buildtools-0.12.3.1/c2hs/toplevel/C2HSConfig.hs
-@@ -46,7 +46,7 @@ import Data.Array (Array, array)
-
- import Foreign (Ptr, FunPtr)
- import Foreign (Storable(sizeOf, alignment), toBool)
--import Foreign.C (CInt)
-+import Foreign.C (CInt(..))
- import System.Info (os)
-
- -- program settings
View
12 patches/pango.pkgbuild
@@ -1,16 +1,16 @@
-Index: archhaskell-habs/haskell-pango/PKGBUILD
+Index: archhaskell/haskell-pango/PKGBUILD
===================================================================
---- archhaskell-habs.orig/haskell-pango/PKGBUILD
-+++ archhaskell-habs/haskell-pango/PKGBUILD
+--- archhaskell.orig/haskell-pango/PKGBUILD
++++ archhaskell/haskell-pango/PKGBUILD
@@ -10,11 +10,12 @@ pkgdesc="Binding to the Pango text rende
url="http://projects.haskell.org/gtk2hs/"
license=("LGPL-2.1")
arch=('i686' 'x86_64')
-makedepends=()
+makedepends=("gtk2hs-buildtools")
- depends=("ghc=7.4.2-1"
- "haskell-cairo=0.12.3.1-25"
- "haskell-glib=0.12.3.1-25"
+ depends=("ghc=7.6.1-1"
+ "haskell-cairo=0.12.4-1"
+ "haskell-glib=0.12.4-1"
- "haskell-mtl=2.1.2-25")
+ "haskell-mtl=2.1.2-25"
+ "pango")
Please sign in to comment.
Something went wrong with that request. Please try again.