From 68e5b0224b8f779da76fbca8bcf2232f1119d9b1 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 3 Oct 2003 13:34:40 +0000 Subject: [PATCH] osx fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@7856 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ README.MacOSX | 21 +++++++++------------ boost/ChangeLog | 5 +++++ boost/boost/config/user.hpp | 3 +++ lib/ChangeLog | 4 ++++ lib/bind/aqua.bind | 2 +- src/frontends/qt2/ChangeLog | 6 +++++- src/frontends/qt2/qfont_loader.C | 1 + status.13x | 6 +++++- 9 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78fba2ff9e..a86bfb665a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-10-02 Ronald Florence + + * README.MacOSX: reformatting + 2003-09-26 Jean-Marc Lasgouttes * Makefile.am (EXTRA_DIST): add README.MacOSX diff --git a/README.MacOSX b/README.MacOSX index cc7fa4dd18..1cb0762283 100644 --- a/README.MacOSX +++ b/README.MacOSX @@ -1,5 +1,5 @@ - Building LyX on Aqua + Building LyX/Mac Ronald Florence @@ -29,11 +29,8 @@ as above), cd to the top of the LyX source hierarchy. Then: % setenv CXX g++2 - % setenv LDFLAGS "-framework Carbon -framework OpenGL -framework AGL -framew -ork QuickTime -lz" - % ./configure --with-frontend=qt --without-x --datadir=/Applications/LyX.app -/Contents/Resources --bindir=/Applications/LyX.app/Contents/MacOS --mandir=/App -lications/LyX.app/Contents/Resources/man + % 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 % make Download the LyX Framework at @@ -45,12 +42,12 @@ lications/LyX.app/Contents/Resources/man For information on configuring LyX/Mac, please see the howto at http://www.18james.com/lyx_on_aqua.html . The binary installation - of LyX on Aqua sets the PATH in ~/.MacOS/environment.plist, - installs the LyX math fonts, configures LyX to use the reLyX and - noweb2lyx commands in the application package and to use system - defaults for viewers, sets up the lyxpipe for Start-LyX, and - optionally installs latex-preview; you will need to do this - configuration manually if you build LyX/Mac yourself. + of LyX/Mac sets the PATH in ~/.MacOS/environment.plist, installs + the LyX math fonts, configures LyX to use the reLyX and noweb2lyx + commands in the application package and to use system defaults for + viewers, sets up the lyxpipe for Start-LyX, and optionally installs + latex-preview; you will need to do this configuration manually if + you build LyX/Mac yourself. The information on this page is believed to be accurate, has been used successfully on many systems and sites, and has benefited from diff --git a/boost/ChangeLog b/boost/ChangeLog index 1d6bbc5752..b2a338ce09 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,8 @@ +2003-10-02 Jean-Marc Lasgouttes + + * boost/config/user.hpp (BOOST_REGEX_NARROW_INSTANTIATE): define + on OSX + 2003-05-26 Jean-Marc Lasgouttes * boost/config/compiler/gcc.hpp: accept gcc 3.3 as valid compiler diff --git a/boost/boost/config/user.hpp b/boost/boost/config/user.hpp index 1c786bb9c1..598f468bb6 100644 --- a/boost/boost/config/user.hpp +++ b/boost/boost/config/user.hpp @@ -70,3 +70,6 @@ #define BOOST_NO_WREGEX 1 #define BOOST_NO_WSTRING 1 #define BOOST_FUNCTION_NO_DEPRECATED 1 +#if defined(__APPLE__) && defined(__GNUC__) +#define BOOST_REGEX_NARROW_INSTANTIATE +#endif diff --git a/lib/ChangeLog b/lib/ChangeLog index ceadbf2a60..5d453dd3c9 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2003-10-02 Jean-Marc Lasgouttes + + * bind/aqua.bind: fix typo + 2003-09-23 Jean-Marc Lasgouttes * CREDITS: add Hartmut Haase diff --git a/lib/bind/aqua.bind b/lib/bind/aqua.bind index c367ac562e..57fb98040b 100644 --- a/lib/bind/aqua.bind +++ b/lib/bind/aqua.bind @@ -18,7 +18,7 @@ \bind "M-~S-i r" "reference-insert" \bind "M-~S-i n" "note-insert" \bind "M-~S-i l" "label-insert" -\bind "M-~S-i i "index-insert" +\bind "M-~S-i i" "index-insert" \bind "M-~S-i s s" "command-sequence math-mode ; math-superscript ; font-free; " \bind "M-~S-i s u" "command-sequence math-mode ; math-subscript ; font-free; " diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 184da48443..8c753a2fa9 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,4 +1,8 @@ -2003-10-01 Vitaly Lipatov +2003-10-02 Jean-Marc Lasgouttes + + * qfont_loader.C: add an #include + +2003-10-01 Vitaly Lipatov * FileDialog.C: use fromqstr in a few places to enable the dialog to read non-latin filenames. diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C index 77a52516bd..d5a724da1a 100644 --- a/src/frontends/qt2/qfont_loader.C +++ b/src/frontends/qt2/qfont_loader.C @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "support/lstrings.h" diff --git a/status.13x b/status.13x index 59e37711ff..3573e80148 100644 --- a/status.13x +++ b/status.13x @@ -22,9 +22,13 @@ What's new ** Updates +- updated italian interface localization ** Bug fixes +- enable the file dialog to open files with non-latin filenames [Qt only] + - add a couple forgotten MacOSX-related files -- enable the file dialog to open files with non-latin filenames. (Qt only.) +- compilation fixes for MacOSX +