Menu
▾
▴
gtk2hs-commit — Mailing list for Darcs commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(68) |
Aug
(4) |
Sep
|
Oct
(23) |
Nov
(95) |
Dec
(9) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
(51) |
May
(81) |
Jun
(2) |
Jul
(86) |
Aug
(143) |
Sep
(3) |
Oct
(31) |
Nov
(63) |
Dec
(90) |
| 2005 |
Jan
(277) |
Feb
(157) |
Mar
(99) |
Apr
(195) |
May
(151) |
Jun
(148) |
Jul
(98) |
Aug
(123) |
Sep
(20) |
Oct
(174) |
Nov
(155) |
Dec
(26) |
| 2006 |
Jan
(51) |
Feb
(19) |
Mar
(16) |
Apr
(12) |
May
(5) |
Jun
|
Jul
(11) |
Aug
(7) |
Sep
(10) |
Oct
(31) |
Nov
(174) |
Dec
(56) |
| 2007 |
Jan
(45) |
Feb
(52) |
Mar
(10) |
Apr
(5) |
May
(47) |
Jun
(16) |
Jul
(80) |
Aug
(29) |
Sep
(14) |
Oct
(59) |
Nov
(46) |
Dec
(16) |
| 2008 |
Jan
(10) |
Feb
(1) |
Mar
|
Apr
|
May
(49) |
Jun
(26) |
Jul
(8) |
Aug
(4) |
Sep
(25) |
Oct
(53) |
Nov
(9) |
Dec
(1) |
| 2009 |
Jan
(66) |
Feb
(11) |
Mar
(1) |
Apr
(14) |
May
(8) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
(9) |
Oct
(23) |
Nov
(35) |
Dec
|
| 2010 |
Jan
(7) |
Feb
(2) |
Mar
(39) |
Apr
(19) |
May
(161) |
Jun
(19) |
Jul
(32) |
Aug
(65) |
Sep
(113) |
Oct
(120) |
Nov
(2) |
Dec
|
| 2012 |
Jan
|
Feb
(5) |
Mar
(4) |
Apr
(7) |
May
(9) |
Jun
(14) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(1) |
Nov
(12) |
Dec
(2) |
| 2013 |
Jan
(1) |
Feb
(17) |
Mar
(4) |
Apr
(4) |
May
(9) |
Jun
|
Jul
(8) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Peter g. <pg...@co...> - 2009-01-22 00:36:41
|
Tue Jan 20 21:25:03 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: add demo/treeList/TreeSort.hs to dist
hunk ./Makefile.am 2939
+ demo/treeList/TreeSort.hs \
|
|
From: Peter g. <pg...@co...> - 2009-01-22 00:36:38
|
Tue Jan 20 20:22:00 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: add a "dep" target that will build .dep files
this target only builds the dependencies that are needed early in the
build process (namely, tools/c2hs/c2hsLocal.deps and the files
generated by chsDepend). It is depended on by the "all" target, and
so will be processed before anything else, since all recursively runs
make all-am, which does the actual building.
hunk ./Makefile.am 112
+EARLY_DEPS = tools/c2hs/c2hsLocal.deps
+all: dep
+dep: $(EARLY_DEPS)
+
+DONT_USE_DEPS = $(strip $(if $(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS))$(filter dep,$(MAKECMDGOALS))$(filter all,$(MAKECMDGOALS)),true,$(if $(MAKECMDGOALS),,true)))
+
hunk ./Makefile.am 277
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 386
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSglib_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 412
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 540
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSgio_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 566
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 950
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSgtk_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 976
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1074
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSglade_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1099
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1223
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSgconf_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1248
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1357
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSsourceview_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1382
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1507
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSgtksourceview2_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1532
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1629
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSmozembed_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1654
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1772
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHScairo_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1797
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1877
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSsvgcairo_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 1902
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 2007
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSgtkglext_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 2032
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 2096
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 2119
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 2277
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSgnomevfs_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 2302
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 2581
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+EARLY_DEPS += $(libHSgstreamer_a_CHSFILES:.chs=.dep)
+
+ifeq (,$(DONT_USE_DEPS))
hunk ./Makefile.am 2608
-ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
+ifeq (,$(DONT_USE_DEPS))
|
|
From: Peter g. <pg...@co...> - 2009-01-22 00:36:38
|
Tue Jan 20 20:26:47 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: make Gtk2HsStore.o depend on CustomStore.o
actually it needs CustomStore_stub.h, but this works
hunk ./Makefile.am 804
+gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.o: gtk/Graphics/UI/Gtk/ModelView/CustomStore.o
|
|
From: Peter g. <pg...@co...> - 2009-01-22 00:36:37
|
Mon Jan 19 22:06:25 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: install stock icon images for docs in the right place
hunk ./Makefile.am 2603
-htmldoc_images = \
+htmldoc_images_stock_icons_dist = \
hunk ./Makefile.am 2696
-EXTRA_DIST += $(htmldoc_images)
+EXTRA_DIST += $(htmldoc_images_stock_icons_dist)
hunk ./Makefile.am 2704
+htmldoc_images_stock_iconsdir = $(htmldocdir)/images/stock-icons
+htmldoc_images_stock_icons_DATA = $(htmldoc_images_stock_icons_dist)
|
|
From: Peter g. <pg...@co...> - 2009-01-22 00:36:37
|
Mon Jan 19 22:07:02 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: haddock 2.0 doesn't create the doc-index-[A-Z].html files
hunk ./Makefile.am 2733
-endif
-
+else
hunk ./Makefile.am 2737
+endif
+
|
|
From: Peter g. <pg...@co...> - 2009-01-22 00:36:37
|
Tue Jan 20 20:19:18 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: make objects from each package depend on objects from dependee packages
hunk ./Makefile.am 490
+$(libHSgio_a_OBJECTS) : $(libHSglib_a_OBJECTS)
hunk ./Makefile.am 897
+libHSgtk_a_objects_deps = $(libHSglib_a_OBJECTS)
+if ENABLE_CAIRO
+libHSgtk_a_objects_deps += $(libHScairo_a_OBJECTS)
+endif
+$(libHSgtk_a_OBJECTS) : $(libHSgtk_a_objects_deps)
hunk ./Makefile.am 1026
+$(libHSglade_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS)
hunk ./Makefile.am 1170
+$(libHSgconf_a_OBJECTS) : $(libHSglib_a_OBJECTS)
hunk ./Makefile.am 1305
+$(libHSsourceview_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS)
hunk ./Makefile.am 1453
+$(libHSgtksourceview2_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS)
hunk ./Makefile.am 1574
+$(libHSmozembed_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS)
hunk ./Makefile.am 1717
+$(libHScairo_a_OBJECTS) : $(libHSglib_a_OBJECTS)
hunk ./Makefile.am 1820
+$(libHSsvgcairo_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHScairo_a_OBJECTS)
hunk ./Makefile.am 1945
+$(libHSgtkglext_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS)
hunk ./Makefile.am 2053
+$(libHSsoegtk_a_OBJECTS) : $(libHSglib_a_OBJECTS) $(libHSgtk_a_OBJECTS)
hunk ./Makefile.am 2209
+$(libHSgnomevfs_a_OBJECTS) : $(libHSglib_a_OBJECTS)
hunk ./Makefile.am 2511
+$(libHSgstreamer_a_OBJECTS) : $(libHSglib_a_OBJECTS)
|
|
From: Peter g. <pg...@co...> - 2009-01-22 00:36:35
|
Mon Jan 19 22:34:02 EST 2009 Peter Gavin <pg...@gm...>
* c2hs: make C2HSConfig.hs not be generated from configure
this causes all of c2hs to be rebuilt if configure is rerun.
The only thing that was needed is the path for CPP, so just use
-cpp -DCPP=$(CPP) instead.
move ./tools/c2hs/toplevel/C2HSConfig.hs.in ./tools/c2hs/toplevel/C2HSConfig.hs
hunk ./Makefile.am 234
- tools/c2hs/toplevel/c2hs_config.c
-
-nodist_tools_c2hs_c2hsLocal_SOURCES = \
+ tools/c2hs/toplevel/c2hs_config.c \
hunk ./Makefile.am 238
- $(tools_c2hs_c2hsLocal_SOURCES) \
- $(nodist_tools_c2hs_c2hsLocal_SOURCES)
+ $(tools_c2hs_c2hsLocal_SOURCES)
hunk ./Makefile.am 243
-tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = $(FFI) '-\#include<c2hs_config.h>'
+tools_c2hs_toplevel_C2HSConfig_hs_HCFLAGS = $(FFI) '-\#include<c2hs_config.h>' \
+ -cpp -D_C2HS_CPP=\""$(CPP)"\" [_$_]
hunk ./configure.ac 905
- tools/c2hs/toplevel/C2HSConfig.hs
hunk ./tools/c2hs/toplevel/C2HSConfig.hs 2
--- ** @configure_input@ **
hunk ./tools/c2hs/toplevel/C2HSConfig.hs 59
-cpp = "@CPP@"
+cpp = _C2HS_CPP -- used to be: "@CPP@"
hunk ./tools/c2hs/toplevel/C2HSConfig.hs 80
-dlsuffix = "@DLSUFFIX@"
+dlsuffix = error "C2HSConfig.dlsuffix" -- used to be: "@DLSUFFIX@"
|
|
From: Peter g. <pg...@co...> - 2009-01-22 00:36:32
|
Mon Jan 19 22:03:59 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: dont read dependency files for dist target
hunk ./Makefile.am 273
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 382
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 406
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 533
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 557
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 936
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 960
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1057
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1080
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1203
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1226
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1334
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1357
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1481
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1504
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1600
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1623
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1740
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1763
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1842
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1865
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1969
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 1992
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 2055
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 2078
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 2235
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 2258
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 2536
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
hunk ./Makefile.am 2561
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
+ifeq (,$(findstring clean,$(MAKECMDGOALS))$(findstring dist,$(MAKECMDGOALS)))
|
|
From: Peter g. <pg...@co...> - 2009-01-20 02:43:06
|
Mon Jan 19 21:29:39 EST 2009 Peter Gavin <pg...@gm...>
* gtksourceview2: handle null pointers correctly in sourceLanguageManager{Get,Guess}Language
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs.pp 91
-sourceLanguageManagerGetLanguage :: SourceLanguageManager -> String -> IO SourceLanguage
-sourceLanguageManagerGetLanguage slm id = makeNewGObject mkSourceLanguage $ liftM castPtr $
- withUTFString id ({#call unsafe source_language_manager_get_language#} slm)
+sourceLanguageManagerGetLanguage :: SourceLanguageManager -> String -> IO (Maybe SourceLanguage)
+sourceLanguageManagerGetLanguage slm id = do
+ slPtr <- liftM castPtr $
+ withUTFString id ({#call unsafe source_language_manager_get_language#} slm)
+ if slPtr /= nullPtr
+ then liftM Just $ makeNewGObject mkSourceLanguage $ return slPtr
+ else return Nothing
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs.pp 102
-sourceLanguageManagerGuessLanguage slm filename contentType = makeNewGObject mkSourceLanguage $ liftM castPtr $
- withUTFString filename $ \cFilename ->
- withUTFString contentType $ \cContentType ->
- {#call unsafe source_language_manager_guess_language#} slm cFilename cContentType
+sourceLanguageManagerGuessLanguage :: SourceLanguageManager -> Maybe String -> Maybe String -> IO (Maybe SourceLanguage)
+sourceLanguageManagerGuessLanguage slm filename contentType =
+ maybeWith withUTFString filename $ \cFilename ->
+ maybeWith withUTFString contentType $ \cContentType -> do
+ slPtr <- liftM castPtr $
+ {#call unsafe source_language_manager_guess_language#} slm cFilename cContentType
+ if slPtr /= nullPtr
+ then liftM Just $ makeNewGObject mkSourceLanguage $ return slPtr
+ else return Nothing
|
|
From: Peter g. <pg...@co...> - 2009-01-20 02:43:05
|
Mon Jan 19 20:59:24 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: use a stamp file so docs don't get rebuilt multiple times
hunk ./Makefile.am 2745
-$(htmldoc_haddock_files) : $(htmldoc_HSFILES)
+$(htmldoc_haddock_files) : docs/reference/stamp
+docs/reference/stamp : $(htmldoc_HSFILES)
hunk ./Makefile.am 2754
+ touch docs/reference/stamp
+CLEANFILES+=docs/reference/stamp
hunk ./Makefile.am 2772
-$(htmldoc_haddock_files) : $(htmldoc_HSFILES)
+$(htmldoc_haddock_files) : docs/reference/stamp
+docs/reference/stamp : $(htmldoc_HSFILES)
hunk ./Makefile.am 2783
-
+ touch docs/reference/stamp
+CLEANFILES+=docs/reference/stamp
|
|
From: Peter g. <pg...@co...> - 2009-01-20 02:43:05
|
Mon Jan 19 18:20:50 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am: add a few files missing from the dist
hunk ./Makefile.am 33
+ gstreamer/hsgstreamer.h \
+ gstreamer/hierarchy.list \
+ gstreamer/mini-hierarchy.list \
+ gstreamer/gobject-hierarchy.list \
+ gstreamer/Media/Streaming/GStreamer/Hierarchy.chs.template \
+ gstreamer/Media/Streaming/GStreamer/MiniHierarchy.chs.template \
hunk ./Makefile.am 41
- gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.h
+ gtksourceview2/marshal.list \
+ gtk/Graphics/UI/Gtk/ModelView/Gtk2HsStore.h \
+ COPYING.LGPLv3 COPYING.GPLv3
hunk ./Makefile.am 486
- $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgio_a_SOURCES))))
+ $(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgio_a_ALLSOURCES))))
hunk ./Makefile.am 2375
-EXTRA_DIST += \
- gstreamer/hsgstreamer.h \
- gstreamer/hierarchy.list \
- gstreamer/mini-hierarchy.list \
- gstreamer/gobject-hierarchy.list \
- gstreamer/Media/Streaming/GStreamer/Hierarchy.chs.template \
- gstreamer/Media/Streaming/GStreamer/MiniHierarchy.chs.template
-
hunk ./Makefile.am 2584
-if BUILDDOCS
-
-# For now just build all the docs together, we can think about doing it in a
-# more modular fashion later if it turns out to be useful.
-
-htmldocdir = $(datadir)/doc/gtk2hs/html
-
-PACKAGES = $(foreach PACKAGE,$(pkglib_LIBRARIES), $(patsubst libHS%.a,%,$(PACKAGE)))
-
-htmldoc_haddock_files = \
- $(foreach HSFILE, $(filter-out \
- $(htmldoc_HSFILES_HIDDEN),$(htmldoc_HSFILES)), \
- $(patsubst $(firstword $(subst /, \
- ,$(HSFILE)))-%.hs, \
- docs/reference/%.html, \
- $(subst /,-,$(HSFILE:.uncpp=)))) \
- docs/reference/haddock.css docs/reference/haskell_icon.gif \
- docs/reference/plus.gif docs/reference/minus.gif \
- docs/reference/haddock.js \
- docs/reference/index.html docs/reference/doc-index.html \
- docs/reference/gtk2hs.haddock
-
-if HADDOCK2
-htmldoc_haddock_files += \
- $(foreach HSFILE, $(filter-out \
- $(htmldoc_HSFILES_HIDDEN),$(htmldoc_HSFILES)), \
- $(patsubst $(firstword $(subst /, \
- ,$(HSFILE)))-%.hs, \
- docs/reference/mini_%.html, \
- $(subst /,-,$(HSFILE:.uncpp=)))) \
- docs/reference/haddock-util.js \
- docs/reference/frames.html \
- docs/reference/index-frames.html
-endif
-
-htmldoc_haddock_files += \
- $(foreach LETTER, A B C D E F G H I J K L M N O P Q R S T U V W X Y \
- 58 , docs/reference/doc-index-$(LETTER).html) #missing Z < > |, i.e. 60 62 124
-
hunk ./Makefile.am 2677
+EXTRA_DIST += $(htmldoc_images)
hunk ./Makefile.am 2679
+if BUILDDOCS
+
+# For now just build all the docs together, we can think about doing it in a
+# more modular fashion later if it turns out to be useful.
+
+htmldocdir = $(datadir)/doc/gtk2hs/html
+
+PACKAGES = $(foreach PACKAGE,$(pkglib_LIBRARIES), $(patsubst libHS%.a,%,$(PACKAGE)))
+
+htmldoc_haddock_files = \
+ $(foreach HSFILE, $(filter-out \
+ $(htmldoc_HSFILES_HIDDEN),$(htmldoc_HSFILES)), \
+ $(patsubst $(firstword $(subst /, \
+ ,$(HSFILE)))-%.hs, \
+ docs/reference/%.html, \
+ $(subst /,-,$(HSFILE:.uncpp=)))) \
+ docs/reference/haddock.css docs/reference/haskell_icon.gif \
+ docs/reference/plus.gif docs/reference/minus.gif \
+ docs/reference/haddock.js \
+ docs/reference/index.html docs/reference/doc-index.html \
+ docs/reference/gtk2hs.haddock
+
+if HADDOCK2
+htmldoc_haddock_files += \
+ $(foreach HSFILE, $(filter-out \
+ $(htmldoc_HSFILES_HIDDEN),$(htmldoc_HSFILES)), \
+ $(patsubst $(firstword $(subst /, \
+ ,$(HSFILE)))-%.hs, \
+ docs/reference/mini_%.html, \
+ $(subst /,-,$(HSFILE:.uncpp=)))) \
+ docs/reference/haddock-util.js \
+ docs/reference/frames.html \
+ docs/reference/index-frames.html
+endif
+
+htmldoc_haddock_files += \
+ $(foreach LETTER, A B C D E F G H I J K L M N O P Q R S T U V W X Y \
+ 58 , docs/reference/doc-index-$(LETTER).html) #missing Z < > |, i.e. 60 62 124
+
+
hunk ./Makefile.am 2886
- demo/statusicon/StatusIcon.hs demo/statusicon/Makefile
+ demo/statusicon/StatusIcon.hs demo/statusicon/Makefile \
+ demo/gstreamer/VorbisPlay.hs demo/gstreamer/Makefile \
+ demo/gnomevfs/TestDir.hs \
+ demo/gnomevfs/TestDriveVolume.hs \
+ demo/gnomevfs/TestSync.hs \
+ demo/gnomevfs/TestVolumeMonitor.hs \
+ demo/gnomevfs/TestXfer.hs \
+ demo/gnomevfs/Makefile
+
|
|
From: Peter g. <pg...@co...> - 2009-01-20 02:43:04
|
Mon Jan 19 20:15:44 EST 2009 Peter Gavin <pg...@gm...>
* Makefile.am, common.mk: use dependencies instead of recursively calling make
hunk ./Makefile.am 267
+$(am_tools_c2hs_c2hsLocal_OBJECTS): | tools/c2hs/c2hsLocal.deps
+tools/c2hs/c2hsLocal.deps: $(tools_c2hs_c2hsLocal_HSFILES)
hunk ./Makefile.am 297
+glib/libHSglib_a.deps : $(libHSglib_a_HSFILES)
+
hunk ./Makefile.am 380
+$(libHSglib_a_CHSFILES_HS): $(libHSglib_a_PRECOMP)
hunk ./Makefile.am 441
-gio/libHSgio_a.deps : glib/libHSglib_a.deps
+gio/libHSgio_a.deps : $(libHSgio_a_HSFILES) | glib/libHSglib_a.deps
hunk ./Makefile.am 529
+$(libHSgio_a_CHSFILES_HS): $(libHSgio_a_PRECOMP)
hunk ./Makefile.am 594
-gtk/libHSgtk_a.deps : glib/libHSglib_a.deps
+gtk/libHSgtk_a.deps : $(libHSgtk_a_HSFILES) | glib/libHSglib_a.deps
hunk ./Makefile.am 598
-gtk/libHSgtk_a.deps : cairo/libHScairo_a.deps
+gtk/libHSgtk_a.deps : | cairo/libHScairo_a.deps
hunk ./Makefile.am 933
+$(libHSgtk_a_CHSFILES_HS): $(libHSgtk_a_PRECOMP)
hunk ./Makefile.am 994
-glade/libHSglade_a.deps : gtk/libHSgtk_a.deps
+glade/libHSglade_a.deps : $(libHSglade_a_HSFILES) | gtk/libHSgtk_a.deps
hunk ./Makefile.am 1052
+$(libHSglade_a_CHSFILES_HS): $(libHSglade_a_PRECOMP)
hunk ./Makefile.am 1119
-gconf/libHSgconf_a.deps : glib/libHSglib_a.deps
+gconf/libHSgconf_a.deps : $(libHSgconf_a_HSFILES) | glib/libHSglib_a.deps
hunk ./Makefile.am 1199
+$(libHSgconf_a_CHSFILES_HS): $(libHSgconf_a_PRECOMP)
hunk ./Makefile.am 1260
-sourceview/libHSsourceview_a.deps : gtk/libHSgtk_a.deps
+sourceview/libHSsourceview_a.deps : $(libHSsourceview_a_HSFILES) | gtk/libHSgtk_a.deps
hunk ./Makefile.am 1329
+$(libHSsourceview_a_CHSFILES_HS): $(libHSsourceview_a_PRECOMP)
hunk ./Makefile.am 1391
-gtksourceview2/libHSgtksourceview2_a.deps : gtk/libHSgtk_a.deps
+gtksourceview2/libHSgtksourceview2_a.deps : $(libHSgtksourceview2_a_HSFILES) | gtk/libHSgtk_a.deps
hunk ./Makefile.am 1476
+$(libHSgtksourceview2_a_CHSFILES_HS): $(libHSgtksourceview2_a_PRECOMP)
hunk ./Makefile.am 1538
-mozembed/libHSmozembed_a.deps : gtk/libHSgtk_a.deps
+mozembed/libHSmozembed_a.deps : $(libHSmozembed_a_HSFILES) | gtk/libHSgtk_a.deps
hunk ./Makefile.am 1595
+$(libHSmozembed_a_CHSFILES_HS): $(libHSmozembed_a_PRECOMP)
hunk ./Makefile.am 1660
-cairo/libHScairo_a.deps: glib/libHSglib_a.deps
+cairo/libHScairo_a.deps: $(libHScairo_a_HSFILES) | glib/libHSglib_a.deps
hunk ./Makefile.am 1738
+$(libHScairo_a_CHSFILES_HS): $(libHScairo_a_PRECOMP)
+
hunk ./Makefile.am 1797
-svgcairo/libHSsvgcairo_a.deps: cairo/libHSsvgcairo_a.deps
+svgcairo/libHSsvgcairo_a.deps: $(libHSsvgcairo_a_HSFILES) | cairo/libHScairo_a.deps
hunk ./Makefile.am 1840
+$(libHSsvgcairo_a_CHSFILES_HS): $(libHSsvgcairo_a_PRECOMP)
+
hunk ./Makefile.am 1843
--include $(libHSsvgcairo_a_CHSFILES:.chs=.dep) cairo/libHSsvgcairo_a.deps
+-include $(libHSsvgcairo_a_CHSFILES:.chs=.dep) svgcairo/libHSsvgcairo_a.deps
hunk ./Makefile.am 1899
-gtkglext/libHSgtkglext_a.deps : gtk/libHSgtk_a.deps
+gtkglext/libHSgtkglext_a.deps : $(libHSgtkglext_a_HSFILES) | gtk/libHSgtk_a.deps
hunk ./Makefile.am 1964
+$(libHSgtkglext_a_CHSFILES_HS): $(libHSgtkglext_a_PRECOMP)
hunk ./Makefile.am 2028
-soegtk/libHSsoegtk_a.deps : gtk/libHSgtk_a.deps
+soegtk/libHSsoegtk_a.deps : $(libHSsoegtk_a_HSFILES) | gtk/libHSgtk_a.deps
hunk ./Makefile.am 2130
-gnomevfs/libHSgnomevfs_a.deps : glib/libHSglib_a.deps
+gnomevfs/libHSgnomevfs_a.deps : $(libHSgnomevfs_a_HSFILES) glib/libHSglib_a.deps
hunk ./Makefile.am 2231
+$(libHSgnomevfs_a_CHSFILES_HS): $(libHSgnomevfs_a_PRECOMP)
hunk ./Makefile.am 2307
-gstreamer/libHSgstreamer_a.deps : glib/libHSglib_a.deps
+gstreamer/libHSgstreamer_a.deps : $(libHSgstreamer_a_HSFILES) | glib/libHSglib_a.deps
hunk ./Makefile.am 2532
+$(libHSgstreamer_a_CHSFILES_HS): $(libHSgstreamer_a_PRECOMP)
hunk ./mk/common.mk 120
- $(strip if test -f $@; then touch $@; else \
hunk ./mk/common.mk 122
- $(MAKE) $(AM_MAKEFLAGS) $($(PKG)_HSFILES); \
hunk ./mk/common.mk 125
- $(AM_CPPFLAGS) $($(PKG)_CPPFLAGS) $($(PKG)_HSFILES);) \
- fi;))
+ $(AM_CPPFLAGS) $($(PKG)_CPPFLAGS) $($(PKG)_HSFILES);))
hunk ./mk/common.mk 131
- $(strip if test -f $@; then touch $@; else \
hunk ./mk/common.mk 138
- $(AM_CPPFLAGS) $($(PKG)_CPPFLAGS) $($(PKG)_HSFILES);) \
- fi;))
+ $(AM_CPPFLAGS) $($(PKG)_CPPFLAGS) $($(PKG)_HSFILES);))
hunk ./mk/common.mk 168
-%.precomp :
+%.precomp : $(C2HS)
hunk ./mk/common.mk 201
-.chs.hs: [_$_]
- $(strip if test -x $(C2HS); then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(C2HS); fi;)
- $(strip if test -f $($(PKG)_PRECOMP); then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $($(PKG)_PRECOMP); fi;)
+.chs.hs: $(C2HS)
|
|
From: Peter g. <pg...@co...> - 2009-01-20 02:43:02
|
Mon Jan 19 18:45:10 EST 2009 Peter Gavin <pg...@gm...>
* gstreamer: define GST_CHECK_VERSION when gstreamer version is before 0.10.18
hunk ./gstreamer/hsgstreamer.h 47
+#if !(GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR > 10 || GST_VERSION_MICRO > 18)
+#define GST_CHECK_VERSION(major,minor,micro) \
+ (GST_VERSION_MAJOR > (major) || \
+ (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR > (minor)) || \
+ (GST_VERSION_MAJOR == (major) && GST_VERSION_MINOR == (minor) && \
+ GST_VERSION_MICRO >= (micro)))
+#endif
+
|
|
From: Peter g. <pg...@co...> - 2009-01-20 02:43:01
|
Mon Jan 19 18:05:16 EST 2009 Peter Gavin <pg...@gm...>
* define *_CHECK_VERSION macros only when pre-processing Haskell source files
These macros are only needed when preprocessing Haskell source files
(because we need to handle different versions of gtk etc., but can't
directly include the C headers in the Haskell sources). So, when
we're compiling with hsc2hs, we don't need to define them (since
#include and #ifdef is handled specially by hsc2hs) and we can still
use gtk2hs-config.h for both cases by introducing another macro
GTK2HS_HS_PREPROC when we're preprocessing Haskell source.
hunk ./acinclude.m4 284
+#ifdef GTK2HS_HS_PREPROC
hunk ./acinclude.m4 290
+#endif
hunk ./configure.ac 484
-GTKHS_PACKAGE_ADD_CHECK_VERSION(gstreamer-0.10, GSTREAMER, gstreamer)
+GTKHS_PACKAGE_ADD_CHECK_VERSION(gstreamer-0.10, GST, gstreamer)
hunk ./configure.ac 545
+#ifdef GTK2HS_HS_PREPROC
hunk ./configure.ac 551
+#endif
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp 41
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Base/Adapter.chs.pp 115
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Base/BaseSink.chs.pp 35
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Base/BaseSink.chs.pp 39
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Base/BaseSink.chs.pp 65
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Base/BaseSink.chs.pp 96
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Base/BaseSrc.chs.pp 38
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Base/BaseSrc.chs.pp 78
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Bin.chs.pp 229
-#if GSTREAMER_CHECK_VERSION (0, 10, 3)
+#if GST_CHECK_VERSION (0, 10, 3)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Bus.chs.pp 95
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Bus.chs.pp 189
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Caps.chs.pp 82
-#if GSTREAMER_CHECK_VERSION(0,10,10)
+#if GST_CHECK_VERSION(0,10,10)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Caps.chs.pp 299
-#if GSTREAMER_CHECK_VERSION(0,10,10)
+#if GST_CHECK_VERSION(0,10,10)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 115
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 124
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 131
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 257
-#if GSTREAMER_CHECK_VERSION(0, 10, 12)
+#if GST_CHECK_VERSION(0, 10, 12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 277
-#if GSTREAMER_CHECK_VERSION(0, 10, 12)
+#if GST_CHECK_VERSION(0, 10, 12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 296
-#if GSTREAMER_CHECK_VERSION(0, 10, 12)
+#if GST_CHECK_VERSION(0, 10, 12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 324
-#if GSTREAMER_CHECK_VERSION(0, 10, 12)
+#if GST_CHECK_VERSION(0, 10, 12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 327
-#if GSTREAMER_CHECK_VERSION(0, 10, 13)
+#if GST_CHECK_VERSION(0, 10, 13)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 351
-#if GSTREAMER_CHECK_VERSION(0, 10, 12)
+#if GST_CHECK_VERSION(0, 10, 12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 354
-#if GSTREAMER_CHECK_VERSION(0, 10, 13)
+#if GST_CHECK_VERSION(0, 10, 13)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 376
-#if GSTREAMER_CHECK_VERSION(0, 10, 12)
+#if GST_CHECK_VERSION(0, 10, 12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 379
-#if GSTREAMER_CHECK_VERSION(0, 10, 13)
+#if GST_CHECK_VERSION(0, 10, 13)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Element.chs.pp 118
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Element.chs.pp 128
-#if GSTREAMER_CHECK_VERSION(0,10,7)
+#if GST_CHECK_VERSION(0,10,7)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Element.chs.pp 583
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Element.chs.pp 696
-#if GSTREAMER_CHECK_VERSION(0,10,7)
+#if GST_CHECK_VERSION(0,10,7)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/ElementFactory.chs.pp 58
-#if GSTREAMER_CHECK_VERSION(0,10,14)
+#if GST_CHECK_VERSION(0,10,14)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/ElementFactory.chs.pp 158
-#if GSTREAMER_CHECK_VERSION(0,10,14)
+#if GST_CHECK_VERSION(0,10,14)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Event.chs.pp 60
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Event.chs.pp 70
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Event.chs.pp 114
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Event.chs.pp 214
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/GhostPad.chs.pp 37
-#if GSTREAMER_CHECK_VERSION(0,10,10)
+#if GST_CHECK_VERSION(0,10,10)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/GhostPad.chs.pp 70
-#if GSTREAMER_CHECK_VERSION(0,10,10)
+#if GST_CHECK_VERSION(0,10,10)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Init.chs.pp 35
-#if GSTREAMER_CHECK_VERSION(0,10,10)
+#if GST_CHECK_VERSION(0,10,10)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Init.chs.pp 41
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Init.chs.pp 94
-#if GSTREAMER_CHECK_VERSION(0,10,10)
+#if GST_CHECK_VERSION(0,10,10)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Init.chs.pp 114
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 53
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 61
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 67
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 74
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 82
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 230
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 303
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 348
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 391
-#if GSTREAMER_CHECK_VERSION(0,10,12)
+#if GST_CHECK_VERSION(0,10,12)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Message.chs.pp 457
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Pad.chs.pp 62
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Pad.chs.pp 246
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/TagList.chs.pp 38
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/Core/TagList.chs.pp 199
-#if GSTREAMER_CHECK_VERSION(0,10,11)
+#if GST_CHECK_VERSION(0,10,11)
hunk ./gstreamer/Media/Streaming/GStreamer/DataProtocol/DataProtocol.chs.pp 39
-#if GSTREAMER_CHECK_VERSION(0,10,7)
+#if GST_CHECK_VERSION(0,10,7)
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 86
-#if PANGO_CHECK_VERSION(1,4,0)
+#if PANGO_VERSION_CHECK(1,4,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 95
-#if PANGO_CHECK_VERSION(1,4,0)
+#if PANGO_VERSION_CHECK(1,4,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 105
-#if PANGO_CHECK_VERSION(1,4,0)
+#if PANGO_VERSION_CHECK(1,4,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 202
-#if PANGO_CHECK_VERSION(1,8,0)
+#if PANGO_VERSION_CHECK(1,8,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 220
-#if (defined (WIN32) && PANGO_CHECK_VERSION(1,10,0)) \
- || (!defined (WIN32) && PANGO_CHECK_VERSION(1,8,0))
+#if (defined (WIN32) && PANGO_VERSION_CHECK(1,10,0)) \
+ || (!defined (WIN32) && PANGO_VERSION_CHECK(1,8,0))
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 229
-#if (defined (WIN32) && PANGO_CHECK_VERSION(1,10,0)) \
- || (!defined (WIN32) && PANGO_CHECK_VERSION(1,8,0))
+#if (defined (WIN32) && PANGO_VERSION_CHECK(1,10,0)) \
+ || (!defined (WIN32) && PANGO_VERSION_CHECK(1,8,0))
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 238
-#if PANGO_CHECK_VERSION(1,8,0)
+#if PANGO_VERSION_CHECK(1,8,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 247
-#if PANGO_CHECK_VERSION(1,4,0)
+#if PANGO_VERSION_CHECK(1,4,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 252
-#if PANGO_CHECK_VERSION(1,6,0)
+#if PANGO_VERSION_CHECK(1,6,0)
hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 257
-#if PANGO_CHECK_VERSION(1,16,0)
+#if PANGO_VERSION_CHECK(1,16,0)
hunk ./mk/common.mk 183
+ -DGTK2HS_HS_PREPROC \
hunk ./mk/common.mk 190
+ -DGTK2HS_HS_PREPROC \
|
|
From: Peter g. <pg...@co...> - 2009-01-20 02:42:59
|
Tue Jan 13 23:41:39 EST 2009 Peter Gavin <pg...@gm...>
* gtksourceview2: make a few imports C2HS imports
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceBuffer.chs 74
-import Graphics.UI.Gtk.SourceView.SourceMark
+{#import Graphics.UI.Gtk.SourceView.SourceMark#}
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceLanguage.chs 53
-import Graphics.UI.Gtk.SourceView.SourceStyleScheme
+{#import Graphics.UI.Gtk.SourceView.SourceStyleScheme#}
|
|
From: Peter g. <pg...@co...> - 2009-01-20 02:42:54
|
Wed Jan 14 00:34:23 EST 2009 Peter Gavin <pg...@gm...>
* glade: remove glade/Glade.chs (not sure why this file is here...)
hunk ./glade/Glade.chs 1
--- GIMP Toolkit (GTK) Binding for Haskell: binding to Libglade -*-haskell-*-
--- for loading XML widget specifications
---
--- Author : Manuel M T Chakravarty
--- Created: 13 March 2002
---
--- Copyright (c) 2002 Manuel M T Chakravarty
--- Modified 2003 by Duncan Coutts (gtk2hs port)
---
--- This library is free software; you can redistribute it and/or
--- modify it under the terms of the GNU Library General Public
--- License as published by the Free Software Foundation; either
--- version 2 of the License, or (at your option) any later version.
---
--- This library 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
--- Library General Public License for more details.
---
--- |
---
--- Libglade facilitates loading of XML specifications of whole widget trees
--- that have been interactively designed with the GUI builder Glade. The
--- present module exports operations for manipulating 'GladeXML' objects.
---
--- @glade_xml_signal_autoconnect()@ is not supported. The C variant is not
--- suitable for Haskell as @-rdynamic@ leads to huge executable and we
--- usually don't want to connect staticly named functions, but closures.
---
--- * @glade_xml_construct()@ is not bound, as it doesn't seem to be useful
--- in Haskell. As usual, the @signal_connect_data@ variant for
--- registering signal handlers isn't bound either. Moreover, the
--- @connect_full@ functions are not bound.
---
--- * This binding does not support Libglade functionality that is
--- exclusively meant for extending Libglade with new widgets. Like new
--- widgets, such functionality is currently expected to be implemented in
--- C.
---
-
-module Glade (
-
- -- * Data types
- --
- GladeXMLClass, GladeXML,
-
- -- * Creation operations
- --
- xmlNew, xmlNewWithRootAndDomain,
-
- -- * Obtaining widget handles
- --
- xmlGetWidget, xmlGetWidgetRaw
-
-) where
-
-import Monad (liftM)
-import FFI
-import GType
-import Object (makeNewObject)
-import GObject (makeNewGObject)
-{#import Hierarchy#}
-{#import GladeType#}
-import GList
-
-{#context lib="glade" prefix ="glade"#}
-
-
--- | Create a new XML object (and the corresponding
--- widgets) from the given XML file; corresponds to
--- 'xmlNewWithRootAndDomain', but without the ability to specify a root
--- widget or translation domain.
---
-xmlNew :: FilePath -> IO (Maybe GladeXML)
-xmlNew file =
- withCString file $ \strPtr1 -> do
- xmlPtr <- {#call unsafe xml_new#} strPtr1 nullPtr nullPtr
- if xmlPtr==nullPtr then return Nothing
- else liftM Just $ makeNewGObject mkGladeXML (return xmlPtr)
-
--- | Create a new GladeXML object (and
--- the corresponding widgets) from the given XML file with an optional
--- root widget and translation domain.
---
--- * If the second argument is not @Nothing@, the interface will only be built
--- from the widget whose name is given. This feature is useful if you only
--- want to build say a toolbar or menu from the XML file, but not the window
--- it is embedded in. Note also that the XML parse tree is cached to speed
--- up creating another \'XML\' object for the same file.
---
-xmlNewWithRootAndDomain :: FilePath -> Maybe String -> Maybe String -> IO (Maybe GladeXML)
-xmlNewWithRootAndDomain file rootWidgetName domain =
- withCString file $ \strPtr1 ->
- withMaybeCString rootWidgetName $ \strPtr2 ->
- withMaybeCString domain $ \strPtr3 -> do
- xmlPtr <- {#call unsafe xml_new#} strPtr1 strPtr2 strPtr3
- if xmlPtr==nullPtr then return Nothing
- else liftM Just $ makeNewGObject mkGladeXML (return xmlPtr)
-
--- | Get the widget that has the given name in
--- the interface description. If the named widget cannot be found
--- or is of the wrong type the result is an error.
---
--- * the second parameter should be a dynamic cast function that
--- returns the type of object that you expect, eg castToButton
---
--- * the third parameter is the ID of the widget in the glade xml
--- file, eg \"button1\".
---
-xmlGetWidget :: (WidgetClass widget) => GladeXML -> (GObject -> widget) -> String -> IO widget
-xmlGetWidget xml cast name = do
- maybeWidget <- xmlGetWidgetRaw xml name
- return $ case maybeWidget of
- Just widget -> cast (toGObject widget) --the cast will return an error if the object is of the wrong type
- Nothing -> error $ "glade.xmlGetWidget: no object named " ++ show name ++ " in the glade file"
-
-xmlGetWidgetRaw :: GladeXML -> String -> IO (Maybe Widget)
-xmlGetWidgetRaw xml name =
- withCString name $ \strPtr1 -> do
- widgetPtr <- {#call unsafe xml_get_widget#} xml strPtr1
- if widgetPtr==nullPtr then return Nothing
- else liftM Just $ makeNewObject mkWidget (return widgetPtr)
-
--- Auxilliary routines
--- -------------------
-
--- Marshall an optional string
---
-withMaybeCString :: Maybe String -> (Ptr CChar -> IO a) -> IO a
-withMaybeCString = maybeWith withCString
rmfile ./glade/Glade.chs
|
|
From: Peter g. <pg...@co...> - 2009-01-13 02:12:53
|
Mon Jan 12 21:12:05 EST 2009 Peter Gavin <pg...@gm...>
* configure.ac: add gstreamer-audio-0.10 to pkg-config for gstreamer
hunk ./configure.ac 408
+ gstreamer-audio-0.10 >= 0.10 \
|
|
From: Peter g. <pg...@co...> - 2009-01-13 00:11:41
|
Mon Jan 12 19:10:01 EST 2009 Peter Gavin <pg...@gm...>
* gtksourceview2: G.U.G.SV.SourceLanguageManager: export sourceLanguageManagerGuessLanguage
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs.pp 36
+#if GTKSOURCEVIEW2_CHECK_VERSION(2,4,0)
+ sourceLanguageManagerGuessLanguage
+#endif
|
|
From: Peter g. <pg...@co...> - 2009-01-13 00:11:39
|
Mon Jan 12 03:09:42 EST 2009 Peter Gavin <pg...@gm...>
* gstreamer: make peekStructure create a copy of the structure
this is probably safer because it's not always safe to make the structure immutable
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Types.chs.pp 663
-peekStructure =
- mkNewStructure $ newForeignPtr_
+peekStructure ptr = do
+ copy <- gst_structure_copy ptr
+ takeStructure copy
+ where _ = {#call structure_copy#}
|
|
From: Peter g. <pg...@co...> - 2009-01-13 00:11:34
|
Mon Jan 12 00:49:50 EST 2009 Peter Gavin <pg...@gm...>
* mk/link-splitobjs.sh.in: add some error checking
hunk ./mk/link-splitobjs.sh.in 14
+exitcode=0
hunk ./mk/link-splitobjs.sh.in 17
- cat ${lib}.list | while read file ; do @AR@ q ${lib} ${file} ; done
+ cat ${lib}.list | while read file ; do
+ @AR@ q ${lib} ${file} < /dev/null || {
+ exitcode=$?
+ break
+ }
+ done
hunk ./mk/link-splitobjs.sh.in 24
- cat ${lib}.list | @XARGS@ @AR@ q ${lib}
+ cat ${lib}.list | @XARGS@ @AR@ q ${lib} || exitcode=$?
hunk ./mk/link-splitobjs.sh.in 28
+exit $exitcode
|
|
From: Peter g. <pg...@co...> - 2009-01-12 05:17:32
|
Mon Jan 12 00:16:46 EST 2009 Peter Gavin <pg...@gm...>
* gstreamer: giveStructure should not free the structure
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Types.chs.pp 673
- ret <- action structure
- liftIO $ {# call structure_free #} structure
- return ret
+ action structure
|
|
From: Peter g. <pg...@co...> - 2009-01-12 05:03:41
|
Sun Jan 11 23:57:57 EST 2009 Peter Gavin <pg...@gm...>
* gstreamer: giveStructure should not make the copy of the structure immutable
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Types.chs.pp 671
- do structure <- liftIO $
- {# call structure_copy #} structure >>=
- peekStructure
- action structure
+ do structure <- liftIO $ liftM Structure $
+ {# call structure_copy #} structure >>= newForeignPtr_
+ ret <- action structure
+ liftIO $ {# call structure_free #} structure
+ return ret
|
|
From: Peter g. <pg...@co...> - 2009-01-12 05:03:35
|
Sun Jan 11 23:27:04 EST 2009 Peter Gavin <pg...@gm...>
* gtksourceview2: handle NULLs returned from a few functions that return gchar**
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceLanguage.chs 44
+import Data.Maybe (fromMaybe)
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceLanguage.chs 95
- mimeTypes <- peekUTFStringArray0 mimeTypesArray
+ mimeTypes <- liftM (fromMaybe []) $ maybePeek peekUTFStringArray0 mimeTypesArray
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceLanguage.chs 104
- globs <- peekUTFStringArray0 globsArray
+ globs <- liftM (fromMaybe []) $ maybePeek peekUTFStringArray0 globsArray
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceLanguageManager.chs.pp 77
- peekUTFStringArray0 dirsPtr
+ liftM (fromMaybe []) $ maybePeek peekUTFStringArray0 dirsPtr
|
|
From: Peter g. <pg...@co...> - 2009-01-12 05:03:33
|
Sun Jan 11 23:40:35 EST 2009 Peter Gavin <pg...@gm...>
* gstreamer: fix marshaling on Structure where GValues weren't initialized properly
reported/fixed by Oleg Belozeorov <up...@gm...>
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 71
+import System.Glib.GTypeConstants
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 73
+{#import System.Glib.GType#}
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 238
-marshalStructureSetM :: (GValue -> a -> IO ())
+marshalStructureSetM :: GType
+ -> (GValue -> a -> IO ())
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 243
-marshalStructureSetM setGValue fieldname value =
+marshalStructureSetM valueType setGValue fieldname value =
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 247
- do setGValue gValue value
+ do valueInit gValue valueType
+ setGValue gValue value
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 255
- marshalStructureSetM valueSetBool
+ marshalStructureSetM bool valueSetBool
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 261
- marshalStructureSetM valueSetInt
+ marshalStructureSetM int valueSetInt
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 267
- marshalStructureSetM $ \gValue fourcc ->
+ marshalStructureSetM fourcc $ \gValue fourcc ->
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 274
- marshalStructureSetM valueSetDouble
+ marshalStructureSetM double valueSetDouble
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 280
- marshalStructureSetM valueSetString
+ marshalStructureSetM string valueSetString
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 286
- marshalStructureSetM $ \gValue date ->
+ marshalStructureSetM date $ \gValue date ->
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 293
- marshalStructureSetM $ \gValue clockTime ->
+ marshalStructureSetM uint64 $ \gValue clockTime ->
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 300
- marshalStructureSetM $ \gValue fraction ->
+ marshalStructureSetM fraction $ \gValue fraction ->
hunk ./gstreamer/Media/Streaming/GStreamer/Core/Structure.chs 355
+
+
+fourcc = {# call fun fourcc_get_type #}
+date = {# call fun date_get_type #} [_$_]
+fraction = {# call fun fraction_get_type #} [_$_]
|
|
From: Peter g. <pg...@co...> - 2009-01-12 05:03:32
|
Sun Jan 11 23:30:17 EST 2009 Peter Gavin <pg...@gm...>
* gtksourceview2: typo: can-redo -> can-undo (for sourceBufferCanUndo)
hunk ./gtksourceview2/Graphics/UI/Gtk/SourceView/SourceBuffer.chs 238
-sourceBufferCanUndo = readAttrFromBoolProperty "can-redo"
+sourceBufferCanUndo = readAttrFromBoolProperty "can-undo"
|
2 messages has been excluded from this view by a project administrator.
