summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-10-07 05:33:47 +0000
committerSamuli Suominen <drac@gentoo.org>2007-10-07 05:33:47 +0000
commit5b6d0a88553bd90d1af6ad2f497b6cd7359a123a (patch)
tree6ed009bc83576a28ef273ec5055f5080213657ee /media-video
parentUse space not tab for prev. commit. (diff)
downloadgentoo-2-5b6d0a88553bd90d1af6ad2f497b6cd7359a123a.tar.gz
gentoo-2-5b6d0a88553bd90d1af6ad2f497b6cd7359a123a.tar.bz2
gentoo-2-5b6d0a88553bd90d1af6ad2f497b6cd7359a123a.zip
Apply patch from Debian fixing nls related build error.
(Portage version: 2.1.3.12)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/camorama/ChangeLog6
-rw-r--r--media-video/camorama/camorama-0.18.ebuild10
-rw-r--r--media-video/camorama/files/camorama-0.18-nls.patch12
3 files changed, 25 insertions, 3 deletions
diff --git a/media-video/camorama/ChangeLog b/media-video/camorama/ChangeLog
index 1fe7c042bcce..1bfc8693e082 100644
--- a/media-video/camorama/ChangeLog
+++ b/media-video/camorama/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/camorama
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.13 2007/02/04 18:49:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.14 2007/10/07 05:33:46 drac Exp $
+
+ 07 Oct 2007; Samuli Suominen <drac@gentoo.org>
+ +files/camorama-0.18-nls.patch, camorama-0.18.ebuild:
+ Apply patch from Debian fixing nls related build error.
04 Feb 2007; Andrej Kacian <ticho@gentoo.org> camorama-0.18.ebuild:
Stable on x86, bug #165238.
diff --git a/media-video/camorama/camorama-0.18.ebuild b/media-video/camorama/camorama-0.18.ebuild
index 565f32d13399..40bf585418b9 100644
--- a/media-video/camorama/camorama-0.18.ebuild
+++ b/media-video/camorama/camorama-0.18.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.18.ebuild,v 1.5 2007/02/04 18:49:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.18.ebuild,v 1.6 2007/10/07 05:33:46 drac Exp $
-inherit gnome2
+inherit eutils gnome2
DESCRIPTION="A GNOME 2 Webcam application featuring various image filters."
HOMEPAGE="http://camorama.fixedgear.org/"
@@ -25,3 +25,9 @@ DEPEND="${RDEPEND}
dev-util/intltool"
SCROLLKEEPER_UPDATE="0"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-nls.patch
+}
diff --git a/media-video/camorama/files/camorama-0.18-nls.patch b/media-video/camorama/files/camorama-0.18-nls.patch
new file mode 100644
index 000000000000..db3767603d33
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.18-nls.patch
@@ -0,0 +1,12 @@
+diff -ur camorama-0.18.orig/src/main.c camorama-0.18/src/main.c
+--- camorama-0.18.orig/src/main.c 2006-09-27 18:56:07.000000000 +0300
++++ camorama-0.18/src/main.c 2007-10-07 08:27:01.000000000 +0300
+@@ -79,7 +79,7 @@
+ cam->video_dev = NULL;
+ cam->read = FALSE;
+
+- bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
++ bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+ setlocale (LC_ALL, "");