Axel, we need build some link to avoid copy Gtk2HsSetup.hs. I'm a little tired of all the packages updated each time.
-- Andy Hamish Mackenzie <hamish.k.macken...@googlemail.com> writes: > 1 patch for repository http://code.haskell.org/gtk2hs: > > Mon Jun 7 02:29:31 NZST 2010 Hamish Mackenzie > <hamish.k.macken...@googlemail.com> > * Fix conflict with gtk-- dlls on Windows > > > New patches: > > [Fix conflict with gtk-- dlls on Windows > Hamish Mackenzie <hamish.k.macken...@googlemail.com>**20100606142931 > Ignore-this: 8a7548ba2f140cf76a6b70e8864b5ddf > ] { > hunk ./cairo/Gtk2HsSetup.hs 91 > import Distribution.Verbosity > import Control.Monad (when, unless, filterM) > import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList ) > -import Data.List (isPrefixOf, isSuffixOf, nub) > +import Data.List (stripPrefix, isPrefixOf, isSuffixOf, nub) > import Data.Char (isAlpha) > import qualified Data.Map as M > import qualified Data.Set as S > hunk ./cairo/Gtk2HsSetup.hs 133 > getDlls dirs = filter ((== ".dll") . takeExtension) . concat <$> > mapM getDirectoryContents dirs > > +isSuitableDLL :: String -> String -> Bool > +isSuitableDLL name file = > + case stripPrefix ("lib"++name) file of > + Just (x:_) | not (isAlpha x) -> True > + _ -> False > + > fixLibs :: [FilePath] -> [String] -> [String] > fixLibs dlls = concatMap $ \ lib -> > hunk ./cairo/Gtk2HsSetup.hs 141 > - case filter (("lib" ++ lib) `isPrefixOf`) dlls of > + case filter (isSuitableDLL lib) dlls of > dll:_ -> [dropExtension dll] > _ -> if lib == "z" then [] else [lib] > > hunk ./gio/Gtk2HsSetup.hs 91 > import Distribution.Verbosity > import Control.Monad (when, unless, filterM) > import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList ) > -import Data.List (isPrefixOf, isSuffixOf, nub) > +import Data.List (stripPrefix, isPrefixOf, isSuffixOf, nub) > import Data.Char (isAlpha) > import qualified Data.Map as M > import qualified Data.Set as S > hunk ./gio/Gtk2HsSetup.hs 133 > getDlls dirs = filter ((== ".dll") . takeExtension) . concat <$> > mapM getDirectoryContents dirs > > +isSuitableDLL :: String -> String -> Bool > +isSuitableDLL name file = > + case stripPrefix ("lib"++name) file of > + Just (x:_) | not (isAlpha x) -> True > + _ -> False > + > fixLibs :: [FilePath] -> [String] -> [String] > fixLibs dlls = concatMap $ \ lib -> > hunk ./gio/Gtk2HsSetup.hs 141 > - case filter (("lib" ++ lib) `isPrefixOf`) dlls of > + case filter (isSuitableDLL lib) dlls of > dll:_ -> [dropExtension dll] > _ -> if lib == "z" then [] else [lib] > > hunk ./glib/Gtk2HsSetup.hs 91 > import Distribution.Verbosity > import Control.Monad (when, unless, filterM) > import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList ) > -import Data.List (isPrefixOf, isSuffixOf, nub) > +import Data.List (stripPrefix, isPrefixOf, isSuffixOf, nub) > import Data.Char (isAlpha) > import qualified Data.Map as M > import qualified Data.Set as S > hunk ./glib/Gtk2HsSetup.hs 133 > getDlls dirs = filter ((== ".dll") . takeExtension) . concat <$> > mapM getDirectoryContents dirs > > +isSuitableDLL :: String -> String -> Bool > +isSuitableDLL name file = > + case stripPrefix ("lib"++name) file of > + Just (x:_) | not (isAlpha x) -> True > + _ -> False > + > fixLibs :: [FilePath] -> [String] -> [String] > fixLibs dlls = concatMap $ \ lib -> > hunk ./glib/Gtk2HsSetup.hs 141 > - case filter (("lib" ++ lib) `isPrefixOf`) dlls of > + case filter (isSuitableDLL lib) dlls of > dll:_ -> [dropExtension dll] > _ -> if lib == "z" then [] else [lib] > > hunk ./gtk/Gtk2HsSetup.hs 91 > import Distribution.Verbosity > import Control.Monad (when, unless, filterM) > import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList ) > -import Data.List (isPrefixOf, isSuffixOf, nub) > +import Data.List (stripPrefix, isPrefixOf, isSuffixOf, nub) > import Data.Char (isAlpha) > import qualified Data.Map as M > import qualified Data.Set as S > hunk ./gtk/Gtk2HsSetup.hs 133 > getDlls dirs = filter ((== ".dll") . takeExtension) . concat <$> > mapM getDirectoryContents dirs > > +isSuitableDLL :: String -> String -> Bool > +isSuitableDLL name file = > + case stripPrefix ("lib"++name) file of > + Just (x:_) | not (isAlpha x) -> True > + _ -> False > + > fixLibs :: [FilePath] -> [String] -> [String] > fixLibs dlls = concatMap $ \ lib -> > hunk ./gtk/Gtk2HsSetup.hs 141 > - case filter (("lib" ++ lib) `isPrefixOf`) dlls of > + case filter (isSuitableDLL lib) dlls of > dll:_ -> [dropExtension dll] > _ -> if lib == "z" then [] else [lib] > > hunk ./pango/Gtk2HsSetup.hs 91 > import Distribution.Verbosity > import Control.Monad (when, unless, filterM) > import Data.Maybe ( isJust, isNothing, fromMaybe, maybeToList ) > -import Data.List (isPrefixOf, isSuffixOf, nub) > +import Data.List (stripPrefix, isPrefixOf, isSuffixOf, nub) > import Data.Char (isAlpha) > import qualified Data.Map as M > import qualified Data.Set as S > hunk ./pango/Gtk2HsSetup.hs 133 > getDlls dirs = filter ((== ".dll") . takeExtension) . concat <$> > mapM getDirectoryContents dirs > > +isSuitableDLL :: String -> String -> Bool > +isSuitableDLL name file = > + case stripPrefix ("lib"++name) file of > + Just (x:_) | not (isAlpha x) -> True > + _ -> False > + > fixLibs :: [FilePath] -> [String] -> [String] > fixLibs dlls = concatMap $ \ lib -> > hunk ./pango/Gtk2HsSetup.hs 141 > - case filter (("lib" ++ lib) `isPrefixOf`) dlls of > + case filter (isSuitableDLL lib) dlls of > dll:_ -> [dropExtension dll] > _ -> if lib == "z" then [] else [lib] > > } > > Context: > > [Move hierarchy.list to gtk package (Don't need reinstall gtk2hs-buildtools > after add new type) > Andy Stewart <lazycat.mana...@gmail.com>**20100604131309 > Ignore-this: d3f52ea66e784a2ecd66d764571f58a9 > ] > [Move hierarchy.list to gio package (Don't need reinstall gtk2hs-buildtools > after add new type) > Andy Stewart <lazycat.mana...@gmail.com>**20100604130442 > Ignore-this: 7539a9c035e4f25ac54d619c92021f49 > ] > [Move hierarchy.list to pango package (Don't need reinstall gtk2hs-buildtools > after add new type) > Andy Stewart <lazycat.mana...@gmail.com>**20100604130210 > Ignore-this: b2ebce6749cf1083f3810e6175ceb1a2 > ] > [Fix INSTALL > Andy Stewart <lazycat.mana...@gmail.com>**20100604095408 > Ignore-this: 832b7cff47d7200ee89ee797981febee > ] > [Create Gtk specific versions of functions that add something to the main > loop. These specific functions acquire the Gtk lock before executing the > action which the documentation promised but... > axel.si...@in.tum.de**20100603153700] > [Improve signal `queryTooltip` > Andy Stewart <lazycat.mana...@gmail.com>**20100602070555 > Ignore-this: 4b625d69ebb779f22ec57ae0cc5223aa > ] > [Add MenuToolButton support functions for Tooltip.chs > Andy Stewart <lazycat.mana...@gmail.com>**20100601165857 > Ignore-this: 9e153056f052f09f3bf7bd5569ce347c > ] > [Fix `widgetTooltipMarkup` and docs. > Andy Stewart <lazycat.mana...@gmail.com>**20100601144701 > Ignore-this: 3fc33fd561f18f221d8b7b0215c71826 > ] > [Fix function `tooltipSetMarkup` > Andy Stewart <lazycat.mana...@gmail.com>**20100601143948 > Ignore-this: b4af7ecca1bc74b22e20727f33729a8b > ] > [Add Widget support functions for Tooltip.chs > Andy Stewart <lazycat.mana...@gmail.com>**20100601140304 > Ignore-this: 6b10098119f7a416d763c834bd892cae > ] > [Add Tooltip.chs (The new module to replace Tooltips.chs) > Andy Stewart <lazycat.mana...@gmail.com>**20100601131828 > Ignore-this: ca64d1d45d3c526494a41fb537d16c6c > ] > [Clean bootstrap.sh > Andy Stewart <lazycat.mana...@gmail.com>**20100601122113 > Ignore-this: f59b5f9bf21945c39258a39432621a03 > ] > [Note that Cabal 1.8 is required for ghci support under Windows. > axel.si...@in.tum.de**20100527181310 > Ignore-this: 1c5fc3bb7ad83f5d1094e0083ddd9913 > ] > [Do not query g_object_get_type as it only exists in newer Gtk+ versions. > axel.si...@in.tum.de**20100527163435 > Ignore-this: 70d62f66a2eb159c7fd3e23079c5debf > ] > [Remove gnomevfs sourceview mozembed since those packages has deprecated. > Andy Stewart <lazycat.mana...@gmail.com>**20100527124728 > Ignore-this: a1dfda3669b7417a7b09c3b4acfaa2d > > Below are backup repositories for those deprecated packages: > > * gnomevfs : http://www2.in.tum.de/~simona/gnomevfs/ > * sourceview : http://www2.in.tum.de/~simona/sourceview/ > * mozembed : http://www2.in.tum.de/~simona/mozembed/ > > ] > [Fix IconTheme.chs docs. > Andy Stewart <lazycat.mana...@gmail.com>**20100527102140 > Ignore-this: 2f2b7ab508c688cc73f1b59012966d13 > ] > [Fix Gtk2HsSetup.hs bug. > Andy Stewart <lazycat.mana...@gmail.com>**20100527095530 > Ignore-this: 1b65945da174e05d0ad2a1f01e2ee651 > ] > [Add gnomevfs demo directory. > Andy Stewart <lazycat.mana...@gmail.com>**20100527061234 > Ignore-this: 40c6dd74b460d7546937212dacf1f9e1 > ] > [Add gtk demo directory. > Andy Stewart <lazycat.mana...@gmail.com>**20100527061041 > Ignore-this: 876a827c6f1bac1a8b26a99cd68c6005 > ] > [Add cairo demo directory. > Andy Stewart <lazycat.mana...@gmail.com>**20100527051924 > Ignore-this: b1a70c2a24812fb84c899e4e8ce3ca6c > ] > [Add pango demo directory. > Andy Stewart <lazycat.mana...@gmail.com>**20100527051205 > Ignore-this: af1ff611ab459ee2b6c5bc09a3f63c11 > ] > [Fix the license of gnomevfs > Andy Stewart <lazycat.mana...@gmail.com>**20100527035350 > Ignore-this: 9ac7c768af168d6f0c7af8c8790e8643 > ] > [Fix the license of gio. > axel.si...@in.tum.de**20100526152125 > Ignore-this: 42fe27de2030e0395227f889ba5345d8 > ] > [Fix Trac #1164. toGSList was reversing lists. > m.ni...@gmail.com**20090514122933 > Ignore-this: c466eadbc5ae61ba71721fe15b44735a > ] > [Remove gconf glade gstreamer gtkglext gtksourceview2 soegtk svgcairo vte > webkit since these all now have their own repos. > axel.si...@in.tum.de**20100525211947] > [Documentation fix for EventM. > axel.si...@in.tum.de**20100525131428 > Ignore-this: 25c3bf3513ec6467cbd0febe397ab53e > ] > [Put upper bounds on base version. > axel.si...@in.tum.de**20100525082101 > Ignore-this: f92b2d9970c436c9fcbcf141fc988e8 > ] > [Make documentation parsable. > axel.si...@in.tum.de**20100525080209 > Ignore-this: 60f44b8251a9f3e933c874f72d8e8801 > ] > [Make the version test in pango less complex as Cabal 1.6 doesn't parse it > otherwise. > axel.si...@in.tum.de**20100525075706 > Ignore-this: f3446237cf66abf49e81bd4ba8ef9744 > ] > [Fix an incorrect pattern in windowSetIcon. > axel.si...@in.tum.de**20100525075639 > Ignore-this: eb596c778897b4ae4fd7f9a8dde59726 > ] > [Get rid of stock images under ./docs/reference/images > Andy Stewart <lazycat.mana...@gmail.com>**20100524235315 > Ignore-this: 1094aaf32c73ba189937e1beee24ee49 > ] > [Redirect image link to library.gnome.org and update image items to GTK+ 2.20 > Andy Stewart <lazycat.mana...@gmail.com>**20100524233947 > Ignore-this: f33362d57605d16365e4dfac59c01122 > ] > [Add an upper version to the requirement on base. > axel.si...@in.tum.de**20100524211158] > [Be more specific as to the prerequisites of packages. > axel.si...@in.tum.de**20100524210210] > [Fix docu. > axel.si...@in.tum.de**20100524210157] > [Make soegtk compile by fixing dependency on old-time and by not relying on > Gtk 2.18. > axel.si...@in.tum.de**20100524210032] > [don't mention tools in the docs for unregistering. > axel.si...@in.tum.de**20100524201401] > [TAG 0.11.0 > axel.si...@in.tum.de**20100524200857] > Patch bundle hash: > 52a9ae5b28edcd9a5ec5a4aeecb3d1fb0c6a3a67 > > ------------------------------------------------------------------------------ > ThinkGeek and WIRED's GeekDad team up for the Ultimate > GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the > lucky parental unit. See the prize list and enter to win: > http://p.sf.net/sfu/thinkgeek-promo_______________________________________________ > Gtk2hs-devel mailing list > Gtk2hs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/gtk2hs-devel ------------------------------------------------------------------------------ ThinkGeek and WIRED's GeekDad team up for the Ultimate GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the lucky parental unit. See the prize list and enter to win: http://p.sf.net/sfu/thinkgeek-promo _______________________________________________ Gtk2hs-devel mailing list Gtk2hs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gtk2hs-devel
