[extrema: 5/5] - Add patch to build with gcc 4.6

terjeros terjeros at fedoraproject.org
Mon Jan 31 21:39:00 UTC 2011


commit f66ca562db4b47986f7fa440a4ba200ba6c22b2d
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Mon Jan 31 22:38:47 2011 +0100

    - Add patch to build with gcc 4.6

 extrema-4.4.5-gcc46.patch |   10 ++++++++++
 extrema.spec              |    7 ++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/extrema-4.4.5-gcc46.patch b/extrema-4.4.5-gcc46.patch
new file mode 100644
index 0000000..ef99ef5
--- /dev/null
+++ b/extrema-4.4.5-gcc46.patch
@@ -0,0 +1,10 @@
+--- extrema-4.4.5/src/Graphics/GRA_thiessenTriangulation.cpp.orig	2011-01-31 20:54:31.951467491 +0100
++++ extrema-4.4.5/src/Graphics/GRA_thiessenTriangulation.cpp	2011-01-31 20:55:54.879463653 +0100
+@@ -15,6 +15,7 @@
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
++#include <cstddef>
+ #include <cmath>
+ 
+ #include "GRA_thiessenTriangulation.h"
diff --git a/extrema.spec b/extrema.spec
index cf1b39b..6b34728 100644
--- a/extrema.spec
+++ b/extrema.spec
@@ -1,12 +1,13 @@
 Summary:       Extrema is a powerful visualization and data analysis tool
 Name:          extrema
 Version:       4.4.5
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       GPLv2+
 Group:         Applications/Engineering
 URL:           http://exsitewebware.com/extrema/
 Source0:       http://downloads.sourceforge.net/extrema/extrema-%{version}.tar.gz
 Patch0:        extrema-4.2.10.desktop.patch
+Patch1:        extrema-4.4.5-gcc46.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK-devel >= 2.6.3
 BuildRequires: desktop-file-utils ImageMagick
@@ -42,6 +43,7 @@ documentation in PDF format for Extrema.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -77,6 +79,9 @@ desktop-file-install --vendor=fedora \
 %doc doc/*.pdf
 
 %changelog
+* Mon Jan 31 2011 Terje Rosten <terje.rosten at ntnu.no> - 4.4.5-2
+- Add patch to build with gcc 4.6
+
 * Sun Jan 30 2011 Terje Rosten <terje.rosten at ntnu.no> - 4.4.5-1
 - 4.4.5
 


More information about the scm-commits mailing list