diff options
Diffstat (limited to 'x11-libs/fxscintilla/files/1.62-fox-SLOT.patch')
| -rw-r--r-- | x11-libs/fxscintilla/files/1.62-fox-SLOT.patch | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch b/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch new file mode 100644 index 000000000000..9b1efe2d9f84 --- /dev/null +++ b/x11-libs/fxscintilla/files/1.62-fox-SLOT.patch @@ -0,0 +1,98 @@ +--- fxscintilla-1.62-orig/src/Makefile.am 2003-08-08 15:04:16.000000000 -0400 ++++ fxscintilla-1.62/src/Makefile.am 2005-04-07 01:33:32.000000000 -0400 +@@ -17,20 +17,20 @@ + AM_LDFLAGS = -mwindows + endif # MinGW32 + +-lib_LTLIBRARIES = libfxscintilla.la ++lib_LTLIBRARIES = ++ ++if HAVE_FOX_1_0 ++lib_LTLIBRARIES += libfxscintilla.la + + libfxscintilla_la_SOURCES = \ + PlatFOX.cxx \ + ScintillaFOX.cxx + +-libfxscintilla_la_LIBADD = \ +- $(top_builddir)/scintilla/src/libscintilla.la +- + ## No need for ltdl with Fox 1.1 +-if HAVE_FOX_1_0 +-libfxscintilla_la_LIBADD += \ +- $(top_builddir)/ltdl/libltdl.la +-endif # HAVE_FOX_1_0 ++libfxscintilla_la_LIBADD = \ ++ $(top_builddir)/scintilla/src/libscintilla.la \ ++ $(top_builddir)/ltdl/libltdl.la \ ++ -L$(FOX_LIB_DIR) -lFOX + + libfxscintilla_la_LDFLAGS = \ + -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE) +@@ -46,10 +46,48 @@ + PlatFOX.cxx \ + ScintillaFOX.cxx + +-libfxscintillanolexer_la_LIBADD = $(top_builddir)/scintilla/src/libscintillanolexer.la ++libfxscintillanolexer_la_LIBADD = \ ++ $(top_builddir)/scintilla/src/libscintillanolexer.la \ ++ -L$(FOX_LIB_DIR) -lFOX + + libfxscintillanolexer_la_LDFLAGS = \ + -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE) + + endif # NOLEXER ++endif # HAVE_FOX_1_0 ++ ++ ++if HAVE_FOX_1_2 ++lib_LTLIBRARIES += libfxscintilla-1.2.la ++ ++libfxscintilla_1_2_la_SOURCES = \ ++ PlatFOX.cxx \ ++ ScintillaFOX.cxx ++ ++libfxscintilla_1_2_la_LIBADD = \ ++ $(top_builddir)/scintilla/src/libscintilla.la \ ++ -L$(FOX_LIB_DIR) -lFOX-1.2 + ++libfxscintilla_1_2_la_LDFLAGS = \ ++ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE) ++ ++libfxscintilla_1_2_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER ++ ++## NoLexer enabled ++if NOLEXER ++ ++lib_LTLIBRARIES += libfxscintillanolexer-1.2.la ++ ++libfxscintillanolexer_1_2_la_SOURCES = \ ++ PlatFOX.cxx \ ++ ScintillaFOX.cxx ++ ++libfxscintillanolexer_1_2_la_LIBADD = \ ++ $(top_builddir)/scintilla/src/libscintillanolexer.la \ ++ -L$(FOX_LIB_DIR) -lFOX-1.2 ++ ++libfxscintillanolexer_1_2_la_LDFLAGS = \ ++ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE) ++ ++endif # NOLEXER ++endif # HAVE_FOX_1_2 +--- fxscintilla-1.62-orig/tests/Makefile.am 2004-05-24 16:29:27.000000000 -0400 ++++ fxscintilla-1.62/tests/Makefile.am 2005-04-06 23:37:35.000000000 -0400 +@@ -1,12 +1,11 @@ + INCLUDES = -I$(top_srcdir)/include -I$(FOX_INCLUDE_DIR) +-LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la + + if HAVE_FOX_1_0 +-LDADD += -lFOX ++LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la -lFOX + endif + + if HAVE_FOX_1_2 +-LDADD += -lFOX-1.2 ++LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.2.la -lFOX-1.2 + endif + + AM_CXXFLAGS = $(PTHREAD_CFLAGS) -W -Wall -DFOX -DSCI_LEXER |