File scite-use-system-scintilla.patch of Package scite
Index: scite-5.2.2/scite/gtk/makefile
===================================================================
--- scite-5.2.2.orig/scite/gtk/makefile
+++ scite-5.2.2/scite/gtk/makefile
@@ -8,6 +8,7 @@
srcdir ?= .
SCINTILLA_DIR ?= $(srcdir)/../../scintilla
+SCINTILLA_INCLUDE_DIR ?= /usr/include/scintilla
LEXILLA_DIR ?= $(srcdir)/../../lexilla
.SUFFIXES: .cxx .o .h .a .c
@@ -60,12 +61,12 @@ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
-all: $(PROG) $(COMPONENT) $(LEXILLA)
+all: $(PROG) $(LEXILLA)
-vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_DIR)/include
+vpath %.h $(srcdir) $(srcdir)/../src $(LEXILLA_DIR)/include $(SCINTILLA_INCLUDE_DIR)
vpath %.cxx $(srcdir) $(srcdir)/../src $(srcdir)/../../lexilla/access $(SCINTILLA_DIR)/call
-INCLUDES=-I $(LEXILLA_DIR)/include -I $(LEXILLA_DIR)/access -I $(SCINTILLA_DIR)/include -I $(srcdir)/../src
+INCLUDES=-I $(LEXILLA_DIR)/include -I $(LEXILLA_DIR)/access -I $(SCINTILLA_INCLUDE_DIR) -I $(srcdir)/../src
DEFINES += -DGTK
DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
@@ -156,7 +157,7 @@ SRC_OBJS = \
Utf8_16.o
$(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
- $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -L ../../scintilla/bin -lscintilla $(LDLIBS)
+ $(CXX) $(BASE_FLAGS) $(LDFLAGS) -rdynamic -Wl,--as-needed -Wl,-rpath,'$${ORIGIN}' -Wl,--version-script $(srcdir)/lua.vers -Wl,-rpath,$(libdir) $^ -o $@ $(CONFIGLIB) $(LIBS) -lscintilla $(LDLIBS)
# Automatically generate header dependencies with "make depend"
include deps.mak
@@ -169,7 +170,6 @@ install:
$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
$(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 $(COMPONENT) $(DESTDIR)$(libdir)
$(INSTALL) -m 755 $(LEXILLA) $(DESTDIR)$(libdir)
for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png $(srcdir)/../doc/SciTEIndicators.png; \
@@ -185,7 +185,6 @@ endif
uninstall:
rm -f $(DESTDIR)$(bindir)/SciTE
- rm -f $(DESTDIR)$(libdir)/libscintilla.so
rm -f $(DESTDIR)$(libdir)/liblexilla.so
rm -rf $(DESTDIR)$(SYSCONF_PATH)
ifdef gnomeprefix
Index: scite-5.2.2/lexilla/src/makefile
===================================================================
--- scite-5.2.2.orig/lexilla/src/makefile
+++ scite-5.2.2/lexilla/src/makefile
@@ -38,6 +38,7 @@ else
BASE_FLAGS += -fvisibility=hidden
endif
+SCINTILLA_INCLUDE_DIR ?= /usr/include/scintilla
LEXILLA=$(DIR_BIN)/$(SHARED_NAME).$(SHAREDEXTENSION)
LIBLEXILLA=$(DIR_BIN)/liblexilla.a
@@ -73,15 +74,13 @@ endif
RANLIB ?= ranlib
-SCINTILLA_INCLUDE = ../../scintilla/include
-
-vpath %.h ../src ../include ../../scintilla/include ../lexlib
+vpath %.h ../src ../include $(SCINTILLA_INCLUDE_DIR) ../lexlib
vpath %.cxx ../src ../lexlib ../lexers
DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
BASE_FLAGS += $(if $(DEBUG),-g,-Os)
-INCLUDES = -I ../include -I $(SCINTILLA_INCLUDE) -I ../src -I ../lexlib
+INCLUDES = -I ../include -I $(SCINTILLA_INCLUDE_DIR) -I ../src -I ../lexlib
LDFLAGS += -shared
BASE_FLAGS += $(WARNINGS)