[wxhaskell-devel] darcs patch: Fix: configure doesn't find GHC's Haddoc... (and 2 more)

[shelarcy <she...@gm...>]

DarcsURL: C:/home/shelarcy/wxhaskell
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"

--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Mon Feb 25 22:57:54 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * Fix: configure doesn't find GHC's Haddock document directory on GHC 6.8=
.x or higher.

Mon Feb 25 23:11:05 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * Fix: docdist and bindist's wx documents don't link wxcore documents.

Mon Feb 25 23:25:51 =93=8C=8B=9E (=95W=8F=80=8E=9E) 2008  shelarcy <shelarc=
y...@gm...>
  * Change samples/contrib/Camels.hs encoding to UTF-8.

--=_
Content-Type: text/x-darcs-patch; name="fix_-configure-doesn_t-find-ghc_s-haddock-document-directory-on-ghc-6_8_x-or-higher_.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!


New patches:

[Fix: configure doesn't find GHC's Haddock document directory on GHC 6.8.x =
or higher.
shelarcy <she...@gm...>**20080225135754] {
hunk ./configure 659
-    docroot=3D"$ghcroot/doc/html/libraries"
+    # set correct haddock root directory
+    case "$hcversion" in
+      6.0* | 6.1* | 6.2* | 6.3* | 6.4* | 6.5* | 6.6*)
+	docroot=3D"$ghcroot/doc/html/libraries";;
+      6.*) =

+	docroot=3D"$ghcroot/doc/libraries";;
+      *)
+	docroot=3D"$ghcroot/doc/libraries";;
+    esac
}

[Fix: docdist and bindist's wx documents don't link wxcore documents.
shelarcy <she...@gm...>**20080225141105] {
hunk ./makefile 770
-HDOCFLAGS   =3D --prologue=3Dconfig/prologue.txt --html $(HDOCBASES)
+WXCORE-HDOCFLAGS   =3D --prologue=3Dconfig/prologue.txt --html $(HDOCBASES=
)
+WX-HDOCFLAGS   =3D $(WXCORE-HDOCFLAGS) -i$(WXCORE-DOC-OUTDIR)/wxcore.haddo=
ck
hunk ./makefile 811
-	$(HDOC) --odir $(WXCORE-DOC-OUTDIR) --dump-interface=3D$(WXCORE-DOCFILE) =
 $(HDOCFLAGS) $(WXCORE-DOCSOURCES)
+	$(HDOC) --odir $(WXCORE-DOC-OUTDIR) --dump-interface=3D$(WXCORE-DOCFILE) =
 $(WXCORE-HDOCFLAGS) $(WXCORE-DOCSOURCES)
hunk ./makefile 814
-	$(HDOC) --odir $(WX-DOC-OUTDIR) --dump-interface=3D$(WX-DOCFILE) $(HDOCFL=
AGS) $(WX-DOCSOURCES)
+	$(HDOC) --odir $(WX-DOC-OUTDIR) --dump-interface=3D$(WX-DOCFILE) $(WX-HDO=
CFLAGS) $(WX-DOCSOURCES)
}

[Change samples/contrib/Camels.hs encoding to UTF-8.
shelarcy <she...@gm...>**20080225142551] {
hunk ./samples/contrib/Camels.hs 1
-{-------------------------------------------------------------------------=
-------
-   Camel game by Maarten L=F6ffler (mlo...@cs...) (adapted by Daan Le=
ijen).
+=EF=BB=BF{----------------------------------------------------------------=
----------------
+   Camel game by Maarten L=C3=B6fler (mlo...@cs...) (adapted by Daan =
Leijen).
hunk ./samples/contrib/Camels.hs 151
-  =3D infoDialog w "About Camels" "Camels\n\nby Maarten L=F6ffler\nmloffle=
r...@cs...\n\nCamels was written using wxHaskell"
+  =3D infoDialog w "About Camels" "Camels\n\nby Maarten L=C3=B6fler\nmloff=
le...@cs...\n\nCamels was written using wxHaskell"
}

Context:

[Add a diagram of wxhaskell components.
Eric Kow <eri...@gm...>**20080224185557] =

[(OS X) Skip intermediate step of compiling master.o (revisited!)
Eric Kow <eri...@gm...>**20080218225200
 =

 I'm going to quote some mails from Malcolm Wallace on wxhaskel-users in ea=
rly
 2008-02.
 =

 First message:
 > I'm attempting to install wxHaskell from the darcs repo at
 > darcs.haskell.org, under ghc-6.6. on MacOS 10.4.11, with
 > wxMac-2.6.4.
 >
 > The compilation of wxHaskell seems to proceed OK until the link
 > stage:
 >
 >     g++ -r -keep_private_externs -nostdlib -o out/wxc/master.o ....
 >
 > which failed because there is no -lstdc++-static on my machine.  I
 > found the place in the makefile to replace -lstdc++-static with
 > the dynamic -lstdc++, and compilation proceeds further, but not
 > much:
 >
 >      g++ -dynamiclib -install_name\
 > /usr/local/wxhaskell/lib/libwxc-mac2.6.4-0.10.1.dylib -undefined suppres=
s\
 > -flat_namespace -o out/wxc/libwxc-mac2.6.4-0.10.1.dylib out/wxc/master.o=
\
 > -lwx_macu_gl-2.6 -L/usr/local/lib -framework QuickTime -framework IOKit\
 > -framework Carbon -framework Cocoa -framework System -lwx_macu_media-2.6=
\
 > -lwx_macu-2.6
 >     ld: out/wxc/master.o undefined symbol 12387 (__ZTI10wxListBase) can'=
t be a weak definition
 >     /usr/bin/libtool: internal link edit command failed
 >
 > The offending symbol __ZTI10wxListBase looks like it might be a
 > z-encoded symbol from Haskell-land, but I'm not sure how to proceed.
 =

 Second message:
 > A correct build on MacOS 10.4.11 with ghc-6.6 requires that
 > wxWidgets is configured with --enable-shared, and that this patch:
 >
 >     (OS X) Check architecture to use intermediate step of compiling
 >     master.o or not.
 >
 > be darcs unpulled from your local repo.
 >
 > With these tweaks, wxHaskell builds, compiles, and runs the demo
 > programs.
 =

] =

[Eliminate mandatory --with-opengl on Linux.
Eric Kow <eri...@gm...>**20080219171912
 =

 If wxWidgets is compiled with opengl, its header files
  #define wxUSE_GLCANVAS 1
 =

 (See, for example, /usr/lib/wx/include/gtk2-unicode-release-2.6/wx/setup.h=
 on
 Ubuntu Gutsy Gibbon), which causes us to compile glcanvas as if we were go=
ing
 to link against the wxWidgets opengl library.  But since we are not linkin=
g
 against that, the user gets errors compiling their applications.
 =

 Here we introduce an extra preprocessor flag to really insist that no, des=
pite
 what wxWidgets says, we don't want to use GLCANVAS.
] =

[Fix: wxPrint**, wxPreviveFrame** and other function causes link error by u=
ndefined reference on Windows (Visual Studio).
shelarcy <she...@gm...>**20080219034144] =

[Cleanup passing of std/media/stc/opengl to wx-config.
Eric Kow <eri...@gm...>**20080218130345] =

[Export TabPage type synonym (bug 1349475)
Eric Kow <eri...@gm...>**20080218005112] =

[Add ListControl test case (bug 1742979)
Eric Kow <eri...@gm...>**20080218002441
 This might only be a bug on Windows, if at all.
] =

[Add test case textColor attribute (bug 1224727).
Eric Kow <eri...@gm...>**20080218000738] =

[Fix Landscape printing (bug 1168903).
Eric Kow <eri...@gm...>**20080217235724
 =

 Filed on behalf on Lennart Augustson <le...@au...>, who
 submitted a regular Unix patch.
] =

[Add BoxedCombinator test case (bug 1549363)
Eric Kow <eri...@gm...>**20080217233719] =

[Add Sound type's Media class stop method.
shelarcy <she...@gm...>**20080218160511] =

[Fix STC* test cases.
shelarcy <she...@gm...>**20080218155734] =

[Fix: wrapper.h and sound.cpp doesn't care about wxWindows 2.4.2.
shelarcy <she...@gm...>**20080218155605] =

[Sync Visual Studio Project's source flatten away ewxw directories.
shelarcy <she...@gm...>**20080218142201] =

[Add the submenu bug.
Eric Kow <eri...@gm...>**20080217174326] =

[Add NonModalDialog test case (bug #1372529)
Eric Kow <eri...@gm...>**20080217174203] =

[Add a bugs directory for test cases.
Eric Kow <eri...@gm...>**20080217174142] =

[Fix UTF8Sampler test case.
Eric Kow <eri...@gm...>**20080217130553] =

[Fix typo pointed out on bugtracker.
Eric Kow <eri...@gm...>**20080217114303] =

[dos2unix files that have both CRLF and LF line terminators
Eric Kow <eri...@gm...>**20080217095711
 =

 Text editors get confused by these.
 Get rid of trailing whitespace while we're at it.
] =

[Flatten away ewxw directories.
Eric Kow <eri...@gm...>**20080217094929
 =

 This is to mirror the wxc project, making it easier to compare our
 version of wxc with the standalone one.
] =

[Remove unused ewxw files.
Eric Kow <eri...@gm...>**20080217082029
 =

 There is an overlap between ./wxc/src/ewxw and ./wxc/src.  The makefile se=
ems
 to ignore the ones in ewxw.
] =

[Synch Visual Studio Project's wxc library version
shelarcy <she...@gm...>**20080216161420] =

[Synch Visual Studio Project's output dir same as makefile
shelarcy <she...@gm...>**20080216155656] =

[Ugly hack to make setup haddock work without first building.
Eric Kow <eri...@gm...>**20080216135157] =

[Bump to 0.10.2.
Eric Kow <eri...@gm...>**20080216130854] =

[Mimick cabal in placement of haddocks.
Eric Kow <eri...@gm...>**20080216130819] =

[Move cabal stuff to end of makefile.
Eric Kow <eri...@gm...>**20080216125445
 so that all variables are defined.
] =

[Add Hs-Source-Dirs for wxcore.cabal.
Eric Kow <eri...@gm...>**20080216125112
 In case we ever switch to the Simple build type.
] =

[Re-add time package dependency (needed by wxdirect).
Eric Kow <eri...@gm...>**20080216124853] =

[Improve description and synopsis of cabal files.
Eric Kow <eri...@gm...>**20080216124832] =

[Split doc building into wxcore and wx version.
Eric Kow <eri...@gm...>**20080216124746] =

[Modernise haskell98 imports in wxdirect.
Eric Kow <eri...@gm...>**20080216120113] =

[Prefer /usr/local/wxhaskell/bin/wx-config to the one on the path.
Eric Kow <eri...@gm...>**20080216113844
 =

 This makes it easier to install wxhaskell via cabal-install.
 Just set up a symbolic link to point to point to your wxWidgets,
 no need for the --wx-config flag.
] =

[Add some --bindir, --datadir, --libexecdir to configure script.
Eric Kow <eri...@gm...>**20080216113837
 For Cabal.  The last two are ignored.
] =

[Change output dir to 'dist' to mimick cabal.
Eric Kow <eri...@gm...>**20080216104847] =

[Modernise haskell98 imports in wxcore.
Eric Kow <eri...@gm...>**20080216100020] =

[Consolidate build targets which exist purely for the sake of Cabal.
Eric Kow <eri...@gm...>**20080216095845] =

[Fix some dependencies that Ross Paterson pointed out.
Eric Kow <eri...@gm...>**20080215181444] =

[TAG 0.10.1
Eric Kow <eri...@gm...>**20080215173503] =

Patch bundle hash:
26dd60bf8dd8a06ee0ca04a8d0897f407c3f27e5

--=_--

.