| 1 |
commit: 50c53cbcbe84fe1473244e2bd6ad5e4533601bac |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 25 21:59:28 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 25 22:00:51 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c53cbc |
| 7 |
|
| 8 |
www-client/w3m: further fixups for autoreconf patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/778482 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
...g.patch => w3m-0.5.3_p20210102-restore-gettext-macro.patch} | 5 ++--- |
| 14 |
www-client/w3m/w3m-0.5.3_p20210102.ebuild | 10 ++++++---- |
| 15 |
2 files changed, 8 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/w3m/files/lang.patch b/www-client/w3m/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch |
| 18 |
similarity index 85% |
| 19 |
rename from www-client/w3m/files/lang.patch |
| 20 |
rename to www-client/w3m/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch |
| 21 |
index dccc3542690..ffd30c62a5d 100644 |
| 22 |
--- a/www-client/w3m/files/lang.patch |
| 23 |
+++ b/www-client/w3m/files/w3m-0.5.3_p20210102-restore-gettext-macro.patch |
| 24 |
@@ -1,5 +1,5 @@ |
| 25 |
-new file mode 100644 |
| 26 |
-index 00000000..da1b2aef |
| 27 |
+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/ |
| 28 |
+https://bugs.gentoo.org/778482 |
| 29 |
--- /dev/null |
| 30 |
+++ b/m4/codeset.m4 |
| 31 |
@@ -0,0 +1,25 @@ |
| 32 |
@@ -29,4 +29,3 @@ index 00000000..da1b2aef |
| 33 |
+]) |
| 34 |
+ |
| 35 |
-- |
| 36 |
-2.20.1 |
| 37 |
|
| 38 |
diff --git a/www-client/w3m/w3m-0.5.3_p20210102.ebuild b/www-client/w3m/w3m-0.5.3_p20210102.ebuild |
| 39 |
index cb833a9cd2b..60b0c812ca7 100644 |
| 40 |
--- a/www-client/w3m/w3m-0.5.3_p20210102.ebuild |
| 41 |
+++ b/www-client/w3m/w3m-0.5.3_p20210102.ebuild |
| 42 |
@@ -11,6 +11,7 @@ MY_PV="${PV/_p/+git}" |
| 43 |
DESCRIPTION="Text based WWW browser, supports tables and frames" |
| 44 |
HOMEPAGE="https://github.com/tats/w3m" |
| 45 |
SRC_URI="https://github.com/tats/w3m/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz" |
| 46 |
+S="${WORKDIR}/${P/_p/-git}" |
| 47 |
|
| 48 |
LICENSE="w3m" |
| 49 |
SLOT="0" |
| 50 |
@@ -47,16 +48,17 @@ BDEPEND=" |
| 51 |
virtual/pkgconfig |
| 52 |
" |
| 53 |
|
| 54 |
-PATCHES=( "${FILESDIR}/lang.patch" ) |
| 55 |
- |
| 56 |
-S="${WORKDIR}/${P/_p/-git}" |
| 57 |
+PATCHES=( |
| 58 |
+ "${FILESDIR}"/${PN}-0.5.3_p20210102-restore-gettext-macro.patch |
| 59 |
+) |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
default |
| 63 |
+ |
| 64 |
sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in || die |
| 65 |
hprefixify acinclude.m4 |
| 66 |
|
| 67 |
- eautoconf |
| 68 |
+ AT_M4DIR="m4" eautoreconf |
| 69 |
} |
| 70 |
|
| 71 |
src_configure() { |
Archives