Remove fontenc from icelandic

[lyx.git] / README.MacOSX

diff --git a/README.MacOSX b/README.MacOSX
index 9693e48ae817dc071a77e0819bcca7589f454a9f..515d5a4040e0053e5c5ae20479650bf83e4b1ca9 100644 (file)
--- a/README.MacOSX
+++ b/README.MacOSX
@@ -1,13 +1,10 @@
 
-                          Building LyX/Mac
+                          Building LyX/Mac-1.4.0
 
                  Ronald Florence <ron@18james.com>
 
    LyX/Mac is built from the LyX source, the GPL-licensed Trolltech
-   Qt/Mac library, and a custom application bundle.  Qt-3.2.3 and
-   later versions align the button labels in the Math Panel better
-   under MacOS-10.3, but present other problems.  Qt-3.1.2 as patched
-   here is fully functional.
+   Qt/Mac library, and a custom application bundle. 
 
    You will need the MacOSX development tools.  The procedure
    described here builds LyX linked with a static Qt library.  If you
@@ -15,33 +12,49 @@
    to "setenv VAR value".
 
    1.  Download the GPL-licensed Qt/Mac library source code from
-   <ftp://ftp.lyx.org/pub/lyx/contrib/qt-mac-free-3.1.2.sit>, untar in
-   a convenient directory, cd to the top of the Qt source hierarcy,
-   and:
+       <ftp://ftp.lyx.org/pub/lyx/contrib/qt-mac-free-3.1.2.sit>,
+       untar in a convenient directory, cd to the top of the Qt source
+       hierarcy, and:
 
      export QTDIR=`pwd` 
      patch -p0 < LYX-SOURCE-DIRECTORY/development/MacOSX/qt.patch
      sudo gcc_select 3.3 
      ./configure -static   [for Panther, use "./configure -static -lresolv"]
      make 
+     rm lib/libqt.la
+
+       Adendum, 19 May 2004. From comments by Jean-Marc
+       There now appears to be no need for this patch.
+
+       a. The additional line
+       +{ '^', MAP_KEY(Qt::Key_AsciiCircum) },
+       is fixed already in Qt/Mac 3.3.x.
+
+       b. The line commenting out 'ControlRef' to prevent a name
+       clash is also fixed in recent versions of the Qt library.
+
+       These instructions are still there in README.OSX because the 1.3.x
+       port relies on qt 3.1.x (because of other problems, I believe).
+
+       For the 1.4.x port, Bennett Helm aims at using the latest Qt version
+       with the current gcc 3 compiler.
+
+   2.  Download the LyX/Mac skeleton from
+       <ftp://ftp.lyx.org/pub/lyx/stable/lyx-mac-1.3.4-skeleton.tar.gz>
+       and unpack it in /Applications.  Change the references to
+       "1.3.4" in /Applications/LyX.app/Contents/Info.plist to
+       "1.4.0".
  
-   2.  Using the same terminal session, cd to the top of the LyX
-   source hierarchy, and:
+   3.  Using the same terminal session you used to build the Qt
+       library, cd to the top of the LyX source hierarchy, and:
 
      export 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
      make
-     cp -R development/MacOSX/LyX.app /Applications
      make install
      rm /Applications/LyX.app/Contents/Resources/LyX/images/lyx.xpm
 
 
-   For information on configuring LyX/Mac, please see the howto at
-   <http://www.18james.com/lyx_on_aqua.html>. The binary installation
-   of LyX/Mac installs LaTeX fonts and packages, and provides
-   additional functionality including inverse DVI search with some
-   DVI-previewers.
-
    The information on this page is believed to be accurate, has been
    used successfully on many systems and sites, and has benefited from
    the comments and suggestions of many users. Due to the variations