From: shelarcy <she...@gm...> - 2007-11-21 13:22:31
|
DarcsURL: C:/home/shelarcy/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= Wed Nov 21 22:15:43 =3D93=3D8C=3D8B=3D9E (=3D95W=3D8F=3D80=3D8E=3D9E) = 2007 shelarcy <shelarc=3D=0A= y...@gm...>=0A= * Change VC 2.6 project to build contribs automatically (just support = stc=3D=0A= currently)=0A= =0A= --=3D_=0A= Content-Type: text/x-darcs-patch; = name=3D"change-vc-2_6-project-to-build-contribs-automatically-_just-suppo= rt-stc-currently_.dpatch"=0A= Content-Transfer-Encoding: quoted-printable=0A= Content-Description: A darcs patch for your repository!=0A= =0A= =0A= New patches:=0A= =0A= [Change VC 2.6 project to build contribs automatically (just support stc = cu=3D=0A= rrently)=0A= shelarcy <she...@gm...>**20071121131543] {=0A= hunk ./wxc/wxc-2.6.dsw 14=0A= + Begin Project Dependency=3D0D=0A= + Project_Dep_Name stc=3D0D=0A= + End Project Dependency=3D0D=0A= hunk ./wxc/wxc-2.6.dsw 19=0A= +########################################################################= ##=3D=0A= #####=3D0D=0A= +=3D0D=0A= +Project: "stc"=3D3D"..\..\wxWidgets-2.6.4\contrib\build\stc\stc.dsp" - = Packa=3D=0A= ge Owner=3D3D<4>=3D0D=0A= +=3D0D=0A= +Package=3D3D<5>=3D0D=0A= +{{{=3D0D=0A= +}}}=3D0D=0A= +=3D0D=0A= +Package=3D3D<4>=3D0D=0A= +{{{=3D0D=0A= +}}}=3D0D=0A= +=3D0D=0A= +=3D0D=0A= }=0A= =0A= Context:=0A= =0A= [Changed Cursor_CreateLoad to return NULL for WXGTK, as WXGTK do yet = implem=3D=0A= ent this function=0A= Mads Lindstroem <mad...@ya...>**20070916170828] =3D=0A= =0A= [Rename wxcu-2.6.4.* to wxc-2.6.* as wxc-2.4 things=0A= shelarcy <she...@gm...>**20070821050957] =3D=0A= =0A= [Update VC++ project file to reflect updated DLL version supporting = wxWidge=3D=0A= ts 2.6.4=0A= shelarcy <she...@gm...>**20070821044612] =3D=0A= =0A= [Remove old wxc project files between 2.6.0 - 2.6.3=0A= shelarcy <she...@gm...>**20070821043754] =3D=0A= =0A= [Remove old wxh samples=0A= shelarcy <she...@gm...>**20070821043453] =3D=0A= =0A= [Remove auto-generated stc files.=0A= Eric Kow <eri...@lo...>**20070819205954=0A= Otherwise, you get annoying new changes in the working directory.=0A= ] =3D=0A= =0A= [Use Data.Time.getCurrentTime instead of (System.)Time.getClockTime=0A= shelarcy <she...@gm...>**20070819204230=0A= to avoid build failure by generated non-UTF8 String=0A= ] =3D=0A= =0A= [Add Drag & Drop and ClipBoard Support=0A= shelarcy <she...@gm...>**20070815175137] =3D=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= 7937304342fb8b2711596b5b76d2175cc0cf76bc=0A= =0A= --=3D_--=0A= =0A= .=0A= =0A= |
From: Eric Y. K. <eri...@gm...> - 2007-11-22 00:24:12
|
Pushed in. Note: I'm getting these erros recently... They don't seem related to the patches I just pushed in, though. ld: /System/Library/Frameworks/WebKit.framework/Versions/A/WebKit load command 20 unknown cmd field /usr/bin/libtool: internal link edit command failed --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
From: shelarcy <she...@gm...> - 2007-11-24 15:27:42
Attachments:
mac_with_master.patch
|
On Thu, 22 Nov 2007 09:23:54 +0900, Eric Y. Kow <eri...@gm...> wrote: > Note: I'm getting these erros recently... They don't seem related to the > patches I just pushed in, though. > > ld: /System/Library/Frameworks/WebKit.framework/Versions/A/WebKit load > command 20 unknown cmd field > /usr/bin/libtool: internal link edit command failed I also tested my patches on PowerPC Mac OS X platform when my patch influence other platforms. And above problem doesn't occur my Mac environment (10.4.10 + XCode 2.5). So I want to know that do you update your OS and/or XCode? Okay, I know I have to update XCode. But I'm changing wxhaskell source code now. So I want to seprate problem from that. I'll update XCode. But I'm not sure whether same problem ocuur. Because I know that Mac OS X's different architecture cause problem on wxHaskell, too. You just remove step that compiling master.o when fixing building problem. So I think you are using Intel architecture. But this intermediate step is important for PowerPC platform. So I applied attached file when testing and using wxHaskell on my Mac. (I don't have Intel Mac. So I hesitated to send this patch to wxhaskell-users Mailing-list.) http://haskell.org/haskellwiki/WxHaskell/Install#PPC.2C_Tiger_.2810.4.7.29.2C_GHC_6.4.1.2C_wxWidgets_2.6.3.2C_wxHaskell_0.9.4 Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
From: Eric Y. K. <eri...@gm...> - 2007-11-24 17:20:43
|
Hi, I'm sorry, I'm not sure I understood > So I want to know that do you update your OS and/or XCode? Only the incremental upgrade from 10.4.10 to 10.4.11 I am indeed using Intel. > Because I know that Mac OS X's different architecture cause problem on > wxHaskell, too. You just remove step that compiling master.o when fixing > building problem. So I think you are using Intel architecture. This patch gives me: /usr/bin/ld: can't locate file for: -lstdc++-static At first I thought that might have been a typo, so I tried changing the Makefile to say -lstdc++ -static, but that gave me /usr/bin/ld: incompatible flag -framework used (must specify "-dynamic" to be used) --=20 Eric Kow http://www.loria.fr/~kow PGP Key ID: 08AC04F9 Merci de corriger mon fran=E7ais. |
From: shelarcy <she...@gm...> - 2007-11-25 15:37:24
|
On Sun, 25 Nov 2007 02:20:09 +0900, Eric Y. Kow <eri...@gm...> wrote: > This patch gives me: > /usr/bin/ld: can't locate file for: -lstdc++-static > > At first I thought that might have been a typo, so I tried changing the > Makefile to say -lstdc++ -static, but that gave me It's not typo. So it specify static version of stc++ library. This file is included in PowerPC Mac environment. And it's only static version library. $ ls /usr/lib/*stdc++* /usr/lib/libstdc++-static.a /usr/lib/libstdc++.6.0.4.dylib /usr/lib/libstdc++.6.0.3.dylib /usr/lib/libstdc++.6.dylib But it would be not included in Intel Mac. So -static flag causes error that you posted previous mail. > /usr/bin/ld: incompatible flag -framework used (must specify "-dynamic" > to be used) I think we must add architecture flag in this place, if we don't find to solve this problem. Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |
From: shelarcy <she...@gm...> - 2007-11-26 12:15:00
|
Hi Eric, On Mon, 26 Nov 2007 00:37:13 +0900, shelarcy <she...@gm...> wrote: >> At first I thought that might have been a typo, so I tried changing the >> Makefile to say -lstdc++ -static, but that gave me > > It's not typo. So it specify static version of stc++ library. > This file is included in PowerPC Mac environment. And it's only > static version library. > > (snip) > > I think we must add architecture flag in this place, if we don't > find to solve this problem. I can't find any other solution. So I made new patch by that way. http://www.mail-archive.com/wxh...@li.../msg00294.html Best Regards, -- shelarcy <shelarcy hotmail.co.jp> http://page.freett.com/shelarcy/ |