1 |
commit: bba0d17aa60092d38f1c1184517fa027c432408c |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Nov 25 12:40:39 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 29 22:08:01 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba0d17a |
7 |
|
8 |
sci-libs/colpack: remove unused patch(es) |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
12 |
|
13 |
sci-libs/colpack/files/colpack-1.0.6-flags.patch | 10 --- |
14 |
sci-libs/colpack/files/colpack-1.0.8-no-bin.patch | 15 ----- |
15 |
.../colpack/files/colpack-1.0.9-fix-c++14.patch | 71 ---------------------- |
16 |
.../files/colpack-1.0.9-fix_gcc49_omp.patch | 26 -------- |
17 |
4 files changed, 122 deletions(-) |
18 |
|
19 |
diff --git a/sci-libs/colpack/files/colpack-1.0.6-flags.patch b/sci-libs/colpack/files/colpack-1.0.6-flags.patch |
20 |
deleted file mode 100644 |
21 |
index 6d4bb6a0d61..00000000000 |
22 |
--- a/sci-libs/colpack/files/colpack-1.0.6-flags.patch |
23 |
+++ /dev/null |
24 |
@@ -1,10 +0,0 @@ |
25 |
-diff -Nur ColPack-1.0.6.orig/Makefile.am ColPack-1.0.6/Makefile.am |
26 |
---- ColPack-1.0.6.orig/Makefile.am 2012-04-13 03:25:37.000000000 +0100 |
27 |
-+++ ColPack-1.0.6/Makefile.am 2012-04-13 03:30:35.000000000 +0100 |
28 |
-@@ -1,5 +1,5 @@ |
29 |
- ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} |
30 |
--COLPACK_COMMON_FLAGS = $(EXTRA_FLAGS) -O5 |
31 |
-+COLPACK_COMMON_FLAGS = $(EXTRA_FLAGS) |
32 |
- |
33 |
- INCLUDES = $(COLPACK_COMMON_FLAGS) \ |
34 |
- -I$(top_srcdir)/Main \ |
35 |
|
36 |
diff --git a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch b/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch |
37 |
deleted file mode 100644 |
38 |
index e9230b0ff10..00000000000 |
39 |
--- a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch |
40 |
+++ /dev/null |
41 |
@@ -1,15 +0,0 @@ |
42 |
-From: Sebastien Fabbro <bicatali@g.o> |
43 |
-Avoid installing the ColPack binary on an absolute path |
44 |
- |
45 |
---- a/Makefile.am |
46 |
-+++ b/Makefile.am |
47 |
-@@ -17,8 +17,7 @@ |
48 |
- LDADD = libColPack.la |
49 |
- AM_DEFAULT_SOURCE_EXT = .cpp |
50 |
- |
51 |
--noinst_bin_PROGRAMS = ColPack |
52 |
--noinst_bindir = $(abs_top_builddir)/progs |
53 |
-+noinst_PROGRAMS = ColPack |
54 |
- lib_LTLIBRARIES = libColPack.la |
55 |
- pkginclude_HEADERS = \ |
56 |
- Utilities/CoutLock.h Utilities/command_line_parameter_processor.h \ |
57 |
|
58 |
diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch b/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch |
59 |
deleted file mode 100644 |
60 |
index 7076be5426a..00000000000 |
61 |
--- a/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch |
62 |
+++ /dev/null |
63 |
@@ -1,71 +0,0 @@ |
64 |
-From 44851d9e90d9847fbfeaaea7b0ed1e7c3d093dcb Mon Sep 17 00:00:00 2001 |
65 |
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <me@××××××××.io> |
66 |
-Date: Wed, 24 Feb 2016 23:26:20 +0100 |
67 |
-Subject: [PATCH] fix semantic errors in error-msgs |
68 |
- |
69 |
---- |
70 |
- Utilities/extra.cpp | 12 +++++------- |
71 |
- 1 file changed, 5 insertions(+), 7 deletions(-) |
72 |
- |
73 |
-diff --git a/Utilities/extra.cpp b/Utilities/extra.cpp |
74 |
-index 21862e6..9f59263 100644 |
75 |
---- a/Utilities/extra.cpp |
76 |
-+++ b/Utilities/extra.cpp |
77 |
-@@ -49,7 +49,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
78 |
- |
79 |
- ofstream out_Matrix (s_MatrixName.c_str()); |
80 |
- if(!out_Matrix) { |
81 |
-- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl; |
82 |
-+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl; |
83 |
- exit(1); |
84 |
- } |
85 |
- |
86 |
-@@ -84,7 +84,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
87 |
- string s_MatrixName = "pattern"+s_postfix+s_BaseName; |
88 |
- ofstream out_Matrix (s_MatrixName.c_str()); |
89 |
- if(!out_Matrix) { |
90 |
-- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl; |
91 |
-+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl; |
92 |
- exit(1); |
93 |
- } |
94 |
- |
95 |
-@@ -111,7 +111,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
96 |
- string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName; |
97 |
- ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str()); |
98 |
- if(!out_CompressedMatrix) { |
99 |
-- cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl; |
100 |
-+ cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl; |
101 |
- exit(1); |
102 |
- } |
103 |
- |
104 |
-@@ -140,7 +140,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
105 |
- string s_MatrixName = "pattern_value"+s_postfix+s_BaseName; |
106 |
- ofstream out_Matrix (s_MatrixName.c_str()); |
107 |
- if(!out_Matrix) { |
108 |
-- cout<<"Error creating file: \""<<out_Matrix<<"\""<<endl; |
109 |
-+ cout<<"Error creating file: \""<<s_MatrixName<<"\""<<endl; |
110 |
- exit(1); |
111 |
- } |
112 |
- |
113 |
-@@ -167,7 +167,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { |
114 |
- string s_CompressedMatrixName = "CompressedMatrix"+s_postfix+s_BaseName; |
115 |
- ofstream out_CompressedMatrix (s_CompressedMatrixName.c_str()); |
116 |
- if(!out_CompressedMatrix) { |
117 |
-- cout<<"Error creating file: \""<<out_CompressedMatrix<<"\""<<endl; |
118 |
-+ cout<<"Error creating file: \""<<s_CompressedMatrixName<<"\""<<endl; |
119 |
- exit(1); |
120 |
- } |
121 |
- |
122 |
-@@ -671,7 +671,6 @@ int buildDotWithColor(ColPack::GraphColoringInterface &g, vector<string> &ListOf |
123 |
- } |
124 |
- } |
125 |
- } |
126 |
-- |
127 |
- } |
128 |
- } |
129 |
- } |
130 |
-@@ -1483,4 +1482,3 @@ int DisplayADICFormat_Value(std::list<std::vector<double> > &lvd_Value) { |
131 |
- } |
132 |
- |
133 |
- #endif |
134 |
-- |
135 |
|
136 |
diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch b/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch |
137 |
deleted file mode 100644 |
138 |
index 0510be9f90e..00000000000 |
139 |
--- a/sci-libs/colpack/files/colpack-1.0.9-fix_gcc49_omp.patch |
140 |
+++ /dev/null |
141 |
@@ -1,26 +0,0 @@ |
142 |
-Index: ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp |
143 |
-=================================================================== |
144 |
---- ColPack-1.0.9.orig/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp |
145 |
-+++ ColPack-1.0.9/BipartiteGraphPartialColoring/BipartiteGraphPartialColoring.cpp |
146 |
-@@ -388,8 +388,9 @@ namespace ColPack |
147 |
- if ( m_vi_LeftVertexColors [m_vi_Edges [x]] == m_vi_LeftVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) { |
148 |
- //Algo 4 - Line 18: add [v] to R ; cont <- false; break |
149 |
- #pragma omp critical |
150 |
-+ { |
151 |
- vi_verticesNeedNewColor.push_back(v); |
152 |
--#pragma omp end critical |
153 |
-+ } |
154 |
- cont = false; |
155 |
- break; |
156 |
- } |
157 |
-@@ -575,8 +576,9 @@ namespace ColPack |
158 |
- if ( m_vi_RightVertexColors [m_vi_Edges [x]] == m_vi_RightVertexColors[v] && f(v) > f(m_vi_Edges [x]) ) { |
159 |
- //Algo 4 - Line 18: add [v] to R ; cont <- false; break |
160 |
- #pragma omp critical |
161 |
-+ { |
162 |
- vi_verticesNeedNewColor.push_back(v); |
163 |
--#pragma omp end critical |
164 |
-+ } |
165 |
- cont = false; |
166 |
- break; |
167 |
- } |