diff --git a/ChangeLog b/ChangeLog index b9e7aa38e4..65559539b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-11-07 Ronald Florence + + * README.MacOSX: small update + 2003-11-04 Ronald Florence * README.MacOSX: update to Panther diff --git a/README.MacOSX b/README.MacOSX index 60976a02d4..a2e973bebc 100644 --- a/README.MacOSX +++ b/README.MacOSX @@ -11,18 +11,16 @@ Download the GPL-licensed MacOSX Qt 3.1.2 library source code from . Untar the .tar.gz file in a convenient directory in /usr/local/src or - /usr/local, open a terminal, cd to the Qt source directory, then: + /usr/local, cd to the Qt source directory, then: - cd src setenv QTDIR `pwd` patch -p0 < lyx-src-directory/development/MacOSX/qt.patch - cd .. sudo gcc_select 2 ./configure -static [for Panther, use "./configure -static -lresolv"] make - Using the same terminal session you used to build the Qt libraries, - cd to the top of the LyX source hierarchy. Then: + Using the same terminal session, cd to the top of the LyX source + hierarchy, and: setenv LDFLAGS "-framework Carbon -framework OpenGL -framework AGL -framework QuickTime -lz" ./configure --with-frontend=qt --without-x --datadir=/Applications/LyX.app/Contents/Resources --bindir=/Applications/LyX.app/Contents/MacOS --mandir=/Applications/LyX.app/Contents/Resources/man diff --git a/development/ChangeLog b/development/ChangeLog index af07b33c2a..4569efd276 100644 --- a/development/ChangeLog +++ b/development/ChangeLog @@ -1,3 +1,7 @@ +2003-11-07 Ronald Florence + + * MacOSX/qt.patch: small tweak for Panther + 2003-09-26 Jean-Marc Lasgouttes * Makefile.am (EXTRA_DIST): add directory MacOSX diff --git a/development/MacOSX/qt.patch b/development/MacOSX/qt.patch index cb4cd50794..bd9355e087 100644 --- a/development/MacOSX/qt.patch +++ b/development/MacOSX/qt.patch @@ -19,3 +19,14 @@ typedef struct OpaqueWindowGroupRef *WindowGroupRef; typedef struct OpaqueGrafPtr *CGrafPtr; typedef struct OpaquePMPrintSession *PMPrintSession; +--- src/tools/qglobal.cpp.orig Thu Nov 6 22:39:39 2003 ++++ src/tools/qglobal.cpp Fri Nov 7 07:42:23 2003 +@@ -161,7 +161,7 @@ + first = FALSE; + long gestalt_version; + if(Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) { +- if(gestalt_version >= 0x1020 && gestalt_version < 0x1030) ++ if(gestalt_version >= 0x1020 && gestalt_version < 0x1040) + macver = Qt::MV_10_DOT_2; + else if(gestalt_version >= 0x1010 && gestalt_version < 0x1020) + macver = Qt::MV_10_DOT_1;