Add Flameeyes's patch to fix nls compilation for bug 112144.

(Portage version: 2.0.54)

4 files changed, 64 insertions, 3 deletions

diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog
index d3f083e9de61..1ce7948feedd 100644
--- a/media-gfx/k3d/ChangeLog
+++ b/media-gfx/k3d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/k3d
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.21 2006/01/30 00:47:28 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.22 2006/01/30 03:32:43 vanquirius Exp $
+
+  30 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/k3d-0.5.0.34-nls.patch, k3d-0.5.0.34.ebuild:
+  Add Flameeyes's patch to fix nls compilation for bug 112144.
 
   30 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -files/va_copy.patch,
   -k3d-0.2.5.4.ebuild, -k3d-0.4.4.0.ebuild, -k3d-0.4.4.2.ebuild,
diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
index a4eced0e2839..413b2160684b 100644
--- a/media-gfx/k3d/Manifest
+++ b/media-gfx/k3d/Manifest
@@ -1,6 +1,7 @@
 MD5 a5f3227e541c06bb4af758fdc2d481e4 ChangeLog 3099
 MD5 f422c293ed6d2f4f51162353a19008a0 files/digest-k3d-0.5.0.33 66
 MD5 20e100fbbfd6cb1cee996065d9a66660 files/digest-k3d-0.5.0.34 66
+MD5 496ef774e987945057662901c2f855ee files/k3d-0.5.0.34-nls.patch 1610
 MD5 b4275fc98b9707d8361812632919ef93 k3d-0.5.0.33.ebuild 2030
-MD5 7671b0301dbdfb65761c8627c4f4b148 k3d-0.5.0.34.ebuild 1818
+MD5 ddae2a43724ef6a3be8e0573c499bdc0 k3d-0.5.0.34.ebuild 1912
 MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
diff --git a/media-gfx/k3d/files/k3d-0.5.0.34-nls.patch b/media-gfx/k3d/files/k3d-0.5.0.34-nls.patch
new file mode 100644
index 000000000000..129fcc69123a
--- /dev/null
+++ b/media-gfx/k3d/files/k3d-0.5.0.34-nls.patch
@@ -0,0 +1,50 @@
+Index: k3d-0.5.0.34/application/main.cpp
+===================================================================
+--- k3d-0.5.0.34.orig/application/main.cpp
++++ k3d-0.5.0.34/application/main.cpp
+@@ -688,10 +688,12 @@ int main(int argc, char* argv[])
+ {
+ 	const std::string program_name = boost::filesystem::path(argv[0], boost::filesystem::native).leaf();
+ 
++#ifdef ENABLE_NLS
+ 	setlocale(LC_ALL, "");
+ 	bindtextdomain(PACKAGE, K3D_LOCALE);
+ 	bind_textdomain_codeset(PACKAGE, "UTF-8");
+ 	textdomain(PACKAGE);
++#endif
+ 
+ 	logbufs_t logbufs;
+ 
+Index: k3d-0.5.0.34/bug-buddy/main.cpp
+===================================================================
+--- k3d-0.5.0.34.orig/bug-buddy/main.cpp
++++ k3d-0.5.0.34/bug-buddy/main.cpp
+@@ -533,10 +533,12 @@ int main(int argc, char* argv[])
+ {
+ 	const std::string program_name = boost::filesystem::path(argv[0], boost::filesystem::native).leaf();
+ 
++#ifdef ENABLE_NLS
+ 	setlocale(LC_ALL, "");
+ 	bindtextdomain(PACKAGE, K3D_LOCALE);
+ 	bind_textdomain_codeset(PACKAGE, "UTF-8");
+ 	textdomain(PACKAGE);
++#endif
+ 
+ 	Gtk::Main main(&argc, &argv);
+ 
+Index: k3d-0.5.0.34/k3dsdk/i18n.h
+===================================================================
+--- k3d-0.5.0.34.orig/k3dsdk/i18n.h
++++ k3d-0.5.0.34/k3dsdk/i18n.h
+@@ -23,12 +23,6 @@
+ 
+ 	#define _(String) (String)
+ 	#define N_(String) (String)
+-	#define textdomain(String) 
+-	#define gettext(String) (String)
+-	#define dgettext(Domain, String) (String)
+-	#define dcgettext(Domain, String, Type) (String)
+-	#define bindtextdomain(Domain, Directory) 
+-	#define bind_textdomain_codeset(Domain, Codeset) 
+ 
+ #endif // !ENABLE_NLS
diff --git a/media-gfx/k3d/k3d-0.5.0.34.ebuild b/media-gfx/k3d/k3d-0.5.0.34.ebuild
index 0a67becc504d..fc6b91c0893a 100644
--- a/media-gfx/k3d/k3d-0.5.0.34.ebuild
+++ b/media-gfx/k3d/k3d-0.5.0.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.34.ebuild,v 1.2 2006/01/30 00:47:28 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.5.0.34.ebuild,v 1.3 2006/01/30 03:32:43 vanquirius Exp $
 
 inherit eutils
 
@@ -34,6 +34,12 @@ DEPEND="virtual/x11
 	=dev-libs/libsigc++-2.0*
 	svg? ( gnome-base/librsvg )"
 
+src_unpack() {
+	unpack ${A}
+	# bug 112144
+	epatch "${FILESDIR}"/${PN}-0.5.0.34-nls.patch
+}
+
 src_compile() {
 	local myconf="--with-ngui"
 	if use expat || ! use xml2 ; then