added patch for --disable-nls, iconv not in libc, and missing strndup

(Portage version: 2.2.01.18761-prefix/cvs/Linux i686)

3 files changed, 92 insertions, 2 deletions

diff --git a/x11-misc/xdg-user-dirs/ChangeLog b/x11-misc/xdg-user-dirs/ChangeLog
index df8be234331d..ac24bf99bac9 100644
--- a/x11-misc/xdg-user-dirs/ChangeLog
+++ b/x11-misc/xdg-user-dirs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdg-user-dirs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.16 2011/05/20 05:43:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/ChangeLog,v 1.17 2011/06/14 12:40:01 mduft Exp $
+
+  14 Jun 2011; Markus Duft <mduft@gentoo.org> xdg-user-dirs-0.14.ebuild,
+  +files/xdg-user-dirs-0.14-strndup-nls.patch:
+  added patch for --disable-nls, iconv not in libc, and missing strndup
 
 *xdg-user-dirs-0.14 (20 May 2011)
 
diff --git a/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.14-strndup-nls.patch b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.14-strndup-nls.patch
new file mode 100644
index 000000000000..190d304309a8
--- /dev/null
+++ b/x11-misc/xdg-user-dirs/files/xdg-user-dirs-0.14-strndup-nls.patch
@@ -0,0 +1,79 @@
+reported upstream: https://bugs.freedesktop.org/show_bug.cgi?id=38279
+
+diff -ru xdg-user-dirs-0.14.orig/Makefile.am xdg-user-dirs-0.14/Makefile.am
+--- xdg-user-dirs-0.14.orig/Makefile.am	2011-06-14 09:37:35 +0200
++++ xdg-user-dirs-0.14/Makefile.am	2011-06-14 09:36:42 +0200
+@@ -16,7 +16,7 @@
+ xdgdir=$(sysconfdir)/xdg
+ xdg_DATA=user-dirs.conf user-dirs.defaults
+ 
+-libraries = $(LIBINTL)
++libraries = $(LIBINTL) $(LIBICONV)
+ 
+ bin_PROGRAMS =					\
+ 	xdg-user-dirs-update			\
+diff -ru xdg-user-dirs-0.14.orig/configure.ac xdg-user-dirs-0.14/configure.ac
+--- xdg-user-dirs-0.14.orig/configure.ac	2011-06-14 09:37:35 +0200
++++ xdg-user-dirs-0.14/configure.ac	2011-06-14 09:36:42 +0200
+@@ -64,6 +64,8 @@
+ else
+ 	AC_MSG_RESULT(no)
+ fi
++
++AC_CHECK_FUNCS([strndup])
+ 			       
+ AC_OUTPUT([ po/Makefile.in
+ Makefile
+diff -ru xdg-user-dirs-0.14.orig/xdg-user-dirs-update.c xdg-user-dirs-0.14/xdg-user-dirs-update.c
+--- xdg-user-dirs-0.14.orig/xdg-user-dirs-update.c	2011-06-14 09:37:35 +0200
++++ xdg-user-dirs-0.14/xdg-user-dirs-update.c	2011-06-14 09:41:35 +0200
+@@ -4,7 +4,9 @@
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef HAVE_GETTEXT
+ #include <libintl.h>
++#endif
+ #include <locale.h>
+ #include <pwd.h>
+ #include <stdio.h>
+@@ -360,7 +362,11 @@
+ 	}
+ 
+       paths = realloc (paths, sizeof (char *) * (numfiles + 2));
++#ifdef HAVE_STRNDUP
+       paths[numfiles++] = strndup (path, len);
++#else
++      paths[numfiles++] = strdup (path);
++#endif
+       paths[numfiles] = NULL;
+     }
+ 
+@@ -848,7 +854,11 @@
+       element_end = path;
+ 
+       element_copy = strdup_end (element, element_end);
++#ifdef HAVE_GETTEXT
+       translated = gettext (element_copy);
++#else
++      translated = element_copy;
++#endif
+ 
+       res = realloc (res, strlen (res) + 1 + strlen (translated) + 1);
+       if (has_slash)
+@@ -1000,6 +1010,7 @@
+   char *set_value = NULL;
+   char *locale_dir = NULL;
+   
++#ifdef HAVE_GETTEXT
+   setlocale (LC_ALL, "");
+   
+   if (is_directory (LOCALEDIR))
+@@ -1038,6 +1049,7 @@
+ 
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+   textdomain (GETTEXT_PACKAGE);
++#endif
+ 
+   force = 0;
+   for (i = 1; i < argc; i++)
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild
index 942a5b1f1293..51c36d583b9b 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild,v 1.1 2011/05/20 05:43:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdg-user-dirs/xdg-user-dirs-0.14.ebuild,v 1.2 2011/06/14 12:40:01 mduft Exp $
 
 EAPI=4
 
+inherit eutils autotools
+
 DESCRIPTION="A tool to help manage 'well known' user directories"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 SRC_URI="http://user-dirs.freedesktop.org/releases/${P}.tar.gz"
@@ -18,6 +20,11 @@ DEPEND="nls? ( sys-devel/gettext )"
 
 DOCS=( AUTHORS ChangeLog NEWS )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-strndup-nls.patch
+	eautoreconf # for the above patch
+}
+
 src_configure() {
 	econf $(use_enable nls)
 }