scite: split out build-with-debian-packaged lua

2 files changed, 83 insertions, 0 deletions

diff --git a/scite-fedora/0007-Build-with-Debian-packaged-Lua.patch b/scite-fedora/0007-Build-with-Debian-packaged-Lua.patch
new file mode 100644
index 0000000..d6e2b79
--- /dev/null
+++ b/scite-fedora/0007-Build-with-Debian-packaged-Lua.patch
@@ -0,0 +1,80 @@
+Author: <gusnan@debian.org>
+Modified-By: bgstack15
+Target: Fedora scite 5.2.3
+Date: Tue, 19 Jun 2018 15:34:57 +0200
+Subject: Slight modification to patch "Build with Debian packaged Lua" from Debian
+Date-modified: 2022-05-31
+
+---
+ scite/gtk/deps.mak |  6 +-----
+ scite/gtk/makefile | 30 ++++--------------------------
+ 2 files changed, 5 insertions(+), 31 deletions(-)
+
+--- a/scite/gtk/deps.mak
++++ b/scite/gtk/deps.mak
+@@ -265,11 +265,7 @@
+ 	../src/Extender.h \
+ 	../src/IFaceTable.h \
+ 	../src/SciTEKeys.h \
+-	../src/LuaExtension.h \
+-	../lua/src/lua.h \
+-	../lua/src/luaconf.h \
+-	../lua/src/lualib.h \
+-	../lua/src/lauxlib.h
++	../src/LuaExtension.h
+ MatchMarker.o: \
+ 	../src/MatchMarker.cxx \
+ 	../../scintilla/include/ScintillaTypes.h \
+--- a/scite/gtk/makefile
++++ b/scite/gtk/makefile
+@@ -33,9 +33,9 @@
+ 
+ PYTHON = $(if $(windir),pyw,python3)
+ 
+-# For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
+-CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
+-CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0)
++# For the Lua and Gnome desktop stuff to work, prefix must point to where Lua and Gnome thinks it is.
++CONFIGFLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION)) $(shell $(PKG_CONFIG) --cflags lua)
++CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua)
+ gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
+ ifndef prefix
+ ifdef gnomeprefix
+@@ -72,28 +72,6 @@
+ DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+ BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+ 
+-ifndef NO_LUA
+-LUA_CORE_OBJS = lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+-		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
+-		ltable.o ltm.o lundump.o lvm.o lzio.o
+-
+-LUA_LIB_OBJS =	lauxlib.o lbaselib.o lbitlib.o lcorolib.o ldblib.o liolib.o lmathlib.o ltablib.o \
+-		lstrlib.o loadlib.o loslib.o linit.o lutf8lib.o
+-
+-LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+-
+-vpath %.c $(srcdir)/../lua/src
+-
+-INCLUDES += -I$(srcdir)/../lua/src
+-LUA_DEFINES = -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+-
+-%.o: %.c
+-	$(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) $(WARNINGS) $(LUA_DEFINES) $(BASE_FLAGS) $(CFLAGS) -c $< -o $@
+-
+-else
+-DEFINES += -DNO_LUA
+-endif
+-
+ LIBS += -lm -lstdc++
+ 
+ UNAME:=$(shell uname -s)
+@@ -154,7 +132,7 @@
+ 	StyleWriter.o \
+ 	Utf8_16.o
+ 
+-$(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
++$(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) LuaExtension.o
+ 	$(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)
+ 
+ # Automatically generate header dependencies with "make depend"
diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec
index 2145880..1507fa1 100644
--- a/scite-fedora/scite.spec
+++ b/scite-fedora/scite.spec
@@ -54,6 +54,7 @@ Source2: SciTEGlobal.properties
 Patch0: scite-utf8.patch
 %if 0%{with_lua} && !0%{with_bundled_lua}
 Patch2: use-lua5.4.4.patch
+Patch3: 0007-Build-with-Debian-packaged-Lua.patch
 %endif
 
 BuildRequires: desktop-file-utils
@@ -87,6 +88,7 @@ rm -rf scite/lua
 # Use distro lua
 rm -rf scite/lua
 %patch2 -p1
+%patch3 -p1
 %endif
 %endif
 
@@ -149,6 +151,7 @@ install -D -p -m 666 %{SOURCE2} %{buildroot}%{_datadir}/scite/SciTEGlobal.proper
 %changelog
 * Tue May 31 2022 B. Stack <bgstack15@gmail.com> - 5.2.3-1/3.7.6-1
 - Update version
+- split back out patch build-with-debian-packaged-lua
 
 * Mon Apr 04 2022 B. Stack <bgstack15@gmail.com> - 5.2.2-2/3.7.6-1
 - Update version