gtk2hs-commit — Mailing list for Darcs commit messages.

[Gtk2hs-commit] gtk2hs/demo/sourceview Makefile,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/sourceview
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/sourceview

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/sourceview/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2005 14:15:35 -0000	1.3
+++ Makefile	19 Jan 2005 04:03:57 -0000	1.4
@@ -1,9 +1,12 @@
 
 PROG  = sourceview
 SOURCES = SourceViewTest.hs
+PACKAGES = sourceview
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/mozembed Makefile,1.2,1.3

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/mozembed
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/mozembed

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/mozembed/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	16 Jan 2005 14:15:35 -0000	1.2
+++ Makefile	19 Jan 2005 04:03:56 -0000	1.3
@@ -1,9 +1,12 @@
 
 PROG  = testembedmoz
 SOURCES = TestEmbedMoz.hs
+PACKAGES = mozembed
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/profileviewer Makefile,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/profileviewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/profileviewer

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/profileviewer/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2005 14:15:35 -0000	1.3
+++ Makefile	19 Jan 2005 04:03:56 -0000	1.4
@@ -1,9 +1,12 @@
 
 PROG  = profileviewer
 SOURCES = ProfileViewer.hs ParseProfile.hs
+PACKAGES = glade mogul
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/graphic Makefile,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/graphic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/graphic

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/graphic/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2005 14:15:34 -0000	1.3
+++ Makefile	19 Jan 2005 04:03:55 -0000	1.4
@@ -1,9 +1,12 @@
 
 PROG  = drawing
 SOURCES = Drawing.hs
+PACKAGES = gtk
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/buttonbox Makefile,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/buttonbox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/buttonbox

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/buttonbox/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2005 14:15:31 -0000	1.3
+++ Makefile	19 Jan 2005 04:03:53 -0000	1.4
@@ -1,9 +1,12 @@
 
 PROG  = buttonbox
 SOURCES = ButtonBox.hs
+PACKAGES = gtk
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/hello Makefile,1.4,1.5

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/hello
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/hello

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/hello/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	16 Jan 2005 14:15:34 -0000	1.4
+++ Makefile	19 Jan 2005 04:03:56 -0000	1.5
@@ -1,9 +1,12 @@
 
 PROG  = helloworld
 SOURCES = World.hs
+PACKAGES = gtk
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/concurrent Makefile,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/concurrent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/concurrent

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/concurrent/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2005 14:15:32 -0000	1.3
+++ Makefile	19 Jan 2005 04:03:53 -0000	1.4
@@ -1,9 +1,12 @@
 
 PROG  = progress
 SOURCES = Progress.hs
+PACKAGES = gtk
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/filechooser Makefile,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/filechooser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/filechooser

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/filechooser/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2005 14:15:32 -0000	1.3
+++ Makefile	19 Jan 2005 04:03:54 -0000	1.4
@@ -1,9 +1,12 @@
 
 PROG  = filechooser
 SOURCES = FileChooserDemo.hs
+PACKAGES = glade
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/unicode Makefile,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/unicode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/unicode

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/unicode/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2005 14:15:36 -0000	1.3
+++ Makefile	19 Jan 2005 04:03:58 -0000	1.4
@@ -1,9 +1,12 @@
 
 PROG  = arabic
 SOURCES = Arabic.hs
+PACKAGES = gtk
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs/demo/treeList Makefile,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/treeList
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30483/demo/treeList

Modified Files:
	Makefile 
Log Message:
Make all the demos support building with older ghc versions that do not support
"auto" packages and so you have to specifiy -package gtk or whatever.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/treeList/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	16 Jan 2005 14:15:36 -0000	1.3
+++ Makefile	19 Jan 2005 04:03:57 -0000	1.4
@@ -1,9 +1,12 @@
 
 PROG  = listtest
 SOURCES = ListTest.hs
+PACKAGES = mogul
 
 $(PROG) : $(SOURCES)
-	ghc --make $< -o $@ $(HCFLAGS)
+	ghc --make $< -o $@ $(HCFLAGS) $(HCEXTRAFLAGS)
+
+HCEXTRAFLAGS = $(if $(HCNEEDSPACKAGE), $(addprefix -package ,$(PACKAGES)))
 
 clean:
 	rm -f $(SOURCES:.hs=.hi) $(SOURCES:.hs=.o) $(PROG)

[Gtk2hs-commit] gtk2hs ChangeLog,1.313,1.314 gtk2hs.spec.in,1.12,1.13

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27321

Modified Files:
	ChangeLog gtk2hs.spec.in 
Log Message:
Revert to building the GHCi .o files in a post-install action and removing
them in a uninstall action.


Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gtk2hs.spec.in	18 Jan 2005 12:14:01 -0000	1.12
+++ gtk2hs.spec.in	19 Jan 2005 03:46:18 -0000	1.13
@@ -136,7 +136,7 @@
 %clean
 rm -rf %{buildroot}
 
-%define ghcpkg_inst env pkglibdir=%{gtk2hsdir} ghc-pkg-%{ghc_version} -u -i
+%define ghcpkg_inst env pkglibdir=%{gtk2hsdir} ghc-pkg-%{ghc_version} -u -g -i
 
 %post -n gtk2hs-%{ghcver}
 %{ghcpkg_inst} %{gtk2hsdir}/gtk.pkg
@@ -159,32 +159,38 @@
 
 %preun -n gtk2hs-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/{HSgtk,HSmogul}.o
   ghc-pkg-%{ghc_version} -r mogul || :
   ghc-pkg-%{ghc_version} -r gtk || :
 fi
 
 %preun gconf-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSgconf.o
   ghc-pkg-%{ghc_version} -r gconf || :
 fi
 
 %preun glade-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSglade.o
   ghc-pkg-%{ghc_version} -r glade || :
 fi
 
 %preun glib-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSglib.o
   ghc-pkg-%{ghc_version} -r glib || :
 fi
 
 %preun mozembed-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSmozembed.o
   ghc-pkg-%{ghc_version} -r mozembed || :
 fi
 
 %preun sourceview-%{ghcver}
 if [ "$1" = 0 ]; then
+  rm -f %{gtk2hsdir}/HSsourceview.o
   ghc-pkg-%{ghc_version} -r sourceview || :
 fi
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- ChangeLog	19 Jan 2005 03:45:26 -0000	1.313
+++ ChangeLog	19 Jan 2005 03:46:18 -0000	1.314
@@ -39,6 +39,9 @@
 	$(datadir)/doc/gtk2hs/html/ to just $(datadir)/doc/gtk2hs/ to conform
 	with the cabal haddock convention.
 
+	* gtk2hs.spec.in: revert to building the GHCi .o files in a
+	post-install action and removing them in a uninstall action.
+
 2005-01-17 Duncan Coutts <du...@co...>
 
 	* configure.ac: add an extra option --without-pkgreg to allow

[Gtk2hs-commit] gtk2hs ChangeLog,1.312,1.313 Makefile.am,1.41,1.42

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26804

Modified Files:
	ChangeLog Makefile.am 
Log Message:
1. Revert patch to build GHCi .o files ourselves, instead leave it up to 
   ghc-pkg -g as we did before.
2. Make building GHCi .o files conditional on the Soalris test from configure.
3. Make sure to remove the previous GHCi .o file otherwise ghc-pkg does
   not re-generate it which would lead to problems for people upgrading.
4. Arrandge for only the appropriate demos to be built and support building
   them with a non-default package.conf location and with older ghc versions
   that do not support "auto" packages.
5. Change the install location of gtk2hs.haddock from
   $(datadir)/doc/gtk2hs/html/ to just $(datadir)/doc/gtk2hs/ to conform with
   the cabal haddock convention.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile.am	17 Jan 2005 18:33:55 -0000	1.41
+++ Makefile.am	19 Jan 2005 03:45:26 -0000	1.42
@@ -879,13 +879,16 @@
 	    $(patsubst $(firstword $(subst /, ,$(HSFILE))).%.hs, doc/%.html, 	\
 		$(subst /,.,$(HSFILE:.uncpp=))))				\
 	doc/haddock.css doc/haskell_icon.gif					\
-	doc/index.html doc/doc-index.html doc/gtk2hs.haddock			\
+	doc/index.html doc/doc-index.html					\
 	$(foreach LETTER, A B C D E F G H I J K L M N O P R S T U V W X Y,	\
 		doc/doc-index-$(LETTER).html) #missing letters Q and Z
 
+haddockifacedir = $(datadir)/doc/gtk2hs
+haddockiface_DATA = doc/gtk2hs.haddock
+
 # --prologue=doc/prologue.txt
 
-$(html_DATA) : $(html_HSFILES)
+$(html_DATA) doc/gtk2hs.haddock : $(html_HSFILES)
 	mkdir -p doc
 	$(strip $(HADDOCK) --html --odir=doc \
 		--title="Gtk2Hs" \
@@ -904,10 +907,16 @@
 #
 ################################################################################
 
-DEMOS = demo/hello demo/buttonbox demo/concurrent demo/filechooser \
+DEMOS = demo/hello demo/buttonbox demo/concurrent \
 	demo/graphic demo/treeList demo/unicode
+if HAVE_GTK_VERSION_2_4
+DEMOS += demo/filechooser 
+endif
 if ENABLE_LIBGLADE
-DEMOS += demo/glade demo/profileviewer
+DEMOS += demo/glade
+if HAVE_GTK_VERSION_2_4
+DEMOS += demo/profileviewer
+endif
 endif
 if ENABLE_GNOME
 DEMOS += demo/gconf demo/sourceview
@@ -917,11 +926,14 @@
 endif
 
 # For the install check just make sure all the demo programs compile and link
+DEMO_MAKE_ARGS= $(if $(PKGCONF), HCFLAGS="-package-conf $(DESTDIR)$(PKGCONF)") \
+		$(if $(GHCPKG_USE_AUTOLIBS),, HCNEEDSPACKAGE=yes)
+
 installcheck-local:
 	$(foreach DEMO,$(DEMOS),$(strip	\
 		make -C $(DEMO) clean &&\
-		make -C $(DEMO) &&	\
-	)) echo ok
+		make -C $(DEMO) $(DEMO_MAKE_ARGS) &&	\
+	)) echo All demos compiled ok, now try running one or two...
 
 EXTRA_DIST +=								\
 	demo/buttonbox/ButtonBox.hs demo/buttonbox/Makefile		\
@@ -952,12 +964,6 @@
 # and if your installation gets corrupt you can re-register the packages from them.
 pkglib_DATA = $(foreach pkgname,$(pkglib_LIBRARIES), $(call getVar,$(pkgname),PACKAGE))
 
-# Also build GHCI compatible .o files for each library.
-pkglib_DATA += $(foreach pkgname,$(pkglib_LIBRARIES), $(patsubst lib%.a,%.o,$(pkgname)))
-
-HS%.o : libHS%.a
-	ld --relocatable --discard-all --output=$@ --whole-archive $<
-
 if ENABLE_PKGREG
 
 # For distributors we usually do not want to register the packages using
@@ -968,14 +974,16 @@
 	$(if $(PKGCONF),if test -f $(PKGCONF); then :; \
 	else echo "[]" > $(PKGCONF); fi;)
 	$(foreach pkgname,$(pkglib_LIBRARIES), \
+	rm -f $(DESTDIR)$(pkglibdir)/$(patsubst lib%.a,%.o,$(pkgname)); \
 	prefix=$(prefix) exec_prefix=$(exec_prefix) pkglibdir=$(pkglibdir) \
-	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -u \
-	-i $(call getVar,$(pkgname),PACKAGE);)
+	$(GHCPKG) $(addprefix --config-file=,$(PKGCONF)) \
+	--update-package $(GHCPKG_BUILD_GHCI_LIB) \
+	--input-file=$(call getVar,$(pkgname),PACKAGE);)
 
 uninstall-hook :
 	$(foreach pkgname,$(lib_LIBRARIES), \
-	  $(GHCPKG) $(addprefix -f ,$(PKGCONF)) \
-	  -r `cat $(call getVar,$(pkgname),PACKAGE) \
+	  $(GHCPKG) $(addprefix --config-file=,$(PKGCONF)) \
+	  --remove-package=`cat $(call getVar,$(pkgname),PACKAGE) \
 	  | $(GREP) name | $(SED) "s/ *name *= *\"\([a-zA-Z0-9]*\)\",/\1/"`;) \
 	$(if $(PKGCONF),if test -f $(PKGCONF); then \
 	  if test -n `head $(PKGCONF) | $(GREP) -e "\[\]"`; then \

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- ChangeLog	19 Jan 2005 03:42:52 -0000	1.312
+++ ChangeLog	19 Jan 2005 03:45:26 -0000	1.313
@@ -25,6 +25,20 @@
 	5. Also add a work around for a broken development version of Gtk that
 	Sun decided to ship.
 
+	* Makefile.am:
+	1. Revert patch to build GHCi .o files ourselves, instead leave it up
+	to ghc-pkg -g as we did before.
+	2. Make building GHCi .o files conditional on the Soalris test from
+	configure.
+	3. Make sure to remove the previous GHCi .o file otherwise ghc-pkg does
+	not re-generate it which would lead to problems for people upgrading.
+	4. Arrandge for only the appropriate demos to be built and support
+	building them with a non-default package.conf location and with older
+	ghc versions that do not support "auto" packages.
+	5. Change the install location of gtk2hs.haddock from 
+	$(datadir)/doc/gtk2hs/html/ to just $(datadir)/doc/gtk2hs/ to conform
+	with the cabal haddock convention.
+
 2005-01-17 Duncan Coutts <du...@co...>
 
 	* configure.ac: add an extra option --without-pkgreg to allow

[Gtk2hs-commit] gtk2hs ChangeLog,1.311,1.312 acinclude.m4,1.5,1.6 configure.ac,1.22,1.23

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26205

Modified Files:
	ChangeLog acinclude.m4 configure.ac 
Log Message:
acinclude.m4: add a macro to deal with a hack on Linux systems where
GHCi cannot load the pthread library. Everything still works if we
just strip out the -lpthread flag because pthread is a dependency of
other libraries I guess.

configure.ac: 
1. Do not build GHCi .o files on Solaris because it does not work due to
   ghc-pkg using an incorrect linker command.
2. Add a hack to add a runtime library search path when linking programs that
   use mozembed.
3. Use the above mentioned pthread hack for each package that uses pthread.
4. Define some extra conditionals for Gtk versions so we know which demos to
   build upon make installcheck.
5. Also add a work around for a broken development version of Gtk that Sun
   decided to ship.


Index: acinclude.m4
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/acinclude.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- acinclude.m4	14 Jan 2005 13:11:18 -0000	1.5
+++ acinclude.m4	19 Jan 2005 03:42:53 -0000	1.6
@@ -131,3 +131,19 @@
 dnl standard directory then we duplicate a path here. Dough.
 [$3]="[$][$3][$]C_LDIR\"\${pkglibdir}\"";
 ])dnl
+
+dnl Another hack, on glibc systems GHCi cannot load the pthread library,
+dnl so do not include it in the LIBS list. This is not usually a problem since
+dnl some other lib usually has the pthread library as a dependency and the
+dnl system dynamic linker loads up the pthread library automatically.
+AC_DEFUN([GTKHS_GLIBC_PTHREAD_HACK],
+[
+TMP_[$1]=;
+for FLAG in [$][$1]; do
+  case [$]FLAG in
+    -lpthread) TMP_[$1]="[$]TMP_[$1]";;
+    *)         TMP_[$1]="[$]TMP_[$1] [$]FLAG";;
+  esac;
+done;
+[$1]=[$]TMP_[$1]
+])

Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- configure.ac	17 Jan 2005 18:33:53 -0000	1.22
+++ configure.ac	19 Jan 2005 03:42:53 -0000	1.23
@@ -21,7 +21,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl ######################################################################
 
-AC_INIT(gtk2hs, 0.9.7_rc2)
+AC_INIT(gtk2hs, 0.9.7_rc3pre)
 AM_INIT_AUTOMAKE
 
 dnl * We require autoconf version 2.50
@@ -215,6 +215,15 @@
   AC_MSG_ERROR([ghc-pkg not found. (But ghc exists!?)]);
 fi
 
+dnl On Solaris ghc-pkg fails to build GHCi .o files when installing because
+dnl it uses a linker command that is only appropriate for GNU ld, not the
+dnl Solaris native ld. Disable building GHCi .o files on Solaris until this
+dnl is fixed. (And then make it conditional on the GHC version, ho hum)
+case "$host_os" in
+  solaris2*) GHCPKG_BUILD_GHCI_LIB=;;
+          *) GHCPKG_BUILD_GHCI_LIB=--auto-ghci-libs;;
+esac
+
 dnl Optimise Haskell by default and give sufficient space.
 if test -z "$HCFLAGS"; then
   HCFLAGS="-O -H180m"
@@ -314,12 +323,48 @@
   PKG_CHECK_MODULES(MOZEMBED,[mozilla-gtkmozembed >= 1.4])
 fi
 
+dnl The following is a hack to fix the fact that
+dnl "pkg-config --libs mozilla-gtkmozembed" does not give us all the right
+dnl stuff. On many systems, the mozilla .so files that we need to link with
+dnl are not installed on the standard library search path.
+dnl "pkg-config --libs mozilla-gtkmozembed" tells us -L/path/to/moz/libs which
+dnl helps with finding the .so libs at static link time but does nothing to
+dnl modify the search path at dynamic link/load time. Hence what we do here is
+dnl modify the lib flags to add -Rfoo for each occurence of -Lfoo
+MOZEMBED_LIBS_TMP=;
+for FLAG in $MOZEMBED_LIBS; do
+  case $FLAG in
+      -L*) MOZEMBED_LIBS_TMP="$MOZEMBED_LIBS_TMP $FLAG -Wl,-R${FLAG#-L}";;
+      *)  MOZEMBED_LIBS_TMP="$MOZEMBED_LIBS_TMP $FLAG";;
+  esac;
+done;
+MOZEMBED_LIBS=$MOZEMBED_LIBS_TMP
+
+dnl Another hack, on glibc systems GHCi cannot load the pthread library,
+dnl so do not include it in the LIBS list. This is not usually a problem since
+dnl some other lib usually has the pthread library as a dependency and the
+dnl system dynamic linker loads up the pthread library automatically.
+case "$host_os" in
+  linux*)
+    GTKHS_GLIBC_PTHREAD_HACK(LIBGLADE_LIBS)
+    GTKHS_GLIBC_PTHREAD_HACK(GCONF_LIBS)
+    GTKHS_GLIBC_PTHREAD_HACK(SOURCEVIEW_LIBS)
+    GTKHS_GLIBC_PTHREAD_HACK(MOZEMBED_LIBS);;
+esac
 
 dnl Some APIs only appeared in later versions of libraries. Generate only
 dnl Haskell types for the available C types.
-CREATE_TYPES="$CREATE_TYPES `$PKG_CONFIG gtk+-2.0 --atleast-version=2.2 && echo gtk-2.2`"
-CREATE_TYPES="$CREATE_TYPES `$PKG_CONFIG gtk+-2.0 --atleast-version=2.4 && echo gtk-2.4`"
-CREATE_TYPES="$CREATE_TYPES `$PKG_CONFIG gtk+-2.0 --atleast-version=2.6 && echo gtk-2.6`"
+HAVE_GTK_VERSION_2_2=`$PKG_CONFIG gtk+-2.0 --atleast-version=2.2 && echo yes || echo no`
+HAVE_GTK_VERSION_2_4=`$PKG_CONFIG gtk+-2.0 --atleast-version=2.4 && echo yes || echo no`
+HAVE_GTK_VERSION_2_6=`$PKG_CONFIG gtk+-2.0 --atleast-version=2.6 && echo yes || echo no`
+
+AM_CONDITIONAL(HAVE_GTK_VERSION_2_2, test "$HAVE_GTK_VERSION_2_2" = "yes")
+AM_CONDITIONAL(HAVE_GTK_VERSION_2_4, test "$HAVE_GTK_VERSION_2_4" = "yes")
+AM_CONDITIONAL(HAVE_GTK_VERSION_2_6, test "$HAVE_GTK_VERSION_2_6" = "yes")
+
+CREATE_TYPES="$CREATE_TYPES `test "$HAVE_GTK_VERSION_2_2" = "yes" && echo gtk-2.2`"
+CREATE_TYPES="$CREATE_TYPES `test "$HAVE_GTK_VERSION_2_4" = "yes" && echo gtk-2.4`"
+CREATE_TYPES="$CREATE_TYPES `test "$HAVE_GTK_VERSION_2_6" = "yes" && echo gtk-2.6`"
 
 dnl Also allow us to conditionally compile binding to the new Gtk+ APIs.
 GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
@@ -338,6 +383,18 @@
       GTK_MICRO_VERSION >= (micro)))
 ])
 
+dnl For reasons know only to themselves, Sun decided to ship a development
+dnl version of Gtk+ (version 2.1.0). Being an intermediate development version
+dnl it had bugs/typos etc. The function gtk_icon_size_lookup was mistakenly
+dnl conditionally included based on the preprocessor symbol GTK_MULTIHEAD_SAFE.
+dnl We'll be nice and support Sun's poor users by defining this symbol for this
+dnl version of Gtk+ only.
+if $PKG_CONFIG gtk+-2.0 --exact-version 2.1.0; then
+  AC_DEFINE(GTK_MULTIHEAD_SAFE, [],
+  [Define this if we need to hack around a broken development version of Gtk+ (2.1.0)
+  that for some reason Sun decided it'd be a really good idea for them to ship. Grrr.])
+fi
+
 dnl The configuration program for GTK is kind of stupid in that it
 dnl lists directories which don't exist. ghc-pkg in ghc 5.04 or greater
 dnl does not like that, so we need to filter out non-existent directories.
@@ -590,6 +647,7 @@
 dnl Versionitis
 AC_SUBST(CREATE_TYPES)
 AC_SUBST(GHCPKG_USE_AUTOLIBS)
+AC_SUBST(GHCPKG_BUILD_GHCI_LIB)
 dnl Optional packages
 AC_SUBST(SOURCEVIEW_CFLAGS)
 AC_SUBST(SOURCEVIEW_LIBS)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- ChangeLog	18 Jan 2005 22:18:56 -0000	1.311
+++ ChangeLog	19 Jan 2005 03:42:52 -0000	1.312
@@ -8,6 +8,23 @@
 	against Gtk+ version 2.1.0 which is a version that Sun shipped with
 	its version of Gnome 2.
 
+	* acinclude.m4: add a macro to deal with a hack on Linux systems where
+	GHCi cannot load the pthread library. Everything still works if we
+	just strip out the -lpthread flag because pthread is a dependency of
+	other libraries I guess.
+
+	* configure.ac: 
+	1. Do not build GHCi .o files on Solaris because it does not work due
+	to ghc-pkg using an incorrect linker command.
+	2. Add a hack to add a runtime library search path when linking
+	programs that use mozembed.
+	3. Use the above mentioned pthread hack for each package that uses
+	pthread.
+	4. Define some extra conditionals for Gtk versions so we know which
+	demos to build upon make installcheck.
+	5. Also add a work around for a broken development version of Gtk that
+	Sun decided to ship.
+
 2005-01-17 Duncan Coutts <du...@co...>
 
 	* configure.ac: add an extra option --without-pkgreg to allow

[Gtk2hs-commit] gtk2hs/gtk/Graphics/UI/Gtk/TreeList TreeStore.chs.pp,1.1,1.2 ListStore.chs.pp,1.1,1.2

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/TreeList
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22816/gtk/Graphics/UI/Gtk/TreeList

Modified Files:
	TreeStore.chs.pp ListStore.chs.pp 
Log Message:
Cope with building against Gtk+ version 2.1.0 which is a version that Sun
shipped with its version of Gnome 2.


Index: ListStore.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/TreeList/ListStore.chs.pp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ListStore.chs.pp	8 Jan 2005 15:35:19 -0000	1.1
+++ ListStore.chs.pp	18 Jan 2005 22:19:13 -0000	1.2
@@ -80,7 +80,7 @@
     (fromIntegral col) vPtr
   valueUnset vPtr
 
-#if GTK_CHECK_VERSION(2,2,0)
+#if GTK_CHECK_VERSION(2,1,0)
 -- | Remove a specific node.
 --
 -- * The 'TreeIter' will point to the entry following the one which

Index: TreeStore.chs.pp
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Graphics/UI/Gtk/TreeList/TreeStore.chs.pp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TreeStore.chs.pp	8 Jan 2005 15:36:43 -0000	1.1
+++ TreeStore.chs.pp	18 Jan 2005 22:19:11 -0000	1.2
@@ -74,7 +74,7 @@
     (fromIntegral col) vPtr
   valueUnset vPtr
 
-#if GTK_CHECK_VERSION(2,2,0)
+#if GTK_CHECK_VERSION(2,1,0)
 -- | Remove a specific node.
 --
 -- * The 'TreeIter' will point to the entry following the one which

[Gtk2hs-commit] gtk2hs ChangeLog,1.310,1.311

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22816

Modified Files:
	ChangeLog 
Log Message:
Cope with building against Gtk+ version 2.1.0 which is a version that Sun
shipped with its version of Gnome 2.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- ChangeLog	18 Jan 2005 22:06:30 -0000	1.310
+++ ChangeLog	18 Jan 2005 22:18:56 -0000	1.311
@@ -3,6 +3,11 @@
 	* tools/c2hs/c/CLexer.hs: trivial fix to allows c2hs to process the
 	glib/gtk 2.6 headders.
 
+	* gtk/Graphics/UI/Gtk/TreeList/TreeStore.chs.pp,
+	gtk/Graphics/UI/Gtk/TreeList/ListStore.chs.pp: cope with building
+	against Gtk+ version 2.1.0 which is a version that Sun shipped with
+	its version of Gnome 2.
+
 2005-01-17 Duncan Coutts <du...@co...>
 
 	* configure.ac: add an extra option --without-pkgreg to allow

[Gtk2hs-commit] gtk2hs/tools/c2hs/c CLexer.hs,1.1,1.2

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20256/tools/c2hs/c

Modified Files:
	CLexer.hs 
Log Message:
Trivial fix to allows c2hs to process the glib/gtk 2.6 headders.


Index: CLexer.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/c2hs/c/CLexer.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CLexer.hs	21 Nov 2004 21:05:27 -0000	1.1
+++ CLexer.hs	18 Jan 2005 22:06:34 -0000	1.2
@@ -253,6 +253,7 @@
   posOf (CTokFor      pos  ) = pos
   posOf (CTokGoto     pos  ) = pos
   posOf (CTokInt      pos  ) = pos
+  posOf (CTokInline   pos  ) = pos
   posOf (CTokIf       pos  ) = pos
   posOf (CTokLong     pos  ) = pos
   posOf (CTokRegister pos  ) = pos

[Gtk2hs-commit] gtk2hs ChangeLog,1.309,1.310

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20256

Modified Files:
	ChangeLog 
Log Message:
Trivial fix to allows c2hs to process the glib/gtk 2.6 headders.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- ChangeLog	17 Jan 2005 18:40:33 -0000	1.309
+++ ChangeLog	18 Jan 2005 22:06:30 -0000	1.310
@@ -1,3 +1,8 @@
+2005-01-18 Duncan Coutts <du...@co...>
+
+	* tools/c2hs/c/CLexer.hs: trivial fix to allows c2hs to process the
+	glib/gtk 2.6 headders.
+
 2005-01-17 Duncan Coutts <du...@co...>
 
 	* configure.ac: add an extra option --without-pkgreg to allow

[Gtk2hs-commit] gtk2hs gtk2hs.spec.in,1.11,1.12

[Jens-Ulrik P. <ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17480

Modified Files:
	gtk2hs.spec.in 
Log Message:
more minor spec file cleaning:
- remove buildrequirement of ghc-doc for now
- improve -doc summary


Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gtk2hs.spec.in	17 Jan 2005 18:40:37 -0000	1.11
+++ gtk2hs.spec.in	18 Jan 2005 12:14:01 -0000	1.12
@@ -18,9 +18,7 @@
 Source: gtk2hs-%{version}.tar.gz
 URL: http://gtk2hs.sourceforge.net/
 BuildRoot: /var/tmp/gtk2hs-%{version}-root
-# --with-c2hs not currently supported
-#BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock, %{?_with_c2hs: c2hs >= 0.13.4}, %{ghcver}-doc = %{ghc_version}
-BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock, %{ghcver}-doc = %{ghc_version}
+BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock
 BuildRequires: gtk2-devel, gtksourceview-devel, libglade2-devel, GConf2-devel, mozilla-devel = %{mozver}
 
 %description
@@ -46,7 +44,7 @@
 This package contains the libraries compiled for ghc-%{ghc_version}.
 
 %package doc
-Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
+Summary: Haskell Gtk+ GUI library documentation
 Group: Development/Languages/Haskell
 
 %description doc
@@ -127,11 +125,8 @@
 %setup -q
 
 %build
-# --with-c2hs not currently supported
-#./configure %{?c2hs: --with-c2hs=%{c2hs}} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --enable-docs --without-pkgreg --prefix=%{_prefix} --libdir=%{ghclibdir}
 ./configure --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --enable-docs --without-pkgreg --prefix=%{_prefix} --libdir=%{ghclibdir}
 
-
 LANG=C make all
 
 %install
@@ -142,6 +137,7 @@
 rm -rf %{buildroot}
 
 %define ghcpkg_inst env pkglibdir=%{gtk2hsdir} ghc-pkg-%{ghc_version} -u -i
+
 %post -n gtk2hs-%{ghcver}
 %{ghcpkg_inst} %{gtk2hsdir}/gtk.pkg
 %{ghcpkg_inst} %{gtk2hsdir}/mogul.pkg
@@ -249,7 +245,7 @@
 %{gtk2hsdir}/imports/sourceview
 
 %changelog
-* Thu Aug 19 2004 Jens Petersen <pet...@re...>
+* Thu Aug 19 2004 Jens Petersen <pet...@ha...>
 - use suffix -ghc621 instead of -ghc6.2.1 and conflict with old packages
 - buildrequire ghc-doc and gtk2hs-doc-ghc621 requires ghc-doc
 - move docs and demo files to %{_defaultdocdir}/gtk2hs

[Gtk2hs-commit] gtk2hs ChangeLog,1.308,1.309 gtk2hs.spec.in,1.10,1.11

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14908

Modified Files:
	ChangeLog gtk2hs.spec.in 
Log Message:
Update to Jens's latest spec file plus my (probably broken) changes.
This needs testing.


Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gtk2hs.spec.in	19 Aug 2004 07:54:18 -0000	1.10
+++ gtk2hs.spec.in	17 Jan 2005 18:40:37 -0000	1.11
@@ -3,10 +3,12 @@
 # Copyright [2001..2002] Manuel M T Chakravarty <ch...@cs...>
 # Copyright 2002, 2003, 2004 Jens-Ulrik Holger Petersen <pet...@ha...>
 
-%define ghc_version 6.2.1
-%define ghcver 621
+%define ghc_version 6.2.2
+%define ghcver ghc622
+%define old_suffix ghc%{ghc_version}
+%define mozver 37:1.7.3
 
-Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
+Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
 Name: gtk2hs
 Version: @VERSION@
 Release: 0.%(date +%%Y%%m%%d)
@@ -16,83 +18,103 @@
 Source: gtk2hs-%{version}.tar.gz
 URL: http://gtk2hs.sourceforge.net/
 BuildRoot: /var/tmp/gtk2hs-%{version}-root
-BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock, %{?_with_c2hs: c2hs >= 0.10.6}
-BuildRequires: gtk2-devel, gtksourceview-devel, libglade2-devel, GConf2-devel
+# --with-c2hs not currently supported
+#BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock, %{?_with_c2hs: c2hs >= 0.13.4}, %{ghcver}-doc = %{ghc_version}
+BuildRequires: ghc = %{ghc_version}, %{_bindir}/hsc2hs, haddock, %{ghcver}-doc = %{ghc_version}
+BuildRequires: gtk2-devel, gtksourceview-devel, libglade2-devel, GConf2-devel, mozilla-devel = %{mozver}
 
 %description
-A Gtk2 binding for the functional language Haskell featuring
-automatic memory management, unicode support, and quite wide
-coverage of widget functions and their signals, including
-the new text and list widgets.  The convenience wrapper
-MoGuL (Monad Gui Library) makes it possible to create and
-lookup named widgets in a type safe way.
+A Gtk+ binding for the functional language Haskell featuring
+automatic memory management, unicode support, and wide
+coverage of widgets up to Gtk+ 2.2 as well as some 2.4 widgets
+such as the new file chooser dialog.
 
-%package ghc%{ghcver}
-Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
+%package -n gtk2hs-%{ghcver}
+Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
 Group: Development/Languages/Haskell
-Requires: ghc = %{ghc_version}
+Requires: ghc = %{ghc_version}, gtk2hs-glib-%{ghcver} = %{version}-%{release}
 Requires: gtk2-devel
 Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
+Conflicts: %{name}-%{old_suffix}
 
-%description ghc%{ghcver}
-A Gtk2 binding for the functional language Haskell featuring
-automatic memory management, unicode support, and quite wide
-coverage of widget functions and their signals, including
-the new text and list widgets.  The convenience wrapper
-MoGuL (Monad Gui Library) makes it possible to create and
-lookup named widgets in a type safe way.
+%description -n gtk2hs-%{ghcver}
+A Gtk+ binding for the functional language Haskell featuring
+automatic memory management, unicode support, and wide
+coverage of widgets up to Gtk+ 2.2 as well as some 2.4 widgets
+such as the new file chooser dialog.
 
 This package contains the libraries compiled for ghc-%{ghc_version}.
 
-%package sourceview-ghc%{ghcver}
-Summary: Haskell binding for gtksourceview
+%package doc
+Summary: A Haskell GUI library based on the Gtk+ GUI toolkit
 Group: Development/Languages/Haskell
-Requires: ghc = %{ghc_version}
-Requires: gtk2hs-ghc%{ghcver} = %{version}-%{release}, gtksourceview-devel
-Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
 
-%description sourceview-ghc%{ghcver}
-A GConf binding for gtk2hs.
+%description doc
+A Gtk+ binding for the functional language Haskell featuring
+automatic memory management, unicode support, and wide
+coverage of widgets up to Gtk+ 2.2 as well as some 2.4 widgets
+such as the new file chooser dialog.
 
-This package is compiled for ghc-%{ghc_version}.
+This package contains the gtk2hs documentation.
 
-%package gconf-ghc%{ghcver}
+%package gconf-%{ghcver}
 Summary: Haskell binding for GConf
 Group: Development/Languages/Haskell
 Requires: ghc = %{ghc_version}
-Requires: gtk2hs-ghc%{ghcver} = %{version}-%{release}, GConf-devel
+Requires: gtk2hs-%{ghcver} = %{version}-%{release}, GConf-devel
 Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
+Conflicts: %{name}-gconf-%{old_suffix}
 
-%description gconf-ghc%{ghcver}
+%description gconf-%{ghcver}
 A GConf binding for gtk2hs.
 
 This package is compiled for ghc-%{ghc_version}.
 
-%package glade-ghc%{ghcver}
+%package glade-%{ghcver}
 Summary: Haskell binding of glade for gtk2hs.
 Group: Development/Languages/Haskell
 Requires: ghc = %{ghc_version}
 Requires: libglade2-devel
 Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
+Conflicts: %{name}-glade-%{old_suffix}
 
-%description glade-ghc%{ghcver}
+%description glade-%{ghcver}
 A Glade2 binding for gtk2hs.
 
 This package is compiled for ghc-%{ghc_version}.
 
-%package doc
-Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
+%package glib-%{ghcver}
+Summary: Haskell binding for glib
 Group: Development/Languages/Haskell
+Requires: ghc = %{ghc_version}
+Requires: glib-devel
+Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
 
-%description doc
-A Gtk2 binding for the functional language Haskell featuring
-automatic memory management, unicode support, and quite wide
-coverage of widget functions and their signals, including
-the new text and list widgets.  The convenience wrapper
-MoGuL (Monad Gui Library) makes it possible to create and
-lookup named widgets in a type safe way.
+%description glib-%{ghcver}
+A glib binding for gtk2hs.
 
-This package contains the gtk2hs documentation.
+%package mozembed-%{ghcver}
+Summary: Haskell binding for gtkembedmoz
+Group: Development/Languages/Haskell
+Requires: ghc = %{ghc_version}
+Requires: gtk2hs-%{ghcver} = %{version}-%{release}, mozilla-devel = %{mozver}
+Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
+
+%description mozembed-%{ghcver}
+A GtkEmbedMoz binding for gtk2hs.
+
+%package sourceview-%{ghcver}
+Summary: Haskell binding for gtksourceview
+Group: Development/Languages/Haskell
+Requires: ghc = %{ghc_version}
+Requires: gtk2hs-%{ghcver} = %{version}-%{release}, gtksourceview-devel
+Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
+Conflicts: %{name}-sourceview-%{old_suffix}
+
+%description sourceview-%{ghcver}
+A GtkSourceView binding for gtk2hs.
+
+This package is compiled for ghc-%{ghc_version}.
 
 # the debuginfo subpackage is currently empty anyway, so don't generate it
 %define debug_package %{nil}
@@ -105,89 +127,135 @@
 %setup -q
 
 %build
-./configure %{?c2hs: --with-c2hs=%{c2hs}} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --enable-sourceview --enable-libglade --with-ghc-docdir=%{_datadir}/doc/ghc-doc-%{ghc_version} --prefix=%{_prefix} --libdir=%{ghclibdir}
+# --with-c2hs not currently supported
+#./configure %{?c2hs: --with-c2hs=%{c2hs}} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --enable-docs --without-pkgreg --prefix=%{_prefix} --libdir=%{ghclibdir}
+./configure --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --enable-docs --without-pkgreg --prefix=%{_prefix} --libdir=%{ghclibdir}
 
-LANG=C make all html
+
+LANG=C make all
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install-without-pkg install-html
-
-mkdir -p %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs
-cp -p demo/sourceview/haskell.lang %{buildroot}%{_datadir}/gtksourceview-1.0/language-specs
-
-# clean demo dirs
-find -type f \( -name "*.hi" -o -name "*.o" -o -exec test -x '{}' ';' \) -exec rm '{}' ';'
+make DESTDIR=%{buildroot} install
 
 %clean
 rm -rf %{buildroot}
 
-%post ghc%{ghcver}
-ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/gtk2/gtk2.conf
-ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/mogul/mogul.conf
+%define ghcpkg_inst env pkglibdir=%{gtk2hsdir} ghc-pkg-%{ghc_version} -u -i
+%post -n gtk2hs-%{ghcver}
+%{ghcpkg_inst} %{gtk2hsdir}/gtk.pkg
+%{ghcpkg_inst} %{gtk2hsdir}/mogul.pkg
 
-%post sourceview-ghc%{ghcver}
-ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/sourceview/sourceview.conf
+%post gconf-%{ghcver}
+%{ghcpkg_inst} %{gtk2hsdir}/gconf.pkg
 
-%post gconf-ghc%{ghcver}
-ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/gconf/gconf.conf
+%post glade-%{ghcver}
+%{ghcpkg_inst} %{gtk2hsdir}/glade.pkg
 
-%post glade-ghc%{ghcver}
-ghc-pkg-%{ghc_version} -u -g -i %{gtk2hsdir}/glade/glade.conf
+%post glib-%{ghcver}
+%{ghcpkg_inst} %{gtk2hsdir}/glib.pkg
 
-%preun ghc%{ghcver}
+%post mozembed-%{ghcver}
+%{ghcpkg_inst} %{gtk2hsdir}/mozembed.pkg
+
+%post sourceview-%{ghcver}
+%{ghcpkg_inst} %{gtk2hsdir}/sourceview.pkg
+
+%preun -n gtk2hs-%{ghcver}
 if [ "$1" = 0 ]; then
-  rm -f %{gtk2hsdir}/{gtk2/gtk2hs,mogul/mogul}.o
   ghc-pkg-%{ghc_version} -r mogul || :
-  ghc-pkg-%{ghc_version} -r gtk2 || :
+  ghc-pkg-%{ghc_version} -r gtk || :
 fi
 
-%preun sourceview-ghc%{ghcver}
+%preun gconf-%{ghcver}
 if [ "$1" = 0 ]; then
-  rm -f %{gtk2hsdir}/sourceview/sourceview.o
-  ghc-pkg-%{ghc_version} -r sourceview || :
+  ghc-pkg-%{ghc_version} -r gconf || :
 fi
 
-%preun gconf-ghc%{ghcver}
+%preun glade-%{ghcver}
 if [ "$1" = 0 ]; then
-  rm -f %{gtk2hsdir}/gconf/gconf.o
-  ghc-pkg-%{ghc_version} -r gconf || :
+  ghc-pkg-%{ghc_version} -r glade || :
 fi
 
-%preun glade-ghc%{ghcver}
+%preun glib-%{ghcver}
 if [ "$1" = 0 ]; then
-  rm -f %{gtk2hsdir}/glade/glade.o
-  ghc-pkg-%{ghc_version} -r glade || :
+  ghc-pkg-%{ghc_version} -r glib || :
 fi
 
-%files ghc%{ghcver}
+%preun mozembed-%{ghcver}
+if [ "$1" = 0 ]; then
+  ghc-pkg-%{ghc_version} -r mozembed || :
+fi
+
+%preun sourceview-%{ghcver}
+if [ "$1" = 0 ]; then
+  ghc-pkg-%{ghc_version} -r sourceview || :
+fi
+
+%files -n gtk2hs-%{ghcver}
 %defattr(-,root,root) 
 %dir %{gtk2hsdir}
-%{gtk2hsdir}/gtk2
-%{gtk2hsdir}/mogul
+%{gtk2hsdir}/gtk.pkg
+%{gtk2hsdir}/mogul.pkg
+%{gtk2hsdir}/libHSgtk.a
+%{gtk2hsdir}/libHSmogul.a
+%dir %{gtk2hsdir}/imports
+%{gtk2hsdir}/imports/gtk
+%{gtk2hsdir}/imports/mogul
 %doc ChangeLog TODO AUTHORS COPYING.LIB
 
-%files sourceview-ghc%{ghcver}
+%files doc
 %defattr(-,root,root) 
-%{gtk2hsdir}/sourceview
-%{_datadir}/gtksourceview-1.0/language-specs
+%{_defaultdocdir}/gtk2hs
 
-%files gconf-ghc%{ghcver}
+%files gconf-%{ghcver}
 %defattr(-,root,root) 
-%{gtk2hsdir}/gconf
+%dir %{gtk2hsdir}
+%{gtk2hsdir}/gconf.pkg
+%{gtk2hsdir}/libHSgconf.a
+%dir %{gtk2hsdir}/imports
+%{gtk2hsdir}/imports/gconf
 
-%files glade-ghc%{ghcver}
+%files glade-%{ghcver}
 %defattr(-,root,root) 
-%{gtk2hsdir}/glade
+%dir %{gtk2hsdir}
+%{gtk2hsdir}/glade.pkg
+%{gtk2hsdir}/libHSglade.a
+%dir %{gtk2hsdir}/imports
+%{gtk2hsdir}/imports/glade
 
-%files doc
+%files glib-%{ghcver}
 %defattr(-,root,root) 
-%doc demo
-%{_datadir}/doc/gtk2hs
+%dir %{gtk2hsdir}
+%{gtk2hsdir}/glib.pkg
+%{gtk2hsdir}/libHSglib.a
+%dir %{gtk2hsdir}/imports
+%{gtk2hsdir}/imports/glib
+
+%files mozembed-%{ghcver}
+%defattr(-,root,root) 
+%dir %{gtk2hsdir}
+%{gtk2hsdir}/mozembed.pkg
+%{gtk2hsdir}/libHSmozembed.a
+%dir %{gtk2hsdir}/imports
+%{gtk2hsdir}/imports/mozembed
+
+%files sourceview-%{ghcver}
+%defattr(-,root,root) 
+%dir %{gtk2hsdir}
+%{gtk2hsdir}/sourceview.pkg
+%{gtk2hsdir}/libHSsourceview.a
+%dir %{gtk2hsdir}/imports
+%{gtk2hsdir}/imports/sourceview
 
 %changelog
-* Mon Aug 16 2004 Jens Petersen <pet...@ha...> - 0:0.9.6-0.fdr.1
-- 0.9.6
+* Thu Aug 19 2004 Jens Petersen <pet...@re...>
+- use suffix -ghc621 instead of -ghc6.2.1 and conflict with old packages
+- buildrequire ghc-doc and gtk2hs-doc-ghc621 requires ghc-doc
+- move docs and demo files to %{_defaultdocdir}/gtk2hs
+
+* Mon Aug 16 2004 Jens Petersen <pet...@ha...>
+- update to 0.9.6
 
 * Thu Jul 22 2004 Jens Petersen <pet...@ha...>
 - split sourceview and glade into separate subpackages

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- ChangeLog	17 Jan 2005 18:33:51 -0000	1.308
+++ ChangeLog	17 Jan 2005 18:40:33 -0000	1.309
@@ -12,6 +12,9 @@
 
 	* mk/common.mk: the register package hook has moved to Makefile.am
 
+	* gtk2hs.spec.in: update to Jens's latest spec file plus my (probably
+	broken) changes. This needs testing.
+
 2005-01-16 Duncan Coutts <du...@co...>
 
 	* demo/buttonbox/ButtonBox.hs demo/buttonbox/Makefile

[Gtk2hs-commit] gtk2hs ChangeLog,1.307,1.308 configure.ac,1.21,1.22 Makefile.am,1.40,1.41

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13293

Modified Files:
	ChangeLog configure.ac Makefile.am 
Log Message:
Add an extra option --without-pkgreg to allow distributors to install without
registering any packages with ghc-pkg.
Move the register package hook to Makefile.am file from mk/common.mk and make
it conditional on the new configure flag.
Install all the %.pkg files and also ghci HS%.o files for each libHS%.a file.

Also a fix for the C library deps of the glib package which was stopping ghci
from loading the glib package (and thus all our other packages).


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.ac	16 Jan 2005 22:27:36 -0000	1.21
+++ configure.ac	17 Jan 2005 18:33:53 -0000	1.22
@@ -220,6 +220,14 @@
   HCFLAGS="-O -H180m"
 fi
 
+dnl Check whether to register the packages with ghc-pkg
+dnl Distributors usuall want install into a temp directory without registering
+dnl anything and leave the registering phase for a post-install action.
+AC_ARG_WITH(pkgreg,
+            [  --without-pkgreg        Do not reigster Haskell packages (useful for distributors)],
+	    [PKGREG=$withval;],[PKGREG=yes;])
+AM_CONDITIONAL(ENABLE_PKGREG, test "$PKGREG" = "yes")
+
 dnl Check whether to use a local package file.
 AC_ARG_WITH(pkgconf,
 	    [  --with-pkgconf=FILE     GHC package file to install packages],
@@ -290,7 +298,7 @@
 
 dnl Check for the GTK&Co libraries. Use the special PKG_CHECK_MODULES
 dnl macro from the pkg-config program.
-PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.0.0])
+PKG_CHECK_MODULES(GLIB,[gobject-2.0 >= 2.0.0])
 PKG_CHECK_MODULES(GTK,[gdk-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 0.12.0])
 dnl if test x$ENABLE_OPENGL = xyes; then
 dnl   PKG_CHECK_MODULES(GTKGLEXT,[gtkglext-1.0 >= 0.7.1])

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Makefile.am	16 Jan 2005 21:53:06 -0000	1.40
+++ Makefile.am	17 Jan 2005 18:33:55 -0000	1.41
@@ -943,5 +943,49 @@
 	demo/treeList/ListTest.hs demo/treeList/Makefile		\
 	demo/unicode/Arabic.hs demo/unicode/Makefile
 
+#
+#       installing and registering packages with the Haskell compiler
+#
+################################################################################
+
+# Include all the .pkg files in the install set, they're useful to distributors
+# and if your installation gets corrupt you can re-register the packages from them.
+pkglib_DATA = $(foreach pkgname,$(pkglib_LIBRARIES), $(call getVar,$(pkgname),PACKAGE))
+
+# Also build GHCI compatible .o files for each library.
+pkglib_DATA += $(foreach pkgname,$(pkglib_LIBRARIES), $(patsubst lib%.a,%.o,$(pkgname)))
+
+HS%.o : libHS%.a
+	ld --relocatable --discard-all --output=$@ --whole-archive $<
+
+if ENABLE_PKGREG
+
+# For distributors we usually do not want to register the packages using
+# ghc-pkg at install time. That is usually left for a post-install action.
+# Therefore these actions can be disabled by ./configure --without-pkgreg
+
+install-data-hook :
+	$(if $(PKGCONF),if test -f $(PKGCONF); then :; \
+	else echo "[]" > $(PKGCONF); fi;)
+	$(foreach pkgname,$(pkglib_LIBRARIES), \
+	prefix=$(prefix) exec_prefix=$(exec_prefix) pkglibdir=$(pkglibdir) \
+	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -u \
+	-i $(call getVar,$(pkgname),PACKAGE);)
+
+uninstall-hook :
+	$(foreach pkgname,$(lib_LIBRARIES), \
+	  $(GHCPKG) $(addprefix -f ,$(PKGCONF)) \
+	  -r `cat $(call getVar,$(pkgname),PACKAGE) \
+	  | $(GREP) name | $(SED) "s/ *name *= *\"\([a-zA-Z0-9]*\)\",/\1/"`;) \
+	$(if $(PKGCONF),if test -f $(PKGCONF); then \
+	  if test -n `head $(PKGCONF) | $(GREP) -e "\[\]"`; then \
+	  $(RM) $(PKGCONF) $(PKGCONF).old; fi; \
+	fi)
+else
+
+install-data-hook :
+uninstall-hook :
+
+endif
 
 include mk/common.mk

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- ChangeLog	16 Jan 2005 22:27:36 -0000	1.307
+++ ChangeLog	17 Jan 2005 18:33:51 -0000	1.308
@@ -1,3 +1,17 @@
+2005-01-17 Duncan Coutts <du...@co...>
+
+	* configure.ac: add an extra option --without-pkgreg to allow
+	distributors to install without registering any packages with ghc-pkg.
+	Also a fix for the C library deps of the glib package which was
+	stopping ghci from loading the glib package (and thus all our other
+	packages).
+
+	* Makefile.am: move the register package hook to this file from
+	mk/common.mk and make it conditional on the new configure flag. Also
+	install all the .pkg files and install ghci .o files for each .a lib.
+
+	* mk/common.mk: the register package hook has moved to Makefile.am
+
 2005-01-16 Duncan Coutts <du...@co...>
 
 	* demo/buttonbox/ButtonBox.hs demo/buttonbox/Makefile

[Gtk2hs-commit] gtk2hs/mk common.mk,1.52,1.53

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13293/mk

Modified Files:
	common.mk 
Log Message:
Add an extra option --without-pkgreg to allow distributors to install without
registering any packages with ghc-pkg.
Move the register package hook to Makefile.am file from mk/common.mk and make
it conditional on the new configure flag.
Install all the %.pkg files and also ghci HS%.o files for each libHS%.a file.

Also a fix for the C library deps of the glib package which was stopping ghci
from loading the glib package (and thus all our other packages).


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- common.mk	16 Jan 2005 21:25:41 -0000	1.52
+++ common.mk	17 Jan 2005 18:33:57 -0000	1.53
@@ -23,6 +23,7 @@
 tools_PKGNAME = $(call tools_$(word 2,$(subst /, ,$(1)))_PKGNAME,$(1))
 
 pkgVPATH = $(subst $(SPACE),:,$($(PKG)_SOURCESDIRS))
+getVar   = $($(subst .,_,$(subst /,_,$(1)))_$(2))
 
 LINK = 	$(strip $(HC) -o $@ $(HCFLAGS) $($(PKG)_HCFLAGS) \
 	$(addprefix -package ,$($(PKG)_PACKAGEDEPS)) \
@@ -116,25 +117,3 @@
 	+RTS $(HSTOOLFLAGS) -RTS \
 	-i$(pkgVPATH) --precomp=$($(PKG)_PRECOMP) -o $@ $<)
 
-
-# installation of packages
-
-getVar			= $($(subst .,_,$(subst /,_,$(1)))_$(2))
-
-install-data-hook :
-	$(if $(PKGCONF),if test -f $(PKGCONF); then :; \
-	else echo "[]" > $(PKGCONF); fi;)
-	$(foreach pkgname,$(pkglib_LIBRARIES), \
-	prefix=$(prefix) exec_prefix=$(exec_prefix) pkglibdir=$(pkglibdir) \
-	$(GHCPKG) $(addprefix -f ,$(PKGCONF)) -u -g \
-	-i $(call getVar,$(pkgname),PACKAGE);)
-
-uninstall-hook :
-	$(foreach pkgname,$(lib_LIBRARIES), \
-	  $(GHCPKG) $(addprefix -f ,$(PKGCONF)) \
-	  -r `cat $(call getVar,$(pkgname),PACKAGE) | $(GREP) name | $(SED) "s/ *name *= *\"\([a-zA-Z0-9]*\)\",/\1/"`;) \
-	$(if $(PKGCONF),if test -f $(PKGCONF); then \
-	  if test -n `head $(PKGCONF) | $(GREP) -e "\[\]"`; then \
-	  $(RM) $(PKGCONF) $(PKGCONF).old; fi; \
-	fi)
-

[Gtk2hs-commit] gtk2hs ChangeLog,1.306,1.307 configure.ac,1.20,1.21

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12052

Modified Files:
	ChangeLog configure.ac 
Log Message:
bump version to 0.9.7_rc2


Index: configure.ac
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/configure.ac,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- configure.ac	16 Jan 2005 21:41:56 -0000	1.20
+++ configure.ac	16 Jan 2005 22:27:36 -0000	1.21
@@ -21,7 +21,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl ######################################################################
 
-AC_INIT(gtk2hs, 0.9.7_rc1)
+AC_INIT(gtk2hs, 0.9.7_rc2)
 AM_INIT_AUTOMAKE
 
 dnl * We require autoconf version 2.50

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- ChangeLog	16 Jan 2005 22:11:10 -0000	1.306
+++ ChangeLog	16 Jan 2005 22:27:36 -0000	1.307
@@ -71,6 +71,8 @@
 	* demo/profileviewer/ProfileViewer.hs: Whitespace fix. Not sure how
 	this got in.
 
+	* configure.ac: bump version to 0.9.7_rc2
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs/demo/profileviewer ProfileViewer.hs,1.3,1.4

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/demo/profileviewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8290/demo/profileviewer

Modified Files:
	ProfileViewer.hs 
Log Message:
Witespace fix. Not sure how this got in.


Index: ProfileViewer.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/demo/profileviewer/ProfileViewer.hs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ProfileViewer.hs	16 Jan 2005 14:15:35 -0000	1.3
+++ ProfileViewer.hs	16 Jan 2005 22:11:10 -0000	1.4
@@ -141,7 +141,7 @@
   when (not (null commands))
        (do profile <- parseProfileFile (head commands)
            writeIORef profileVar (Just profile)
-          repopulateTreeStore)
+           repopulateTreeStore)
 
   -- The final step is to display the main window and run the main loop
   widgetShowAll mainWindow

[Gtk2hs-commit] gtk2hs ChangeLog,1.305,1.306

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8290

Modified Files:
	ChangeLog 
Log Message:
Witespace fix. Not sure how this got in.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- ChangeLog	16 Jan 2005 21:53:06 -0000	1.305
+++ ChangeLog	16 Jan 2005 22:11:10 -0000	1.306
@@ -68,6 +68,9 @@
 	to build haddock documentation that references the our docs. Also,
 	clean up the .hs.uncpp files.
 
+	* demo/profileviewer/ProfileViewer.hs: Whitespace fix. Not sure how
+	this got in.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files

[Gtk2hs-commit] gtk2hs ChangeLog,1.304,1.305 Makefile.am,1.39,1.40

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4106

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Distribute the gtk2hs.haddock file in case anyone wants to build haddock
documentation that references the our docs.

Also, clean up the .hs.uncpp files.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile.am	16 Jan 2005 21:35:39 -0000	1.39
+++ Makefile.am	16 Jan 2005 21:53:06 -0000	1.40
@@ -879,7 +879,7 @@
 	    $(patsubst $(firstword $(subst /, ,$(HSFILE))).%.hs, doc/%.html, 	\
 		$(subst /,.,$(HSFILE:.uncpp=))))				\
 	doc/haddock.css doc/haskell_icon.gif					\
-	doc/index.html doc/doc-index.html					\
+	doc/index.html doc/doc-index.html doc/gtk2hs.haddock			\
 	$(foreach LETTER, A B C D E F G H I J K L M N O P R S T U V W X Y,	\
 		doc/doc-index-$(LETTER).html) #missing letters Q and Z
 
@@ -895,7 +895,7 @@
 .hs.hs.uncpp : $(CONFIG_H)
 	$(HSCPP) -I. $< -o $@
 
-CLEANFILES += $(html_DATA)
+CLEANFILES += $(html_DATA) $(html_HSFILES_PREPROC:.hs=.hs.uncpp)
 
 endif #BUILDDOCS
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- ChangeLog	16 Jan 2005 21:44:14 -0000	1.304
+++ ChangeLog	16 Jan 2005 21:53:06 -0000	1.305
@@ -60,10 +60,14 @@
 	all the <module>.pkg.in files.
 
 	* gconf/gconf.pkg.in, glib/glib.pkg.in, mogul/mogul.pkg.in,
-	sourceview/sourceview.pkg.in, glade/glade.pkg.in,  gtk/gtk.pkg.in,
+	sourceview/sourceview.pkg.in, glade/glade.pkg.in, gtk/gtk.pkg.in,
 	mozembed/mozembed.pkg.in: use the new GHCPKG_USE_AUTOLIBS substitution
 	so the .pkg files will be understood by older versions of ghc-pkg.
 
+	* Makefile.am: distribute the gtk2hs.haddock file in case anyone wants
+	to build haddock documentation that references the our docs. Also,
+	clean up the .hs.uncpp files.
+
 2005-01-15 Duncan Coutts <du...@co...>
 
 	* mk/common.mk: change the way we find pacakge variables for files