From: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu, 16 Feb 2023 20:59:04 +0000 (+0100)
Subject: elinks: Update to version 0.16.0
X-Git-Tag: v2.27-core174~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccf8c0580f2605af4daa0442bfde1b6fede909ea;p=ipfire-2.x.git

elinks: Update to version 0.16.0

- Update from version 0.15.1 to 0.16.0
- Update of rootfile
- According to the forked elinks developer if parallel build is required then meson
   should be used for the build. With make they don't believe that it ever ran in
   parallel mode.
- This patch modifies the build from autotools to meson and updates the version.
- Parallel build option added back in to meson/ninja flow.
- The build requires git to be present so git moved to just before elinks in make.sh
- Changelog
ELinks 0.16.0
* detect xterm on my computer
ELinks 0.16.0rc1
* alternative mujs engine for js
* bump mozjs to 102
* experimental XHR implementation
* macros in exmode #196
* removed infinite loop, which occurred under BSD #197
* optional terminal hyperlinks in dumps #198

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---

diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks
index be30d1cde2..c8c79f1143 100644
--- a/config/rootfiles/common/elinks
+++ b/config/rootfiles/common/elinks
@@ -25,7 +25,7 @@ usr/local/etc/elinks/elinks.conf
 #usr/local/share/locale/da/LC_MESSAGES/elinks.mo
 #usr/local/share/locale/de
 #usr/local/share/locale/de/LC_MESSAGES
-usr/local/share/locale/de/LC_MESSAGES/elinks.mo
+#usr/local/share/locale/de/LC_MESSAGES/elinks.mo
 #usr/local/share/locale/el
 #usr/local/share/locale/el/LC_MESSAGES
 #usr/local/share/locale/el/LC_MESSAGES/elinks.mo
@@ -62,7 +62,6 @@ usr/local/share/locale/de/LC_MESSAGES/elinks.mo
 #usr/local/share/locale/ja
 #usr/local/share/locale/ja/LC_MESSAGES
 #usr/local/share/locale/ja/LC_MESSAGES/elinks.mo
-#usr/local/share/locale/locale.alias
 #usr/local/share/locale/lt
 #usr/local/share/locale/lt/LC_MESSAGES
 #usr/local/share/locale/lt/LC_MESSAGES/elinks.mo
@@ -102,6 +101,3 @@ usr/local/share/locale/de/LC_MESSAGES/elinks.mo
 #usr/local/share/locale/uk
 #usr/local/share/locale/uk/LC_MESSAGES
 #usr/local/share/locale/uk/LC_MESSAGES/elinks.mo
-#usr/local/share/man/man1/elinks.1
-#usr/local/share/man/man5/elinks.conf.5
-#usr/local/share/man/man5/elinkskeys.5
diff --git a/lfs/elinks b/lfs/elinks
index bf8f66f56f..c4b121d6a7 100644
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = An advanced and well-established feature-rich text mode web browser
 
-VER        = 0.15.1
+VER        = 0.16.0
 
 THISAPP    = elinks-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e049664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2
+$(DL_FILE)_BLAKE2 = b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8
 
 install : $(TARGET)
 
@@ -72,10 +72,13 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure
-	cd $(DIR_APP) && make $(EXTRA_MAKE)
-	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && meson \
+		      --prefix=/usr/local \
+		      -D tre=false \
+		      -D gpm=false \
+		      builddir/
+	cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && ninja -C builddir/ install
 
 	mkdir -p /usr/local/etc/elinks
 	cp -vf $(DIR_SRC)/config/elinks/elinks.conf /usr/local/etc/elinks/elinks.conf
diff --git a/make.sh b/make.sh
index 306ce79593..3b7f9850cc 100755
--- a/make.sh
+++ b/make.sh
@@ -1494,6 +1494,7 @@ buildipfire() {
   lfsmake2 libstatgrab
   lfsmake2 liboping
   lfsmake2 collectd
+  lfsmake2 git
   lfsmake2 elinks
   lfsmake2 igmpproxy
   lfsmake2 opus
@@ -1531,7 +1532,6 @@ buildipfire() {
   lfsmake2 perl-Authen-SASL
   lfsmake2 perl-MIME-Lite
   lfsmake2 perl-Email-Date-Format
-  lfsmake2 git
   lfsmake2 squidclamav
   lfsmake2 vnstat
   lfsmake2 iw