summaryrefslogtreecommitdiff
path: root/scite/debian
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-12-17 02:01:14 +0000
committerB. Stack <bgstack15@gmail.com>2022-12-17 02:01:14 +0000
commit186e29a3fff4b3b88c5803deee1c907447d3ca2e (patch)
tree740f9a398dc7d310acc8a0fd246e662fb673842d /scite/debian
parentMerge branch 'newmoon-bump' into 'master' (diff)
parentupdate _service (diff)
downloadstackrpms-186e29a3fff4b3b88c5803deee1c907447d3ca2e.tar.gz
stackrpms-186e29a3fff4b3b88c5803deee1c907447d3ca2e.tar.bz2
stackrpms-186e29a3fff4b3b88c5803deee1c907447d3ca2e.zip
Merge branch 'scite-bump' into 'master'
Scite 5.3.2 See merge request bgstack15/stackrpms!331
Diffstat (limited to 'scite/debian')
-rw-r--r--scite/debian/_service4
-rw-r--r--scite/debian/changelog11
-rw-r--r--scite/debian/patches/0003-reproducible_build.patch8
-rw-r--r--scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch6
-rw-r--r--scite/debian/scite+devuan.dsc2
5 files changed, 19 insertions, 12 deletions
diff --git a/scite/debian/_service b/scite/debian/_service
index beba213..6c8324c 100644
--- a/scite/debian/_service
+++ b/scite/debian/_service
@@ -14,8 +14,8 @@
<service name="download_url">
<param name="protocol">https</param>
<param name="host">www.scintilla.org</param>
- <param name="path">scite531.tgz</param>
- <param name="filename">scite_5.3.1.orig.tar.gz</param>
+ <param name="path">scite532.tgz</param>
+ <param name="filename">scite_5.3.2.orig.tar.gz</param>
</service>
<service name="extract_file">
<param name="archive">*.tar.xz</param>
diff --git a/scite/debian/changelog b/scite/debian/changelog
index 2927b3d..29c844c 100644
--- a/scite/debian/changelog
+++ b/scite/debian/changelog
@@ -1,9 +1,16 @@
-scite (5.3.1-1+devuan) unstable; urgency=medium
+scite (5.3.2-1+devuan) unstable; urgency=medium
* Add stackrpms lua script and customized global.properties
* Use lua 5.4.4
- -- B. Stack <bgstack15@gmail.com> Sun, 16 Oct 2022 16:40:05 -0400
+ -- B. Stack <bgstack15@gmail.com> Thu, 08 Dec 2022 09:00:05 -0500
+
+scite (5.3.2-1) unstable; urgency=medium
+
+ * New upstream version 5.3.2
+ * Refresh patches
+
+ -- Andreas Rönnquist <gusnan@debian.org> Wed, 07 Dec 2022 14:10:05 +0100
scite (5.3.1-1) unstable; urgency=medium
diff --git a/scite/debian/patches/0003-reproducible_build.patch b/scite/debian/patches/0003-reproducible_build.patch
index 0a8ce2a..ae3715f 100644
--- a/scite/debian/patches/0003-reproducible_build.patch
+++ b/scite/debian/patches/0003-reproducible_build.patch
@@ -9,12 +9,12 @@ Subject: Allow reproducible build
--- a/scite/src/Credits.cxx
+++ b/scite/src/Credits.cxx
-@@ -601,7 +601,7 @@
+@@ -615,7 +615,7 @@
}
- AddStyledText(wsci, GetTranslationToAbout("Version").c_str(), trsSty);
- AddStyledText(wsci, sVersion.c_str(), 1);
+ 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").c_str(), trsSty);
+ AddStyledText(wsci, GetTranslationToAbout("by"), trsSty);
diff --git a/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch b/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch
index 0e5e8df..29e40a0 100644
--- a/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch
+++ b/scite/debian/patches/0007-Build-with-Debian-packaged-Lua.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
--- a/scite/gtk/deps.mak
+++ b/scite/gtk/deps.mak
-@@ -265,11 +265,7 @@
+@@ -267,11 +267,7 @@
../src/Extender.h \
../src/IFaceTable.h \
../src/SciTEKeys.h \
@@ -40,7 +40,7 @@ Forwarded: not-needed
ifdef gnomeprefix
@@ -72,28 +72,6 @@
DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
- BASE_FLAGS += $(if $(DEBUG),-g,-Os)
+ 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 \
@@ -67,7 +67,7 @@ Forwarded: not-needed
LIBS += -lm -lstdc++
UNAME:=$(shell uname -s)
-@@ -154,7 +132,7 @@
+@@ -155,7 +133,7 @@
StyleWriter.o \
Utf8_16.o
diff --git a/scite/debian/scite+devuan.dsc b/scite/debian/scite+devuan.dsc
index 9560434..f97f871 100644
--- a/scite/debian/scite+devuan.dsc
+++ b/scite/debian/scite+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
Source: scite
Binary: scite
Architecture: any
-Version: 5.3.1-1+devuan
+Version: 5.3.2-1+devuan
Maintainer: B. Stack <bgstack15@gmail.com>
Homepage: https://scintilla.org/SciTE.html
Standards-Version: 4.6.0.1
bgstack15