1 |
commit: 1e0279c07698c06dc567af8fd51abee09674c6e3 |
2 |
Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Dec 27 22:05:20 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 22:05:20 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0279c0 |
7 |
|
8 |
sci-libs/cdd+: Gentoo-Bug: 569222, fix for GCC-5. |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
sci-libs/cdd+/cdd+-077a.ebuild | 4 +- |
13 |
sci-libs/cdd+/files/cdd+-077a-gcc-5.patch | 14 +++++++ |
14 |
sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch | 47 +++++++++++++++++++++++ |
15 |
3 files changed, 64 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/sci-libs/cdd+/cdd+-077a.ebuild b/sci-libs/cdd+/cdd+-077a.ebuild |
18 |
index 19dd12c..d3333ee 100644 |
19 |
--- a/sci-libs/cdd+/cdd+-077a.ebuild |
20 |
+++ b/sci-libs/cdd+/cdd+-077a.ebuild |
21 |
@@ -21,7 +21,9 @@ RDEPEND="${DEPEND}" |
22 |
src_prepare() { |
23 |
epatch \ |
24 |
"${FILESDIR}"/${P}-headers.patch \ |
25 |
- "${FILESDIR}"/${P}-gentoo.patch |
26 |
+ "${FILESDIR}"/${P}-gentoo.patch \ |
27 |
+ "${FILESDIR}"/${P}-gcc-5.patch \ |
28 |
+ "${FILESDIR}"/${P}-qa-const-char.patch |
29 |
} |
30 |
|
31 |
src_compile() { |
32 |
|
33 |
diff --git a/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch |
34 |
new file mode 100644 |
35 |
index 0000000..cd2d32a |
36 |
--- /dev/null |
37 |
+++ b/sci-libs/cdd+/files/cdd+-077a-gcc-5.patch |
38 |
@@ -0,0 +1,14 @@ |
39 |
+Fix check for GCC version beyond major version 4. |
40 |
+Gentoo bug #569222 |
41 |
+ |
42 |
+--- cdd+-077a/gmp_init.cc |
43 |
++++ cdd+-077a/gmp_init.cc |
44 |
+@@ -31,7 +31,7 @@ |
45 |
+ # define pm_gmp_reallocate std::__alloc::reallocate |
46 |
+ #endif // gcc 3.3 |
47 |
+ |
48 |
+-#if __GNUC__==3 && __GNUC_MINOR__==4 || __GNUC__==4 |
49 |
++#if __GNUC__==3 && __GNUC_MINOR__==4 || __GNUC__>=4 |
50 |
+ # include <ext/pool_allocator.h> |
51 |
+ |
52 |
+ namespace { |
53 |
|
54 |
diff --git a/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch |
55 |
new file mode 100644 |
56 |
index 0000000..a230472 |
57 |
--- /dev/null |
58 |
+++ b/sci-libs/cdd+/files/cdd+-077a-qa-const-char.patch |
59 |
@@ -0,0 +1,47 @@ |
60 |
+Silence warnings produced by passing a string literal to a 'char*': |
61 |
+ |
62 |
+cddio.C: In function ‘void SetWriteFileName(char*, char, char*)’: |
63 |
+cddio.C:103:20: warning: deprecated conversion from string constant to ‘char*’ [-Wwrite-strings] |
64 |
+ extension=".ine"; break; /* output file for ine data */ |
65 |
+ |
66 |
+--- cdd+-077a/cdd.h |
67 |
++++ cdd+-077a/cdd.h |
68 |
+@@ -185,8 +185,8 @@ |
69 |
+ extern int output_digits; /* Float digits for output. Does not affect the computation. */ |
70 |
+ |
71 |
+ void SetInputFile(boolean *); |
72 |
+-void SetWriteFileName(DataFileType, char, char *); |
73 |
+-void SetReadFileName(DataFileType, char, char *); |
74 |
++void SetWriteFileName(DataFileType, char, const char *); |
75 |
++void SetReadFileName(DataFileType, char, const char *); |
76 |
+ |
77 |
+ myTYPE FABS(myTYPE); |
78 |
+ void SetNumberType(string); |
79 |
+--- cdd+-077a/cddio.C |
80 |
++++ cdd+-077a/cddio.C |
81 |
+@@ -90,10 +90,10 @@ |
82 |
+ } |
83 |
+ } |
84 |
+ |
85 |
+-void SetWriteFileName(DataFileType fname, char cflag, char *fscript) |
86 |
++void SetWriteFileName(DataFileType fname, char cflag, const char *fscript) |
87 |
+ { |
88 |
+ boolean quit=False; |
89 |
+- char *extension; |
90 |
++ const char *extension; |
91 |
+ DataFileType newname; |
92 |
+ |
93 |
+ switch (cflag) { |
94 |
+@@ -192,10 +192,10 @@ |
95 |
+ if (DynamicWriteOn) printf("Open %s file %s.\n",fscript,fname); |
96 |
+ } |
97 |
+ |
98 |
+-void SetReadFileName(DataFileType fname, char cflag, char *fscript) |
99 |
++void SetReadFileName(DataFileType fname, char cflag, const char *fscript) |
100 |
+ { |
101 |
+ boolean quit=False; |
102 |
+- char *extension; |
103 |
++ const char *extension; |
104 |
+ DataFileType newname; |
105 |
+ |
106 |
+ switch (cflag) { |