Comment 2 for bug 1804865

Revision history for this message
Andreas Rönnquist (gusnan) wrote :

diff -Nru scite-4.0.0/debian/changelog scite-4.0.0/debian/changelog
--- scite-4.0.0/debian/changelog 2017-08-16 19:11:14.000000000 +0200
+++ scite-4.0.0/debian/changelog 2018-11-23 20:53:03.000000000 +0100
@@ -1,3 +1,10 @@
+scite (4.0.0-1ubuntu1) bionic; urgency=medium
+
+ * Add patch enable_lua_to_access_dynamic_libraries.patch
+ enabling dynamic Lua libraries in SciTE (LP: #1804865)
+
+ -- Andreas Rönnquist <email address hidden> Fri, 23 Nov 2018 20:53:03 +0100
+
 scite (4.0.0-1) unstable; urgency=medium

   * New upstream release
diff -Nru scite-4.0.0/debian/patches/enable_lua_to_access_dynamic_libraries.patch scite-4.0.0/debian/patches/enable_lua_to_access_dynamic_libraries.patch
--- scite-4.0.0/debian/patches/enable_lua_to_access_dynamic_libraries.patch 1970-01-01 01:00:00.000000000 +0100
+++ scite-4.0.0/debian/patches/enable_lua_to_access_dynamic_libraries.patch 2018-11-23 20:52:15.000000000 +0100
@@ -0,0 +1,32 @@
+Author: jj5
+Description: On Linux, enable Lua to access dynamic libraries.
+Applied-Upstream: https://sourceforge.net/p/scintilla/scite/ci/2b22af2a7fbbaec530d5043523ecf8d49a6e02c9/
+Index: scite-4.0.0/scite/gtk/makefile
+===================================================================
+--- scite-4.0.0.orig/scite/gtk/makefile
++++ scite-4.0.0/scite/gtk/makefile
+@@ -77,7 +77,7 @@ vpath %.c $(srcdir)/../lua/src
+ INCLUDEDIRS=-I $(srcdir)/../../scintilla/include -I $(srcdir)/../src -I$(srcdir)/../lua/src
+
+ .c.o:
+- $(CC) $(CPPFLAGS) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(CXXTFLAGS) $(CFLAGS) -c $< -o $@
++ $(CC) $(CPPFLAGS) $(INCLUDEDIRS) $(MISLEADING) -DLUA_USE_POSIX $(LUACFLAGS) $(CXXTFLAGS) $(CFLAGS) -c $< -o $@
+
+ else
+ CXXTFLAGS+=-DNO_LUA
+@@ -88,12 +88,15 @@ CXXTFLAGS:=$(CXXTFLAGS)
+ UNAME:=$(shell uname -s)
+ ifeq ($(UNAME), Linux)
+ LIBDL:=-ldl
++LUACFLAGS:=-DLUA_USE_DLOPEN
+ endif
+ ifneq (,$(findstring GNU,$(UNAME)))
+ LIBDL:=-ldl
++LUACFLAGS:=-DLUA_USE_DLOPEN
+ endif
+ ifeq ($(UNAME), Darwin)
+ CXXTFLAGS:=$(CXXTFLAGS) -Dunix
++LUACFLAGS:=-DLUA_USE_DLOPEN
+ endif
+
+ .cxx.o:
diff -Nru scite-4.0.0/debian/patches/series scite-4.0.0/debian/patches/series
--- scite-4.0.0/debian/patches/series 2017-08-16 19:11:14.000000000 +0200
+++ scite-4.0.0/debian/patches/series 2018-11-23 20:39:40.000000000 +0100
@@ -1,3 +1,4 @@
 hardening_flags.patch
 do_not_use_remote_logo.patch
 reproducible_build.patch
+enable_lua_to_access_dynamic_libraries.patch