diff options
| author |   Sam James <sam@gentoo.org> | 2022-08-16 23:18:43 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-08-16 23:18:43 +0100 |
| commit | 3c60972b09734b8870174d7956a459ebab636990 (patch) | |
| tree | b4227e7324185336411e943abf20e45d8f13c533 | |
| parent | x11-misc/xdg-user-dirs: add 0.18 (diff) | |
| download | gentoo-3c60972b09734b8870174d7956a459ebab636990.tar.gz gentoo-3c60972b09734b8870174d7956a459ebab636990.tar.bz2 gentoo-3c60972b09734b8870174d7956a459ebab636990.zip | |
x11-misc/xdg-user-dirs: add link to upstream PR for patch
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.15-libiconv.patch | 31 |
1 files changed, 26 insertions, 5 deletions
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 index bf5910882c3b..7fa9e48b3230 100644 --- 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 @@ -1,11 +1,32 @@ -http://bugs.gentoo.org/366885 -http://bugs.gentoo.org/499940 +https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/9 +From f310c0534c1394410e98e610cf5cd34d1f4c07e4 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 16 Aug 2022 23:14:39 +0100 +Subject: [PATCH] Makefile.am: link with libiconv when needed + +Fixes issues on systems with libiconv separate from libc +(e.g. Darwin/macOS, uclibc). + +We already ask configure to do detection for us +of whether we need an explicit library link line +for libintl and libiconv, so let's use the result. + +This will have no effect if the variable is empty +of course, as will be the case on many systems +(everywhere it worked before). + +We've been carrying this patch in Gentoo for quite some time +with no issues. + +Bug: https://bugs.gentoo.org/366885 +Bug: https://bugs.gentoo.org/499940 +Signed-off-by: Sam James <sam@gentoo.org> --- a/Makefile.am +++ b/Makefile.am -@@ -16,7 +16,7 @@ - xdgdir=$(sysconfdir)/xdg - xdg_DATA=user-dirs.conf user-dirs.defaults +@@ -22,7 +22,7 @@ xdg_DATA=user-dirs.conf user-dirs.defaults + xdgautostartdir=$(xdgdir)/autostart + xdgautostart_DATA = xdg-user-dirs.desktop -libraries = $(LIBINTL) +libraries = $(LIBINTL) $(LIBICONV) |