[frepple] Patch for gcc 4.7 compatibility.
Johan De Taeye
jdetaeye at fedoraproject.org
Sat Jan 14 10:13:17 UTC 2012
commit 1a7fd51fdc1fc0b6e935f9ef08011821a0f3cdf1
Author: johan <johan at freckle.mcasolutions.com>
Date: Sat Jan 14 11:12:20 2012 +0100
Patch for gcc 4.7 compatibility.
frepple.spec | 7 ++++++-
gcc47.patch | 20 ++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/frepple.spec b/frepple.spec
index e036d3c..2789d1b 100644
--- a/frepple.spec
+++ b/frepple.spec
@@ -3,7 +3,7 @@
Summary: Free Production Planning Library
Name: frepple
Version: 0.9.0
-Release: 2%{?dist}
+Release: 3%{?dist}
# Note on the license: frePPle is released with the LGPL license, version 2.1 or higher.
# The optional plugin module mod_lpsolver depends on the GLPK package which is
# licensed under GPL. That module is therefore disabled in this build.
@@ -11,6 +11,7 @@ License: LGPLv2+
Group: Applications/Productivity
URL: http://www.frepple.com
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0: gcc47.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-XXXXXX)
Requires: xerces-c, Django
BuildRequires: python-devel, xerces-c-devel, Django
@@ -42,6 +43,7 @@ Documentation subpackage for frePPLe - the Free Production Planning Library.
%prep
%setup -q
+%patch0 -p1
%build
# Configure
@@ -115,6 +117,9 @@ rm -rf %{buildroot}
%doc doc/reference doc/Frepple doc/UI doc/Main doc/Tutorial doc/uploads doc/uploads/Frepple doc/uploads/UI doc/uploads/Tutorial doc/*.pdf doc/favicon.ico doc/*.html doc/*.css doc/*.gif doc/*.bmp
%changelog
+* Sat Jan 14 2012 Johan De Taeye <jdetaeye at users.sourceforge.net> - 0.9.0-3
+- Patch for gcc 4.7 compatibility
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/gcc47.patch b/gcc47.patch
new file mode 100644
index 0000000..41dfb2f
--- /dev/null
+++ b/gcc47.patch
@@ -0,0 +1,20 @@
+diff -uNr frepple-0.9.0/include/frepple/utils.h frepple-0.9.0p/include/frepple/utils.h
+--- frepple-0.9.0/include/frepple/utils.h 2011-10-01 10:57:24.000000000 +0200
++++ frepple-0.9.0p/include/frepple/utils.h 2012-01-14 10:18:39.085381403 +0100
+@@ -5380,13 +5380,13 @@
+ }
+
+ FreppleIterator() : i(DATACLASS::begin())
+- {initType(PythonExtension<ME>::getType().type_object());}
++ {this->initType(PythonExtension<ME>::getType().type_object());}
+
+ template <class OTHER> FreppleIterator(const OTHER *o) : i(o)
+- {initType(PythonExtension<ME>::getType().type_object());}
++ {this->initType(PythonExtension<ME>::getType().type_object());}
+
+ template <class OTHER> FreppleIterator(const OTHER &o) : i(o)
+- {initType(PythonExtension<ME>::getType().type_object());}
++ {this->initType(PythonExtension<ME>::getType().type_object());}
+
+ static PyObject* create(PyObject* self, PyObject* args)
+ {return new ME();}
More information about the scm-commits
mailing list