Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-user-dirs/files/
Date: Tue, 16 Aug 2022 22:19:03
Message-Id: 1660688323.3c60972b09734b8870174d7956a459ebab636990.sam@gentoo
1 commit: 3c60972b09734b8870174d7956a459ebab636990
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 16 22:18:43 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 16 22:18:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c60972b
7
8 x11-misc/xdg-user-dirs: add link to upstream PR for patch
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 .../files/xdg-user-dirs-0.15-libiconv.patch | 31 ++++++++++++++++++----
13 1 file changed, 26 insertions(+), 5 deletions(-)
14
15 diff --git a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
16 index bf5910882c3b..7fa9e48b3230 100644
17 --- a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
18 +++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch
19 @@ -1,11 +1,32 @@
20 -http://bugs.gentoo.org/366885
21 -http://bugs.gentoo.org/499940
22 +https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/9
23
24 +From f310c0534c1394410e98e610cf5cd34d1f4c07e4 Mon Sep 17 00:00:00 2001
25 +From: Sam James <sam@g.o>
26 +Date: Tue, 16 Aug 2022 23:14:39 +0100
27 +Subject: [PATCH] Makefile.am: link with libiconv when needed
28 +
29 +Fixes issues on systems with libiconv separate from libc
30 +(e.g. Darwin/macOS, uclibc).
31 +
32 +We already ask configure to do detection for us
33 +of whether we need an explicit library link line
34 +for libintl and libiconv, so let's use the result.
35 +
36 +This will have no effect if the variable is empty
37 +of course, as will be the case on many systems
38 +(everywhere it worked before).
39 +
40 +We've been carrying this patch in Gentoo for quite some time
41 +with no issues.
42 +
43 +Bug: https://bugs.gentoo.org/366885
44 +Bug: https://bugs.gentoo.org/499940
45 +Signed-off-by: Sam James <sam@g.o>
46 --- a/Makefile.am
47 +++ b/Makefile.am
48 -@@ -16,7 +16,7 @@
49 - xdgdir=$(sysconfdir)/xdg
50 - xdg_DATA=user-dirs.conf user-dirs.defaults
51 +@@ -22,7 +22,7 @@ xdg_DATA=user-dirs.conf user-dirs.defaults
52 + xdgautostartdir=$(xdgdir)/autostart
53 + xdgautostart_DATA = xdg-user-dirs.desktop
54
55 -libraries = $(LIBINTL)
56 +libraries = $(LIBINTL) $(LIBICONV)