1 |
commit: bc87905acb5f7f3bca89b62a0ca543352aaba78f |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 2 19:16:01 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 2 19:16:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc87905a |
7 |
|
8 |
sci-calculators/transcalc: Fix -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707536 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
.../files/transcalc-0.14-fno-common.patch | 70 ++++++++++++++++++++++ |
15 |
sci-calculators/transcalc/transcalc-0.14-r2.ebuild | 14 +++-- |
16 |
2 files changed, 78 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/sci-calculators/transcalc/files/transcalc-0.14-fno-common.patch b/sci-calculators/transcalc/files/transcalc-0.14-fno-common.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..1e9288c74b9 |
21 |
--- /dev/null |
22 |
+++ b/sci-calculators/transcalc/files/transcalc-0.14-fno-common.patch |
23 |
@@ -0,0 +1,70 @@ |
24 |
+--- a/src/transcalc.c |
25 |
++++ b/src/transcalc.c |
26 |
+@@ -37,6 +37,15 @@ |
27 |
+ extern gint trc_file_load (FILE *, short); |
28 |
+ |
29 |
+ char version[] = "transcalc " VERSION; |
30 |
++GtkWidget *main_body_window; |
31 |
++GtkWidget *transtype_combo; |
32 |
++ |
33 |
++short current_transtype; |
34 |
++trans_win *twin; |
35 |
++short statusint; |
36 |
++trans_gui *tgui; |
37 |
++gboolean statusexists; |
38 |
++int main_window_width, main_window_height; |
39 |
+ |
40 |
+ |
41 |
+ /* |
42 |
+--- a/src/transcalc.h |
43 |
++++ b/src/transcalc.h |
44 |
+@@ -53,8 +53,8 @@ |
45 |
+ #endif /* HAVE_STRCPY */ |
46 |
+ |
47 |
+ |
48 |
+-GtkWidget *main_body_window; |
49 |
+-GtkWidget *transtype_combo; |
50 |
++extern GtkWidget *main_body_window; |
51 |
++extern GtkWidget *transtype_combo; |
52 |
+ /*GtkWidget *status;*/ |
53 |
+ |
54 |
+ #define MICROSTRIP 0 |
55 |
+@@ -163,12 +163,12 @@ |
56 |
+ gfloat electrical_params_value[NUMELECPARS]; |
57 |
+ } trans_value; |
58 |
+ |
59 |
+-short current_transtype; |
60 |
+-trans_win *twin; |
61 |
+-short statusint; |
62 |
+-trans_gui *tgui; |
63 |
+-gboolean statusexists; |
64 |
+-int main_window_width, main_window_height; |
65 |
++extern short current_transtype; |
66 |
++extern trans_win *twin; |
67 |
++extern short statusint; |
68 |
++extern trans_gui *tgui; |
69 |
++extern gboolean statusexists; |
70 |
++extern int main_window_width, main_window_height; |
71 |
+ |
72 |
+ void error_mes(gchar * text); |
73 |
+ |
74 |
+--- a/src/unitscombo.c |
75 |
++++ b/src/unitscombo.c |
76 |
+@@ -33,6 +33,7 @@ |
77 |
+ #include "transcalc.h" |
78 |
+ #include "body.h" |
79 |
+ |
80 |
++short length_unit, freq_unit, res_unit, ang_unit; |
81 |
+ |
82 |
+ gchar *length_unit_name[] = { "mil", |
83 |
+ "cm", |
84 |
+--- a/src/units.h |
85 |
++++ b/src/units.h |
86 |
+@@ -77,6 +77,6 @@ |
87 |
+ #define ohm_to_kohm(a) (a/1000.0) |
88 |
+ */ |
89 |
+ |
90 |
+-short length_unit, freq_unit, res_unit, ang_unit; |
91 |
++extern short length_unit, freq_unit, res_unit, ang_unit; |
92 |
+ |
93 |
+ #endif |
94 |
|
95 |
diff --git a/sci-calculators/transcalc/transcalc-0.14-r2.ebuild b/sci-calculators/transcalc/transcalc-0.14-r2.ebuild |
96 |
index 02376bc9ed7..b6c144a8b7f 100644 |
97 |
--- a/sci-calculators/transcalc/transcalc-0.14-r2.ebuild |
98 |
+++ b/sci-calculators/transcalc/transcalc-0.14-r2.ebuild |
99 |
@@ -1,28 +1,30 @@ |
100 |
-# Copyright 1999-2016 Gentoo Foundation |
101 |
+# Copyright 1999-2021 Gentoo Authors |
102 |
# Distributed under the terms of the GNU General Public License v2 |
103 |
|
104 |
-EAPI=6 |
105 |
+EAPI=7 |
106 |
|
107 |
DESCRIPTION="Microwave and RF transmission line calculator" |
108 |
HOMEPAGE="http://transcalc.sourceforge.net" |
109 |
SRC_URI="http://transcalc.sourceforge.net/${P}.tar.gz" |
110 |
|
111 |
LICENSE="GPL-2" |
112 |
- |
113 |
SLOT="0" |
114 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
115 |
-IUSE="" |
116 |
|
117 |
RDEPEND="x11-libs/gtk+:2" |
118 |
DEPEND="${RDEPEND}" |
119 |
|
120 |
# patch from debian |
121 |
-PATCHES=( "${FILESDIR}"/${P}-fd-perm.patch ) |
122 |
+PATCHES=( |
123 |
+ "${FILESDIR}"/${P}-fd-perm.patch |
124 |
+ "${FILESDIR}"/${P}-fno-common.patch |
125 |
+) |
126 |
|
127 |
src_prepare() { |
128 |
+ default |
129 |
+ |
130 |
# respect flags |
131 |
sed -i -e 's|^CFLAGS=|#CFLAGS=|g' configure || die |
132 |
- default |
133 |
# syntax errors |
134 |
sed -i \ |
135 |
-e 's/ythesize/ynthesize/g' \ |