commit: 50c53cbcbe84fe1473244e2bd6ad5e4533601bac Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Apr 25 21:59:28 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 25 22:00:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c53cbc
www-client/w3m: further fixups for autoreconf patch Closes: https://bugs.gentoo.org/778482 Signed-off-by: Sam James <sam <AT> gentoo.org> ...g.patch => w3m-0.5.3_p20210102-restore-gettext-macro.patch} | 5 ++--- www-client/w3m/w3m-0.5.3_p20210102.ebuild | 10 ++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/www-client/w3m/files/lang.patch b/www-client/w3m/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch similarity index 85% rename from www-client/w3m/files/lang.patch rename to www-client/w3m/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch index dccc3542690..ffd30c62a5d 100644 --- a/www-client/w3m/files/lang.patch +++ b/www-client/w3m/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch @@ -1,5 +1,5 @@ -new file mode 100644 -index 00000000..da1b2aef +https://sources.debian.org/patches/gnokii/0.6.30+dfsg-1.3/0001-Add-codeset.m4-to-m4-to-prevent-build-failure-with-g.patch/ +https://bugs.gentoo.org/778482 --- /dev/null +++ b/m4/codeset.m4 @@ -0,0 +1,25 @@ @@ -29,4 +29,3 @@ index 00000000..da1b2aef +]) + -- -2.20.1 diff --git a/www-client/w3m/w3m-0.5.3_p20210102.ebuild b/www-client/w3m/w3m-0.5.3_p20210102.ebuild index cb833a9cd2b..60b0c812ca7 100644 --- a/www-client/w3m/w3m-0.5.3_p20210102.ebuild +++ b/www-client/w3m/w3m-0.5.3_p20210102.ebuild @@ -11,6 +11,7 @@ MY_PV="${PV/_p/+git}" DESCRIPTION="Text based WWW browser, supports tables and frames" HOMEPAGE="https://github.com/tats/w3m" SRC_URI="https://github.com/tats/w3m/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${P/_p/-git}" LICENSE="w3m" SLOT="0" @@ -47,16 +48,17 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( "${FILESDIR}/lang.patch" ) - -S="${WORKDIR}/${P/_p/-git}" +PATCHES=( + "${FILESDIR}"/${PN}-0.5.3_p20210102-restore-gettext-macro.patch +) src_prepare() { default + sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in || die hprefixify acinclude.m4 - eautoconf + AT_M4DIR="m4" eautoreconf } src_configure() {