summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-06-09 12:53:11 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-06-09 12:53:11 +0000
commitfd0239b37fb46408582f34218895c11727f2719d (patch)
treee4e0ba39a6ef5e8a3d8322b5a155a0213d88f41e /app-text/sword
parentAdd patch to build with GCC 4.3. Thanks to Peter Alfredsen (loki_val) in bug ... (diff)
downloadgentoo-2-fd0239b37fb46408582f34218895c11727f2719d.tar.gz
gentoo-2-fd0239b37fb46408582f34218895c11727f2719d.tar.bz2
gentoo-2-fd0239b37fb46408582f34218895c11727f2719d.zip
Add patch to build with GCC 4.3. Thanks to Marek Miller in bug #225479.
(Portage version: 2.1.5.4)
Diffstat (limited to 'app-text/sword')
-rw-r--r--app-text/sword/ChangeLog6
-rw-r--r--app-text/sword/files/sword-1.5.10+gcc-4.3.patch48
-rw-r--r--app-text/sword/sword-1.5.10-r2.ebuild3
3 files changed, 55 insertions, 2 deletions
diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index a6a93b3baa5a..a2ca0bcd9d62 100644
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/sword
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.41 2008/05/21 12:51:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.42 2008/06/09 12:53:11 flameeyes Exp $
+
+ 09 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+ +files/sword-1.5.10+gcc-4.3.patch, sword-1.5.10-r2.ebuild:
+ Add patch to build with GCC 4.3. Thanks to Marek Miller in bug #225479.
21 May 2008; Samuli Suominen <drac@gentoo.org> sword-1.5.8-r2.ebuild,
sword-1.5.9-r2.ebuild, sword-1.5.10-r2.ebuild:
diff --git a/app-text/sword/files/sword-1.5.10+gcc-4.3.patch b/app-text/sword/files/sword-1.5.10+gcc-4.3.patch
new file mode 100644
index 000000000000..968be88c898e
--- /dev/null
+++ b/app-text/sword/files/sword-1.5.10+gcc-4.3.patch
@@ -0,0 +1,48 @@
+--- include/gbfwordjs.h.orig 2008-06-09 00:45:08.000000000 +0200
++++ include/gbfwordjs.h 2008-06-09 00:45:49.000000000 +0200
+@@ -21,6 +21,8 @@
+ #ifndef GBFWORDSJS_H
+ #define GBFWORDSJS_H
+
++
++#include <cstdio>
+ #include <swoptfilter.h>
+
+ SWORD_NAMESPACE_START
+
+--- include/flatapi.h.orig 2008-06-09 00:51:23.000000000 +0200
++++ include/flatapi.h 2008-06-09 00:51:43.000000000 +0200
+@@ -29,6 +29,8 @@
+
+ extern "C" {
+
++
++#include <stdint.h>
+ #define SWHANDLE intptr_t
+
+
+
+--- utilities/diatheke/corediatheke.h.orig 2008-06-09 00:57:06.000000000 +0200
++++ utilities/diatheke/corediatheke.h 2008-06-09 00:57:57.000000000 +0200
+@@ -3,7 +3,8 @@
+ // Licensed under GNU General Public License (GPL)
+ // see accompanying LICENSE file for license details
+
+-#include <stdio.h>
++#include <cstdio>
++#include <fstream>
+
+ #include "diathekemgr.h"
+ #include <localemgr.h>
+
+--- utilities/diatheke/osiscgi.h.orig 2008-06-09 01:01:14.000000000 +0200
++++ utilities/diatheke/osiscgi.h 2008-06-09 01:01:45.000000000 +0200
+@@ -19,6 +19,7 @@
+
+ #include <swbasicfilter.h>
+
++#include <cctype>
+ #include <defs.h>
+
+ SWORD_NAMESPACE_START
+
diff --git a/app-text/sword/sword-1.5.10-r2.ebuild b/app-text/sword/sword-1.5.10-r2.ebuild
index b80afec35ff3..2262c8044d0b 100644
--- a/app-text/sword/sword-1.5.10-r2.ebuild
+++ b/app-text/sword/sword-1.5.10-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.10-r2.ebuild,v 1.2 2008/05/21 12:51:33 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.10-r2.ebuild,v 1.3 2008/06/09 12:53:11 flameeyes Exp $
inherit flag-o-matic
@@ -24,6 +24,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}/escape_range.patch"
+ epatch "${FILESDIR}/${P}+gcc-4.3.patch"
}
src_compile() {