summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/SoQt/ChangeLog9
-rw-r--r--media-libs/SoQt/SoQt-1.4.1.ebuild8
-rw-r--r--media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch11
3 files changed, 24 insertions, 4 deletions
diff --git a/media-libs/SoQt/ChangeLog b/media-libs/SoQt/ChangeLog
index ceb39de14d7c..0cbbff512c3f 100644
--- a/media-libs/SoQt/ChangeLog
+++ b/media-libs/SoQt/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/SoQt
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/ChangeLog,v 1.20 2009/04/09 19:54:32 tester Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/ChangeLog,v 1.21 2009/08/23 19:02:15 vostorga Exp $
+
+ 23 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> SoQt-1.4.1.ebuild,
+ +files/SoQt-1.4.1-gcc44.patch:
+ Adding patch to compile against gcc 4.4 , thanks to Jean-Francois Ostiguy
+ <jfostiguy@sbcglobal.net>, bug #281763
09 Apr 2009; Olivier Crête <tester@gentoo.org> SoQt-1.4.1.ebuild:
Add Qt4 support with patch from bug #202226
diff --git a/media-libs/SoQt/SoQt-1.4.1.ebuild b/media-libs/SoQt/SoQt-1.4.1.ebuild
index ab95ac4491b7..a26533fa58cb 100644
--- a/media-libs/SoQt/SoQt-1.4.1.ebuild
+++ b/media-libs/SoQt/SoQt-1.4.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-1.4.1.ebuild,v 1.3 2009/04/09 19:54:32 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-1.4.1.ebuild,v 1.4 2009/08/23 19:02:15 vostorga Exp $
EAPI="2"
-inherit flag-o-matic
+inherit flag-o-matic eutils
DESCRIPTION="The glue between Coin3D and Qt"
SRC_URI="ftp://ftp.coin3d.org/pub/coin/src/all/${P}.tar.gz"
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( app-doc/doxygen )"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-gcc44.patch"
+}
+
src_configure() {
if use qt4; then
export PATH="/usr/bin/:${PATH}"
diff --git a/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch b/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch
new file mode 100644
index 000000000000..1f0954ca6754
--- /dev/null
+++ b/media-libs/SoQt/files/SoQt-1.4.1-gcc44.patch
@@ -0,0 +1,11 @@
+--- ./src/Inventor/Qt/SoQtComponent.cpp.orig 2006-10-30 16:09:20.000000000 -0600
++++ ./src/Inventor/Qt/SoQtComponent.cpp 2009-08-17 08:07:57.000000000 -0500
+@@ -100,7 +100,7 @@
+ this->parent->removeEventFilter(this);
+ }
+
+-static void delete_dict_value(unsigned long key, void * value)
++static void delete_dict_value(SbDictKeyType key, void * value)
+ {
+ delete (QCursor *)value;
+ }