Attached patch works around compile errors by #including
"LaTeXFeatures.h" in several files. I am able to compile and run
lyx-1.3.4 using gcc3.3 and Qt/Mac 3.3.1. A recent ltmain.sh is also
required.
Venkat
diff -ruN lyx-1.3.4-orig/src/frontends/controllers/ControlPrefs.C lyx-1.3.4/src/frontends/controllers/ControlPrefs.C
--- lyx-1.3.4-orig/src/frontends/controllers/ControlPrefs.C Wed Jan 15 03:21:33 2003
+++ lyx-1.3.4/src/frontends/controllers/ControlPrefs.C Thu Apr 29 20:00:43 2004
@@ -26,6 +26,9 @@
#include "frontends/Dialogs.h"
#include "converter.h"
#include "debug.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
extern string system_lyxdir;
extern string user_lyxdir;
diff -ruN lyx-1.3.4-orig/src/frontends/controllers/ControlPrint.C lyx-1.3.4/src/frontends/controllers/ControlPrint.C
--- lyx-1.3.4-orig/src/frontends/controllers/ControlPrint.C Wed Nov 27 16:00:22 2002
+++ lyx-1.3.4/src/frontends/controllers/ControlPrint.C Thu Apr 29 20:00:43 2004
@@ -32,6 +32,9 @@
#include "support/filetools.h"
#include "support/path.h"
#include "support/systemcall.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
#include "debug.h" // for lyxerr
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/QCharacterDialog.C lyx-1.3.4/src/frontends/qt2/QCharacterDialog.C
--- lyx-1.3.4-orig/src/frontends/qt2/QCharacterDialog.C Sun Oct 20 07:18:27 2002
+++ lyx-1.3.4/src/frontends/qt2/QCharacterDialog.C Thu Apr 29 20:00:43 2004
@@ -20,6 +20,9 @@
#include <qcheckbox.h>
#include <qpushbutton.h>
#include <qgroupbox.h>
+#ifdef Q_OS_MACX
+#include "LaTeXFeatures.h"
+#endif
QCharacterDialog::QCharacterDialog(QCharacter * form)
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/QDelimiterDialog.C lyx-1.3.4/src/frontends/qt2/QDelimiterDialog.C
--- lyx-1.3.4-orig/src/frontends/qt2/QDelimiterDialog.C Wed Dec 18 02:07:10 2002
+++ lyx-1.3.4/src/frontends/qt2/QDelimiterDialog.C Thu Apr 29 20:00:43 2004
@@ -28,6 +28,9 @@
#include <qpixmap.h>
#include <qpushbutton.h>
#include <qcheckbox.h>
+#ifdef Q_OS_MACX
+#include "LaTeXFeatures.h"
+#endif
namespace {
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/QMath.C lyx-1.3.4/src/frontends/qt2/QMath.C
--- lyx-1.3.4-orig/src/frontends/qt2/QMath.C Mon Oct 28 22:13:57 2002
+++ lyx-1.3.4/src/frontends/qt2/QMath.C Thu Apr 29 20:00:43 2004
@@ -25,6 +25,9 @@
#include "QMath.h"
#include "iconpalette.h"
+#ifdef Q_OS_MACX
+#include "LaTeXFeatures.h"
+#endif
// needless to say, this can't last for long
extern BufferView * current_view;
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/QMathDialog.C lyx-1.3.4/src/frontends/qt2/QMathDialog.C
--- lyx-1.3.4-orig/src/frontends/qt2/QMathDialog.C Mon Jul 21 18:25:59 2003
+++ lyx-1.3.4/src/frontends/qt2/QMathDialog.C Thu Apr 29 20:00:43 2004
@@ -37,6 +37,9 @@
#include <qlayout.h>
#include <qpopupmenu.h>
#include <qcursor.h>
+#ifdef Q_OS_MACX
+#include "LaTeXFeatures.h"
+#endif
using std::min;
using std::max;
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/QParagraphDialog.C lyx-1.3.4/src/frontends/qt2/QParagraphDialog.C
--- lyx-1.3.4-orig/src/frontends/qt2/QParagraphDialog.C Sun Oct 20 07:18:28 2002
+++ lyx-1.3.4/src/frontends/qt2/QParagraphDialog.C Thu Apr 29 20:00:43 2004
@@ -24,6 +24,9 @@
#include <qvalidator.h>
#include "helper_funcs.h"
+#ifdef Q_OS_MACX
+#include "LaTeXFeatures.h"
+#endif
using std::vector;
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/QSendtoDialog.C lyx-1.3.4/src/frontends/qt2/QSendtoDialog.C
--- lyx-1.3.4-orig/src/frontends/qt2/QSendtoDialog.C Wed Dec 18 02:07:10 2002
+++ lyx-1.3.4/src/frontends/qt2/QSendtoDialog.C Thu Apr 29 20:00:43 2004
@@ -29,6 +29,9 @@
#include "QSendtoDialog.h"
#include "QSendto.h"
+#ifdef Q_OS_MACX
+#include "LaTeXFeatures.h"
+#endif
QSendtoDialog::QSendtoDialog(QSendto * form)
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/QTexinfoDialog.C lyx-1.3.4/src/frontends/qt2/QTexinfoDialog.C
--- lyx-1.3.4-orig/src/frontends/qt2/QTexinfoDialog.C Wed Dec 18 02:07:10 2002
+++ lyx-1.3.4/src/frontends/qt2/QTexinfoDialog.C Thu Apr 29 20:00:43 2004
@@ -26,6 +26,9 @@
#include <qcombobox.h>
#include <vector>
+#ifdef Q_OS_MACX
+#include "LaTeXFeatures.h"
+#endif
QTexinfoDialog::QTexinfoDialog(QTexinfo * form)
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/QTocDialog.C lyx-1.3.4/src/frontends/qt2/QTocDialog.C
--- lyx-1.3.4-orig/src/frontends/qt2/QTocDialog.C Mon Feb 3 02:26:28 2003
+++ lyx-1.3.4/src/frontends/qt2/QTocDialog.C Thu Apr 29 20:00:43 2004
@@ -20,6 +20,9 @@
#include <qlistview.h>
#include <qpushbutton.h>
+#ifdef Q_OS_MACX
+#include "LaTeXFeatures.h"
+#endif
QTocDialog::QTocDialog(QToc * form)
diff -ruN lyx-1.3.4-orig/src/frontends/qt2/qfont_loader.C lyx-1.3.4/src/frontends/qt2/qfont_loader.C
--- lyx-1.3.4-orig/src/frontends/qt2/qfont_loader.C Thu Apr 29 19:38:19 2004
+++ lyx-1.3.4/src/frontends/qt2/qfont_loader.C Thu Apr 29 20:00:43 2004
@@ -31,12 +31,12 @@
#include <boost/tuple/tuple.hpp>
-#ifdef Q_WS_X11
#include <qwidget.h>
+#ifdef Q_WS_X11
#include <X11/Xlib.h>
+#endif
#include "support/systemcall.h"
#include "support/filetools.h"
-#endif
using std::endl;
using std::vector;
diff -ruN lyx-1.3.4-orig/src/insets/insetmarginal.C lyx-1.3.4/src/insets/insetmarginal.C
--- lyx-1.3.4-orig/src/insets/insetmarginal.C Wed Sep 25 19:56:11 2002
+++ lyx-1.3.4/src/insets/insetmarginal.C Thu Apr 29 20:00:43 2004
@@ -23,6 +23,9 @@
#include "insets/insettext.h"
#include "support/LOstream.h"
#include "debug.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
using std::ostream;
diff -ruN lyx-1.3.4-orig/src/insets/insetnote.C lyx-1.3.4/src/insets/insetnote.C
--- lyx-1.3.4-orig/src/insets/insetnote.C Wed Dec 4 18:56:55 2002
+++ lyx-1.3.4/src/insets/insetnote.C Thu Apr 29 20:00:43 2004
@@ -25,6 +25,9 @@
#include "support/LOstream.h"
#include "support/lstrings.h"
#include "debug.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
using std::ostream;
diff -ruN lyx-1.3.4-orig/src/kbmap.C lyx-1.3.4/src/kbmap.C
--- lyx-1.3.4-orig/src/kbmap.C Wed Nov 27 16:00:07 2002
+++ lyx-1.3.4/src/kbmap.C Thu Apr 29 20:00:43 2004
@@ -17,6 +17,9 @@
#include "commandtags.h"
#include "kbsequence.h"
#include "debug.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
using std::endl;
diff -ruN lyx-1.3.4-orig/src/kbsequence.C lyx-1.3.4/src/kbsequence.C
--- lyx-1.3.4-orig/src/kbsequence.C Mon Jan 6 04:08:41 2003
+++ lyx-1.3.4/src/kbsequence.C Thu Apr 29 20:00:43 2004
@@ -20,6 +20,9 @@
#include "kbmap.h"
#include "commandtags.h"
#include "debug.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
using std::make_pair;
diff -ruN lyx-1.3.4-orig/src/mathed/math_fontoldinset.h lyx-1.3.4/src/mathed/math_fontoldinset.h
--- lyx-1.3.4-orig/src/mathed/math_fontoldinset.h Wed Sep 11 13:56:02 2002
+++ lyx-1.3.4/src/mathed/math_fontoldinset.h Thu Apr 29 20:00:43 2004
@@ -3,6 +3,9 @@
#define MATH_FONTOLDINSET_H
#include "math_nestinset.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
#ifdef __GNUG__
#pragma interface
diff -ruN lyx-1.3.4-orig/src/mathed/math_fracinset.h lyx-1.3.4/src/mathed/math_fracinset.h
--- lyx-1.3.4-orig/src/mathed/math_fracinset.h Wed Sep 11 13:56:02 2002
+++ lyx-1.3.4/src/mathed/math_fracinset.h Thu Apr 29 20:00:43 2004
@@ -3,6 +3,9 @@
#define MATH_FRACINSET_H
#include "math_fracbase.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
#ifdef __GNUG__
#pragma interface
diff -ruN lyx-1.3.4-orig/src/mathed/math_gridinset.h lyx-1.3.4/src/mathed/math_gridinset.h
--- lyx-1.3.4-orig/src/mathed/math_gridinset.h Mon Dec 2 04:29:24 2002
+++ lyx-1.3.4/src/mathed/math_gridinset.h Thu Apr 29 20:00:43 2004
@@ -86,6 +86,7 @@
MathGridInset();
/// constructor from columns description, creates one row
MathGridInset(char valign, string const & halign);
+ ~MathGridInset(){}
/// Note: columns first!
MathGridInset(col_type m, row_type n);
///
diff -ruN lyx-1.3.4-orig/src/mathed/math_lefteqninset.h lyx-1.3.4/src/mathed/math_lefteqninset.h
--- lyx-1.3.4-orig/src/mathed/math_lefteqninset.h Tue Sep 10 21:23:33 2002
+++ lyx-1.3.4/src/mathed/math_lefteqninset.h Thu Apr 29 20:00:43 2004
@@ -3,6 +3,9 @@
#define MATH_LEFTEQNINSET_H
#include "math_nestinset.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
#ifdef __GNUG__
#pragma interface
diff -ruN lyx-1.3.4-orig/src/mathed/math_sqrtinset.h lyx-1.3.4/src/mathed/math_sqrtinset.h
--- lyx-1.3.4-orig/src/mathed/math_sqrtinset.h Wed Sep 11 13:56:02 2002
+++ lyx-1.3.4/src/mathed/math_sqrtinset.h Thu Apr 29 20:00:43 2004
@@ -3,6 +3,9 @@
#define MATH_SQRTINSET_H
#include "math_nestinset.h"
+#ifdef __APPLE__
+#include "LaTeXFeatures.h"
+#endif
#ifdef __GNUG__
#pragma interface
