From patchwork Thu Feb 16 20:59:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6543 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PHnPR5Mkmz3x1n for ; Thu, 16 Feb 2023 20:59:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PHnPQ116Nz171; Thu, 16 Feb 2023 20:59:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PHnPP5Yslz2xkr; Thu, 16 Feb 2023 20:59:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PHnPN5gclz2xGx for ; Thu, 16 Feb 2023 20:59:20 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PHnPM6Kzzzqc; Thu, 16 Feb 2023 20:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1676581160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q+scGAGAL1GXhq5/6lgL01w6BsqYUtH8KWXoSIofBbg=; b=c4QUwJg+X2+lgIPEWZMmf767s44DMC1U79Rl89XEU1aXzcBcbDNVu5Gogm0nqKRFXWScII PyzGhs5frK2GikwwH3ImeF03XhgmdwSavakY4p5Gu8fj2+4Os6MkGeagiqhLO9fqcXsJWx tTQkHBfo4XbO8XwMbMQfoBTMiOLGr7SHl4lIoUa7g4a3so37j68vxRsubc1dPWMCDxe+bZ WNqmApgqYR5MI75/31eliPJH8ey57sooLlG4LQADUzOi7KokaYWEdTQx97XDUZDKl1Khg4 uSx1Lop2egR1UZGoUsLjGs0YfF9B47xqN6GCSkv+BhPljKneeLNDmubyuJn4lQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1676581160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=q+scGAGAL1GXhq5/6lgL01w6BsqYUtH8KWXoSIofBbg=; b=Uz32t7xIsL0sokNBaOxdmLVTWAcs5wlgNGBIoA+xnrfn182qoL2nZr83+sMx746qFNSRXR Bto4JC+Z2CogmOBg== From: Adolf Belka 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 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 --- 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 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 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