[packages/vigra] Fix building with gcc 4.7 (patch from fedora) Cosmetics - no version in patch names Release 8

baggins baggins at pld-linux.org
Thu Jul 12 20:29:30 CEST 2012


commit 0e47031aedd9bea2513703a746857a2cc49d8b96
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jul 12 20:28:42 2012 +0200

    Fix building with gcc 4.7 (patch from fedora)
    Cosmetics - no version in patch names
    Release 8

 vigra-gcc47.patch                                      | 12 ++++++++++++
 vigra-1.8.0.lib_suffix.patch => vigra-lib_suffix.patch |  0
 vigra.spec                                             |  6 ++++--
 3 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/vigra-gcc47.patch b/vigra-gcc47.patch
new file mode 100644
index 0000000..f6dc8c4
--- /dev/null
+++ b/vigra-gcc47.patch
@@ -0,0 +1,12 @@
+diff -ru vigra-1.8.0/include/vigra/numpy_array.hxx vigra-1.8.0.new/include/vigra/numpy_array.hxx
+--- vigra-1.8.0/include/vigra/numpy_array.hxx	2011-09-20 19:38:36.000000000 +0100
++++ vigra-1.8.0.new/include/vigra/numpy_array.hxx	2012-02-27 21:03:54.000000000 +0000
+@@ -1074,7 +1074,7 @@
+ 
+         this->m_stride /= sizeof(value_type);
+         this->m_ptr = reinterpret_cast<pointer>(pyArray()->data);
+-        vigra_precondition(checkInnerStride(Stride()),
++        vigra_precondition(this->checkInnerStride(Stride()),
+             "NumpyArray<..., UnstridedArrayTag>::setupArrayView(): First dimension of given array is not unstrided (should never happen).");
+ 
+     }
diff --git a/vigra-1.8.0.lib_suffix.patch b/vigra-lib_suffix.patch
similarity index 100%
rename from vigra-1.8.0.lib_suffix.patch
rename to vigra-lib_suffix.patch
diff --git a/vigra.spec b/vigra.spec
index 89a7103..70880ce 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -2,13 +2,14 @@ Summary:	Generic Programming for Computer Vision
 Summary(pl.UTF-8):	Ogólne programowanie obrazu komputerowego
 Name:		vigra
 Version:	1.8.0
-Release:	7
+Release:	8
 License:	MIT
 Group:		Libraries
 Source0:	http://hci.iwr.uni-heidelberg.de/vigra/%{name}-%{version}-src.tar.gz
 # Source0-md5:	15c5544448e529ee60020758ab6be264
 URL:		http://hci.iwr.uni-heidelberg.de/vigra/
-Patch0:		vigra-1.8.0.lib_suffix.patch
+Patch0:		%{name}-lib_suffix.patch
+Patch1:		%{name}-gcc47.patch
 BuildRequires:	boost-python-devel >= 1.40.0
 BuildRequires:	cmake >= 2.6.0
 BuildRequires:	doxygen
@@ -92,6 +93,7 @@ Dokumentacja programisty do biblioteki vigra.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %cmake . \


More information about the pld-cvs-commit mailing list