From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/w3m/
Date: Tue, 11 Mar 2025 09:11:24 +0000 (UTC) [thread overview]
Message-ID: <1741684240.a6947312b65b1f615a0701eab7a7b07632ddb9e5.sam@gentoo> (raw)
commit: a6947312b65b1f615a0701eab7a7b07632ddb9e5
Author: NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Sat Mar 8 20:31:05 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 09:10:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6947312
www-client/w3m: switch to rkta fork
the current upstream has been inactive for a long time.
switch to rkta's fork, specifically the oldstable branch which
"contains a very conservative set of bug fixes [potential CVE
fixes] to the last release of tats/w3m."
alpine, freebsd and openbsd has also switched to rkta's fork.
it's likely that other distros will do the same given that w3m
has a bunch of CVEs accumulated (some of which are potentially
fixed in the fork).
in the future we should consider switching over to master branch
instead of oldstable. oldstable is a more lower hanging fruit so
going with that for now.
Ref: https://github.com/tats/w3m/issues/304
Signed-off-by: NRK <nrk <AT> disroot.org>
Closes: https://github.com/gentoo/gentoo/pull/40968
Signed-off-by: Sam James <sam <AT> gentoo.org>
www-client/w3m/Manifest | 1 +
www-client/w3m/metadata.xml | 4 -
www-client/w3m/w3m-0.5.3_p20240916.ebuild | 136 ++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+), 4 deletions(-)
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 1946192e9c98..52a313d01658 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1 +1,2 @@
DIST w3m-0.5.3+git20230121.tar.gz 2322709 BLAKE2B d4ebed126e7b4205c1282ec0dd7c7db34fb69768084142a0df9c4d051ac74642d5c62b4cff2be368a1db391c93ff6394842a52cfe68d1cdfcd9fb9c1a5c386e5 SHA512 f220aabf69cf11ca7560c1519a971bdb1cc0baa443b1b46cd8fca2a4defb614653dd9ba637afbf9315f3b63a349f972436348c2f93d06665573057e4232eab1c
+DIST w3m-0.5.3_p20240916.tar.gz 2322816 BLAKE2B 13c85c4f99eaeb7acd755603e9ce07637fe9869188a775110aa9f8edf910c471da2f1c91e7e25b4f7a2faf6fc5ccf69f2aa72ef27b0959350c0f96fe03968f59 SHA512 976d11f6f2fb9bdc93693d51a2566b2017acbd4afa1f20d86aa838af1ef2c5a3630b88154220248bae5e5c096d5c4356cdd23dea30860773149787e8006c1e6d
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
index 5472d90dcdaa..54f8f23c6f20 100644
--- a/www-client/w3m/metadata.xml
+++ b/www-client/w3m/metadata.xml
@@ -13,8 +13,4 @@
<flag name="gdk-pixbuf">Enable support for <pkg>x11-libs/gdk-pixbuf</pkg></flag>
<flag name="lynxkeymap">If you prefer Lynx-like key binding</flag>
</use>
- <upstream>
- <remote-id type="sourceforge">w3m</remote-id>
- <remote-id type="github">tats/w3m</remote-id>
- </upstream>
</pkgmetadata>
diff --git a/www-client/w3m/w3m-0.5.3_p20240916.ebuild b/www-client/w3m/w3m-0.5.3_p20240916.ebuild
new file mode 100644
index 000000000000..6396a086ec03
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3_p20240916.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools prefix toolchain-funcs flag-o-matic
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="https://git.sr.ht/~rkta/w3m"
+# based on oldstable branch
+COMMIT="b951c6ab75efd87810736b37ec053192c38cb80c"
+SRC_URI="https://git.sr.ht/~rkta/w3m/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/w3m-${COMMIT}"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="fbcon gdk-pixbuf gpm imlib l10n_ja lynxkeymap nls nntp ssl unicode X xface"
+
+REQUIRED_USE="
+ fbcon? ( ?? ( gdk-pixbuf imlib ) )
+ X? ( ?? ( gdk-pixbuf imlib ) )
+"
+
+RDEPEND="
+ dev-libs/boehm-gc:=
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf
+ X? ( x11-libs/gdk-pixbuf-xlib )
+ )
+ !gdk-pixbuf? (
+ imlib? ( media-libs/imlib2[X?] )
+ )
+ gpm? ( sys-libs/gpm )
+ ssl? ( dev-libs/openssl:0= )
+ X? (
+ x11-base/xorg-proto
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ )
+ xface? ( media-libs/compface )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.3_p20210102-restore-gettext-macro.patch
+ "${FILESDIR}"/${PN}-0.5.3_p20210102-fix-configure-gettext.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in || die
+ hprefixify acinclude.m4
+
+ AT_NOEAUTOHEADER="yes" AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ local myconf=()
+ local image imagelib
+
+ # Bug: https://bugs.gentoo.org/943868
+ append-cflags -std=gnu17
+
+ if use gdk-pixbuf ; then
+ imagelib="gtk3"
+ elif use imlib ; then
+ imagelib="imlib2"
+ fi
+ if [[ -n "${imagelib}" ]] ; then
+ use X && image="${image}${image:+,}x11"
+ use fbcon && image="${image}${image:+,}fb"
+ fi
+ # emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+ # so we better enable or disable both. Default to enable
+ # m17n and unicode, see bug #47046.
+ if use l10n_ja ; then
+ myconf+=( --enable-japanese=$(usex unicode U E) )
+ else
+ myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
+ fi
+ # lynxkeymap IUSE flag. bug #49397
+ myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
+
+ econf \
+ $(use_enable gpm mouse) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable ssl digest-auth) \
+ $(use_enable xface) \
+ $(use_with ssl) \
+ --enable-image=${image:-no} \
+ --enable-m17n \
+ --enable-unicode \
+ --with-browser="${EPREFIX}/usr/bin/xdg-open" \
+ --with-editor="${EPREFIX}/usr/bin/vi" \
+ --with-imagelib="${imagelib:-no}" \
+ --with-mailer="${EPREFIX}/bin/mail" \
+ --without-migemo \
+ --with-termlib=yes \
+ "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ insinto /etc/${PN}
+ newins "${FILESDIR}"/${PN}.mailcap mailcap
+
+ insinto /usr/share/${PN}/Bonus
+ doins Bonus/{*.{cgi,rb},html*,makeref}
+
+ docinto en
+ dodoc doc/{HISTORY,README,keymap,menu}*
+ newdoc Bonus/README.eng README.Bonus
+ docinto html/en
+ dodoc doc/*.html
+
+ docinto de
+ dodoc doc-de/README*
+ docinto html/de
+ dodoc doc-de/*.html
+
+ docinto ja
+ dodoc doc-jp/{HISTORY,README,keymap,menu}*
+ newdoc Bonus/README README.Bonus
+ docinto html/ja
+ dodoc doc-jp/*.html
+}
next reply other threads:[~2025-03-11 9:11 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-11 9:11 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-04 20:07 [gentoo-commits] repo/gentoo:master commit in: www-client/w3m/ Mart Raudsepp
2025-04-26 6:41 Arthur Zamarin
2025-04-26 1:37 Sam James
2025-04-26 1:31 Sam James
2025-04-26 1:25 Sam James
2025-04-26 0:44 Sam James
2025-04-26 0:39 Sam James
2025-04-17 7:25 Joonas Niilola
2024-11-22 13:55 Sam James
2023-02-03 2:05 Sam James
2023-02-03 2:05 Sam James
2023-02-03 2:05 Sam James
2023-02-02 19:42 Arthur Zamarin
2023-02-02 18:52 Arthur Zamarin
2023-02-02 18:52 Arthur Zamarin
2023-02-02 18:21 Arthur Zamarin
2023-01-25 7:13 Sam James
2023-01-25 7:13 Sam James
2023-01-25 6:10 Sam James
2022-12-07 14:41 Sam James
2022-08-16 7:48 Agostino Sarubbo
2022-08-16 7:47 Agostino Sarubbo
2022-08-16 7:46 Agostino Sarubbo
2022-08-16 7:45 Agostino Sarubbo
2022-08-16 7:44 Agostino Sarubbo
2022-08-16 5:36 Joonas Niilola
2022-08-16 5:36 Joonas Niilola
2022-08-10 6:03 Joonas Niilola
2022-05-14 0:42 Sam James
2022-05-09 5:29 WANG Xuerui
2022-02-21 14:03 Joonas Niilola
2022-02-21 14:03 Joonas Niilola
2022-02-12 18:43 Jonas Stein
2021-07-16 21:44 Sam James
2021-07-15 21:42 Sam James
2021-07-15 7:42 Agostino Sarubbo
2021-07-15 7:40 Agostino Sarubbo
2021-07-15 7:38 Agostino Sarubbo
2021-07-14 16:20 Sam James
2021-07-14 16:20 Sam James
2021-06-29 22:08 Yixun Lan
2021-04-30 18:30 Mikle Kolyada
2021-04-27 7:27 Ulrich Müller
2021-04-26 9:57 Sam James
2021-01-06 11:37 Fabian Groffen
2020-12-17 14:00 Mart Raudsepp
2020-11-16 19:51 Mike Gilbert
2020-02-13 21:40 David Seifert
2019-02-25 13:26 Akinori Hattori
2018-12-27 18:48 Fabian Groffen
2018-07-22 13:14 Akinori Hattori
2018-04-07 16:42 Patrice Clement
2018-04-07 12:07 Sergei Trofimovich
2018-04-07 12:05 Sergei Trofimovich
2018-04-06 22:44 Sergei Trofimovich
2018-04-05 13:43 Thomas Deutschmann
2018-04-04 22:26 Sergei Trofimovich
2018-04-04 16:13 Aaron Bauman
2018-04-03 13:32 Akinori Hattori
2018-04-03 13:32 Akinori Hattori
2018-04-03 13:32 Akinori Hattori
2018-01-15 10:52 Lars Wendler
2017-09-28 17:18 Mike Gilbert
2016-12-22 9:34 Agostino Sarubbo
2016-12-20 9:44 Agostino Sarubbo
2016-12-19 15:12 Agostino Sarubbo
2016-12-19 14:35 Agostino Sarubbo
2016-12-06 11:53 Agostino Sarubbo
2016-12-06 11:50 Agostino Sarubbo
2016-12-05 15:49 Tobias Klausmann
2016-12-03 5:48 Yixun Lan
2016-07-21 1:53 Benda XU
2016-06-28 6:10 Ulrich Müller
2016-05-12 13:56 Mike Gilbert
2016-05-11 20:11 Anthony G. Basile
2016-02-28 6:12 Matt Thode
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1741684240.a6947312b65b1f615a0701eab7a7b07632ddb9e5.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox