pool/ColPack
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 397915 from devel:libraries:c_c++

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/397915
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ColPack?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2016-05-31 10:10:12 +00:00 committed by Git OBS Bridge
commit f95e951116
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ColPack.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 25 09:51:32 UTC 2016 - martin.liska@suse.com
- Add gcc6-fix-errors.patch to remove errors seen by GCC6.
-------------------------------------------------------------------
Thu Oct 18 09:25:19 UTC 2012 - kkhere.geo@gmail.com

5
ColPack.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ColPack
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,6 +27,8 @@ Url: http://www.cscapes.org/coloringpage/
Source: http://www.cscapes.org/download/ColPack/%{name}-%{version}.tar.gz
Source2: baselibs.conf
Patch1: colpack-return-in-non-void.patch
# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6.
Patch2: gcc6-fix-errors.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@ -69,6 +71,7 @@ This package provides the development environment for ColPack
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
%build
autoreconf -v --install --force

47
gcc6-fix-errors.patch Normal file
View File

@ -0,0 +1,47 @@
--- ColPack-1.0.9/Utilities/extra.cpp 2012-02-04 04:00:14.000000000 +0100
+++ ColPack-1.0.9/Utilities/extra.cpp 2016-05-25 11:47:41.593922991 +0200
@@ -49,7 +49,7 @@
ofstream out_Matrix (s_MatrixName.c_str());
if(!out_Matrix) {
- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
exit(1);
}
@@ -84,7 +84,7 @@
string s_MatrixName = "pattern"+s_postfix+s_BaseName;
ofstream out_Matrix (s_MatrixName.c_str());
if(!out_Matrix) {
- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
exit(1);
}
@@ -111,7 +111,7 @@
string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
if(!out_CompressedMatrix) {
- cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
+ cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
exit(1);
}
@@ -140,7 +140,7 @@
string s_MatrixName = "pattern_value"+s_postfix+s_BaseName;
ofstream out_Matrix (s_MatrixName.c_str());
if(!out_Matrix) {
- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl;
+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl;
exit(1);
}
@@ -167,7 +167,7 @@
string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName;
ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str());
if(!out_CompressedMatrix) {
- cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl;
+ cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl;
exit(1);
}