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: Axel S. <A....@ke...> - 2007-11-08 13:58:59
|
Wed Nov 7 16:04:51 PST 2007 Peter Gavin <pg...@gm...>
* c2hs: added definitions for succ, pred, enumFrom{,To,ThenTo}; also add support for bitwise and, or, xor, and complement
hunk ./tools/c2hs/gen/GenBind.hs 120
+import Data.Bits ((.&.), (.|.), xor, complement)
+
hunk ./tools/c2hs/gen/GenBind.hs 579
- if enumAuto then "\n" else "\n" ++ enumInst hident enumVals
+ if enumAuto then "\n" else "\n" ++ enumInst hident enumVals (elem "Eq" userDerive)
hunk ./tools/c2hs/gen/GenBind.hs 627
-enumInst :: String -> [(String, Maybe CExpr)] -> String
-enumInst ident list =
+enumInst :: String -> [(String, Maybe CExpr)] -> Bool -> String
+enumInst ident list haveEq =
hunk ./tools/c2hs/gen/GenBind.hs 630
- ++ fromDef list 0 ++ "\n" ++ toDef list 0
+ ++ fromDef list 0 ++ "\n" ++ toDef list 0 ++ "\n"
+ ++ succDef names ++ "\n" ++ predDef names ++ "\n"
+ ++ enumFromToDef names
hunk ./tools/c2hs/gen/GenBind.hs 634
+ names = map fst list
hunk ./tools/c2hs/gen/GenBind.hs 662
+ succDef [] = " succ _ = undefined\n"
+ succDef [x] = " succ _ = undefined\n"
+ succDef (x:x':xs) =
+ " succ " ++ x ++ " = " ++ x' ++ "\n"
+ ++ succDef (x':xs)
+ predDef [] = " pred _ = undefined\n"
+ predDef [x] = " pred _ = undefined\n"
+ predDef (x:x':xs) =
+ " pred " ++ x' ++ " = " ++ x ++ "\n"
+ ++ predDef (x':xs)
+ enumFromToDef [] = ""
+ enumFromToDef names =
+ if haveEq
+ then " enumFromTo x y | x == y = [ y ]\n"
+ ++ " | otherwise = x : enumFromTo (succ x) y\n"
+ ++ " enumFrom x = enumFromTo x " ++ last names ++ "\n"
+ ++ " enumFromThenTo _ _ _ = undefined\n"
+ else ""
+
hunk ./tools/c2hs/gen/GenBind.hs 1892
+applyBin cpos CAndOp (IntResult x)
+ (IntResult y) = return $ IntResult (x .&. y)
+applyBin cpos COrOp (IntResult x)
+ (IntResult y) = return $ IntResult (x .|. y)
+applyBin cpos CXorOp (IntResult x)
+ (IntResult y) = return $ IntResult (x `xor` y)
hunk ./tools/c2hs/gen/GenBind.hs 1923
-applyUnary cpos CCompOp _ = [_$_]
- todo "GenBind.applyUnary: ~ not yet implemented."
+applyUnary cpos CCompOp (IntResult x) = return (IntResult (complement x))
|
|
From: Axel S. <A....@ke...> - 2007-11-08 13:58:59
|
Wed Nov 7 16:10:32 PST 2007 Peter Gavin <pg...@gm...>
* glib: replace toFlags with toFlags'
merger 0.0 (
hunk ./glib/System/Glib/Flags.hs 30
- toFlags,
- toFlags'
+ toFlags
hunk ./glib/System/Glib/Flags.hs 30
- toFlags,
- toFlags'
+ toFlags
)
merger 0.0 (
hunk ./glib/System/Glib/Flags.hs 44
--- * Note that this function falls over if bits are set for which no [_$_]
--- constructurs are set. This could only be circumvented by catching
--- the error raised in toEnum, enumerating all flags with [minBound..
--- maxBound] does NOT work.
---
-toFlags :: Flags a => Int -> [a]
-toFlags f = testBits f 1
- where testBits f n
- | f == 0 = []
- | f `testBit` 0 = toEnum n : testBits (f `shiftR` 1) (n `shiftL` 1)
- | otherwise = testBits (f `shiftR` 1) (n `shiftL` 1)
-
--- * Unlike 'toFlags', this function ignores bits set in the passed
+-- * This function ignores bits set in the passed
hunk ./glib/System/Glib/Flags.hs 44
--- * Note that this function falls over if bits are set for which no [_$_]
--- constructurs are set. This could only be circumvented by catching
--- the error raised in toEnum, enumerating all flags with [minBound..
--- maxBound] does NOT work.
---
-toFlags :: Flags a => Int -> [a]
-toFlags f = testBits f 1
- where testBits f n
- | f == 0 = []
- | f `testBit` 0 = toEnum n : testBits (f `shiftR` 1) (n `shiftL` 1)
- | otherwise = testBits (f `shiftR` 1) (n `shiftL` 1)
-
--- * Unlike 'toFlags', this function ignores bits set in the passed
+-- * Note that this function ignores bits set in the passed
)
merger 0.0 (
hunk ./glib/System/Glib/Flags.hs 58
-toFlags' :: Flags a => Int -> [a]
-toFlags' n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
+toFlags :: Flags a => Int -> [a]
+toFlags n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
hunk ./glib/System/Glib/Flags.hs 58
-toFlags' :: Flags a => Int -> [a]
-toFlags' n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
- then Just flag
- else Nothing
- | flag <- [ minBound .. maxBound ] ]
+toFlags :: Flags a => Int -> [a]
+toFlags n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
+ then Just flag
+ else Nothing
+ | flag <- [ minBound .. maxBound ] ]
)
|
|
From: Axel S. <A....@ke...> - 2007-11-08 13:58:58
|
Mon Nov 5 07:53:03 PST 2007 A....@ke...
* Replace toFlags with Peter Galvin's version.
hunk ./glib/System/Glib/Flags.hs 30
- toFlags,
- toFlags'
+ toFlags
hunk ./glib/System/Glib/Flags.hs 43
--- * Note that this function falls over if bits are set for which no [_$_]
--- constructurs are set. This could only be circumvented by catching
--- the error raised in toEnum, enumerating all flags with [minBound..
--- maxBound] does NOT work.
---
-toFlags :: Flags a => Int -> [a]
-toFlags f = testBits f 1
- where testBits f n
- | f == 0 = []
- | f `testBit` 0 = toEnum n : testBits (f `shiftR` 1) (n `shiftL` 1)
- | otherwise = testBits (f `shiftR` 1) (n `shiftL` 1)
-
--- * Unlike 'toFlags', this function ignores bits set in the passed
+-- * This function ignores bits set in the passed
hunk ./glib/System/Glib/Flags.hs 45
-toFlags' :: Flags a => Int -> [a]
-toFlags' n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
+toFlags :: Flags a => Int -> [a]
+toFlags n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
|
|
From: Axel S. <A....@ke...> - 2007-11-08 13:58:58
|
Thu Nov 8 00:56:31 PST 2007 A....@ke...
* Remove the variant of toFlags.
hunk ./glib/System/Glib/Flags.hs 30
- toFlags,
- toFlags'
+ toFlags
hunk ./glib/System/Glib/Flags.hs 43
--- * Note that this function falls over if bits are set for which no [_$_]
--- constructurs are set. This could only be circumvented by catching
--- the error raised in toEnum, enumerating all flags with [minBound..
--- maxBound] does NOT work.
---
-toFlags :: Flags a => Int -> [a]
-toFlags f = testBits f 1
- where testBits f n
- | f == 0 = []
- | f `testBit` 0 = toEnum n : testBits (f `shiftR` 1) (n `shiftL` 1)
- | otherwise = testBits (f `shiftR` 1) (n `shiftL` 1)
-
--- * Unlike 'toFlags', this function ignores bits set in the passed
+-- * Note that this function ignores bits set in the passed
hunk ./glib/System/Glib/Flags.hs 45
-toFlags' :: Flags a => Int -> [a]
-toFlags' n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
- then Just flag
- else Nothing
- | flag <- [ minBound .. maxBound ] ]
+toFlags :: Flags a => Int -> [a]
+toFlags n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
+ then Just flag
+ else Nothing
+ | flag <- [ minBound .. maxBound ] ]
|
|
From: Axel S. <A....@ke...> - 2007-11-08 13:58:57
|
Mon Nov 5 07:06:31 PST 2007 Peter Gavin <pg...@gm...>
* glib: add toFlags': like toFlags but works doesn't fail when we haven't defined toEnum for a bit
This is needed for a few reasons, the most important of which is for forward compatibility.
If a newer version of the upstream package defines a new flag for a flag type, we shouldn't
fail just because we don't recognize it. This version allows overlapping flags, for example, given:
data OpenFlags = Read | Write | ReadWrite
instance Flags OpenFlags
instance Enum OpenFlags where ...
If ReadWrite is equivalent to [ Read, Write ] in C land, then it will be in Haskell land as well.
hunk ./glib/System/Glib/Flags.hs 30
- toFlags
+ toFlags,
+ toFlags'
hunk ./glib/System/Glib/Flags.hs 34
-import Data.Bits ((.|.), testBit, shiftL, shiftR)
+import Data.Bits ((.|.), (.&.), testBit, shiftL, shiftR)
+import Data.Maybe (catMaybes)
hunk ./glib/System/Glib/Flags.hs 56
+-- * Unlike 'toFlags', this function ignores bits set in the passed
+-- 'Int' that do not correspond to a flag.
+toFlags' :: Flags a => Int -> [a]
+toFlags' n = catMaybes [ if n .&. fromEnum flag == fromEnum flag
+ then Just flag
+ else Nothing
+ | flag <- [ minBound .. maxBound ] ]
+
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:20:06
|
Wed Nov 7 18:22:06 PST 2007 Duncan Coutts <du...@ha...> tagged 0.9.12.1 |
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:20:05
|
Wed Nov 7 06:18:22 PST 2007 Duncan Coutts <du...@ha...>
* Oops, missed out cairo's package file in the explitic dep stuff
hunk ./cairo/cairo.package.conf.in 18
-depends: base mtl glib-@PACKAGE_VERSION@
+depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @CAIRO_SPLITBASE_DEPENDS@
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:20:04
|
Wed Nov 7 05:32:49 PST 2007 Duncan Coutts <du...@ha...>
* Use precise package versions when building and in package registration
Previously we were being sloppy and allowing any version in the registration
so there was no guarantee that the version we built against was the same as
the version that would get used when the package was installed. Similarly
we could build against packages that were registered per-user which would
then fail if we did a global install. Now it only looks for global packages
unless you ./configure --with-user-pkgconf
hunk ./Makefile.am 129
-tools_c2hs_c2hsLocal_EXTERNALDEPS += pretty containers array
+tools_c2hs_c2hsLocal_EXTERNALDEPS += pretty containers array
hunk ./Makefile.am 365
-libHSgtk_a_EXTERNALDEPS += containers array
+libHSgtk_a_EXTERNALDEPS += containers-$(PKG_CONTAINERS_VERSION) array-$(PKG_ARRAY_VERSION)
hunk ./Makefile.am 368
-libHSgtk_a_EXTERNALDEPS += mtl
+libHSgtk_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1245
-libHScairo_a_EXTERNALDEPS += mtl
+libHScairo_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
+endif
+if HAVE_SPLIT_BASE
+libHScairo_a_EXTERNALDEPS += bytestring-$(PKG_BYTESTRING_VERSION)
hunk ./Makefile.am 1382
-libHSsvgcairo_a_EXTERNALDEPS += mtl
+libHSsvgcairo_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1601
-libHSsoegtk_a_EXTERNALDEPS += old-time
+libHSsoegtk_a_EXTERNALDEPS += old-time-$(PKG_OLDTIME_VERSION)
hunk ./Makefile.am 1616
-libHSsoegtk_a_EXTERNALDEPS += mtl
+libHSsoegtk_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./acinclude.m4 95
-if ${GHCPKG} --simple-output list $1 > /dev/null 2> /dev/null
+if test "$USERPKGCONF" = "yes"; then
+ C=$(${GHCPKG} list $1 | sed -e '/package.conf:/d')
+else
+ C=$(${GHCPKG} list $1 | sed -e '1d;/package.conf:/,$d')
+fi
+if echo "${C}" | ${GREP} $1 > /dev/null 2> /dev/null
hunk ./acinclude.m4 102
- AC_MSG_RESULT(yes)
+ if test "$USE_NEW_PKG_FORMAT" = "yes"; then
+ $2=$(echo "${C}" | sed -e 's/,/\n/g' -e 's/[[(), ]]//g' | grep -v '^$' | sed -e 's/[[A-Za-z-]]*//' | sort -r -n | head -n1)
+ AC_MSG_RESULT([yes, version $$2])
+ else
+ AC_MSG_RESULT(yes)
+ fi
hunk ./acinclude.m4 110
-Missing GHC package "$1". Install "$1" and re-run ./configure])
+Missing GHC package "$1". Install "$1" and re-run ./configure
+If $1 is actually installed but per-user rather than globally and
+you want to do a per-user install of gtk2hs then use:
+./configure --with-user-pkgconf --prefix=$HOME/some/path])
hunk ./configure.ac 152
-dnl check for a recent ghc-6.7 or later as a proxy for the base package split
-GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.7.20070912, [
+dnl check for ghc-6.8 or later as a proxy for the base package split
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.8, [
hunk ./configure.ac 234
-GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -gt, 6.4.0, [GHC_PKG_CHECK(mtl)])
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.4, [GHC_PKG_CHECK(mtl,PKG_MTL_VERSION)])
+AC_SUBST(PKG_MTL_VERSION)
+
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.8, [
+ GHC_PKG_CHECK(bytestring,PKG_BYTESTRING_VERSION)
+ CAIRO_SPLITBASE_DEPENDS="bytestring-${PKG_BYTESTRING_VERSION}"
+ GHC_PKG_CHECK(containers, [PKG_CONTAINERS_VERSION])
+ GHC_PKG_CHECK(array, [PKG_ARRAY_VERSION])
+ GHC_PKG_CHECK(old-time, [PKG_OLDTIME_VERSION])
+ GTK_SPLITBASE_DEPENDS="containers-${PKG_CONTAINERS_VERSION} array-${PKG_ARRAY_VERSION}"
+ SOEGTK_SPLITBASE_DEPENDS="old-time-${PKG_OLDTIME_VERSION}"
+])
+AC_SUBST(PKG_BYTESTRING_VERSION)
+AC_SUBST(PKG_CONTAINERS_VERSION)
+AC_SUBST(PKG_ARRAY_VERSION)
+AC_SUBST(PKG_OLDTIME_VERSION)
+AC_SUBST(CAIRO_SPLITBASE_DEPENDS)
+AC_SUBST(GTK_SPLITBASE_DEPENDS)
+AC_SUBST(SOEGTK_SPLITBASE_DEPENDS)
hunk ./gtk/gtk.package.conf.in 16
-depends: base mtl glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @GTK_SPLITBASE_DEPENDS@
hunk ./soegtk/soegtk.package.conf.in 13
-depends: base gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: base mtl-@PKG_MTL_VERSION@ gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @SOEGTK_SPLITBASE_DEPENDS@
hunk ./svgcairo/svgcairo.package.conf.in 18
-depends: base mtl glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
+depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:20:04
|
Wed Nov 7 09:13:49 PST 2007 Duncan Coutts <du...@ha...>
* Fix ball soe demo to work with newer soe api
hunk ./demo/soe/BouncingBall.hs 9
- do w <- openWindowEx "Bouncing Ball" Nothing (Just (300, 300)) drawBufferedGraphic (Just 30)
+ do w <- openWindowEx "Bouncing Ball" Nothing (Just (300, 300)) drawBufferedGraphic
hunk ./demo/soe/BouncingBall.hs 26
- e <- maybeGetWindowEvent w
- case e of Just Closed -> return ()
- _ -> do getWindowTick w
- loop x''' y''' xd' yd'
+ e <- getWindowEvent w
+ case e of Closed -> return ()
+ _ -> loop x''' y''' xd' yd'
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:20:04
|
Wed Nov 7 09:07:56 PST 2007 Duncan Coutts <du...@ha...>
* Add statusicon demo to tarball
hunk ./Makefile.am 1858
- demo/soe/Snowflake.hs demo/soe/Makefile
+ demo/soe/Snowflake.hs demo/soe/Makefile \
+ demo/statusicon/StatusIcon.hs demo/statusicon/Makefile
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:20:04
|
Sun Nov 4 16:44:42 PST 2007 Duncan Coutts <du...@ha...>
* compile clipboard functions conditionaly when gtk >= 2.2
as the Clipboard type was only introduced in gtk-2.2
move ./gtk/Graphics/UI/Gtk/General/Clipboard.chs ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp
hunk ./Makefile.am 432
- gtk/Graphics/UI/Gtk/General/Clipboard.chs \
+ gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp \
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 33
+#if GTK_CHECK_VERSION(2,2,0)
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 39
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 51
+#if GTK_CHECK_VERSION(2,2,0)
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 85
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 139
-
+#if GTK_CHECK_VERSION(2,2,0)
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 143
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 963
+#if GTK_CHECK_VERSION(2,2,0)
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 1000
+#endif
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:19:54
|
Mon Oct 29 06:21:50 PDT 2007 Duncan Coutts <du...@ha...>
* Fix mistake over #ifdev vs #if
hunk ./gtk/Graphics/UI/Gtk.hs.pp 252
-#ifdef GTK_CHECK_VERSION(2,10,0)
+#if GTK_CHECK_VERSION(2,10,0)
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:19:54
|
Mon Oct 29 04:35:38 PDT 2007 Duncan Coutts <du...@ha...>
* Make the StatusIcon stuff compile with gtk < 2.10
move ./gtk/Graphics/UI/Gtk.hs ./gtk/Graphics/UI/Gtk.hs.pp
hunk ./Makefile.am 398
- gtk/Graphics/UI/Gtk.hs \
+ gtk/Graphics/UI/Gtk.hs.pp \
hunk ./gtk/Graphics/UI/Gtk.hs.pp 252
+#ifdef GTK_CHECK_VERSION(2,10,0)
hunk ./gtk/Graphics/UI/Gtk.hs.pp 254
+#else
+import Graphics.UI.Gtk.Display.StatusIcon
+#endif
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:18:47
|
Wed Nov 7 09:13:49 PST 2007 Duncan Coutts <du...@ha...>
* Fix ball soe demo to work with newer soe api
hunk ./demo/soe/BouncingBall.hs 9
- do w <- openWindowEx "Bouncing Ball" Nothing (Just (300, 300)) drawBufferedGraphic (Just 30)
+ do w <- openWindowEx "Bouncing Ball" Nothing (Just (300, 300)) drawBufferedGraphic
hunk ./demo/soe/BouncingBall.hs 26
- e <- maybeGetWindowEvent w
- case e of Just Closed -> return ()
- _ -> do getWindowTick w
- loop x''' y''' xd' yd'
+ e <- getWindowEvent w
+ case e of Closed -> return ()
+ _ -> loop x''' y''' xd' yd'
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:18:46
|
Wed Nov 7 05:34:55 PST 2007 Duncan Coutts <du...@ha...>
* Use precise package versions when building and in package registration
Previously we were being sloppy and allowing any version in the registration
so there was no guarantee that the version we built against was the same as
the version that would get used when the package was installed. Similarly
we could build against packages that were registered per-user which would
then fail if we did a global install. Now it only looks for global packages
unless you ./configure --with-user-pkgconf
This version of the patch for gtk2hs HEAD also covers gstreamer and gnomevfs
hunk ./Makefile.am 153
-tools_c2hs_c2hsLocal_EXTERNALDEPS += pretty containers array
+tools_c2hs_c2hsLocal_EXTERNALDEPS += pretty containers array
hunk ./Makefile.am 390
-libHSgtk_a_EXTERNALDEPS += containers array
+libHSgtk_a_EXTERNALDEPS += containers-$(PKG_CONTAINERS_VERSION) array-$(PKG_ARRAY_VERSION)
hunk ./Makefile.am 393
-libHSgtk_a_EXTERNALDEPS += mtl
+libHSgtk_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1268
-libHScairo_a_EXTERNALDEPS += mtl
+libHScairo_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1271
-libHScairo_a_EXTERNALDEPS += bytestring
+libHScairo_a_EXTERNALDEPS += bytestring-$(PKG_BYTESTRING_VERSION)
hunk ./Makefile.am 1405
-libHSsvgcairo_a_EXTERNALDEPS += mtl
+libHSsvgcairo_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1624
-libHSsoegtk_a_EXTERNALDEPS += old-time
+libHSsoegtk_a_EXTERNALDEPS += old-time-$(PKG_OLDTIME_VERSION)
hunk ./Makefile.am 1639
-libHSsoegtk_a_EXTERNALDEPS += mtl
+libHSsoegtk_a_EXTERNALDEPS += mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1708
-libHSgnomevfs_a_EXTERNALDEPS = base haskell98 mtl
+libHSgnomevfs_a_EXTERNALDEPS = base haskell98 mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1710
-libHSgnomevfs_a_EXTERNALDEPS += bytestring
+libHSgnomevfs_a_EXTERNALDEPS += bytestring-$(PKG_BYTESTRING_VERSION)
hunk ./Makefile.am 1873
-libHSgstreamer_a_EXTERNALDEPS = base haskell98 mtl
+libHSgstreamer_a_EXTERNALDEPS = base haskell98 mtl-$(PKG_MTL_VERSION)
hunk ./Makefile.am 1875
-libHSgstreamer_a_EXTERNALDEPS += bytestring
+libHSgstreamer_a_EXTERNALDEPS += bytestring-$(PKG_BYTESTRING_VERSION)
hunk ./acinclude.m4 95
-if ${GHCPKG} --simple-output list $1 > /dev/null 2> /dev/null
+if test "$USERPKGCONF" = "yes"; then
+ C=$(${GHCPKG} list $1 | sed -e '/package.conf:/d')
+else
+ C=$(${GHCPKG} list $1 | sed -e '1d;/package.conf:/,$d')
+fi
+if echo "${C}" | ${GREP} $1 > /dev/null 2> /dev/null
hunk ./acinclude.m4 102
- AC_MSG_RESULT(yes)
+ if test "$USE_NEW_PKG_FORMAT" = "yes"; then
+ $2=$(echo "${C}" | sed -e 's/,/\n/g' -e 's/[[(), ]]//g' | grep -v '^$' | sed -e 's/[[A-Za-z-]]*//' | sort -r -n | head -n1)
+ AC_MSG_RESULT([yes, version $$2])
+ else
+ AC_MSG_RESULT(yes)
+ fi
hunk ./acinclude.m4 110
-Missing GHC package "$1". Install "$1" and re-run ./configure])
+Missing GHC package "$1". Install "$1" and re-run ./configure
+If $1 is actually installed but per-user rather than globally and
+you want to do a per-user install of gtk2hs then use:
+./configure --with-user-pkgconf --prefix=$HOME/some/path])
hunk ./cairo/cairo.package.conf.in 18
-depends: base mtl glib-@PACKAGE_VERSION@
+depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @CAIRO_SPLITBASE_DEPENDS@
hunk ./configure.ac 152
-dnl check for a recent ghc-6.7 or later as a proxy for the base package split
-GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.7.20070912, [
+dnl check for ghc-6.8 or later as a proxy for the base package split
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.8, [
hunk ./configure.ac 234
-GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -gt, 6.4.0, [GHC_PKG_CHECK(mtl)])
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.4, [GHC_PKG_CHECK(mtl,PKG_MTL_VERSION)])
+AC_SUBST(PKG_MTL_VERSION)
+
+GTKHS_PROG_CHECK_VERSION($GHC_VERSION, -ge, 6.8, [
+ GHC_PKG_CHECK(bytestring,PKG_BYTESTRING_VERSION)
+ CAIRO_SPLITBASE_DEPENDS="bytestring-${PKG_BYTESTRING_VERSION}"
+ GHC_PKG_CHECK(containers, [PKG_CONTAINERS_VERSION])
+ GHC_PKG_CHECK(array, [PKG_ARRAY_VERSION])
+ GHC_PKG_CHECK(old-time, [PKG_OLDTIME_VERSION])
+ GTK_SPLITBASE_DEPENDS="containers-${PKG_CONTAINERS_VERSION} array-${PKG_ARRAY_VERSION}"
+ SOEGTK_SPLITBASE_DEPENDS="old-time-${PKG_OLDTIME_VERSION}"
+ GNOMEVFS_SPLITBASE_DEPENDS="bytestring-${PKG_BYTESTRING_VERSION}"
+ GSTREAMER_SPLITBASE_DEPENDS="bytestring-${PKG_BYTESTRING_VERSION}"
+])
+AC_SUBST(PKG_BYTESTRING_VERSION)
+AC_SUBST(PKG_CONTAINERS_VERSION)
+AC_SUBST(PKG_ARRAY_VERSION)
+AC_SUBST(PKG_OLDTIME_VERSION)
+AC_SUBST(CAIRO_SPLITBASE_DEPENDS)
+AC_SUBST(GTK_SPLITBASE_DEPENDS)
+AC_SUBST(SOEGTK_SPLITBASE_DEPENDS)
+AC_SUBST(GNOMEVFS_SPLITBASE_DEPENDS)
+AC_SUBST(GSTREAMER_SPLITBASE_DEPENDS)
hunk ./gnomevfs/gnomevfs.package.conf.in 16
-depends: glib-@PACKAGE_VERSION@
+depends: glib-@PACKAGE_VERSION@ @GNOMEVFS_SPLITBASE_DEPENDS@
hunk ./gstreamer/gstreamer.package.conf.in 16
-depends: glib-@PACKAGE_VERSION@, mtl
+depends: glib-@PACKAGE_VERSION@ mtl-@PKG_MTL_VERSION@ @GSTREAMER_SPLITBASE_DEPENDS@
hunk ./gtk/gtk.package.conf.in 16
-depends: base mtl glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @GTK_SPLITBASE_DEPENDS@
hunk ./soegtk/soegtk.package.conf.in 13
-depends: base gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@
+depends: base mtl-@PKG_MTL_VERSION@ gtk-@PACKAGE_VERSION@ @GTK_CAIRO_DEPEND@ @SOEGTK_SPLITBASE_DEPENDS@
hunk ./svgcairo/svgcairo.package.conf.in 18
-depends: base mtl glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
+depends: base mtl-@PKG_MTL_VERSION@ glib-@PACKAGE_VERSION@ cairo-@PACKAGE_VERSION@
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:18:45
|
Wed Nov 7 09:07:56 PST 2007 Duncan Coutts <du...@ha...>
* Add statusicon demo to tarball
hunk ./Makefile.am 2346
- demo/soe/Snowflake.hs demo/soe/Makefile
+ demo/soe/Snowflake.hs demo/soe/Makefile \
+ demo/statusicon/StatusIcon.hs demo/statusicon/Makefile
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:18:43
|
Wed Nov 7 03:57:59 PST 2007 Duncan Coutts <du...@ha...>
* Follow renaming of Image.chs -> Image.chs.pp in Makefile
hunk ./Makefile.am 1300
- cairo/Graphics/Rendering/Cairo/Internal/Surfaces/Image.chs \
+ cairo/Graphics/Rendering/Cairo/Internal/Surfaces/Image.chs.pp \
|
|
From: Duncan C. <dun...@wo...> - 2007-11-08 02:18:42
|
Sun Nov 4 16:44:42 PST 2007 Duncan Coutts <du...@ha...>
* compile clipboard functions conditionaly when gtk >= 2.2
as the Clipboard type was only introduced in gtk-2.2
move ./gtk/Graphics/UI/Gtk/General/Clipboard.chs ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp
hunk ./Makefile.am 457
- gtk/Graphics/UI/Gtk/General/Clipboard.chs \
+ gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp \
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 33
+#if GTK_CHECK_VERSION(2,2,0)
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 39
+#endif
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 51
+#if GTK_CHECK_VERSION(2,2,0)
hunk ./gtk/Graphics/UI/Gtk/General/Clipboard.chs.pp 85
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 139
-
+#if GTK_CHECK_VERSION(2,2,0)
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 143
+#endif
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 963
+#if GTK_CHECK_VERSION(2,2,0)
hunk ./gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs.pp 1000
+#endif
|
|
From: Duncan C. <dun...@wo...> - 2007-11-04 02:00:23
|
Sat Nov 3 14:20:34 PDT 2007 Bertram Felgenhauer <in...@gm...>
* fix build with ghc 6.8.1
hunk ./Makefile.am 1269
+endif
+if HAVE_SPLIT_BASE
+libHScairo_a_EXTERNALDEPS += bytestring
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1570
+#if __GLASGOW_HASKELL__ < 608
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1572
+#else
+ BS.packCStringLen (castPtr ptr, height * stride)
+#endif
|
|
From: Duncan C. <dun...@wo...> - 2007-11-02 23:44:40
|
Fri Nov 2 16:45:14 PDT 2007 Duncan Coutts <du...@ha...>
* Make Adam's cairo patch build with cairo-1.0
move ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/Image.chs ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/Image.chs.pp
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 172
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 175
+#endif
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1554
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1571
+#endif
hunk ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/Image.chs.pp 26
+#if CAIRO_CHECK_VERSION(1,2,0)
hunk ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/Image.chs.pp 29
-
+#endif
|
|
From: Duncan C. <dun...@wo...> - 2007-11-02 23:44:39
|
Wed Oct 31 06:50:16 PDT 2007 Bertram Felgenhauer <in...@gm...>
* SVG: provide implementation for GObjectClass
hunk ./svgcairo/Graphics/Rendering/Cairo/SVG.chs 85
-import System.Glib.GObject (GObjectClass, constructNewGObject)
+import System.Glib.GObject (GObjectClass(..), constructNewGObject, unGObject, mkGObject)
hunk ./svgcairo/Graphics/Rendering/Cairo/SVG.chs 98
-instance GObjectClass SVG
+mkSVG = SVG
+unSVG (SVG o) = o
+
+instance GObjectClass SVG where
+ toGObject = mkGObject . castForeignPtr . unSVG
+ unsafeCastGObject = mkSVG . castForeignPtr . unGObject
|
|
From: Duncan C. <dun...@wo...> - 2007-11-02 23:44:38
|
Tue Oct 30 11:38:25 PDT 2007 ag...@im...
* Add support for getting the stride and image data of an image surface
This wraps the cairo functions:
cairo_image_surface_get_stride
cairo_image_surface_get_data
Note that these functions were introduced in cairo 1.2, and so this sets a new
high bar for gtk2hs cairo.
hunk ./cairo/Graphics/Rendering/Cairo/Internal/Surfaces/Image.chs 26
+{#fun image_surface_get_stride as imageSurfaceGetStride { withSurface* `Surface' } -> `Int'#}
+{#fun image_surface_get_data as imageSurfaceGetData { withSurface* `Surface' } -> `(Ptr CUChar)' id#}
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 172
+ , imageSurfaceGetStride
+ , imageSurfaceGetData
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 242
+import Foreign.Ptr (castPtr)
+import qualified Data.ByteString as BS
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1526
--- [_$_]
+--
hunk ./cairo/Graphics/Rendering/Cairo.hs.pp 1552
+-- | Get the number of bytes from the start of one row to the start of the
+-- next. If the image data contains no padding, then this is equal to
+-- the pixel depth * the width.
+imageSurfaceGetStride :: Surface -> Render Int
+imageSurfaceGetStride = liftIO . Internal.imageSurfaceGetStride
+
+-- | Return a ByteString of the image data for a surface. In order to remain
+-- safe the returned ByteString is a copy of the data. This is a little
+-- slower than returning a pointer into the image surface object itself, but
+-- much safer
+imageSurfaceGetData :: Surface -> IO BS.ByteString
+imageSurfaceGetData a = do
+ height <- Internal.imageSurfaceGetHeight a
+ stride <- Internal.imageSurfaceGetStride a
+ ptr <- Internal.imageSurfaceGetData a
+ BS.copyCStringLen (castPtr ptr, height * stride)
+
|
|
From: Duncan C. <dun...@wo...> - 2007-11-02 23:44:37
|
Wed Oct 31 06:47:17 PDT 2007 Bertram Felgenhauer <in...@gm...>
* GLDrawingArea: provide implementation for GObjectClass
Without this patch, trying to use a GLDrawingArea results in
program: gtkglext/Graphics/UI/Gtk/OpenGL/DrawingArea.chs:73:0: No instance nor default method for class operation System.Glib.Types.toGObject
hunk ./gtkglext/Graphics/UI/Gtk/OpenGL/DrawingArea.chs 74
-instance GObjectClass GLDrawingArea
+instance GObjectClass GLDrawingArea where
+ toGObject (GLDrawingArea gd) = toGObject gd
+ unsafeCastGObject = GLDrawingArea . unsafeCastGObject
|
|
From: Duncan C. <dun...@wo...> - 2007-10-30 10:42:03
|
Tue Oct 30 02:48:42 PDT 2007 Duncan Coutts <du...@ha...>
* Bump version number in branch to 0.9.12.1 in preparation for a point release
hunk ./configure.ac 25
-AC_INIT([gtk2hs],[0.9.12])
+AC_INIT([gtk2hs],[0.9.12.1])
|
|
From: Duncan C. <dun...@wo...> - 2007-10-30 10:42:02
|
Sun Oct 21 12:26:10 PDT 2007 Peter Gavin <pg...@gm...>
* Makefile.am: in uninstall, unregister from user pkg conf when USERPKGCONF is set
hunk ./Makefile.am 1940
- $(GHCPKG) $(addprefix --package-conf=,$(PKGCONF)) \
+ $(GHCPKG) $(addprefix --package-conf=,$(PKGCONF)) $(if $(USERPKGCONF),--user) \
|
2 messages has been excluded from this view by a project administrator.
