summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Gurr <tgurr@gentoo.org>2008-06-11 22:37:12 +0000
committerTimo Gurr <tgurr@gentoo.org>2008-06-11 22:37:12 +0000
commit8f30229ccc2201eda7de4186881d1d060f9765a2 (patch)
treefa1a0404fda52a07be45e20ea2ba6f76e5a07d37 /kde-base
parentstable x86, bug 219933 (diff)
downloadgentoo-2-8f30229ccc2201eda7de4186881d1d060f9765a2.tar.gz
gentoo-2-8f30229ccc2201eda7de4186881d1d060f9765a2.tar.bz2
gentoo-2-8f30229ccc2201eda7de4186881d1d060f9765a2.zip
Fix arts-3.5.9.ebuild, glibc-2.8 compatibility bug #225763.
(Portage version: 2.1.5.4)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/arts/ChangeLog6
-rw-r--r--kde-base/arts/arts-3.5.9.ebuild11
-rw-r--r--kde-base/arts/files/arts-1.5.9-glibc2.8-build-fix.patch11
3 files changed, 24 insertions, 4 deletions
diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 0c680f382c8a..f0c619a00279 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/arts
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.269 2008/06/07 10:48:23 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.270 2008/06/11 22:37:11 tgurr Exp $
+
+ 11 Jun 2008; Timo Gurr <tgurr@gentoo.org>
+ +files/arts-1.5.9-glibc2.8-build-fix.patch, arts-3.5.9.ebuild:
+ Fix arts-3.5.9.ebuild, glibc-2.8 compatibility bug #225763.
07 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org> -arts-3.5.8.ebuild:
Removed old versions.
diff --git a/kde-base/arts/arts-3.5.9.ebuild b/kde-base/arts/arts-3.5.9.ebuild
index 8df495f0032c..edc523d47efb 100644
--- a/kde-base/arts/arts-3.5.9.ebuild
+++ b/kde-base/arts/arts-3.5.9.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/kde-base/arts/arts-3.5.9.ebuild,v 1.7 2008/05/18 14:32:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.9.ebuild,v 1.8 2008/06/11 22:37:11 tgurr Exp $
EAPI="1"
inherit kde flag-o-matic eutils versionator
@@ -34,12 +34,17 @@ RDEPEND="$(qt_min_version 3.3)
DEPEND="${RDEPEND}
dev-util/pkgconfig"
-PATCHES="${FILESDIR}/arts-1.5.0-bindnow.patch
- ${FILESDIR}/arts-1.5.4-multilib.patch"
+#PATCHES="${FILESDIR}/arts-1.5.0-bindnow.patch
+# ${FILESDIR}/arts-1.5.4-multilib.patch
+# ${FILESDIR}/arts-1.5.9-glibc2.8-build-fix.patch"
src_unpack() {
kde_src_unpack
+ epatch "${FILESDIR}/arts-1.5.0-bindnow.patch"
+ epatch "${FILESDIR}/arts-1.5.4-multilib.patch"
+ epatch "${FILESDIR}/arts-1.5.9-glibc2.8-build-fix.patch"
+
sed -i -e "s:GENTOO_LIB64:$(get_abi_LIBDIR amd64):" \
-e "s:GENTOO_LIB32:$(get_abi_LIBDIR x86):" artsc/artsdsp.in \
|| die "multilib-sed failed"
diff --git a/kde-base/arts/files/arts-1.5.9-glibc2.8-build-fix.patch b/kde-base/arts/files/arts-1.5.9-glibc2.8-build-fix.patch
new file mode 100644
index 000000000000..5ccfa8c08e4e
--- /dev/null
+++ b/kde-base/arts/files/arts-1.5.9-glibc2.8-build-fix.patch
@@ -0,0 +1,11 @@
+diff -Naur arts-1.5.9/mcop/mcoputils.cc arts-1.5.9.new/mcop/mcoputils.cc
+--- arts-1.5.9/mcop/mcoputils.cc 2008-02-13 10:35:23.000000000 +0100
++++ arts-1.5.9.new/mcop/mcoputils.cc 2008-06-11 02:07:41.349233625 +0200
+@@ -36,6 +36,7 @@
+ #include <cstring>
+ #include <stdio.h>
+ #include <map>
++#include <limits.h>
+
+ using namespace std;
+ using namespace Arts;