summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2009-07-31 13:12:56 +0000
committerMarkus Dittrich <markusle@gentoo.org>2009-07-31 13:12:56 +0000
commit7cb9c515b732635bd8755ea0e5d63ac33a772f26 (patch)
tree311f9e148d650f71c7f6d894243a55e4312f6d41 /sci-mathematics
parentMarked stable on AMD64 as requested by Arfrever Frehtes Taifersar Arahesis <a... (diff)
downloadhistorical-7cb9c515b732635bd8755ea0e5d63ac33a772f26.tar.gz
historical-7cb9c515b732635bd8755ea0e5d63ac33a772f26.tar.bz2
historical-7cb9c515b732635bd8755ea0e5d63ac33a772f26.zip
Added gcc-4.4 compatibility patch (fixes bug #274039).
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/qtoctave/ChangeLog7
-rw-r--r--sci-mathematics/qtoctave/Manifest5
-rw-r--r--sci-mathematics/qtoctave/files/qtoctave-0.8.1-gcc4.4.patch8
-rw-r--r--sci-mathematics/qtoctave/qtoctave-0.8.1.ebuild9
4 files changed, 25 insertions, 4 deletions
diff --git a/sci-mathematics/qtoctave/ChangeLog b/sci-mathematics/qtoctave/ChangeLog
index 7fba3280c537..b25cacd81d57 100644
--- a/sci-mathematics/qtoctave/ChangeLog
+++ b/sci-mathematics/qtoctave/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-mathematics/qtoctave
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/ChangeLog,v 1.4 2009/02/20 18:14:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/ChangeLog,v 1.5 2009/07/31 13:12:55 markusle Exp $
+
+ 31 Jul 2009; Markus Dittrich <markusle@gentoo.org> qtoctave-0.8.1.ebuild,
+ +files/qtoctave-0.8.1-gcc4.4.patch:
+ Added gcc-4.4 compatibility patch (fixes bug #274039).
+ Thanks much to Naohiro Aota for providing the fix.
20 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> qtoctave-0.8.1.ebuild:
Update ebuild to use cmake-utils eclass correctly.
diff --git a/sci-mathematics/qtoctave/Manifest b/sci-mathematics/qtoctave/Manifest
index ad30011bd6e9..545518733a5c 100644
--- a/sci-mathematics/qtoctave/Manifest
+++ b/sci-mathematics/qtoctave/Manifest
@@ -1,4 +1,5 @@
+AUX qtoctave-0.8.1-gcc4.4.patch 410 RMD160 971ffd6ea7641b129a681d0011e73de0cd217c8e SHA1 6f2a693a59a963d92b788211065eb492027efce5 SHA256 c6e8ad6fa19758bc3de11430f124fe86214fcef9cb76b5c2f328f7838bd680e5
DIST qtoctave-0.8.1.tar.gz 1707919 RMD160 41bb670f630ce08ce5b440b2c8dbe16fdbe282b0 SHA1 e7cb555eed318c0e62b2de974e5904e40579d2c4 SHA256 d5654f5aaa2ea86b473accb49cea4a85c2899d2822fe4c3d980f0260bbe87498
-EBUILD qtoctave-0.8.1.ebuild 809 RMD160 c96b61773ec7e156442ec15e17f3c040b904fe78 SHA1 52cab7fba45fe65ce6359e32447cbd8bcc8f5ebf SHA256 f22aa64c590eea8cac9d47531e53dd8fbc12800bd8509bc9e47de98427ea2d9f
-MISC ChangeLog 762 RMD160 efef366b7d152912a1a28c71bb16433288ce61e3 SHA1 1329355f217dcfea4c29a67ae8635207c80c3da5 SHA256 08540aac03efe94cc251d999fe8e73cd1de3bb00fd7a2147e50068b468ef4046
+EBUILD qtoctave-0.8.1.ebuild 891 RMD160 86a13bb634f6f7d0f7e120b46c87a2b9e93ae277 SHA1 94a8f3acdf7a42a82e38e654c947c49b5b2f85c6 SHA256 a8d112c0ebb8be126b4909b2fbea1ad8667b5c2fd7662210ca3af1a2aa4988f6
+MISC ChangeLog 987 RMD160 7ae030371c9be6d2eaec14aaec81792a73722977 SHA1 470f346d7fba24d011a10a0a3ffb61cac1212b30 SHA256 4cf23c9fa7fc31f45a5779eeb54eda88b4c2a4633e4e2fde2355edce9dbaadbe
MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
diff --git a/sci-mathematics/qtoctave/files/qtoctave-0.8.1-gcc4.4.patch b/sci-mathematics/qtoctave/files/qtoctave-0.8.1-gcc4.4.patch
new file mode 100644
index 000000000000..4bc26f858cb5
--- /dev/null
+++ b/sci-mathematics/qtoctave/files/qtoctave-0.8.1-gcc4.4.patch
@@ -0,0 +1,8 @@
+diff -Naur qtoctave-0.8.1/qtoctave/src/search_dialog.cpp qtoctave-0.8.1.new/qtoctave/src/search_dialog.cpp
+--- qtoctave-0.8.1/qtoctave/src/search_dialog.cpp 2008-09-21 05:00:30.000000000 -0400
++++ qtoctave-0.8.1.new/qtoctave/src/search_dialog.cpp 2009-07-31 09:04:20.000000000 -0400
+@@ -1,3 +1,4 @@
++#include <cstdio>
+ #include "search_dialog.h"
+
+ SearchDialog::SearchDialog(QWidget *parent): QDialog(parent)
diff --git a/sci-mathematics/qtoctave/qtoctave-0.8.1.ebuild b/sci-mathematics/qtoctave/qtoctave-0.8.1.ebuild
index 3a8c1e36acce..17db532e66d2 100644
--- a/sci-mathematics/qtoctave/qtoctave-0.8.1.ebuild
+++ b/sci-mathematics/qtoctave/qtoctave-0.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/qtoctave-0.8.1.ebuild,v 1.3 2009/02/20 18:14:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/qtoctave/qtoctave-0.8.1.ebuild,v 1.4 2009/07/31 13:12:55 markusle Exp $
EAPI="1"
@@ -24,6 +24,13 @@ RDEPEND="${DEPEND}
S="${WORKDIR}"/${P}/${PN}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc4.4.patch
+}
+
src_compile() {
mycmakeargs="-DCMAKE_SKIP_RPATH:BOOL=YES"
cmake-utils_src_compile