scite 5.4.0 rc1

5 files changed, 28 insertions, 16 deletions

diff --git a/scite/debian/patches/0002-do_not_use_remote_logo.patch b/scite/debian/patches/0001-do_not_use_remote_logo.patch
index c90927e..d6eeaac 100644
--- a/scite/debian/patches/0002-do_not_use_remote_logo.patch
+++ b/scite/debian/patches/0001-do_not_use_remote_logo.patch
@@ -8,9 +8,11 @@ Subject: Fix the "privacy-breach-logo" error detected by lintian
  scite/doc/SciTE.html     | 15 +--------------
  2 files changed, 2 insertions(+), 28 deletions(-)
 
+diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
+index 258df4a..0d4c8c4 100644
 --- a/scintilla/doc/index.html
 +++ b/scintilla/doc/index.html
-@@ -172,20 +172,7 @@
+@@ -177,20 +177,7 @@ if (!IsRemote()) { //if NOT remote...
      </p>
  There is a <a href="https://sourceforge.net/projects/scintilla/">Scintilla project page</a>
  hosted on
@@ -32,9 +34,11 @@ Subject: Fix the "privacy-breach-logo" error detected by lintian
    </body>
  </html>
  
+diff --git a/scite/doc/SciTE.html b/scite/doc/SciTE.html
+index 3e1709c..4f5017e 100644
 --- a/scite/doc/SciTE.html
 +++ b/scite/doc/SciTE.html
-@@ -139,20 +139,7 @@
+@@ -142,20 +142,7 @@ if (IsRemote()) {
        <a href="https://sourceforge.net/project/showfiles.php?group_id=2439">the downloads page</a>.
      </p>
  There is a <a href="https://sourceforge.net/projects/scintilla/">Scintilla project page</a> hosted on
diff --git a/scite/debian/patches/0003-reproducible_build.patch b/scite/debian/patches/0002-reproducible_build.patch
index ae3715f..d91ff9b 100644
--- a/scite/debian/patches/0003-reproducible_build.patch
+++ b/scite/debian/patches/0002-reproducible_build.patch
@@ -7,9 +7,11 @@ Subject: Allow reproducible build
  scite/src/Credits.cxx | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/scite/src/Credits.cxx b/scite/src/Credits.cxx
+index 7489bf2..3e8ff89 100644
 --- a/scite/src/Credits.cxx
 +++ b/scite/src/Credits.cxx
-@@ -615,7 +615,7 @@
+@@ -619,7 +619,7 @@ void SciTEBase::SetAboutMessage(GUI::ScintillaWindow &wsci, const char *appTitle
  		}
  		AddStyledText(wsci, GetTranslationToAbout("Version"), trsSty);
  		AddStyledText(wsci, sVersion, 1);
diff --git a/scite/debian/patches/0005-scite-desktop.patch b/scite/debian/patches/0003-scite-desktop.patch
index c0d0693..cdea9cf 100644
--- a/scite/debian/patches/0005-scite-desktop.patch
+++ b/scite/debian/patches/0003-scite-desktop.patch
@@ -7,9 +7,11 @@ Add the Keywords entry to the desktop file.
  scite/gtk/SciTE.desktop | 1 +
  1 file changed, 1 insertion(+)
 
+diff --git a/scite/gtk/SciTE.desktop b/scite/gtk/SciTE.desktop
+index e47c178..585ef41 100755
 --- a/scite/gtk/SciTE.desktop
 +++ b/scite/gtk/SciTE.desktop
-@@ -21,3 +21,4 @@
+@@ -21,3 +21,4 @@ Terminal=false
  StartupNotify=true
  Categories=TextEditor;Development;GTK;
  MimeType=text/plain;
diff --git a/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch b/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch
index 1a69a2b..e622de0 100644
--- a/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch
+++ b/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch
@@ -1,16 +1,18 @@
 From: =?utf-8?q?Andreas_R=C3=B6nnquist?= <gusnan@debian.org>
 Date: Tue, 19 Jun 2018 15:34:57 +0200
 Subject: Build with Debian packaged Lua
-Forwarded: not-needed
 
+Forwarded: not-needed
 ---
  scite/gtk/deps.mak |  6 +-----
  scite/gtk/makefile | 30 ++++--------------------------
  2 files changed, 5 insertions(+), 31 deletions(-)
 
+diff --git a/scite/gtk/deps.mak b/scite/gtk/deps.mak
+index 919cba9..af4432a 100644
 --- a/scite/gtk/deps.mak
 +++ b/scite/gtk/deps.mak
-@@ -267,11 +267,7 @@
+@@ -267,11 +267,7 @@ LuaExtension.o: \
  	../src/Extender.h \
  	../src/IFaceTable.h \
  	../src/SciTEKeys.h \
@@ -23,22 +25,24 @@ Forwarded: not-needed
  MatchMarker.o: \
  	../src/MatchMarker.cxx \
  	../../scintilla/include/ScintillaTypes.h \
+diff --git a/scite/gtk/makefile b/scite/gtk/makefile
+index a53e8f4..86ad0fe 100644
 --- a/scite/gtk/makefile
 +++ b/scite/gtk/makefile
-@@ -33,9 +33,9 @@
+@@ -33,9 +33,9 @@ GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
  
  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)
-+# stackrpms,3 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 lua5.4)
-+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.4)
++# 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 lua5.3)
++CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gthread-2.0 gmodule-no-export-2.0) $(shell $(PKG_CONFIG) --libs lua5.3)
  gnomeprefix:=$(shell $(PKG_CONFIG) --variable=prefix $(GTK_VERSION) 2>/dev/null)
  ifndef prefix
  ifdef gnomeprefix
-@@ -72,28 +72,6 @@
+@@ -72,28 +72,6 @@ DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
  DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
  BASE_FLAGS += $(if $(DEBUG),-g,-O3)
  
@@ -67,7 +71,7 @@ Forwarded: not-needed
  LIBS += -lm -lstdc++
  
  UNAME:=$(shell uname -s)
-@@ -155,7 +133,7 @@
+@@ -155,7 +133,7 @@ SRC_OBJS = \
  	StyleWriter.o \
  	Utf8_16.o
  
diff --git a/scite/debian/patches/series b/scite/debian/patches/series
index 45df0d6..4ce0616 100644
--- a/scite/debian/patches/series
+++ b/scite/debian/patches/series
@@ -1,5 +1,5 @@
-0002-do_not_use_remote_logo.patch
-0003-reproducible_build.patch
-0005-scite-desktop.patch
-0007-Build-with-Debian-packaged-Lua.patch
+0001-do_not_use_remote_logo.patch
+0002-reproducible_build.patch
+0003-scite-desktop.patch
+0004-Build-with-Debian-packaged-Lua.patch
 use-lua5.4.4.patch