From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] elinks: Update to version 0.16.0
Date: Thu, 16 Feb 2023 21:59:04 +0100
Message-ID: <20230216205904.1864533-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1121080616280994469=="
List-Id: <development.lists.ipfire.org>

--===============1121080616280994469==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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 ra=
n in
   parallel mode.
- This patch modifies the build from autotools to meson and updates the versi=
on.
- 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(a)ipfire.org>
---
 config/rootfiles/common/elinks |  6 +-----
 lfs/elinks                     | 15 +++++++++------
 make.sh                        |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/config/rootfiles/common/elinks b/config/rootfiles/common/elinks
index be30d1cde..c8c79f114 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 bf8f66f56..c4b121d6a 100644
--- a/lfs/elinks
+++ b/lfs/elinks
@@ -26,7 +26,7 @@ include Config
=20
 SUMMARY    =3D An advanced and well-established feature-rich text mode web b=
rowser
=20
-VER        =3D 0.15.1
+VER        =3D 0.16.0
=20
 THISAPP    =3D elinks-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D dcec7054d417842e709f26bab53ddb1bf43556de4c69d116ad1e04=
9664bc7c5a5513f02cee500d591252b439a66f354079e2e3eff5692202102cb900e06340c2
+$(DL_FILE)_BLAKE2 =3D b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01=
b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8
=20
 install : $(TARGET)
=20
@@ -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=3D/usr/local \
+		      -D tre=3Dfalse \
+		      -D gpm=3Dfalse \
+		      builddir/
+	cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && ninja -C builddir/ install
=20
 	mkdir -p /usr/local/etc/elinks
 	cp -vf $(DIR_SRC)/config/elinks/elinks.conf /usr/local/etc/elinks/elinks.co=
nf
diff --git a/make.sh b/make.sh
index 6222a741f..2001a2ce6 100755
--- a/make.sh
+++ b/make.sh
@@ -1493,6 +1493,7 @@ buildipfire() {
   lfsmake2 libstatgrab
   lfsmake2 liboping
   lfsmake2 collectd
+  lfsmake2 git
   lfsmake2 elinks
   lfsmake2 igmpproxy
   lfsmake2 opus
@@ -1530,7 +1531,6 @@ buildipfire() {
   lfsmake2 perl-Authen-SASL
   lfsmake2 perl-MIME-Lite
   lfsmake2 perl-Email-Date-Format
-  lfsmake2 git
   lfsmake2 squidclamav
   lfsmake2 vnstat
   lfsmake2 iw
--=20
2.39.1


--===============1121080616280994469==--