Menu
▾
▴
wxhaskell-users
|
From: shelarcy <she...@gm...> - 2007-08-16 02:46:13
|
DarcsURL: http://darcs.haskell.org/wxhaskell=0A= MIME-Version: 1.0=0A= Content-Type: multipart/mixed; boundary=3D"=3D_"=0A= =0A= --=3D_=0A= Content-Type: text/plain=0A= Content-Transfer-Encoding: quoted-printable=0A= =0A= Mon Aug 13 15:25:17 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Use Data.Time.getCurrentTime instead of (System.)Time.getClockTime = to a=3D=0A= void build failure by generated non-UTF8 String=0A= =0A= --=3D_=0A= Content-Type: text/x-darcs-patch; = name=3D"use-data_time_getcurrenttime-instead-of-_system__time_getclocktim= e-to-avoid-build-failure-by-generated-non_utf8-string.dpatch"=0A= Content-Transfer-Encoding: quoted-printable=0A= Content-Description: A darcs patch for your repository!=0A= =0A= =0A= New patches:=0A= =0A= [Use Data.Time.getCurrentTime instead of (System.)Time.getClockTime to = avoi=3D=0A= d build failure by generated non-UTF8 String=0A= shelarcy <she...@gm...>**20070813062517] {=0A= hunk ./configure 619=0A= +# Test if we can include the time package explicitly=0A= +$hcpkg -s time > /dev/null 2> /dev/null=0A= +case $? in=0A= + 0) pkgtime=3D3D"-package time";;=0A= + *) pkgtime=3D3D"";;=0A= +esac=0A= +=0A= hunk ./configure 791=0A= +PKG-TIME=3D3D$pkgtime=0A= hunk ./makefile 432=0A= - $(HC) $(HCFLAGS) $(PKG-PARSEC) -o $@ $^=0A= + $(HC) $(HCFLAGS) $(PKG-PARSEC) $(PKG-TIME) -o $@ $^=0A= hunk ./makefile 436=0A= - @$(call compile-hs,$@,$<,$(HCFLAGS) = $(PKG-PARSEC),$(WXD-OUTDIR),-i$(WXD-S=3D=0A= RCDIR))=0A= + @$(call compile-hs,$@,$<,$(HCFLAGS) $(PKG-PARSEC) = $(PKG-TIME),$(WXD-OUTDI=3D=0A= R),-i$(WXD-SRCDIR))=0A= hunk ./wxdirect/src/CompileClassTypes.hs 17=0A= -import Time( getClockTime)=0A= +import Data.Time( getCurrentTime)=0A= hunk ./wxdirect/src/CompileClassTypes.hs 28=0A= - =3D3D do time <- getClockTime=0A= + =3D3D do time <- getCurrentTime=0A= hunk ./wxdirect/src/CompileClasses.hs 20=0A= -import Time( getClockTime)=0A= +import Data.Time( getCurrentTime )=0A= hunk ./wxdirect/src/CompileClasses.hs 36=0A= - time <- getClockTime=0A= + time <- getCurrentTime=0A= hunk ./wxdirect/src/CompileHeader.hs 19=0A= -import Time( getClockTime)=0A= +import Data.Time( getCurrentTime)=0A= hunk ./wxdirect/src/CompileHeader.hs 35=0A= - time <- getClockTime=0A= + time <- getCurrentTime=0A= hunk ./wxdirect/src/HaskellNames.hs 22=0A= -import Time( getClockTime )=0A= +import Data.Time( getCurrentTime )=0A= hunk ./wxdirect/src/HaskellNames.hs 149=0A= - =3D3D do time <- getClockTime=0A= + =3D3D do time <- getCurrentTime=0A= }=0A= =0A= Context:=0A= =0A= [Add (Multi-)MediaCtrl Support=0A= shelarcy <she...@gm...>**20070811123742] =3D=0A= =0A= [Rework wxToolkit and isDefined by fixing *defs' char array to wxChar = array=0A= shelarcy <she...@gm...>**20070806121930] =3D=0A= =0A= [Change some str* functions or wcs* functions to wxStr* functions=0A= shelarcy <she...@gm...>**20070805112624] =3D=0A= =0A= [Remove unused wxh directory files=0A= shelarcy <she...@gm...>**20070803123528] =3D=0A= =0A= [Remove unused wxWidgets 2.5.x's VC project=0A= shelarcy <she...@gm...>**20070803120930] =3D=0A= =0A= [Add VC project for wxWidgets 2.6.4=0A= shelarcy <she...@gm...>**20070803120733] =3D=0A= =0A= [Fix broken wxc-2.4 Visual Studio Project=0A= shelarcy <she...@ho...>**20070723214850] =3D=0A= =0A= [polyline-64bit-compatibility-fix=0A= ar...@cs...**20070313080116=0A= Fixes a problem with the polyline function on a 64-bit platform.=0A= The wxDC_DrawLines function now properly indexes into the array=0A= with points.=0A= ] =3D=0A= =0A= [fix-polygon-behaviour-64=0A= ar...@cs...**20070202154517=0A= Fixed issue 'Strange polygon behaviour on 64-bit machines'=0A= reported by Chris Mears at 14 Dec 2006.=0A= =3D=0A= =0A= Problem: the arrays inspected by the wxDC_Polygon function=0A= are assumed to contain 32-bits ints. On 64-bit machines=0A= these are actually 64-bits ints.=0A= =3D=0A= =0A= Fix: (a bit of a hack...) the code now assumes that the=0A= arrays contain intptr_t values. This type represents ints=0A= of the same number of bits as the Haskell ints (on 32-bit=0A= and 64-bit machines). The code now dereferences each element=0A= in the array correctly, but still truncates the possibly=0A= 64-bit value to a 32-bit value. This is not a problem=0A= in practice.=0A= ] =3D=0A= =0A= [Announce new maintainers, darcs (homepage).=0A= Eric Kow <eri...@lo...>**20070120231403] =3D=0A= =0A= [Add miscellaneous other images (homepage).=0A= Eric Kow <eri...@lo...>**20070120224435] =3D=0A= =0A= [Add application screenshots (homepage).=0A= Eric Kow <eri...@lo...>**20070120224104] =3D=0A= =0A= [Add images used in quick start (homepage).=0A= Eric Kow <eri...@lo...>**20070120223650] =3D=0A= =0A= [Add images used for samples (homepage).=0A= Eric Kow <eri...@lo...>**20070120223301] =3D=0A= =0A= [Add images directory (and wxhaskell logo).=0A= Eric Kow <eri...@lo...>**20070120222724] =3D=0A= =0A= [Remove counter code from homepage.=0A= Eric Kow <eri...@lo...>**20070120221619=0A= =3D=0A= =0A= This counter has an pop-up ads, which is rather obnoxious.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add wxhaskell homepage files (main html, css only).=0A= Eric Kow <eri...@lo...>**20070120221304=0A= =3D=0A= =0A= I took the liberty of running dos2unix on these.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add some wxhaskell-specifile boring file regexps.=0A= Eric Kow <eri...@lo...>**20070120221235] =3D=0A= =0A= [Use a custom boring file. (Right now just the darcs default)=0A= Eric Kow <eri...@lo...>**20070120221223] =3D=0A= =0A= [Add an etc/ directory for misc use.=0A= Eric Kow <eri...@lo...>**20070120212146] =3D=0A= =0A= [Modify wx-install so it doesn't accidentally recompile things.=0A= Eric Kow <eri...@lo...>**20070120225914=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Merge wxStyledTextCntrl (Scintilla edit control wrapper) support from = Hast=3D=0A= e project=0A= shelarcy <she...@ca...>**20070111090641] =3D=0A= =0A= [Added #ifndef compilation flag around <inttypes.h> to avoid building = probl=3D=0A= em under Visual C++ (VC). (VC doesn't have <inttypes.h>.)=0A= she...@ca...**20061207005946] =3D=0A= =0A= [Correct previous patch for db.cpp=0A= she...@ca...**20061207004327] =3D=0A= =0A= [Add an eyeball test for Unicode strings.=0A= Eric Kow <eri...@lo...>**20061129042230] =3D=0A= =0A= [Use intptr_t to avoid assumption that integers are 32 bit.=0A= Arie Middelkoop <ar...@cs...>**20061125125628=0A= =3D=0A= =0A= Compiling wxHaskell on a 64bits platform fails, because there=0A= are some assumptions in the code that assume that integers are=0A= 32bits. For example, there are a couple of assignments of a=0A= pointer to an int.=0A= =3D=0A= =0A= This patch fixes these problems. Sometimes, after assigning a=0A= pointer to an integer, the int was used as a boolean value. In=0A= those cases, instead of returning a pointer p, I changed the=0A= code to return p !=3D3D NULL. In two other cases, a pointer is stored=0A= inside the int and in these cases I changed the type of the=0A= int to intptr_t, of which it is guaranteed that a pointer can be=0A= assigned to it and recovered from it.=0A= =3D=0A= =0A= Requires <inttypes.h>.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Added the -fPIC compiler flag to CXX options in the makefile.=0A= Arie Middelkoop <ar...@cs...>**20061115121006=0A= =3D=0A= =0A= Apparantly, my platform (gentoo x86_64 linux) required that .o files = are "=3D=0A= relocatable" when there =3D=0A= =0A= are linked into a dynamic library.=0A= =3D=0A= =0A= (It might be an idea to use libtool to hide this kind of = platform-specific=3D=0A= details)=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Tweak wx build target to depend on wxcore-clean.=0A= Eric Kow <eri...@lo...>**20061115002142=0A= =3D=0A= =0A= This avoids weird build errors with GHC 6.6 like=0A= wx/src/Graphics/UI/WX/Types.hs:94:0:=0A= Bad interface file: out/wx/imports/Graphics/UI/WXCore/Types.hi=0A= Something is amiss; requested module=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Update Windows/VC++ build for 0.10.1 (from jer...@gm...).=0A= Eric Kow <eri...@lo...>**20061029082957=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Separate make/make install for wxcore and wx.=0A= Eric Kow <eri...@lo...>**20061027201218=0A= =3D=0A= =0A= Now the user has to type=0A= make=0A= (sudo) make install=0A= make wx=0A= (sudo) make wx-install=0A= =3D=0A= =0A= This is a tweak of Shelarcy's patch for making wxhaskell compile on GHC = 6.=3D=0A= 6.=0A= The intention is to avoid the surprising behaviour of wxcore being = install=3D=0A= ed=0A= when the user types 'make'.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add shelarcy patch for compile with GHC-6.6=0A= jer...@gm...**20061027102208] =3D=0A= =0A= [Add support for toolbar divider and other toolbar options (from = shelarcy@g=3D=0A= mail.com)=0A= jer...@gm...**20061023095411] =3D=0A= =0A= [Add support for toolbar divider (for she...@gm...)=0A= jer...@gm...**20061023094720] =3D=0A= =0A= [Add support for list item mask (from she...@gm...)=0A= jer...@gm...**20061023094528] =3D=0A= =0A= [Add support for Calendar events (from sha...@gm...)=0A= jer...@gm...**20061023094412] =3D=0A= =0A= [Add support for wxWidgets version >=3D3D 2.5 (Sound API, db API)=0A= jer...@gm...**20061023094049] =3D=0A= =0A= [Shelarcy patch: fix typos in wxHaskell samples/contrib=0A= jer...@gm...**20060830114937] =3D=0A= =0A= [(OS X) Skip intermediate step of compiling master.o.=0A= Eric Kow <eri...@lo...>**20060813212620=0A= =3D=0A= =0A= Removing this step (which compiles master.o, and combines it with other=0A= stuff to get the real library we want) avoids weird error messages like=0A= =3D=0A= =0A= ld: out/wxc/master.o undefined symbol 36218 (__ZdaPv) can't be a weak=0A= definition=0A= =3D=0A= =0A= It's quite possible that this breaks something else, though...=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Update VC++ project file to reflect new wxWidgets version support = (unteste=3D=0A= d)=0A= jer...@gm...**20060817170205] =3D=0A= =0A= [Update VC++ project file to reflect updated DLL version supporting = wxWidge=3D=0A= ts 2.6.3=0A= jer...@gm...**20060817170011] =3D=0A= =0A= [Update revision numbers and wxversion guesses for Windows / VC++ = (jeremy.o=3D=0A= don...@gm...)=0A= jer...@gm...**20060817165704] =3D=0A= =0A= [Shelarcy patch (VC project for wxWindows 2.6.3)=0A= jer...@gm...**20060816134707] =3D=0A= =0A= [Shelarcy patch (WxcTypes.hs)=0A= jer...@gm...**20060816115419] =3D=0A= =0A= [Shelarcy patch (eljdialup.cpp)=0A= jer...@gm...**20060816114418] =3D=0A= =0A= [Shelarcy patch (db.cpp)=0A= jer...@gm...**20060816113728] =3D=0A= =0A= [(wxc, Unicode) Files for compiling unicode version under Visual Studio.=0A= shelarcy <she...@ca...>**20060813212315=0A= =3D=0A= =0A= This is Eric Kow recording on Shelarcy's behalf. This corresponds to = vers=3D=0A= ion=0A= 08 of my Unicode patch.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [Add a small makefile for compiling the samples.=0A= Eric Kow <eri...@lo...>**20060813211705=0A= =3D=0A= =0A= (This comes from version 08 of my Unicode patch).=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxcore, Unicode) Add/use ability to interact with C wchar_t.=0A= Eric Kow <eri...@lo...>**20060813211211=0A= =3D=0A= =0A= This corresponds to the wxcore part of my Unicode patch, version 08=0A= modulo trailing whitespace.=0A= =3D=0A= =0A= I believe this would require for wxWidgets and wxhaskell to be compiled = wi=3D=0A= th=0A= Unicode enabled.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxdirect, Unicode) Use the Haskell types for C wchar_t and friends.=0A= Eric Kow <eri...@lo...>**20060813210420=0A= =3D=0A= =0A= I believe this would require that wxWidgets be compiled with Unicode=0A= enabled.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [(wxc, Unicode) Use wxChar instead of char.=0A= Eric Kow <eri...@lo...>**20060813205557=0A= =3D=0A= =0A= wxChar is a C preprocessor macro that selects for char under=0A= --disable-unicode, and for wchar_t under --enable-unicode.=0A= =3D=0A= =0A= This corresponds to version 08 of my Unicode patch, but only the parts=0A= which affect wxc.=0A= =3D=0A= =0A= ] =3D=0A= =0A= [[wxhaskell-from-cvs @ 2005-05-08 08:12:51 by dleijen]=0A= dleijen**20050508081251=0A= updated change log=0A= ] =3D=0A= =0A= [[wxhaskell-from-cvs @ 2005-05-08 07:24:23 by dleijen]=0A= dleijen**20050508072423=0A= Compile wx via -fvia-C to fix crash with ghci on windows=0A= ] =3D=0A= =0A= [TAG wxhakell-0-9-4=0A= Unknown tagger**20060712042545] =3D=0A= =0A= Patch bundle hash:=0A= 5d4a5ec1d58e064bd7d8af9ef9ba15b5077f00c9=0A= =0A= --=3D_--=0A= =0A= .=0A= =0A= |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-16 20:05:59
|
I'll have a look over the weekend Out of curiosity, what's the motivation behind this patch? --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
|
From: shelarcy <she...@gm...> - 2007-08-17 04:38:57
|
Hi Eric, On Fri, 17 Aug 2007 05:05:54 +0900, Eric Y. Kow <eri...@gm...> wrote: > Out of curiosity, what's the motivation behind this patch? Please see this patch's complete name. > * Use Data.Time.getCurrentTime instead of (System.)Time.getClockTime to > avoid build failure by generated non-UTF8 String This is my Windows environment problem that I wrote almost one year ago. In Sat, 02 Sep 2006 16:56:24 +0900, shelarcy <she...@gm...> wrote: > $ make > ghc -c wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs -o out/wx/imports/Graphics > /UI/WXCore/WxcClassTypes.o -iout/wx/imports -odir out/wx/imports -hidir out/wx/i > mports -fvia-C -package-name wxcore -Iwxc/include > > wxcore/src/Graphics/UI/WXCore/WxcClassTypes.hs:1:0: > lexical error at character '\65279' > make: *** [out/wx/imports/Graphics/UI/WXCore/WxcClassTypes.o] Error 1 > > This is a known problem except Ascii, Latin-1 and EUC user. > If show System.Time.ClockTime, we can show string that passed by OS. > Windows show local encoding String, although using Unicode internally. > > By this effect, sometimes code generator cause problem. So I have > to change from shift_jis to utf-8 a few generated files. > > $ cd wxcore/src/Graphics/UI/WXCore/ > $ mv WxcClassTypes.hs WxcClassTypes.hs.orig > $ iconv -f shift_jis -t utf-8 WxcClassTypes.orig > WxcClassTypes.hs Compiling WxcClasses* also cause this problem. So I don't test and develop wxHaskell smoothly. I have a headache from that. Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
|
From: Eric Y. K. <eri...@gm...> - 2007-08-19 20:44:32
|
Looks fine to me. This might be a bit disruptive, but I've modified your patch metadata, breaking up short patch name in two lines. Please unpull your version of the patch before pulling from the official repository. Sorry for the trouble. --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X