1 |
commit: 9f3ea90ac43ed06b3a5fad8007a9e16f355acc3f |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 29 11:27:31 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 29 11:35:25 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3ea90a |
7 |
|
8 |
x11-plugins/wmcalendar: fix build with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/711692 |
11 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
.../files/wmcalendar-0.5.2-fno-common.patch | 97 ++++++++++++++++++++++ |
15 |
x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild | 7 +- |
16 |
2 files changed, 102 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..9907634290a |
21 |
--- /dev/null |
22 |
+++ b/x11-plugins/wmcalendar/files/wmcalendar-0.5.2-fno-common.patch |
23 |
@@ -0,0 +1,97 @@ |
24 |
+diff -Naur Src.orig/calendar.c Src/calendar.c |
25 |
+--- Src.orig/calendar.c 2007-01-15 01:14:32.000000000 +0100 |
26 |
++++ Src/calendar.c 2020-03-29 13:25:39.390760510 +0200 |
27 |
+@@ -1,5 +1,10 @@ |
28 |
+ #include "calendar.h" |
29 |
+ |
30 |
++time_t modtime; |
31 |
++struct calobj* calRoot; |
32 |
++int xr, yr; |
33 |
++int datetype[32][2]; |
34 |
++ |
35 |
+ int get_datetype(int day){return datetype[day][0];} |
36 |
+ |
37 |
+ /*------------------------------------------------------ |
38 |
+diff -Naur Src.orig/calendarfunc.c Src/calendarfunc.c |
39 |
+--- Src.orig/calendarfunc.c 2003-07-13 16:41:02.000000000 +0200 |
40 |
++++ Src/calendarfunc.c 2020-03-29 13:24:07.630789052 +0200 |
41 |
+@@ -24,6 +24,7 @@ |
42 |
+ #include <stdio.h> |
43 |
+ |
44 |
+ |
45 |
++int datemoon[200][2]; |
46 |
+ |
47 |
+ long persian_jdn(struct icaltimetype dt) |
48 |
+ { |
49 |
+diff -Naur Src.orig/calendarfunc.h Src/calendarfunc.h |
50 |
+--- Src.orig/calendarfunc.h 2003-07-15 17:19:43.000000000 +0200 |
51 |
++++ Src/calendarfunc.h 2020-03-29 13:23:23.468802848 +0200 |
52 |
+@@ -70,5 +70,5 @@ |
53 |
+ |
54 |
+ int Ceil(float number); |
55 |
+ |
56 |
+-int datemoon[200][2]; /* hashtable for moonphase.[jdn%32][0] stores moonphase of day jdn, |
57 |
++extern int datemoon[200][2]; /* hashtable for moonphase.[jdn%32][0] stores moonphase of day jdn, |
58 |
+ [jdn%32][1] stores jdn. */ |
59 |
+diff -Naur Src.orig/calendar.h Src/calendar.h |
60 |
+--- Src.orig/calendar.h 2007-01-15 01:13:50.000000000 +0100 |
61 |
++++ Src/calendar.h 2020-03-29 13:25:57.657754851 +0200 |
62 |
+@@ -5,10 +5,10 @@ |
63 |
+ #include <sys/stat.h> |
64 |
+ |
65 |
+ |
66 |
+-time_t modtime; /* modified time of icalendar file */ |
67 |
+-struct calobj* calRoot; /* 1st element in list of calendar obj*/ |
68 |
+-int xr, yr; /*evil hack for moving dayview window*/ |
69 |
+-int datetype[32][2]; /* hashtable for coloring days.[jdn%32][0] stores color of day jdn, |
70 |
++extern time_t modtime; /* modified time of icalendar file */ |
71 |
++extern struct calobj* calRoot; /* 1st element in list of calendar obj*/ |
72 |
++extern int xr, yr; /*evil hack for moving dayview window*/ |
73 |
++extern int datetype[32][2]; /* hashtable for coloring days.[jdn%32][0] stores color of day jdn, |
74 |
+ [jdn%32][1] stores jdn. */ |
75 |
+ struct calobj{ |
76 |
+ struct icaltimetype start; |
77 |
+diff -Naur Src.orig/settings.c Src/settings.c |
78 |
+--- Src.orig/settings.c 2003-07-15 17:22:51.000000000 +0200 |
79 |
++++ Src/settings.c 2020-03-29 13:26:31.673744323 +0200 |
80 |
+@@ -1,4 +1,14 @@ |
81 |
+ #include "settings.h" |
82 |
++ |
83 |
++char rcfile[250]; |
84 |
++char icsfile[250]; |
85 |
++char application[250]; |
86 |
++int start_of_week; |
87 |
++char* daystr[8]; |
88 |
++int appicon; |
89 |
++int lang; |
90 |
++int debug; |
91 |
++ |
92 |
+ void set_lang(int language){lang = language;} |
93 |
+ void setAppicon(int app){appicon = app;} |
94 |
+ void enter_callback( GtkWidget *widget, GtkWidget *entry ){ |
95 |
+diff -Naur Src.orig/settings.h Src/settings.h |
96 |
+--- Src.orig/settings.h 2006-09-15 11:56:12.000000000 +0200 |
97 |
++++ Src/settings.h 2020-03-29 13:26:37.732742450 +0200 |
98 |
+@@ -7,14 +7,14 @@ |
99 |
+ |
100 |
+ |
101 |
+ |
102 |
+-char rcfile[250]; /* location of settings file */ |
103 |
+-char icsfile[250]; /* location of icalendar file */ |
104 |
+-char application[250]; /* command for starting external application */ |
105 |
+-int start_of_week; /* defines the first day of week */ |
106 |
+-char* daystr[8]; |
107 |
+-int appicon; /* sets the application icon evol(0) moz(1) other(2)*/ |
108 |
+-int lang; /* defines the language 0:english(default) 1:farsi */ |
109 |
+-int debug; /* debug mode off(0) or on(1) */ |
110 |
++extern char rcfile[250]; /* location of settings file */ |
111 |
++extern char icsfile[250]; /* location of icalendar file */ |
112 |
++extern char application[250]; /* command for starting external application */ |
113 |
++extern int start_of_week; /* defines the first day of week */ |
114 |
++extern char* daystr[8]; |
115 |
++extern int appicon; /* sets the application icon evol(0) moz(1) other(2)*/ |
116 |
++extern int lang; /* defines the language 0:english(default) 1:farsi */ |
117 |
++extern int debug; /* debug mode off(0) or on(1) */ |
118 |
+ |
119 |
+ |
120 |
+ void destroy (GtkWidget * widget, gpointer data); |
121 |
|
122 |
diff --git a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild |
123 |
index a3aae730cbb..1bbb79c3f80 100644 |
124 |
--- a/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild |
125 |
+++ b/x11-plugins/wmcalendar/wmcalendar-0.5.2-r2.ebuild |
126 |
@@ -1,4 +1,4 @@ |
127 |
-# Copyright 1999-2018 Gentoo Foundation |
128 |
+# Copyright 1999-2020 Gentoo Authors |
129 |
# Distributed under the terms of the GNU General Public License v2 |
130 |
|
131 |
EAPI=7 |
132 |
@@ -27,8 +27,11 @@ S=${WORKDIR}/${P}/Src |
133 |
|
134 |
PATCHES=( "${FILESDIR}"/${P}-exit-sin-and-cos.patch |
135 |
"${FILESDIR}"/${P}-rename_kill_func.patch |
136 |
- "${FILESDIR}"/${P}-ical.patch ) |
137 |
+ "${FILESDIR}"/${P}-ical.patch |
138 |
+ "${FILESDIR}"/${P}-fno-common.patch |
139 |
+) |
140 |
|
141 |
src_compile() { |
142 |
tc-export CC PKG_CONFIG |
143 |
+ default |
144 |
} |