my-aports/scite: upgrade to 5.5.4

2 files changed, 102 insertions, 13 deletions

diff --git a/scite/APKBUILD b/scite/APKBUILD
index e88f3d3..04f52b1 100644
--- a/scite/APKBUILD
+++ b/scite/APKBUILD
@@ -1,33 +1,35 @@
-# Contributor: John Vogel <jvogel4@stny.rr.com>
-# Maintainer: John Vogel <jvogel4@stny.rr.com>
+# Contributor: John Vogel <jvogel@stygian.me>
+# Maintainer: John Vogel <jvogel@stygian.me>
 pkgname=scite
-pkgver=550
+pkgver=5.5.4
 pkgrel=0
 pkgdesc="graphical GTK+ based editor"
 url="https://www.scintilla.org/SciTE.html"
 arch="all"
-license="HPNB"
+license="HPND"
 makedepends="gtk+3.0-dev"
 subpackages="$pkgname-doc"
-source="https://www.scintilla.org/scite550.tgz"
+source="https://www.scintilla.org/scite${pkgver//./}.tgz
+	makefiles_fixate_relative_pathes.patch"
 builddir="$srcdir"
-options="!check"
+options="!check" # todo
 
 build() {
-	make -C "$builddir"/lexilla/src
-	make -C "$builddir"/scintilla/gtk GTK3=1
-	make -C "$builddir"/scite/gtk GTK3=1
+	make -C lexilla/src
+	make -C scintilla/gtk GTK3=1 srcdir="$builddir"/scintilla/gtk
+	make -C scite/gtk GTK3=1 srcdir="$builddir"/scite/gtk
 }
 
 package() {
-	make -C "$builddir"/scite/gtk DESTDIR="$pkgdir" GTK3=1 install
+	make -C scite/gtk srcdir="$builddir"/scite/gtk DESTDIR="$pkgdir" GTK3=1 install
 	ln -sf SciTE "$pkgdir"/usr/bin/scite
-	install -D -m644 -t "$pkgdir"/usr/share/man/man1 \
+	install -Dm644 -t "$pkgdir"/usr/share/man/man1 \
 		"$builddir"/scite/doc/scite.1
-	install -D -m644 -t "$pkgdir"/usr/share/doc/"$pkgname" \
+	install -Dm644 -t "$pkgdir"/usr/share/licenses/"$pkgname" \
 		"$builddir"/scite/License.txt
 }
 
 sha512sums="
-4241a4a900a6ab2d0acf40c4de2c0bb15a63429957054cf6526feac2decdbdc63713f0d8562392c8840f08c24c7f70ab2e1d04bd344a2d87c15b5a6be19f49c0  scite550.tgz
+c12def09368d5bbc4eeb44e835a13b17949f0c8c65d5a7d4fed8264d3756c34d89fe1065723089c365428468e4679cab7945c68b1515a016f09c221a3fdcc5f1  scite554.tgz
+46377fb324e61fb4c3f5d874e1fc9815758965bcecf7dd590db76e6e9d07420f5c409dbabd6fdcfe7a66beb9d7b83ae39fa0a6ade6c612dddc9336b143bbddb2  makefiles_fixate_relative_pathes.patch
 "
diff --git a/scite/makefiles_fixate_relative_pathes.patch b/scite/makefiles_fixate_relative_pathes.patch
new file mode 100644
index 0000000..eb1a062
--- /dev/null
+++ b/scite/makefiles_fixate_relative_pathes.patch
@@ -0,0 +1,87 @@
+diff -Naur a/lexilla/src/makefile b/lexilla/src/makefile
+--- a/lexilla/src/makefile	2025-02-05 13:44:27.807344949 -0500
++++ b/lexilla/src/makefile	2025-02-05 14:09:19.668976650 -0500
+@@ -15,7 +15,7 @@
+ .SUFFIXES: .cxx
+ 
+ DIR_O=.
+-DIR_BIN=../bin
++DIR_BIN=$(DIR_O)/../bin
+ 
+ WARNINGS = -Wpedantic -Wall -Wextra
+ 
+@@ -73,15 +73,15 @@
+ 
+ RANLIB ?= ranlib
+ 
+-SCINTILLA_INCLUDE = ../../scintilla/include
++SCINTILLA_INCLUDE = $(DIR_O)/../../scintilla/include
+ 
+-vpath %.h ../include ../../scintilla/include ../lexlib
+-vpath %.cxx ../src ../lexlib ../lexers
++vpath %.h $(DIR_O)/../include $(DIR_O)/../../scintilla/include $(DIR_O)/../lexlib
++vpath %.cxx $(DIR_O)/../src $(DIR_O)/../lexlib $(DIR_O)/../lexers
+ 
+ DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG)
+ BASE_FLAGS += $(if $(DEBUG),-g,-O3)
+ 
+-INCLUDES = -I ../include -I $(SCINTILLA_INCLUDE) -I ../lexlib
++INCLUDES = -I $(DIR_O)/../include -I $(SCINTILLA_INCLUDE) -I $(DIR_O)/../lexlib
+ LDFLAGS += -shared
+ 
+ BASE_FLAGS += $(WARNINGS)
+@@ -98,15 +98,15 @@
+ 	$(WINDRES) $< $@
+ 
+ analyze:
+-	$(CXX) --analyze $(DEFINES) $(INCLUDES) $(BASE_FLAGS) $(CXXFLAGS) *.cxx ../lexlib/*.cxx ../lexers/*.cxx
++	$(CXX) --analyze $(DEFINES) $(INCLUDES) $(BASE_FLAGS) $(CXXFLAGS) *.cxx $(DIR_O)/../lexlib/*.cxx $(DIR_O)/../lexers/*.cxx
+ 
+ depend deps.mak:
+ 	$(PYTHON) DepGen.py
+ 
+ $(SCINTILLA_INCLUDE):
+-	@echo Scintilla must be installed at ../../scintilla to provide access to Scintilla headers.
++	@echo Scintilla must be installed at $(DIR_O)/../../scintilla to provide access to Scintilla headers.
+ 
+-LEXERS:=$(sort $(notdir $(wildcard ../lexers/Lex*.cxx)))
++LEXERS:=$(sort $(notdir $(wildcard $(DIR_O)/../lexers/Lex*.cxx)))
+ 
+ OBJS = Lexilla.o
+ 
+diff -Naur a/scite/gtk/makefile b/scite/gtk/makefile
+--- a/scite/gtk/makefile	2025-02-05 13:44:27.844011165 -0500
++++ b/scite/gtk/makefile	2025-02-05 14:33:01.841495411 -0500
+@@ -57,8 +57,8 @@
+ # make should be run in ../../scintilla/gtk to compile all the lexers.
+ SHAREDEXTENSION = $(if $(windir),dll,so)
+ COMPLIB=$(SCINTILLA_DIR)/bin/scintilla.a
+-COMPONENT=$(srcdir)/../bin/libscintilla.$(SHAREDEXTENSION)
+-LEXILLA=$(srcdir)/../bin/liblexilla.$(SHAREDEXTENSION)
++COMPONENT=$(SCINTILLA_DIR)/bin/libscintilla.$(SHAREDEXTENSION)
++LEXILLA=$(LEXILLA_DIR)/bin/liblexilla.$(SHAREDEXTENSION)
+ 
+ all: $(PROG) $(COMPONENT) $(LEXILLA)
+ 
+@@ -116,10 +116,10 @@
+ depend deps.mak:
+ 	$(PYTHON) AppDepGen.py
+ 
+-../bin/%.$(SHAREDEXTENSION):	../../scintilla/bin/%.$(SHAREDEXTENSION)
++$(srcdir)/../bin/%.$(SHAREDEXTENSION):	$(SCINTILLA_DIR)/bin/%.$(SHAREDEXTENSION)
+ 	$(COPY) $< $(@D)
+ 
+-../bin/%.$(SHAREDEXTENSION):	../../lexilla/bin/%.$(SHAREDEXTENSION)
++$(srcdir)/../bin/%.$(SHAREDEXTENSION):	$(LEXILLA_DIR)/bin/%.$(SHAREDEXTENSION)
+ 	$(COPY) $< $(@D)
+ 
+ # To almost make lua.vers (needs header and footer added) which is only needed after updating Lua:
+@@ -156,7 +156,7 @@
+ 	Utf8_16.o
+ 
+ $(PROG): SciTEGTK.o Strips.o GUIGTK.o Widget.o DirectorExtension.o $(SRC_OBJS) $(LUA_OBJS)
+-	$(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)
++	$(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_DIR)/bin -lscintilla $(LDLIBS)
+ 
+ # Automatically generate header dependencies with "make depend"
+ include deps.mak