From 9d14d13a39701b47699192c93175792c9df3e026 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Mon, 4 Dec 2023 15:41:05 -0500 Subject: scite 5.4.0 rc1 --- scite/debian/_service | 4 +- scite/debian/changelog | 12 +++- .../patches/0001-do_not_use_remote_logo.patch | 62 ++++++++++++++++ .../patches/0002-do_not_use_remote_logo.patch | 58 --------------- scite/debian/patches/0002-reproducible_build.patch | 22 ++++++ scite/debian/patches/0003-reproducible_build.patch | 20 ------ scite/debian/patches/0003-scite-desktop.patch | 18 +++++ .../0004-Build-with-Debian-packaged-Lua.patch | 82 ++++++++++++++++++++++ scite/debian/patches/0005-scite-desktop.patch | 16 ----- .../0007-Build-with-Debian-packaged-Lua.patch | 78 -------------------- scite/debian/patches/series | 8 +-- scite/debian/scite+stackrpms.dsc | 2 +- 12 files changed, 201 insertions(+), 181 deletions(-) create mode 100644 scite/debian/patches/0001-do_not_use_remote_logo.patch delete mode 100644 scite/debian/patches/0002-do_not_use_remote_logo.patch create mode 100644 scite/debian/patches/0002-reproducible_build.patch delete mode 100644 scite/debian/patches/0003-reproducible_build.patch create mode 100644 scite/debian/patches/0003-scite-desktop.patch create mode 100644 scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch delete mode 100644 scite/debian/patches/0005-scite-desktop.patch delete mode 100644 scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch (limited to 'scite/debian') diff --git a/scite/debian/_service b/scite/debian/_service index 88ccb3e..a4fd393 100644 --- a/scite/debian/_service +++ b/scite/debian/_service @@ -14,8 +14,8 @@ https www.scintilla.org - scite539.tgz - scite_5.3.9.orig.tar.gz + scite540.tgz + scite_5.4.0.orig.tar.gz *.tar.xz diff --git a/scite/debian/changelog b/scite/debian/changelog index 42226e2..0d8d007 100644 --- a/scite/debian/changelog +++ b/scite/debian/changelog @@ -1,9 +1,17 @@ -scite (5.3.9-1+stackrpms) unstable; urgency=medium +scite (5.4.0-100+stackrpms) unstable; urgency=medium * Add stackrpms lua script and customized global.properties * Use lua 5.4.4 - -- B. Stack Thu, 16 Nov 2023 10:43:26 -0500 + -- B. Stack Mon, 04 Dec 2023 15:35:16 -0500 + +scite (5.4.0-1) unstable; urgency=medium + + * New upstream release. + * debian/patches: + - Refresh and renumber all patches. + + -- Antonio Valentino Sun, 26 Nov 2023 07:32:58 +0000 scite (5.3.9-1) unstable; urgency=medium diff --git a/scite/debian/patches/0001-do_not_use_remote_logo.patch b/scite/debian/patches/0001-do_not_use_remote_logo.patch new file mode 100644 index 0000000..d6eeaac --- /dev/null +++ b/scite/debian/patches/0001-do_not_use_remote_logo.patch @@ -0,0 +1,62 @@ +From: Antonio Valentino +Date: Sat, 14 Apr 2018 17:39:34 +0000 +Subject: Fix the "privacy-breach-logo" error detected by lintian + +=================================================================== +--- + scintilla/doc/index.html | 15 +-------------- + 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 +@@ -177,20 +177,7 @@ if (!IsRemote()) { //if NOT remote... +

+ There is a Scintilla project page + hosted on +- +- ++SourceForge + + + +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 +@@ -142,20 +142,7 @@ if (IsRemote()) { + the downloads page. +

+ There is a Scintilla project page hosted on +- +- ++SourceForge + + + diff --git a/scite/debian/patches/0002-do_not_use_remote_logo.patch b/scite/debian/patches/0002-do_not_use_remote_logo.patch deleted file mode 100644 index c90927e..0000000 --- a/scite/debian/patches/0002-do_not_use_remote_logo.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Antonio Valentino -Date: Sat, 14 Apr 2018 17:39:34 +0000 -Subject: Fix the "privacy-breach-logo" error detected by lintian - -=================================================================== ---- - scintilla/doc/index.html | 15 +-------------- - scite/doc/SciTE.html | 15 +-------------- - 2 files changed, 2 insertions(+), 28 deletions(-) - ---- a/scintilla/doc/index.html -+++ b/scintilla/doc/index.html -@@ -172,20 +172,7 @@ -

- There is a Scintilla project page - hosted on -- -- -+SourceForge - - - ---- a/scite/doc/SciTE.html -+++ b/scite/doc/SciTE.html -@@ -139,20 +139,7 @@ - the downloads page. -

- There is a Scintilla project page hosted on -- -- -+SourceForge - - - diff --git a/scite/debian/patches/0002-reproducible_build.patch b/scite/debian/patches/0002-reproducible_build.patch new file mode 100644 index 0000000..d91ff9b --- /dev/null +++ b/scite/debian/patches/0002-reproducible_build.patch @@ -0,0 +1,22 @@ +From: Antonio Valentino +Date: Sat, 14 Apr 2018 17:39:34 +0000 +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 +@@ -619,7 +619,7 @@ void SciTEBase::SetAboutMessage(GUI::ScintillaWindow &wsci, const char *appTitle + } + AddStyledText(wsci, GetTranslationToAbout("Version"), trsSty); + AddStyledText(wsci, sVersion, 1); +- AddStyledText(wsci, " " __DATE__ " " __TIME__ "\n", 1); ++ AddStyledText(wsci, " " BUILD_DATE "\n", 1); + SetAboutStyle(wsci, 2, ColourRGB(0, 0, 0)); + wsci.StyleSetItalic(2, true); + AddStyledText(wsci, GetTranslationToAbout("by"), trsSty); diff --git a/scite/debian/patches/0003-reproducible_build.patch b/scite/debian/patches/0003-reproducible_build.patch deleted file mode 100644 index ae3715f..0000000 --- a/scite/debian/patches/0003-reproducible_build.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Antonio Valentino -Date: Sat, 14 Apr 2018 17:39:34 +0000 -Subject: Allow reproducible build - -=================================================================== ---- - scite/src/Credits.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/scite/src/Credits.cxx -+++ b/scite/src/Credits.cxx -@@ -615,7 +615,7 @@ - } - AddStyledText(wsci, GetTranslationToAbout("Version"), trsSty); - AddStyledText(wsci, sVersion, 1); -- AddStyledText(wsci, " " __DATE__ " " __TIME__ "\n", 1); -+ AddStyledText(wsci, " " BUILD_DATE "\n", 1); - SetAboutStyle(wsci, 2, ColourRGB(0, 0, 0)); - wsci.StyleSetItalic(2, true); - AddStyledText(wsci, GetTranslationToAbout("by"), trsSty); diff --git a/scite/debian/patches/0003-scite-desktop.patch b/scite/debian/patches/0003-scite-desktop.patch new file mode 100644 index 0000000..cdea9cf --- /dev/null +++ b/scite/debian/patches/0003-scite-desktop.patch @@ -0,0 +1,18 @@ +From: Antonio Valentino +Date: Sat, 14 Apr 2018 18:30:43 +0000 +Subject: scite-desktop + +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 @@ Terminal=false + StartupNotify=true + Categories=TextEditor;Development;GTK; + MimeType=text/plain; ++Keywords=TextEditor; diff --git a/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch b/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch new file mode 100644 index 0000000..e622de0 --- /dev/null +++ b/scite/debian/patches/0004-Build-with-Debian-packaged-Lua.patch @@ -0,0 +1,82 @@ +From: =?utf-8?q?Andreas_R=C3=B6nnquist?= +Date: Tue, 19 Jun 2018 15:34:57 +0200 +Subject: Build with Debian packaged Lua + +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 @@ LuaExtension.o: \ + ../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 \ +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 @@ 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) ++# 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 @@ DEFINES += -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" + DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) + BASE_FLAGS += $(if $(DEBUG),-g,-O3) + +-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) +@@ -155,7 +133,7 @@ SRC_OBJS = \ + 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/debian/patches/0005-scite-desktop.patch b/scite/debian/patches/0005-scite-desktop.patch deleted file mode 100644 index c0d0693..0000000 --- a/scite/debian/patches/0005-scite-desktop.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Antonio Valentino -Date: Sat, 14 Apr 2018 18:30:43 +0000 -Subject: scite-desktop - -Add the Keywords entry to the desktop file. ---- - scite/gtk/SciTE.desktop | 1 + - 1 file changed, 1 insertion(+) - ---- a/scite/gtk/SciTE.desktop -+++ b/scite/gtk/SciTE.desktop -@@ -21,3 +21,4 @@ - StartupNotify=true - Categories=TextEditor;Development;GTK; - MimeType=text/plain; -+Keywords=TextEditor; diff --git a/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch b/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch deleted file mode 100644 index 1a69a2b..0000000 --- a/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch +++ /dev/null @@ -1,78 +0,0 @@ -From: =?utf-8?q?Andreas_R=C3=B6nnquist?= -Date: Tue, 19 Jun 2018 15:34:57 +0200 -Subject: Build with Debian packaged Lua -Forwarded: not-needed - ---- - 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 -@@ -267,11 +267,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) -+# 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) - 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,-O3) - --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) -@@ -155,7 +133,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/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 diff --git a/scite/debian/scite+stackrpms.dsc b/scite/debian/scite+stackrpms.dsc index 2317685..1b0f326 100644 --- a/scite/debian/scite+stackrpms.dsc +++ b/scite/debian/scite+stackrpms.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: scite Binary: scite Architecture: any -Version: 5.3.9-1+stackrpms +Version: 5.4.0-1+stackrpms Maintainer: B. Stack Homepage: https://scintilla.org/SciTE.html Standards-Version: 4.6.0.1 -- cgit