Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/links/files/, www-client/links/
Date: Wed, 03 Jun 2020 20:54:35
Message-Id: 1591217644.decdf1e4e5f15e98d7302930ef0a345721fa66fd.monsieurp@gentoo
1 commit: decdf1e4e5f15e98d7302930ef0a345721fa66fd
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 3 19:20:31 2020 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 3 20:54:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=decdf1e4
7
8 www-client/links: replace echo for printf.
9
10 Courtesy of Lars Wendler <polynomial-c <AT> gentoo.org>.
11
12 Closes: https://bugs.gentoo.org/667304
13 Package-Manager: Portage-2.3.99, Repoman-2.3.22
14 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
15
16 www-client/links/files/swap-echo-for-printf.patch | 26 +++++++++++++++++++++++
17 www-client/links/links-2.20.2-r1.ebuild | 2 ++
18 2 files changed, 28 insertions(+)
19
20 diff --git a/www-client/links/files/swap-echo-for-printf.patch b/www-client/links/files/swap-echo-for-printf.patch
21 new file mode 100644
22 index 00000000000..9681a624ed2
23 --- /dev/null
24 +++ b/www-client/links/files/swap-echo-for-printf.patch
25 @@ -0,0 +1,26 @@
26 +"echo -n" is not POSIX compliant but printf is.
27 +See "man 1p echo" section "APPLICATION USAGE" or visit
28 +https://www.in-ulm.de/%7Emascheck/various/echo+printf/
29 +
30 +--- a/intl/synclang.orig 2020-06-03 19:13:38.082539276 -0000
31 ++++ b/intl/synclang 2020-06-03 19:13:59.122352023 -0000
32 +@@ -6,7 +6,7 @@
33 + if [ -n "$languages" ]; then
34 + for i in $languages; do
35 + if [ "$i" != english ]; then
36 +- echo -n $i" " 1>&2
37 ++ printf '%s ' "$i" 1>&2
38 + awk -f synclang.awk <$i.lng | sed 's/
39 //g' >_sync.tmp
40 + mv $i.lng ../intl-bak/$i.lng.bak
41 + mv _sync.tmp $i.lng
42 +--- a/intl/gen-intl.orig 2020-06-03 19:14:37.258679373 -0000
43 ++++ b/intl/gen-intl 2020-06-03 19:14:47.651920249 -0000
44 +@@ -10,7 +10,7 @@
45 + n=0
46 + echo '/* Automatically generated by gen-intl */'
47 + for i in $languages; do
48 +- echo -n $i" " 1>&2
49 ++ printf '%s ' "$i" 1>&2
50 + if test `cat $i.lng|wc -l` != `cat english.lng|wc -l`; then
51 + echo 1>&2
52 + echo 1>&2
53
54 diff --git a/www-client/links/links-2.20.2-r1.ebuild b/www-client/links/links-2.20.2-r1.ebuild
55 index a36d03fe29a..0c528094f16 100644
56 --- a/www-client/links/links-2.20.2-r1.ebuild
57 +++ b/www-client/links/links-2.20.2-r1.ebuild
58 @@ -83,6 +83,8 @@ REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
59
60 DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
61
62 +PATCHES=( "${FILESDIR}/swap-echo-for-printf.patch" )
63 +
64 src_prepare() {
65 use X && xdg_environment_reset