summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2005-03-25 18:49:14 +0000
committerSimon Stelling <blubb@gentoo.org>2005-03-25 18:49:14 +0000
commit74db3b9d3e821d224667b9cb1aee857595e432b3 (patch)
tree44137b8a9bf10c2793ca956f4ad8c1986668632f /app-text
parentVersion bump and fix for bug #84508. (diff)
downloadgentoo-2-74db3b9d3e821d224667b9cb1aee857595e432b3.tar.gz
gentoo-2-74db3b9d3e821d224667b9cb1aee857595e432b3.tar.bz2
gentoo-2-74db3b9d3e821d224667b9cb1aee857595e432b3.zip
#86444
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/gnomesword/ChangeLog6
-rw-r--r--app-text/gnomesword/files/gnomesword-2.1.1-gcc-3.4.patch13
-rw-r--r--app-text/gnomesword/gnomesword-2.1.1.ebuild12
3 files changed, 27 insertions, 4 deletions
diff --git a/app-text/gnomesword/ChangeLog b/app-text/gnomesword/ChangeLog
index 37853055f5f3..32811d11f9ba 100644
--- a/app-text/gnomesword/ChangeLog
+++ b/app-text/gnomesword/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/gnomesword
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.4 2005/01/01 16:16:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/ChangeLog,v 1.5 2005/03/25 18:49:14 blubb Exp $
+
+ 25 Mar 2005; <blubb@gentoo.org> +files/gnomesword-2.1.1-gcc-3.4.patch,
+ gnomesword-2.1.1.ebuild:
+ added Will Brigg's patch and ~amd64 keyword, see bug #86444
18 Sep 2004; Jon Hood <squinky86@gentoo.org> gnomesword-2.1.1.ebuild:
Stable on x86.
diff --git a/app-text/gnomesword/files/gnomesword-2.1.1-gcc-3.4.patch b/app-text/gnomesword/files/gnomesword-2.1.1-gcc-3.4.patch
new file mode 100644
index 000000000000..4152dc22e8c0
--- /dev/null
+++ b/app-text/gnomesword/files/gnomesword-2.1.1-gcc-3.4.patch
@@ -0,0 +1,13 @@
+--- src/backend/sword_main.cc 2004-07-01 17:45:30.000000000 +0200
++++ src/backend/sword_main.cc.new 2005-03-25 20:42:53.566287072 +0100
+@@ -190,8 +190,8 @@
+ VerseKey key;
+ GList *retlist = NULL;
+ char *book = NULL;
+- unsigned int bytes_read;
+- unsigned int bytes_written;
++ gsize bytes_read;
++ gsize bytes_written;
+ GError *error;
+ int i = 0, j = 0, x = 2;
+
diff --git a/app-text/gnomesword/gnomesword-2.1.1.ebuild b/app-text/gnomesword/gnomesword-2.1.1.ebuild
index 6e67553594bc..389814c3b181 100644
--- a/app-text/gnomesword/gnomesword-2.1.1.ebuild
+++ b/app-text/gnomesword/gnomesword-2.1.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.1.1.ebuild,v 1.7 2005/01/01 16:16:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnomesword/gnomesword-2.1.1.ebuild,v 1.8 2005/03/25 18:49:14 blubb Exp $
-inherit libtool gnome2
+inherit libtool gnome2 eutils
DESCRIPTION="Gnome Bible study software"
HOMEPAGE="http://gnomesword.sf.net/"
@@ -11,7 +11,7 @@ RESTRICT="nomirror"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
IUSE="spell"
RDEPEND="=gnome-extra/libgtkhtml-3.0*
@@ -31,3 +31,9 @@ DEPEND="${RDEPEND}
G2CONF="${G2CONF} --enable-sword_cvs $(use_enable spell pspell)"
DOCS="COPYING NEWS ChangeLog README TODO"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/gnomesword-2.1.1-gcc-3.4.patch
+}