summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Griffis <agriffis@gentoo.org>2003-02-11 00:02:57 +0000
committerAron Griffis <agriffis@gentoo.org>2003-02-11 00:02:57 +0000
commit58c83aeb33a096d64f0956d25f1f82de44ed5cc6 (patch)
treef3b3945cb896eae5d6787a6f31d35d7bb4cb0edb
parentadd ~alpha (diff)
downloadgentoo-2-58c83aeb33a096d64f0956d25f1f82de44ed5cc6.tar.gz
gentoo-2-58c83aeb33a096d64f0956d25f1f82de44ed5cc6.tar.bz2
gentoo-2-58c83aeb33a096d64f0956d25f1f82de44ed5cc6.zip
add ~alpha and fix bug 15450
-rw-r--r--gnome-base/nautilus/ChangeLog6
-rw-r--r--gnome-base/nautilus/files/nautilus-2.2.0.2-locale.patch10
-rw-r--r--gnome-base/nautilus/nautilus-2.2.0.2.ebuild15
3 files changed, 27 insertions, 4 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 834e1c9de3b2..1dc53af495e4 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-base/nautilus
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.35 2003/01/31 01:40:23 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.36 2003/02/11 00:02:57 agriffis Exp $
+
+ 10 Feb 2003; Aron Griffis <agriffis@gentoo.org> nautilus-2.2.0.2.ebuild files/nautilus-2.2.0.2-locale.patch :
+ Fix bug 15450 so that nautilus can build without optimization.
+ Add ~alpha to KEYWORDS
*nautilus-2.2.0.2 (30 Jan 2003)
diff --git a/gnome-base/nautilus/files/nautilus-2.2.0.2-locale.patch b/gnome-base/nautilus/files/nautilus-2.2.0.2-locale.patch
new file mode 100644
index 000000000000..24c068ce815b
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.2.0.2-locale.patch
@@ -0,0 +1,10 @@
+--- nautilus-2.2.0.2/src/nautilus-server-connect.c.old 2003-02-10 17:46:16.000000000 -0500
++++ nautilus-2.2.0.2/src/nautilus-server-connect.c 2003-02-10 17:46:25.000000000 -0500
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <locale.h>
+ #include <glib.h>
+ #include <gnome.h>
+ #include <gconf/gconf-client.h>
diff --git a/gnome-base/nautilus/nautilus-2.2.0.2.ebuild b/gnome-base/nautilus/nautilus-2.2.0.2.ebuild
index e89649f572bb..1fbcd3d237fd 100644
--- a/gnome-base/nautilus/nautilus-2.2.0.2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.2.0.2.ebuild
@@ -1,15 +1,15 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.2.0.2.ebuild,v 1.2 2003/02/09 15:25:10 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.2.0.2.ebuild,v 1.3 2003/02/11 00:02:57 agriffis Exp $
-inherit gnome2
+inherit gnome2 eutils
S=${WORKDIR}/${P}
DESCRIPTION="A filemanager for the Gnome2 desktop"
HOMEPAGE="http://www.gnome.org/"
SLOT="0"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~alpha"
IUSE="oggvorbis"
RDEPEND="app-admin/fam-oss
@@ -42,3 +42,12 @@ DEPEND="${RDEPEND}
G2CONF="${G2CONF} --enable-gdialog=yes"
DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # Fix bug 15450: nautilus-2.2.0.2 doesn't build without
+ # optimization. We'll need this patch until it's fixed upstream.
+ epatch ${FILESDIR}/${PN}-2.2.0.2-locale.patch
+}