[Fencommits] fenfire-hs: make compile on Ubuntu 7.10 Gutsy

[Tuukka Hastrup]

Tue Apr 22 02:13:44 EEST 2008  Tuukka Hastrup <Tuukka.Hastrup at iki.fi>
  * make compile on Ubuntu 7.10 Gutsy

    M ./Fenfire/Main.hs +2
    M ./Fenfire/RDF.hs +1
    M ./README -2 +3

Tue Apr 22 02:13:44 EEST 2008  Tuukka Hastrup <Tuukka.Hastrup at iki.fi>
  * make compile on Ubuntu 7.10 Gutsy
diff -rN -u old-fenfire-hs/Fenfire/Main.hs new-fenfire-hs/Fenfire/Main.hs
--- old-fenfire-hs/Fenfire/Main.hs	2008-04-22 02:15:13.830805000 +0300
+++ new-fenfire-hs/Fenfire/Main.hs	2008-04-22 02:15:13.910854000 +0300
@@ -684,6 +684,7 @@
 makeAboutDialog :: (?pw :: Window) => IO AboutDialog
 makeAboutDialog = do
     dialog <- aboutDialogNew
+{- pixbufNewFromFile has different signature on newer gtk2hs:
     logoFilename <- getDataFileName "data-files/logo.svg"
     pixbuf <- Control.Exception.catch (pixbufNewFromFile logoFilename)
                   (\e -> return $ Left (undefined, show e))
@@ -695,6 +696,7 @@
                                pixbufScaleSimple pixbuf'
                                    200 (floor (200*(1.40::Double))) 
                                    InterpHyper 
+-}  logo <- return Nothing
     set dialog [ aboutDialogName := "Fenfire" 
                , aboutDialogVersion := "alpha version"
                , aboutDialogCopyright := "Licensed under GNU GPL v2 or later"
diff -rN -u old-fenfire-hs/Fenfire/RDF.hs new-fenfire-hs/Fenfire/RDF.hs
--- old-fenfire-hs/Fenfire/RDF.hs	2008-04-22 02:15:13.830805000 +0300
+++ new-fenfire-hs/Fenfire/RDF.hs	2008-04-22 02:15:13.910854000 +0300
@@ -29,6 +29,7 @@
                              runWriter, runWriterT)
 import Control.Monad.Reader (Reader, ask, runReader)
 import Control.Monad.State (State, get, put, modify, runState)
+import Control.Monad.Error () -- for the instance (Monad (Either String))
 
 import Data.Generics hiding ((:*:))
 import Data.List (intersperse)
diff -rN -u old-fenfire-hs/README new-fenfire-hs/README
--- old-fenfire-hs/README	2008-04-22 02:15:13.830805000 +0300
+++ new-fenfire-hs/README	2008-04-22 02:15:13.910854000 +0300
@@ -2,6 +2,7 @@
 Fenfire version 0.1
 ===================
 
+http://fenfire.org/
 
 Introduction
 ============
@@ -32,8 +33,8 @@
   alex   2.0.1  (A lexical analyser generator for Haskell)
   HList  0.1    (Heterogeneous collections for Haskell)
 
-(Packages in Debian: ghc6 libghc6-gtk-dev libraptor1-dev c2hs libghc6-harp-dev 
- libghc6-haxml-dev happy alex libghc6-network-dev)
+(Debian packages: ghc6 libghc6-gtk-dev libraptor1-dev c2hs libghc6-harp-dev 
+ libghc6-haxml-dev happy alex libghc6-network-dev libghc6-hlist-dev)
 
 
 Running a precompiled binary only requires: