gtk2hs-commit — Mailing list for Darcs commit messages.

[Gtk2hs-commit] gtk2hs/gtk/multiline TextView.chs,1.9,1.10

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/multiline
In directory sc8-pr-cvs1:/tmp/cvs-serv32042/gtk/multiline

Modified Files:
	TextView.chs 
Log Message:
(textViewGetVisibleRect): Fix docu typo.


Index: TextView.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextView.chs,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- TextView.chs	9 Jul 2003 22:42:45 -0000	1.9
+++ TextView.chs	9 Aug 2003 04:47:11 -0000	1.10
@@ -235,7 +235,7 @@
 textViewPlaceCursorOnscreen tv = liftM toBool $ 
   {#call unsafe text_view_place_cursor_onscreen#} (toTextView tv)
 
--- @method textViewGetVisible@ Get the currently visible rectangle.
+-- @method textViewGetVisibleRect@ Get the currently visible rectangle.
 --
 -- * Use @ref method textViewBufferToWindowCoords@ to convert into window 
 -- coordinates.

[Gtk2hs-commit] gtk2hs ChangeLog,1.87,1.88

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv32042

Modified Files:
	ChangeLog 
Log Message:
(textViewGetVisibleRect): Fix docu typo.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- ChangeLog	2 Aug 2003 05:55:35 -0000	1.87
+++ ChangeLog	9 Aug 2003 04:47:11 -0000	1.88
@@ -1,3 +1,7 @@
+2003-08-09  Jens Petersen  <pet...@ha...>
+
+	* gtk/multiline/TextView.chs (textViewGetVisibleRect): Fix docu typo.
+
 2003-08-02  Jens Petersen  <pet...@ha...>
 
 	* gtk/multiline/TextBuffer.chs (textBufferGetCharCount): Call

[Gtk2hs-commit] gtk2hs/gtk/multiline TextBuffer.chs,1.8,1.9

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/multiline
In directory sc8-pr-cvs1:/tmp/cvs-serv24290/gtk/multiline

Modified Files:
	TextBuffer.chs 
Log Message:
fix typo in textBufferGetCharCount (it was calling text_buffer_get_line_count!)


Index: TextBuffer.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/TextBuffer.chs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- TextBuffer.chs	9 Jul 2003 22:42:45 -0000	1.8
+++ TextBuffer.chs	2 Aug 2003 05:55:35 -0000	1.9
@@ -163,7 +163,7 @@
 --
 textBufferGetCharCount :: TextBuffer -> IO Int
 textBufferGetCharCount tb = liftM fromIntegral $
-  {#call unsafe text_buffer_get_line_count#} tb
+  {#call unsafe text_buffer_get_char_count#} tb
 
 -- @method textBufferGetTagTable@ Extract the tag table that is associated
 -- with this text buffer.

[Gtk2hs-commit] gtk2hs ChangeLog,1.86,1.87

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv24290

Modified Files:
	ChangeLog 
Log Message:
fix typo in textBufferGetCharCount (it was calling text_buffer_get_line_count!)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- ChangeLog	31 Jul 2003 11:13:55 -0000	1.86
+++ ChangeLog	2 Aug 2003 05:55:35 -0000	1.87
@@ -1,3 +1,8 @@
+2003-08-02  Jens Petersen  <pet...@ha...>
+
+	* gtk/multiline/TextBuffer.chs (textBufferGetCharCount): Call
+	text_buffer_get_char_count not text_buffer_get_line_count.
+
 2003-07-31  Jens Petersen  <pet...@ha...>
 
 	* gtk2hs.spec.in: Default to ghc-6.0.1.

[Gtk2hs-commit] gtk2hs ChangeLog,1.85,1.86

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv23342

Modified Files:
	ChangeLog 
Log Message:
- add changelog entries
- fix docu type in Enums.chs


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- ChangeLog	31 Jul 2003 10:18:36 -0000	1.85
+++ ChangeLog	31 Jul 2003 11:13:55 -0000	1.86
@@ -1,9 +1,21 @@
+2003-07-31  Jens Petersen  <pet...@ha...>
+
+	* gtk2hs.spec.in: Default to ghc-6.0.1.
+	(%files): Include demo as dir in docs rather than individual
+	source files.
+
+	* Makefile (inplace): Do not build the demos by default.
+	(noinplace): Ditto.
+	(demo): New separate target to build demos.
+	(install*): Drop no-op for demos.
+	(uninstall): Ditto.
+
 2003-07-18 Axel Simon <A....@ke...>
 
 	* VERSION: Bumped to 0.9.4, prepare to do a ghc-6.0 release.
 	
 	* mk/common.mk: Make hsc2hs pass -no-hs-main to ghc when linking.
-	This avoids an undefined symbol error the the Haskell main
+	This avoids an undefined symbol error for the Haskell main
 	function on Apple and Solaris.
 
 	* gtk/Makefile: Added the header file for gdk-pixbuf.

[Gtk2hs-commit] gtk2hs/gtk/general Enums.chs,1.6,1.7

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/general
In directory sc8-pr-cvs1:/tmp/cvs-serv23342/gtk/general

Modified Files:
	Enums.chs 
Log Message:
- add changelog entries
- fix docu type in Enums.chs


Index: Enums.chs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/Enums.chs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Enums.chs	3 Nov 2002 20:35:42 -0000	1.6
+++ Enums.chs	31 Jul 2003 11:13:55 -0000	1.7
@@ -316,7 +316,7 @@
 --
 {#enum WindowType {underscoreToCase}#}
 
--- @data WrapMode@ Determine how lines are warpped in a @ref data TextView@.
+-- @data WrapMode@ Determine how lines are wrapped in a @ref data TextView@.
 --
 {#enum WrapMode {underscoreToCase}#}
 

[Gtk2hs-commit] gtk2hs Makefile,1.15,1.16 gtk2hs.spec.in,1.6,1.7

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv14715

Modified Files:
	Makefile gtk2hs.spec.in 
Log Message:
* Makefile (inplace): Do not build the demos by default.
	(noinplace): Ditto.
	(demo): New separate target to build demos.
	(install*): Drop no-op for demos.
	(uninstall): Ditto.
* gtk2hs.spec.in: Default to ghc-6.0.1.
	(%files): Include demo as dir in docs rather than individual
	source files.
fix changelog typo



Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	15 Jul 2003 08:48:41 -0000	1.15
+++ Makefile	31 Jul 2003 10:30:38 -0000	1.16
@@ -20,11 +20,6 @@
 endif
 	$(MAKE) -Cgtk $@ 
 	$(MAKE)	-Cmogul $@ 
-	$(MAKE) -Cdemo/hello $@ 
-	$(MAKE) -Cdemo/unicode $@ 
-	$(MAKE) -Cdemo/graphic $@ 
-	$(MAKE) -Cdemo/treeList $@ 
-	$(MAKE) -Cdemo/concurrent $@ 
 ifeq ($(BUILDDOCS),yes)
 	$(MAKE) -Cdoc all
 endif
@@ -32,6 +27,8 @@
 noinplace :
 	$(MAKE) -Cmogul $@ 
 	$(MAKE) -Cgtk $@
+
+demo : noinplace
 	$(MAKE) -Cdemo/concurrent $@ 
 	$(MAKE) -Cdemo/treeList $@ 
 	$(MAKE) -Cdemo/graphic $@ 
@@ -41,20 +38,10 @@
 install install-without-pkg : all
 	$(MAKE) -Cgtk  $@
 	$(MAKE) -Cmogul  $@
-	$(MAKE) -Cdemo/hello install
-	$(MAKE) -Cdemo/unicode install
-	$(MAKE) -Cdemo/graphic install
-	$(MAKE) -Cdemo/treeList install
-	$(MAKE) -Cdemo/concurrent install
 
 uninstall :
 	$(MAKE) -Cmogul  $@
 	$(MAKE) -Cgtk  $@
-	$(MAKE) -Cdemo/concurrent $@ 
-	$(MAKE) -Cdemo/treeList $@ 
-	$(MAKE) -Cdemo/graphic $@ 
-	$(MAKE) -Cdemo/unicode $@ 
-	$(MAKE) -Cdemo/hello $@ 
 
 clean	: noinplace
 ifeq ($(BUILT_IN_C2HS),yes)

Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gtk2hs.spec.in	15 Jul 2003 10:45:46 -0000	1.6
+++ gtk2hs.spec.in	31 Jul 2003 10:30:38 -0000	1.7
@@ -3,8 +3,7 @@
 # Copyright [2001..2002] Manuel M T Chakravarty <ch...@cs...>
 # Copyright 2002, 2003 Jens-Ulrik Holger Petersen <pet...@ha...>
 
-%define ghc_version 6.0
-#%%define ghc_version 5.04.3
+%define ghc_version 6.0.1
 
 Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
 Name: gtk2hs
@@ -96,11 +95,15 @@
 
 %files doc
 %defattr(-,root,root) 
-%doc demo/*/*.hs
+%doc demo
 %doc doc/GTK
 %doc doc/MOGUL
 
 %changelog
+* Thu Jul 31 2003 Jens Petersen <pet...@ha...>
+- build with ghc-6.0.1
+- put demo dir in docs dir rather than individual source files
+
 * Thu Jul 10 2003 Jens Petersen <pet...@ha...>
 - build with ghc-6.0
 - name ghc subpackage "ghc%%{ghc_version}"

[Gtk2hs-commit] gtk2hs ChangeLog,1.84,1.85

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv14072

Modified Files:
	ChangeLog 
Log Message:
Fix up earlier entry for gtk2hs.spec.in.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- ChangeLog	18 Jul 2003 16:20:05 -0000	1.84
+++ ChangeLog	31 Jul 2003 10:18:36 -0000	1.85
@@ -17,8 +17,8 @@
 	* gtk2hs.spec.in: Default to ghc-6.0 now.  Split binary package
 	into -ghc%{ghc_version} and -doc subpackages.  Disable building of
 	debuginfo subpackage.
-	(%install) Use install-without-pkg.
-	(%preun) Only remove object files when uninstalling.
+	(%install): Use install-without-pkg.
+	(%preun): Only remove object files when uninstalling.
 
 	* Makefile (install-without-pkg): New target; like install but it
 	does not install the ghc library packages.

[Gtk2hs-commit] gtk2hs VERSION,1.5,1.6 ChangeLog,1.83,1.84

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv7807

Modified Files:
	VERSION ChangeLog 
Log Message:
Bump version. Prepare to release.


Index: VERSION
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/VERSION,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- VERSION	3 Jul 2003 05:19:36 -0000	1.5
+++ VERSION	18 Jul 2003 16:20:05 -0000	1.6
@@ -1 +1 @@
-0.9.3.50
+0.9.4

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- ChangeLog	18 Jul 2003 15:44:48 -0000	1.83
+++ ChangeLog	18 Jul 2003 16:20:05 -0000	1.84
@@ -1,5 +1,7 @@
 2003-07-18 Axel Simon <A....@ke...>
 
+	* VERSION: Bumped to 0.9.4, prepare to do a ghc-6.0 release.
+	
 	* mk/common.mk: Make hsc2hs pass -no-hs-main to ghc when linking.
 	This avoids an undefined symbol error the the Haskell main
 	function on Apple and Solaris.

[Gtk2hs-commit] gtk2hs ChangeLog,1.82,1.83

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv867

Modified Files:
	ChangeLog 
Log Message:
Make hsc2hs run on Apple and Solaris.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- ChangeLog	18 Jul 2003 12:33:01 -0000	1.82
+++ ChangeLog	18 Jul 2003 15:44:48 -0000	1.83
@@ -1,5 +1,9 @@
 2003-07-18 Axel Simon <A....@ke...>
 
+	* mk/common.mk: Make hsc2hs pass -no-hs-main to ghc when linking.
+	This avoids an undefined symbol error the the Haskell main
+	function on Apple and Solaris.
+
 	* gtk/Makefile: Added the header file for gdk-pixbuf.
 
 2003-07-15  Jens Petersen  <pet...@ha...>

[Gtk2hs-commit] gtk2hs/mk common.mk,1.21,1.22

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv867/mk

Modified Files:
	common.mk 
Log Message:
Make hsc2hs run on Apple and Solaris.


Index: common.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/common.mk,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- common.mk	9 Jul 2003 22:42:46 -0000	1.21
+++ common.mk	18 Jul 2003 15:44:48 -0000	1.22
@@ -138,7 +138,7 @@
 		$(EXTRA_CPPFLAGS_ONLY_I) $(CPPFLAGS_ONLY_I) \
 		$(addprefix --lflag=,$(EXTRA_LIBS_ONLY_Ll) $(LIBS_ONLY_L)\
 		$(addprefix --cflag=,$(CPPFLAGS) $(EXTRA_CPP_FLAGS)))\
-		--cc=$(HC))
+		--cc=$(HC) --lflag=-no-hs-main)
 
 # Specify how c2hs should be run.
 C2HSFLAGGED	:= $(C2HS) $(C2HSFLAGS) +RTS $(HSTOOLFLAGS) -RTS \

[Gtk2hs-commit] gtk2hs ChangeLog,1.81,1.82

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv3807

Modified Files:
	ChangeLog 
Log Message:
Added header file for gdk-pixbuf


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- ChangeLog	15 Jul 2003 10:47:31 -0000	1.81
+++ ChangeLog	18 Jul 2003 12:33:01 -0000	1.82
@@ -1,3 +1,7 @@
+2003-07-18 Axel Simon <A....@ke...>
+
+	* gtk/Makefile: Added the header file for gdk-pixbuf.
+
 2003-07-15  Jens Petersen  <pet...@ha...>
 
 	* mk/library.mk (install-without-pkg): New target that installs

[Gtk2hs-commit] gtk2hs/gtk Makefile,1.21,1.22

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv3807/gtk

Modified Files:
	Makefile 
Log Message:
Added header file for gdk-pixbuf


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile	3 Jul 2003 05:19:36 -0000	1.21
+++ Makefile	18 Jul 2003 12:33:01 -0000	1.22
@@ -159,7 +159,9 @@
 CellRendererPixbuf-HEADER = gtk/gtkcellrendererpixbuf.h
 CellRendererToggle-HEADER = gtk/gtkcellrenderertoggle.h
 ListStore-HEADER	= gtk/gtkliststore.h
-
+# extensions
+Pixbuf-HEADER		= gtk/gtk.h 
+# replace last line with gdk-pixbuf/gdk-pixbuf.h
 endif
 
 # These are .chi files that need to be created before any other .chs files.

[Gtk2hs-commit] gtk2hs ChangeLog,1.80,1.81

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv1807

Modified Files:
	ChangeLog 
Log Message:
install-without-pkg and spec file update


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- ChangeLog	13 Jul 2003 11:34:52 -0000	1.80
+++ ChangeLog	15 Jul 2003 10:47:31 -0000	1.81
@@ -1,7 +1,22 @@
+2003-07-15  Jens Petersen  <pet...@ha...>
+
+	* mk/library.mk (install-without-pkg): New target that installs
+	library without installing ghc package.
+	(install): Use it.
+
+	* gtk2hs.spec.in: Default to ghc-6.0 now.  Split binary package
+	into -ghc%{ghc_version} and -doc subpackages.  Disable building of
+	debuginfo subpackage.
+	(%install) Use install-without-pkg.
+	(%preun) Only remove object files when uninstalling.
+
+	* Makefile (install-without-pkg): New target; like install but it
+	does not install the ghc library packages.
+
 2003-07-13 Axel Simon <A....@ke...>
 
 	* gtk/misc/Arrow.chs, gtk/general/Gtk.hs: Changed the name of the
-	file to GArrow.chs to avoid the clash wich Arrow in hslibs of GHC.
+	file to GArrow.chs to avoid the clash with Arrow in hslibs of GHC.
 
 	* mk/library.mk: Remove the target install from install-pkg and
 	add the target install-pkg to install. Without this, the files are

[Gtk2hs-commit] gtk2hs gtk2hs.spec.in,1.5,1.6

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv1472

Modified Files:
	gtk2hs.spec.in 
Log Message:
Default to ghc-6.0 now.  Split binary package
into -ghc%{ghc_version} and -doc subpackages.  Disable building of
debuginfo subpackage.
(%install): Use install-without-pkg.
(%preun): Only remove object files when uninstalling.


Index: gtk2hs.spec.in
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk2hs.spec.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gtk2hs.spec.in	3 Jul 2003 05:19:36 -0000	1.5
+++ gtk2hs.spec.in	15 Jul 2003 10:45:46 -0000	1.6
@@ -3,7 +3,8 @@
 # Copyright [2001..2002] Manuel M T Chakravarty <ch...@cs...>
 # Copyright 2002, 2003 Jens-Ulrik Holger Petersen <pet...@ha...>
 
-%define _ghc_version 5.04.3
+%define ghc_version 6.0
+#%%define ghc_version 5.04.3
 
 Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
 Name: gtk2hs
@@ -14,10 +15,6 @@
 Source: gtk2hs-%{version}.tar.gz
 URL: http://gtk2hs.sourceforge.net/
 BuildRoot: /var/tmp/gtk2hs-%{version}-%{release}-root
-Requires: ghc5 = %{_ghc_version}
-Requires: gtk2
-Requires(post,preun): %{_bindir}/ghc-pkg-%{_ghc_version}
-BuildRequires: ghc5 = %{_ghc_version} gtk2-devel %{?_with_c2hs: c2hs >= 0.10.6}
 
 %description
 A Gtk2 binding for the functional language Haskell featuring
@@ -27,50 +24,96 @@
 MoGuL (Monad Gui Library) makes it possible to create and
 lookup named widgets in a type safe way.
 
+%package ghc%{ghc_version}
+Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
+Group: Development/Languages/Haskell
+BuildRequires: ghc = %{ghc_version}, gtk2-devel, %{?_with_c2hs: c2hs >= 0.10.6}, %{_bindir}/hsc2hs
+Requires: ghc = %{ghc_version}
+Requires: gtk2
+Requires(post,preun): %{_bindir}/ghc-pkg-%{ghc_version}
+
+%description ghc%{ghc_version}
+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.
+
+This package contains the libraries compiled for ghc-%{ghc_version}.
+
+%package doc
+Summary: Haskell binding for the GIMP Toolkit (GTK2), a GUI library
+Group: Development/Languages/Haskell
+
+%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.
+
+This package contains the gtk2hs documentation.
+
+# the debuginfo subpackage is currently empty anyway, so don't generate it
+%define debug_package %{nil}
+%define __spec_install_post /usr/lib/rpm/brp-compress
+
 %prep
 %setup -q
 
 %build
-./configure %{?_with_c2hs} --with-hc=ghc-%{_ghc_version} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl
-make prefix=%{_prefix} libdir=%{_libdir}/ghc-%{_ghc_version}
+./configure %{?_with_c2hs} --with-hc=ghc-%{ghc_version} --with-hcflags="-O" --with-catalog=%{_datadir}/sgml/docbook/xmlcatalog --with-html=%{_datadir}/sgml/docbook/xsl-stylesheets/xhtml/chunk.xsl # --with-fo=%{_datadir}/sgml/docbook/xsl-stylesheets/fo/docbook.xsl
+make prefix=%{_prefix} libdir=%{_libdir}/ghc-%{ghc_version}
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir}/ghc-%{_ghc_version} install
+make DESTDIR=%{buildroot} prefix=%{_prefix} libdir=%{_libdir}/ghc-%{ghc_version} install-without-pkg
 
 %clean
 rm -rf %{buildroot}
 
-%post
+%post ghc%{ghc_version}
 # # remove buildroot traces from package files
 # perl -pi -e "s|%{buildroot}||" \
-#     %{_libdir}/ghc-%{_ghc_version}/{%{name}/gtk2.conf,mogul.conf}
+#     %{_libdir}/ghc-%{ghc_version}/{%{name}/gtk2.conf,mogul.conf}
 
-ghc-pkg-%{_ghc_version} -u -g -i %{_libdir}/ghc-%{_ghc_version}/%{name}/gtk2.conf
-ghc-pkg-%{_ghc_version} -u -g -i %{_libdir}/ghc-%{_ghc_version}/mogul.conf
+ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/%{name}/gtk2.conf
+ghc-pkg-%{ghc_version} -u -g -i %{_libdir}/ghc-%{ghc_version}/mogul/mogul.conf
 
-%preun
-rm -f %{_libdir}/ghc-%{_ghc_version}/{%{name}/gtk2hs.o,mogul.o}
+%preun ghc%{ghc_version}
 if [ "$1" = 0 ]; then
-  ghc-pkg-%{_ghc_version} -r mogul || :
-  ghc-pkg-%{_ghc_version} -r gtk2 || :
+  rm -f %{_libdir}/ghc-%{ghc_version}/{%{name}/gtk2hs.o,mogul.o}
+  ghc-pkg-%{ghc_version} -r mogul || :
+  ghc-pkg-%{ghc_version} -r gtk2 || :
 fi
 
-%files
+%files ghc%{ghc_version}
 %defattr(-,root,root) 
+%{_prefix}/lib/*
 %doc ChangeLog TODO AUTHORS COPYING.LIB
+
+%files doc
+%defattr(-,root,root) 
 %doc demo/*/*.hs
 %doc doc/GTK
 %doc doc/MOGUL
-%{_prefix}/lib/*
 
 %changelog
-* Wed May 21 2003 Jens Petersen <pet...@re...>
+* Thu Jul 10 2003 Jens Petersen <pet...@ha...>
+- build with ghc-6.0
+- name ghc subpackage "ghc%%{ghc_version}"
+
+* Wed Jun 18 2003 Jens Petersen <pet...@ha...>
+- require and buildrequire %{_bindir}/ghc-%%{ghc_version}
+
+* Wed May 21 2003 Jens Petersen <pet...@ha...>
 - add -g option to ghc-pkg -u so that ghci object gets generated
 - delete them when uninstalling
 - build and include mogul documentation
 
-* Thu May 15 2003 Jens Petersen <pet...@re...>
+* Thu May 15 2003 Jens Petersen <pet...@ha...>
 - use new DESTDIR make variable, so no longer need to fix config files in post
 - remove buildroot before install
 - build and include gtk docs

[Gtk2hs-commit] gtk2hs Makefile,1.14,1.15

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv18795

Modified Files:
	Makefile 
Log Message:
(install-without-pkg): New target; like install but it does
not install the ghc library packages.


Index: Makefile
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	3 Jul 2003 05:19:36 -0000	1.14
+++ Makefile	15 Jul 2003 08:48:41 -0000	1.15
@@ -38,14 +38,14 @@
 	$(MAKE) -Cdemo/unicode $@ 
 	$(MAKE) -Cdemo/hello $@ 
 
-install : all
+install install-without-pkg : all
 	$(MAKE) -Cgtk  $@
 	$(MAKE) -Cmogul  $@
-	$(MAKE) -Cdemo/hello $@ 
-	$(MAKE) -Cdemo/unicode $@ 
-	$(MAKE) -Cdemo/graphic $@ 
-	$(MAKE) -Cdemo/treeList $@ 
-	$(MAKE) -Cdemo/concurrent $@ 
+	$(MAKE) -Cdemo/hello install
+	$(MAKE) -Cdemo/unicode install
+	$(MAKE) -Cdemo/graphic install
+	$(MAKE) -Cdemo/treeList install
+	$(MAKE) -Cdemo/concurrent install
 
 uninstall :
 	$(MAKE) -Cmogul  $@

[Gtk2hs-commit] gtk2hs/mk library.mk,1.17,1.18

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv18462/mk

Modified Files:
	library.mk 
Log Message:
(install-without-pkg): New target that installs library
without installing ghc package.
(install): Use it.


Index: library.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- library.mk	13 Jul 2003 11:34:52 -0000	1.17
+++ library.mk	15 Jul 2003 08:47:18 -0000	1.18
@@ -53,7 +53,9 @@
 installdirs :
 	$(INSTALL) -d $(DESTDIR)$(INST_HIDIR) $(DESTDIR)$(INST_LIBDIR) $(DESTDIR)$(INST_INCLDIR)
 
-install : $(TARGETOK) installdirs installfiles install-pkg
+install-without-pkg : $(TARGETOK) installdirs installfiles
+
+install : install-without-pkg install-pkg
 
 installfiles : $(PACKAGENAME).conf
 	$(INSTALL) -m644 $(ALLHSFILES:.hs=.hi) $(DESTDIR)$(INST_HIDIR)

[Gtk2hs-commit] gtk2hs/gtk/general Gtk.hs,1.18,1.19

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/general
In directory sc8-pr-cvs1:/tmp/cvs-serv11764/gtk/general

Modified Files:
	Gtk.hs 
Log Message:
Rename Arrow.chs to GArrow.chs. Remove HookGenerator.hs.in. Swap dependency between install-pkg and install.


Index: Gtk.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/general/Gtk.hs,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Gtk.hs	3 Jul 2003 05:19:36 -0000	1.18
+++ Gtk.hs	13 Jul 2003 11:34:52 -0000	1.19
@@ -138,7 +138,7 @@
   module VScrollbar,
   -- miscellaneous
   module Adjustment,
-  module Arrow,
+  module GArrow,
   module Calendar,
   module DrawingArea,
   module EventBox,
@@ -277,7 +277,7 @@
 import ScrolledWindow
 -- miscellaneous
 import Adjustment
-import Arrow
+import GArrow
 import Calendar
 import DrawingArea
 import EventBox

[Gtk2hs-commit] gtk2hs/gtk/signals HookGenerator.hs.in,1.4,NONE

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/signals
In directory sc8-pr-cvs1:/tmp/cvs-serv11764/gtk/signals

Removed Files:
	HookGenerator.hs.in 
Log Message:
Rename Arrow.chs to GArrow.chs. Remove HookGenerator.hs.in. Swap dependency between install-pkg and install.


--- HookGenerator.hs.in DELETED ---

[Gtk2hs-commit] gtk2hs/mk library.mk,1.16,1.17

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/mk
In directory sc8-pr-cvs1:/tmp/cvs-serv11764/mk

Modified Files:
	library.mk 
Log Message:
Rename Arrow.chs to GArrow.chs. Remove HookGenerator.hs.in. Swap dependency between install-pkg and install.


Index: library.mk
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/mk/library.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- library.mk	9 Jul 2003 22:42:46 -0000	1.16
+++ library.mk	13 Jul 2003 11:34:52 -0000	1.17
@@ -53,7 +53,7 @@
 installdirs :
 	$(INSTALL) -d $(DESTDIR)$(INST_HIDIR) $(DESTDIR)$(INST_LIBDIR) $(DESTDIR)$(INST_INCLDIR)
 
-install : $(TARGETOK) installdirs installfiles
+install : $(TARGETOK) installdirs installfiles install-pkg
 
 installfiles : $(PACKAGENAME).conf
 	$(INSTALL) -m644 $(ALLHSFILES:.hs=.hi) $(DESTDIR)$(INST_HIDIR)
@@ -89,8 +89,8 @@
 	  $(addprefix -u ,$(EXTRA_SYMBOLS)))]} \
 	> $(PACKAGENAME).conf
 
-install-pkg : installcheck install
-	$(PKG) -i $(PACKAGENAME).conf -a 
+install-pkg : installcheck
+	$(PKG) -i $(PACKAGENAME).conf -a -g
 
 uninstall-pkg : uninstall
 	$(PKG) -r $(PACKAGENAME)

[Gtk2hs-commit] gtk2hs/gtk/misc GArrow.chs,NONE,1.1 Arrow.chs,1.3,NONE

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv11764/gtk/misc

Added Files:
	GArrow.chs 
Removed Files:
	Arrow.chs 
Log Message:
Rename Arrow.chs to GArrow.chs. Remove HookGenerator.hs.in. Swap dependency between install-pkg and install.


--- NEW FILE: GArrow.chs ---
-- -*-haskell-*-
--  GIMP Toolkit (GTK) @entry Widget GArrow@
--
--  Author : Axel Simon
--          
--  Created: 23 May 2001
--
--  Version $Revision: 1.1 $ from $Date: 2003/07/13 11:34:52 $
--
--  Copyright (c) 1999..2002 Axel Simon
--
--  This file is free software; you can redistribute it and/or modify
--  it under the terms of the GNU General Public License as published by
--  the Free Software Foundation; either version 2 of the License, or
--  (at your option) any later version.
--
--  This file is distributed in the hope that it will be useful,
--  but WITHOUT ANY WARRANTY; without even the implied warranty of
--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--  GNU General Public License for more details.
--
-- @description@ --------------------------------------------------------------
--
-- * An Arrow pointing to one of the four cardinal direction.
--
-- @documentation@ ------------------------------------------------------------
--
--
-- @todo@ ---------------------------------------------------------------------

module GArrow(
  Arrow,
  ArrowClass,
  castToArrow,
  ArrowType(..),
  ShadowType(..),
  arrowNew,
  arrowSet
  ) where

import Monad	(liftM)
import FFI

import Object	(makeNewObject)
{#import Hierarchy#}
{#import Signal#}
import Enums	(ArrowType(..), ShadowType(..))

{# context lib="gtk" prefix="gtk" #}

-- methods

-- @constructor arrowNew@ Create a new arrow with display options.
--
arrowNew :: ArrowType -> ShadowType -> IO Arrow
arrowNew at st = makeNewObject mkArrow $ liftM castPtr $ 
  {#call unsafe arrow_new#} ((fromIntegral.fromEnum) at) 
  ((fromIntegral.fromEnum) st)

-- @method arrowSet@ Change the visual appearance of this widget.
--
arrowSet :: ArrowClass a => a -> ArrowType -> ShadowType -> IO ()
arrowSet a at st = {#call arrow_set#} (toArrow a) ((fromIntegral.fromEnum) at)
  ((fromIntegral.fromEnum) st)


--- Arrow.chs DELETED ---

[Gtk2hs-commit] gtk2hs ChangeLog,1.79,1.80

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1:/tmp/cvs-serv11764

Modified Files:
	ChangeLog 
Log Message:
Rename Arrow.chs to GArrow.chs. Remove HookGenerator.hs.in. Swap dependency between install-pkg and install.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- ChangeLog	9 Jul 2003 22:42:42 -0000	1.79
+++ ChangeLog	13 Jul 2003 11:34:52 -0000	1.80
@@ -1,3 +1,16 @@
+2003-07-13 Axel Simon <A....@ke...>
+
+	* gtk/misc/Arrow.chs, gtk/general/Gtk.hs: Changed the name of the
+	file to GArrow.chs to avoid the clash wich Arrow in hslibs of GHC.
+
+	* mk/library.mk: Remove the target install from install-pkg and
+	add the target install-pkg to install. Without this, the files are
+	copied but the package file is not updated.
+
+	* gtk/signals/HookGenerator.hs.in: Removed this file which should
+	have happened a long time ago. HookGenerator.hs is the only file
+	needed.
+	
 2003-07-09 Axel Simon <A....@ke...>
 	
 	* c2hs/gen/GBMonad.hs, c2hs/gen/GenBind.hs: Applied the patch I

[Gtk2hs-commit] gtk2hs/gtk/general FFI.hs,NONE,1.1

[<as...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/general
In directory sc8-pr-cvs1:/tmp/cvs-serv3484

Added Files:
	FFI.hs 
Log Message:
Forgot to add the most important file. Dooh.


--- NEW FILE: FFI.hs ---
{-# OPTIONS -cpp #-}
--  GIMP Toolkit (GTK) UTF aware string marshalling, version dependencies
--
--  Author : Axel Simon
--          
--  Created: 22 June 2001
--
--  Version $Revision: 1.1 $ from $Date: 2003/07/10 08:20:25 $
--
--  Copyright (c) 1999..2002 Axel Simon
--
--  This file is free software; you can redistribute it and/or modify
--  it under the terms of the GNU General Public License as published by
--  the Free Software Foundation; either version 2 of the License, or
--  (at your option) any later version.
--
--  This file is distributed in the hope that it will be useful,
--  but WITHOUT ANY WARRANTY; without even the implied warranty of
--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--  GNU General Public License for more details.
--
-- @description@ --------------------------------------------------------------
--
-- * This module adds CString-like functions that handle UTF8 strings.
--   Furthermore it serves as an impedance matcher for different compiler
--   versions.
--
--- DOCU ----------------------------------------------------------------------
--
--
--- TODO ----------------------------------------------------------------------

module FFI(
  with,
  nullForeignPtr,
  foreignFree,
  withUTFString,
  withUTFStringLen,
  newUTFString,
  newUTFStringLen,
  peekUTFString,
  peekUTFStringLen,
  module Foreign,
#if __GLASGOW_HASKELL__>=504
  module Foreign.C
#else
  module CForeign
#endif
  ) where

import Monad	(liftM)
import Char
import LocalData(unsafePerformIO)

#if __GLASGOW_HASKELL__>=504
import Data.Bits
import Foreign.C
import qualified Foreign
import Foreign	 hiding (with)
#else
import Bits
import CForeign
import qualified Foreign
import Foreign	 hiding (withObject)
#endif


#if __GLASGOW_HASKELL__>=504
with :: (Storable a) => a -> (Ptr a -> IO b) -> IO b
with = Foreign.with
#else
with :: (Storable a) => a -> (Ptr a -> IO b) -> IO b
with = Foreign.withObject
#endif

#if __GLASGOW_HASKELL__>=600
foreign import ccall unsafe "&free"
  free' :: FinalizerPtr a

foreignFree :: Ptr a -> FinalizerPtr a
foreignFree _ = free'

nullForeignPtr :: ForeignPtr a
nullForeignPtr = unsafePerformIO $ newForeignPtr nullPtr free'
#else
nullForeignPtr :: ForeignPtr a
nullForeignPtr = unsafePerformIO $ newForeignPtr nullPtr (return ())

foreignFree :: Ptr a -> IO ()
foreignFree = free
#endif


-- Define withUTFString to emit UTF-8.
--
withUTFString :: String -> (CString -> IO a) -> IO a
withUTFString hsStr = withCString (toUTF hsStr)

-- Define withUTFStringLen to emit UTF-8.
--
withUTFStringLen :: String -> (CStringLen -> IO a) -> IO a
withUTFStringLen hsStr = withCStringLen (toUTF hsStr)

-- Define newUTFString to emit UTF-8.
--
newUTFString :: String -> IO CString
newUTFString = newCString . toUTF

-- Define newUTFStringLen to emit UTF-8.
--
newUTFStringLen :: String -> IO CStringLen
newUTFStringLen = newCStringLen . toUTF

-- Define peekUTFString to retrieve UTF-8.
--
peekUTFString :: CString -> IO String
peekUTFString strPtr = liftM fromUTF $ peekCString strPtr

-- Define peekUTFStringLen to retrieve UTF-8.
--
peekUTFStringLen :: CStringLen -> IO String
peekUTFStringLen strPtr = liftM fromUTF $ peekCStringLen strPtr

-- Convert Unicode characters to UTF-8.
--
toUTF :: String -> String
toUTF [] = []
toUTF (x:xs) | ord x<=0x007F = x:toUTF xs
	     | ord x<=0x07FF = chr (0xC0 .|. ((ord x `shift` (-6)) .&. 0x1F)):
			       chr (0x80 .|. (ord x .&. 0x3F)):
			       toUTF xs
	     | otherwise     = chr (0xE0 .|. ((ord x `shift` (-12)) .&. 0x0F)):
			       chr (0x80 .|. ((ord x `shift` (-6)) .&. 0x3F)):
			       chr (0x80 .|. (ord x .&. 0x3F)):
			       toUTF xs

-- Convert UTF-8 to Unicode.
--
fromUTF :: String -> String
fromUTF [] = []
fromUTF (all@(x:xs)) | ord x<=0x7F = x:fromUTF xs
		     | ord x<=0xBF = err
		     | ord x<=0xDF = twoBytes all
		     | ord x<=0xEF = threeBytes all
		     | otherwise   = err
  where
    twoBytes (x1:x2:xs) = chr (((ord x1 .&. 0x1F) `shift` 6) .|.
			       (ord x2 .&. 0x3F)):fromUTF xs
    twoBytes _ = error "fromUTF: illegal two byte sequence"

    threeBytes (x1:x2:x3:xs) = chr (((ord x1 .&. 0x0F) `shift` 12) .|.
				    ((ord x2 .&. 0x3F) `shift` 6) .|.
				    (ord x3 .&. 0x3F)):fromUTF xs
    threeBytes _ = error "fromUTF: illegal three byte sequence" 
    
    err = error "fromUTF: illegal UTF-8 character"

Re: [Gtk2hs-commit] gtk2hs/gtk/general General.chs,1.10,1.11 IconFactory.chs,1.4,1.5 StockItems.hsc,1.8,1.9 Structs.hsc,1.19,1.20 Style.chs,1.2,1.3 UTFCForeign.hs,1.5,NONE

[Jens P. <pet...@re...>]

2003年07月10日(木)の07時43分に as...@us... 曰く:
> Log Message:
> Make compile with GHC
> 6.00. There are two major changes in the FFI which made me
> separate everything that has to do with Foreign and Foreign.C into
> a new file called general/FFI.hs.

Axel, thanks for all the ghc 6.0 work! :-)

I think you forgot to commit "gtk/general/FFI.hs".

Jens

ps I wonder how to get syncmail to only send out a single message per
commit (ie not one per changed file). ;-)

[Gtk2hs-commit] gtk2hs/gtk/multiline .cvsignore,1.3,1.4

[<ju...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/gtk/multiline
In directory sc8-pr-cvs1:/tmp/cvs-serv9887/gtk/multiline

Modified Files:
	.cvsignore 
Log Message:
- add *.h
- add new .hs file to gtk/gdk/.cvsignore


Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/gtk/multiline/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	8 May 2003 11:28:44 -0000	1.3
+++ .cvsignore	10 Jul 2003 00:45:51 -0000	1.4
@@ -4,3 +4,4 @@
 TextTag.hs
 TextTagTable.hs
 TextView.hs
+*.h