1 |
commit: 889e3d4327c8d5e88412da05ad2f9bb73164aec6 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 13:21:22 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 4 13:21:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889e3d43 |
7 |
|
8 |
sci-astronomy/missfits: Fix -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707528 |
11 |
Closes: https://bugs.gentoo.org/725298 |
12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
.../missfits/files/missfits-2.8.0-fno-common.patch | 65 ++++++++++++++++++++++ |
16 |
.../files/missfits-2.8.0-run-AM_PROG_AR.patch | 10 ++++ |
17 |
sci-astronomy/missfits/missfits-2.8.0.ebuild | 20 +++++-- |
18 |
3 files changed, 89 insertions(+), 6 deletions(-) |
19 |
|
20 |
diff --git a/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch b/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..0c7e042376b |
23 |
--- /dev/null |
24 |
+++ b/sci-astronomy/missfits/files/missfits-2.8.0-fno-common.patch |
25 |
@@ -0,0 +1,65 @@ |
26 |
+--- a/src/file.c |
27 |
++++ b/src/file.c |
28 |
+@@ -45,6 +45,8 @@ |
29 |
+ #include "prefs.h" |
30 |
+ #include "xml.h" |
31 |
+ |
32 |
++char gstr[MAXCHAR]; |
33 |
++ |
34 |
+ /****** load_fitsfiles ******************************************************* |
35 |
+ PROTO catstruct **load_fitsfiles(char *name, int *ncat, int * outcat, |
36 |
+ filenum *filetype, int *headflag) |
37 |
+--- a/src/fits/fitscat.h |
38 |
++++ b/src/fits/fitscat.h |
39 |
+@@ -333,6 +333,6 @@ |
40 |
+ warning(char *msg1, char *msg2); |
41 |
+ |
42 |
+ |
43 |
+-int bswapflag; |
44 |
++extern int bswapflag; |
45 |
+ |
46 |
+ #endif |
47 |
+--- a/src/fits/fitscheck.c |
48 |
++++ b/src/fits/fitscheck.c |
49 |
+@@ -38,6 +38,8 @@ |
50 |
+ #include "fitscat_defs.h" |
51 |
+ #include "fitscat.h" |
52 |
+ |
53 |
++int bswapflag; |
54 |
++ |
55 |
+ #define ENCODE_OFFSET 0x30 |
56 |
+ unsigned int exclude[13] = {0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, |
57 |
+ 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60}; |
58 |
+--- a/src/globals.h |
59 |
++++ b/src/globals.h |
60 |
+@@ -30,7 +30,7 @@ |
61 |
+ #include "types.h" |
62 |
+ |
63 |
+ /*----------------------- miscellaneous variables ---------------------------*/ |
64 |
+-char gstr[MAXCHAR]; |
65 |
++extern char gstr[MAXCHAR]; |
66 |
+ |
67 |
+ /*------------------------------- functions ---------------------------------*/ |
68 |
+ extern void makeit(void), |
69 |
+--- a/src/prefs.c |
70 |
++++ b/src/prefs.c |
71 |
+@@ -50,6 +50,8 @@ |
72 |
+ #include "prefs.h" |
73 |
+ #include "preflist.h" |
74 |
+ |
75 |
++prefstruct prefs; |
76 |
++ |
77 |
+ /********************************* dumpprefs ********************************/ |
78 |
+ /* |
79 |
+ Print the default preference parameters. |
80 |
+--- a/src/prefs.h |
81 |
++++ b/src/prefs.h |
82 |
+@@ -84,7 +84,7 @@ |
83 |
+ double time_diff; /* Execution time */ |
84 |
+ } prefstruct; |
85 |
+ |
86 |
+-prefstruct prefs; |
87 |
++extern prefstruct prefs; |
88 |
+ |
89 |
+ /*----------------------------- Internal constants --------------------------*/ |
90 |
+ |
91 |
|
92 |
diff --git a/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch b/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch |
93 |
new file mode 100644 |
94 |
index 00000000000..33166519fc6 |
95 |
--- /dev/null |
96 |
+++ b/sci-astronomy/missfits/files/missfits-2.8.0-run-AM_PROG_AR.patch |
97 |
@@ -0,0 +1,10 @@ |
98 |
+--- a/configure.ac |
99 |
++++ b/configure.ac |
100 |
+@@ -78,6 +78,7 @@ |
101 |
+ ACX_PROG_CC_OPTIM |
102 |
+ fi |
103 |
+ |
104 |
++AM_PROG_AR |
105 |
+ AC_PROG_RANLIB |
106 |
+ AC_PROG_INSTALL |
107 |
+ |
108 |
|
109 |
diff --git a/sci-astronomy/missfits/missfits-2.8.0.ebuild b/sci-astronomy/missfits/missfits-2.8.0.ebuild |
110 |
index 970e40703b1..c619190e23f 100644 |
111 |
--- a/sci-astronomy/missfits/missfits-2.8.0.ebuild |
112 |
+++ b/sci-astronomy/missfits/missfits-2.8.0.ebuild |
113 |
@@ -1,21 +1,29 @@ |
114 |
# Copyright 1999-2020 Gentoo Authors |
115 |
# Distributed under the terms of the GNU General Public License v2 |
116 |
|
117 |
-EAPI=6 |
118 |
+EAPI=7 |
119 |
+ |
120 |
+inherit autotools |
121 |
|
122 |
DESCRIPTION="Performs basic maintenance and packaging tasks on FITS files" |
123 |
HOMEPAGE="http://www.astromatic.net/software/missfits/" |
124 |
SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz" |
125 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
126 |
|
127 |
LICENSE="GPL-3" |
128 |
SLOT="0" |
129 |
-IUSE="doc" |
130 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
131 |
|
132 |
-RDEPEND="" |
133 |
-DEPEND="${RDEPEND}" |
134 |
+PATCHES=( |
135 |
+ "${FILESDIR}"/${P}-run-AM_PROG_AR.patch |
136 |
+ "${FILESDIR}"/${P}-fno-common.patch |
137 |
+) |
138 |
+ |
139 |
+src_prepare() { |
140 |
+ default |
141 |
+ eautoreconf |
142 |
+} |
143 |
|
144 |
src_install() { |
145 |
default |
146 |
- use doc && dodoc doc/* |
147 |
+ dodoc -r doc/. |
148 |
} |