[gentoo-commits] repo/gentoo:master commit in: www-client/links/files/, www-client/links/

[gentoo-commits] repo/gentoo:master commit in: www-client/links/files/, www-client/links/

[Patrice Clement]

commit:     decdf1e4e5f15e98d7302930ef0a345721fa66fd
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 19:20:31 2020 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 20:54:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=decdf1e4

www-client/links: replace echo for printf.

Courtesy of Lars Wendler <polynomial-c <AT> gentoo.org>.

Closes: https://bugs.gentoo.org/667304
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 www-client/links/files/swap-echo-for-printf.patch | 26 +++++++++++++++++++++++
 www-client/links/links-2.20.2-r1.ebuild           |  2 ++
 2 files changed, 28 insertions(+)

diff --git a/www-client/links/files/swap-echo-for-printf.patch b/www-client/links/files/swap-echo-for-printf.patch
new file mode 100644
index 00000000000..9681a624ed2
--- /dev/null
+++ b/www-client/links/files/swap-echo-for-printf.patch
@@ -0,0 +1,26 @@
+"echo -n" is not POSIX compliant but printf is.
+See "man 1p echo" section "APPLICATION USAGE" or visit
+https://www.in-ulm.de/%7Emascheck/various/echo+printf/
+
+--- a/intl/synclang.orig	2020-06-03 19:13:38.082539276 -0000
++++ b/intl/synclang	2020-06-03 19:13:59.122352023 -0000
+@@ -6,7 +6,7 @@
+ if [ -n "$languages" ]; then
+ 	for i in $languages; do
+ 		if [ "$i" != english ]; then
+-			echo -n $i" " 1>&2
++			printf '%s ' "$i" 1>&2
+ 			awk -f synclang.awk <$i.lng | sed 's/\r//g' >_sync.tmp
+ 			mv $i.lng ../intl-bak/$i.lng.bak
+ 			mv _sync.tmp $i.lng
+--- a/intl/gen-intl.orig	2020-06-03 19:14:37.258679373 -0000
++++ b/intl/gen-intl	2020-06-03 19:14:47.651920249 -0000
+@@ -10,7 +10,7 @@
+ n=0
+ echo '/* Automatically generated by gen-intl */'
+ for i in $languages; do
+-	echo -n $i" " 1>&2
++	printf '%s ' "$i" 1>&2
+ 	if test `cat $i.lng|wc -l` != `cat english.lng|wc -l`; then
+ 		echo 1>&2
+ 		echo 1>&2

diff --git a/www-client/links/links-2.20.2-r1.ebuild b/www-client/links/links-2.20.2-r1.ebuild
index a36d03fe29a..0c528094f16 100644
--- a/www-client/links/links-2.20.2-r1.ebuild
+++ b/www-client/links/links-2.20.2-r1.ebuild
@@ -83,6 +83,8 @@ REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
 
 DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
 
+PATCHES=( "${FILESDIR}/swap-echo-for-printf.patch" )
+
 src_prepare() {
 	use X && xdg_environment_reset
 

[gentoo-commits] repo/gentoo:master commit in: www-client/links/files/, www-client/links/

[Ben Kohler]

commit:     873de391ebd75ba3220f2f2647c32cd24fb9259d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 17:49:36 2021 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 17:51:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873de391

www-client/links: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 www-client/links/Manifest                         |   1 -
 www-client/links/files/swap-echo-for-printf.patch |  26 ----
 www-client/links/links-2.21.ebuild                | 171 ----------------------
 3 files changed, 198 deletions(-)

diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index ea25936b50a..0156069b00d 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,2 +1 @@
-DIST links-2.21.tar.bz2 6491465 BLAKE2B a60d2fbd252b97ead45e451c1d1d16204a23e618a59016c6b46a56b7c2f96189d3d7f71e9d647f188824ad7e7c36fd8d62dac3c7125eb9cf833591a6ce3206e6 SHA512 11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8
 DIST links-2.22.tar.bz2 6481705 BLAKE2B a6855fcc62377116fe61adb01623c0cd757ee47ae36bfb35ae657a6d6587f9e47b6b1f78ad73e3fca911ad4aee8c15f364d4af911d694f04229b107d10d6f422 SHA512 d2c9f764d64c2d73b85c998db9fc8c241556977380eef1f4041623ca306f5798227b2b57daecf09ee85e0b07f8738bdfe0b84fefc924d6e05d931e29d29ba40e

diff --git a/www-client/links/files/swap-echo-for-printf.patch b/www-client/links/files/swap-echo-for-printf.patch
deleted file mode 100644
index 9681a624ed2..00000000000
--- a/www-client/links/files/swap-echo-for-printf.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-"echo -n" is not POSIX compliant but printf is.
-See "man 1p echo" section "APPLICATION USAGE" or visit
-https://www.in-ulm.de/%7Emascheck/various/echo+printf/
-
---- a/intl/synclang.orig	2020-06-03 19:13:38.082539276 -0000
-+++ b/intl/synclang	2020-06-03 19:13:59.122352023 -0000
-@@ -6,7 +6,7 @@
- if [ -n "$languages" ]; then
- 	for i in $languages; do
- 		if [ "$i" != english ]; then
--			echo -n $i" " 1>&2
-+			printf '%s ' "$i" 1>&2
- 			awk -f synclang.awk <$i.lng | sed 's/\r//g' >_sync.tmp
- 			mv $i.lng ../intl-bak/$i.lng.bak
- 			mv _sync.tmp $i.lng
---- a/intl/gen-intl.orig	2020-06-03 19:14:37.258679373 -0000
-+++ b/intl/gen-intl	2020-06-03 19:14:47.651920249 -0000
-@@ -10,7 +10,7 @@
- n=0
- echo '/* Automatically generated by gen-intl */'
- for i in $languages; do
--	echo -n $i" " 1>&2
-+	printf '%s ' "$i" 1>&2
- 	if test `cat $i.lng|wc -l` != `cat english.lng|wc -l`; then
- 		echo 1>&2
- 		echo 1>&2

diff --git a/www-client/links/links-2.21.ebuild b/www-client/links/links-2.21.ebuild
deleted file mode 100644
index e61c5b57a2a..00000000000
--- a/www-client/links/links-2.21.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop xdg-utils
-
-DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
-HOMEPAGE="http://links.twibright.com/"
-SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
-
-GRAPHICS_DEPEND="media-libs/libpng:0="
-
-RDEPEND="
-	brotli? (
-		app-arch/brotli
-	)
-	bzip2? (
-		app-arch/bzip2
-	)
-	fbcon? (
-		${GRAPHICS_DEPEND}
-	)
-	freetype? (
-		media-libs/fontconfig
-		media-libs/freetype
-	)
-	gpm? (
-		sys-libs/gpm
-	)
-	jpeg? (
-		virtual/jpeg:0
-	)
-	libevent? (
-		dev-libs/libevent:0=
-	)
-	livecd? (
-		${GRAPHICS_DEPEND}
-		sys-libs/gpm
-		virtual/jpeg:0
-	)
-	lzip? (
-		app-arch/lzip
-	)
-	lzma? (
-		app-arch/xz-utils
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	svga? (
-		${GRAPHICS_DEPEND}
-		media-libs/svgalib
-	)
-	tiff? (
-		media-libs/tiff:0
-	)
-	X? (
-		${GRAPHICS_DEPEND}
-		x11-libs/libXext
-	)
-	zlib? (
-		sys-libs/zlib
-	)
-	zstd? (
-		app-arch/zstd
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	fbcon? ( virtual/os-headers )
-	livecd? ( virtual/os-headers )
-	X? ( dev-util/desktop-file-utils )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-PATCHES=( "${FILESDIR}/swap-echo-for-printf.patch" )
-
-src_prepare() {
-	use X && xdg_environment_reset
-
-	if use unicode; then
-		pushd intl > /dev/null || die
-		./gen-intl || die
-		./synclang || die
-		popd > /dev/null || die
-	fi
-
-	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
-	sed -i \
-		-e '/AC_PROG_CXX/s:dnl ::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die #467020
-
-	# Upstream configure produced by broken autoconf-2.13. This also fixes
-	# toolchain detection.
-	mv configure.in configure.ac || die
-
-	default
-	eautoreconf #131440 and #103483#c23
-}
-
-src_configure() {
-	local myconf
-
-	if use livecd; then
-		export ac_cv_lib_gpm_Gpm_Open=yes
-		myconf+=' --with-fb --with-libjpeg'
-	else
-		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
-	fi
-
-	if use X || use fbcon || use svga || use livecd; then
-		myconf+=' --enable-graphics'
-	fi
-
-	econf \
-		--without-directfb \
-		--without-librsvg \
-		$(use_with brotli) \
-		$(use_with bzip2) \
-		$(use_with fbcon fb) \
-		$(use_with freetype) \
-		$(use_with ipv6) \
-		$(use_with jpeg libjpeg) \
-		$(use_with libevent) \
-		$(use_with lzip) \
-		$(use_with lzma) \
-		$(use_with ssl) \
-		$(use_with svga svgalib) \
-		$(use_with tiff libtiff) \
-		$(use_with X x) \
-		$(use_with zlib) \
-		$(use_with zstd) \
-		${myconf}
-}
-
-src_install() {
-	HTML_DOCS="doc/links_cal/*"
-	default
-
-	if use X; then
-		newicon Links_logo.png links.png
-		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
-		local d="${ED}"/usr/share/applications
-		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
-		if use ssl; then
-			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
-			"${d}"/*.desktop || die
-		fi
-	fi
-
-	use suid && fperms 4755 /usr/bin/links
-}
-
-pkg_postinst() {
-	use X && xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	use X && xdg_desktop_database_update
-}

[gentoo-commits] repo/gentoo:master commit in: www-client/links/files/, www-client/links/

[Ben Kohler]

commit:     03599c76817d939df579400463f5390c0e91934f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 16:17:06 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 16:17:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03599c76

www-client/links: fix zstd-only build

Closes: https://bugs.gentoo.org/908250

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../files/links-2.29-fix-zstd-only-build.patch     | 35 ++++++++++++++++++++++
 www-client/links/links-2.29.ebuild                 |  2 ++
 2 files changed, 37 insertions(+)

diff --git a/www-client/links/files/links-2.29-fix-zstd-only-build.patch b/www-client/links/files/links-2.29-fix-zstd-only-build.patch
new file mode 100644
index 000000000000..96d0cc9184be
--- /dev/null
+++ b/www-client/links/files/links-2.29-fix-zstd-only-build.patch
@@ -0,0 +1,35 @@
+From fbac17250d41c2f0316e8fd7a2da02dcf01852ed Mon Sep 17 00:00:00 2001
+From: Ben Kohler <bkohler@gentoo.org>
+Date: Thu, 15 Jun 2023 11:07:27 -0500
+Subject: [PATCH] Fix build where zstd is the only enabled compression
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If only zstd support is enabled, HAVE_ANY_COMPRESSION doesn't get
+defined and links fails to build.
+
+compress.c: In function ‘get_file_by_term’:
+error: label ‘return_decompressed’ used but not defined
+
+Signed-off-by: Ben Kohler <bkohler@gentoo.org>
+---
+ links.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/links.h b/links.h
+index 3a29a08..72a618e 100644
+--- a/links.h
++++ b/links.h
+@@ -2717,7 +2717,7 @@ void detach_object_connection(struct object_request *, off_t);
+ 
+ /* compress.c */
+ 
+-#if defined(HAVE_ZLIB) || defined(HAVE_BROTLI) || defined(HAVE_BZIP2) || defined(HAVE_LZMA) || defined(HAVE_LZIP)
++#if defined(HAVE_ZLIB) || defined(HAVE_BROTLI) || defined(HAVE_BZIP2) || defined(HAVE_LZMA) || defined(HAVE_LZIP) || defined(HAVE_ZSTD)
+ #define HAVE_ANY_COMPRESSION
+ #endif
+ 
+-- 
+2.41.0
+

diff --git a/www-client/links/links-2.29.ebuild b/www-client/links/links-2.29.ebuild
index 15d73239db8c..5d00117ebd69 100644
--- a/www-client/links/links-2.29.ebuild
+++ b/www-client/links/links-2.29.ebuild
@@ -92,6 +92,8 @@ REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
 
 DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
 
+PATCHES=( "${FILESDIR}/links-2.29-fix-zstd-only-build.patch" )
+
 src_prepare() {
 	use X && xdg_environment_reset