1 |
commit: ca44b49126e8b55af71ad6326d34830154c97c90 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 11:50:18 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 11:50:18 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca44b491 |
7 |
|
8 |
x11-wm/awesome: fix build with gcc-10 |
9 |
|
10 |
* Port to cmake eclass |
11 |
* Minor additional cleanup |
12 |
* Thanks to Jeroen Roovers for submitting the patch link and to Eddie |
13 |
Chapman for providing the patch fix |
14 |
|
15 |
Closes: https://bugs.gentoo.org/707262 |
16 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
17 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
18 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
19 |
|
20 |
...awesome-4.3-r1.ebuild => awesome-4.3-r2.ebuild} | 71 ++++++++++++---------- |
21 |
x11-wm/awesome/files/awesome-4.3-fno-common.patch | 69 ++------------------- |
22 |
2 files changed, 42 insertions(+), 98 deletions(-) |
23 |
|
24 |
diff --git a/x11-wm/awesome/awesome-4.3-r1.ebuild b/x11-wm/awesome/awesome-4.3-r2.ebuild |
25 |
similarity index 72% |
26 |
rename from x11-wm/awesome/awesome-4.3-r1.ebuild |
27 |
rename to x11-wm/awesome/awesome-4.3-r2.ebuild |
28 |
index c01581082c1..206d64b0eb2 100644 |
29 |
--- a/x11-wm/awesome/awesome-4.3-r1.ebuild |
30 |
+++ b/x11-wm/awesome/awesome-4.3-r2.ebuild |
31 |
@@ -3,65 +3,70 @@ |
32 |
|
33 |
EAPI=7 |
34 |
|
35 |
-inherit cmake-utils desktop pax-utils |
36 |
+inherit cmake desktop pax-utils |
37 |
+ |
38 |
+if [[ ${PV} == *9999 ]] ; then |
39 |
+ inherit git-r3 |
40 |
+ EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" |
41 |
+else |
42 |
+ SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" |
43 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
44 |
+fi |
45 |
|
46 |
DESCRIPTION="A dynamic floating and tiling window manager" |
47 |
HOMEPAGE="https://awesomewm.org/" |
48 |
-SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" |
49 |
|
50 |
LICENSE="GPL-2" |
51 |
SLOT="0" |
52 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
53 |
IUSE="dbus doc gnome luajit test" |
54 |
-RESTRICT="test" |
55 |
+RESTRICT="test" # https://bugs.gentoo.org/654084 |
56 |
|
57 |
RDEPEND=" |
58 |
- >=dev-lang/lua-5.1:0 |
59 |
- luajit? ( dev-lang/luajit:2 ) |
60 |
+ dev-lang/lua:0 |
61 |
dev-libs/glib:2 |
62 |
- >=dev-libs/libxdg-basedir-1 |
63 |
- >=dev-lua/lgi-0.8 |
64 |
+ dev-libs/libxdg-basedir |
65 |
+ dev-lua/lgi |
66 |
x11-libs/cairo[X,xcb(+)] |
67 |
- x11-libs/gdk-pixbuf:2[introspection] |
68 |
- >=x11-libs/libxcb-1.6[xkb] |
69 |
- >=x11-libs/pango-1.19.3[introspection] |
70 |
- >=x11-libs/startup-notification-0.10_p20110426 |
71 |
- >=x11-libs/xcb-util-0.3.8 |
72 |
+ x11-libs/gdk-pixbuf:2 |
73 |
+ x11-libs/libxcb[xkb] |
74 |
+ x11-libs/pango[introspection] |
75 |
+ x11-libs/startup-notification |
76 |
+ x11-libs/xcb-util |
77 |
x11-libs/xcb-util-cursor |
78 |
- >=x11-libs/xcb-util-keysyms-0.3.4 |
79 |
- >=x11-libs/xcb-util-wm-0.3.8 |
80 |
- >=x11-libs/xcb-util-xrm-1.0 |
81 |
+ x11-libs/xcb-util-keysyms |
82 |
+ x11-libs/xcb-util-wm |
83 |
+ x11-libs/xcb-util-xrm |
84 |
x11-libs/libXcursor |
85 |
x11-libs/libxkbcommon[X] |
86 |
- >=x11-libs/libX11-1.3.99.901 |
87 |
- dbus? ( >=sys-apps/dbus-1 ) |
88 |
+ x11-libs/libX11 |
89 |
+ dbus? ( sys-apps/dbus ) |
90 |
+ luajit? ( dev-lang/luajit:2 ) |
91 |
" |
92 |
|
93 |
# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 |
94 |
DEPEND="${RDEPEND} |
95 |
- >=app-text/asciidoc-8.4.5 |
96 |
- app-text/xmlto |
97 |
- dev-util/gperf |
98 |
- virtual/pkgconfig |
99 |
- media-gfx/imagemagick[png] |
100 |
- >=x11-base/xcb-proto-1.5 |
101 |
+ x11-base/xcb-proto |
102 |
x11-base/xorg-proto |
103 |
- doc? ( dev-lua/ldoc ) |
104 |
test? ( |
105 |
- app-shells/zsh |
106 |
x11-base/xorg-server[xvfb] |
107 |
dev-lua/busted |
108 |
dev-lua/luacheck |
109 |
) |
110 |
" |
111 |
+BDEPEND=" |
112 |
+ app-text/asciidoc |
113 |
+ media-gfx/imagemagick[png] |
114 |
+ virtual/pkgconfig |
115 |
+ doc? ( dev-lua/ldoc ) |
116 |
+ test? ( app-shells/zsh )" |
117 |
|
118 |
# Skip installation of README.md by einstalldocs, which leads to broken symlink |
119 |
DOCS=() |
120 |
PATCHES=( |
121 |
- "${FILESDIR}/${PN}-4.0-convert-path.patch" # bug #408025 |
122 |
- "${FILESDIR}/${PN}-xsession.patch" # bug #408025 |
123 |
- "${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658 |
124 |
- "${FILESDIR}/${PN}-4.3-fno-common.patch" # bug #707262 |
125 |
+ "${FILESDIR}"/${PN}-4.0-convert-path.patch # bug #408025 |
126 |
+ "${FILESDIR}"/${PN}-xsession.patch # bug #408025 |
127 |
+ "${FILESDIR}"/${PN}-4.0-cflag-cleanup.patch # bug #509658 |
128 |
+ "${FILESDIR}"/${P}-fno-common.patch # bug #707262 |
129 |
) |
130 |
|
131 |
src_configure() { |
132 |
@@ -77,16 +82,16 @@ src_configure() { |
133 |
mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0") |
134 |
mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so") |
135 |
fi |
136 |
- cmake-utils_src_configure |
137 |
+ cmake_src_configure |
138 |
} |
139 |
|
140 |
src_test() { |
141 |
# awesome's test suite starts Xvfb by itself, no need for virtualx eclass |
142 |
- HEADLESS=1 cmake-utils_src_make check -j1 |
143 |
+ HEADLESS=1 cmake_build check -j1 |
144 |
} |
145 |
|
146 |
src_install() { |
147 |
- cmake-utils_src_install |
148 |
+ cmake_src_install |
149 |
rm "${ED}"/usr/share/doc/${PF}/LICENSE || die |
150 |
|
151 |
pax-mark m "${ED}"/usr/bin/awesome |
152 |
|
153 |
diff --git a/x11-wm/awesome/files/awesome-4.3-fno-common.patch b/x11-wm/awesome/files/awesome-4.3-fno-common.patch |
154 |
index 9a77bf42a39..c75a8afd5e6 100644 |
155 |
--- a/x11-wm/awesome/files/awesome-4.3-fno-common.patch |
156 |
+++ b/x11-wm/awesome/files/awesome-4.3-fno-common.patch |
157 |
@@ -1,38 +1,7 @@ |
158 |
-https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch |
159 |
-https://bugs.gentoo.org/707262 |
160 |
+Taken from: https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0 |
161 |
+Author: Reiner Herrmann <reiner@××××××××.de> |
162 |
Rebased by Eddie Chapman <maracay@××××.net> |
163 |
----- |
164 |
-From d256d9055095f27a33696e0aeda4ee20ed4fb1a0 Mon Sep 17 00:00:00 2001 |
165 |
-From: Reiner Herrmann <reiner@××××××××.de> |
166 |
-Date: Fri, 17 Apr 2020 19:25:40 +0200 |
167 |
-Subject: [PATCH] Move variable declarations from header to C file to fix build |
168 |
- with GCC 10 |
169 |
|
170 |
-GCC 10 builds with -fno-common by default, which causes linker errors when |
171 |
-variables are declared in header files and included in multiple places. |
172 |
- |
173 |
-See also: https://gcc.gnu.org/gcc-10/porting_to.html |
174 |
---- |
175 |
- common/lualib.c | 2 ++ |
176 |
- common/lualib.h | 2 +- |
177 |
- luaa.c | 2 ++ |
178 |
- luaa.h | 2 +- |
179 |
- objects/button.c | 2 ++ |
180 |
- objects/button.h | 2 +- |
181 |
- objects/client.c | 2 ++ |
182 |
- objects/client.h | 2 +- |
183 |
- objects/drawin.c | 2 ++ |
184 |
- objects/drawin.h | 2 +- |
185 |
- objects/key.c | 2 ++ |
186 |
- objects/key.h | 2 +- |
187 |
- objects/tag.c | 2 ++ |
188 |
- objects/tag.h | 2 +- |
189 |
- objects/window.c | 1 + |
190 |
- objects/window.h | 2 +- |
191 |
- 16 files changed, 23 insertions(+), 8 deletions(-) |
192 |
- |
193 |
-diff --git a/common/lualib.c b/common/lualib.c |
194 |
-index 312fb2d594..bb110ac716 100644 |
195 |
--- a/common/lualib.c |
196 |
+++ b/common/lualib.c |
197 |
@@ -20,6 +20,8 @@ |
198 |
@@ -44,8 +13,6 @@ index 312fb2d594..bb110ac716 100644 |
199 |
void luaA_checkfunction(lua_State *L, int idx) |
200 |
{ |
201 |
if(!lua_isfunction(L, idx)) |
202 |
-diff --git a/common/lualib.h b/common/lualib.h |
203 |
-index 8a3ef089d7..a91261843c 100644 |
204 |
--- a/common/lualib.h |
205 |
+++ b/common/lualib.h |
206 |
@@ -28,7 +28,7 @@ |
207 |
@@ -57,8 +24,6 @@ index 8a3ef089d7..a91261843c 100644 |
208 |
|
209 |
void luaA_checkfunction(lua_State *, int); |
210 |
void luaA_checktable(lua_State *, int); |
211 |
-diff --git a/luaa.c b/luaa.c |
212 |
-index 419a8c2eb2..aeaba9cd1f 100644 |
213 |
--- a/luaa.c |
214 |
+++ b/luaa.c |
215 |
@@ -91,6 +91,8 @@ extern const struct luaL_Reg awesome_mouse_meta[]; |
216 |
@@ -70,8 +35,6 @@ index 419a8c2eb2..aeaba9cd1f 100644 |
217 |
/** A call into the Lua code aborted with an error. |
218 |
* |
219 |
* This signal is used in the example configuration, @{05-awesomerc.md}, |
220 |
-diff --git a/luaa.h b/luaa.h |
221 |
-index e159258348..d26c437691 100644 |
222 |
--- a/luaa.h |
223 |
+++ b/luaa.h |
224 |
@@ -317,7 +317,7 @@ const char *luaA_find_config(xdgHandle *, const char *, luaA_config_callback *); |
225 |
@@ -83,8 +46,6 @@ index e159258348..d26c437691 100644 |
226 |
|
227 |
int luaA_class_index_miss_property(lua_State *, lua_object_t *); |
228 |
int luaA_class_newindex_miss_property(lua_State *, lua_object_t *); |
229 |
-diff --git a/objects/button.c b/objects/button.c |
230 |
-index 892347a928..5ffdcd4432 100644 |
231 |
--- a/objects/button.c |
232 |
+++ b/objects/button.c |
233 |
@@ -35,6 +35,8 @@ |
234 |
@@ -96,8 +57,6 @@ index 892347a928..5ffdcd4432 100644 |
235 |
/** Button object. |
236 |
* |
237 |
* @tfield int button The mouse button number, or 0 for any button. |
238 |
-diff --git a/objects/button.h b/objects/button.h |
239 |
-index fb8bb8da28..8f0b894305 100644 |
240 |
--- a/objects/button.h |
241 |
+++ b/objects/button.h |
242 |
@@ -39,7 +39,7 @@ typedef struct button_t |
243 |
@@ -109,8 +68,6 @@ index fb8bb8da28..8f0b894305 100644 |
244 |
LUA_OBJECT_FUNCS(button_class, button_t, button) |
245 |
ARRAY_FUNCS(button_t *, button, DO_NOTHING) |
246 |
|
247 |
-diff --git a/objects/client.c b/objects/client.c |
248 |
-index 7b2d3a2022..b617a9e7a9 100644 |
249 |
--- a/objects/client.c |
250 |
+++ b/objects/client.c |
251 |
@@ -108,6 +108,8 @@ |
252 |
@@ -122,8 +79,6 @@ index 7b2d3a2022..b617a9e7a9 100644 |
253 |
/** Client class. |
254 |
* |
255 |
* This table allow to add more dynamic properties to the clients. For example, |
256 |
-diff --git a/objects/client.h b/objects/client.h |
257 |
-index 74a23131c5..387e7c2aea 100644 |
258 |
--- a/objects/client.h |
259 |
+++ b/objects/client.h |
260 |
@@ -200,7 +200,7 @@ struct client_t |
261 |
@@ -135,8 +90,6 @@ index 74a23131c5..387e7c2aea 100644 |
262 |
|
263 |
LUA_OBJECT_FUNCS(client_class, client_t, client) |
264 |
|
265 |
-diff --git a/objects/drawin.c b/objects/drawin.c |
266 |
-index 3fd1cc4350..3bbd93179c 100644 |
267 |
--- a/objects/drawin.c |
268 |
+++ b/objects/drawin.c |
269 |
@@ -46,6 +46,8 @@ |
270 |
@@ -148,8 +101,6 @@ index 3fd1cc4350..3bbd93179c 100644 |
271 |
/** Drawin object. |
272 |
* |
273 |
* @field border_width Border width. |
274 |
-diff --git a/objects/drawin.h b/objects/drawin.h |
275 |
-index 31f315aac5..2f8887d944 100644 |
276 |
--- a/objects/drawin.h |
277 |
+++ b/objects/drawin.h |
278 |
@@ -52,7 +52,7 @@ void luaA_drawin_systray_kickout(lua_State *); |
279 |
@@ -161,8 +112,6 @@ index 31f315aac5..2f8887d944 100644 |
280 |
|
281 |
#endif |
282 |
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 |
283 |
-diff --git a/objects/key.c b/objects/key.c |
284 |
-index c42f7446d8..365ba998cc 100644 |
285 |
--- a/objects/key.c |
286 |
+++ b/objects/key.c |
287 |
@@ -43,6 +43,8 @@ |
288 |
@@ -174,8 +123,6 @@ index c42f7446d8..365ba998cc 100644 |
289 |
/** Key object. |
290 |
* |
291 |
* @tfield string key The key to trigger an event. |
292 |
-diff --git a/objects/key.h b/objects/key.h |
293 |
-index 8aa07ffe3d..45f23cac79 100644 |
294 |
--- a/objects/key.h |
295 |
+++ b/objects/key.h |
296 |
@@ -36,7 +36,7 @@ typedef struct keyb_t |
297 |
@@ -187,21 +134,17 @@ index 8aa07ffe3d..45f23cac79 100644 |
298 |
LUA_OBJECT_FUNCS(key_class, keyb_t, key) |
299 |
DO_ARRAY(keyb_t *, key, DO_NOTHING) |
300 |
|
301 |
-diff --git a/objects/tag.c b/objects/tag.c |
302 |
-index a0050cc2a9..1b1a135762 100644 |
303 |
--- a/objects/tag.c |
304 |
+++ b/objects/tag.c |
305 |
@@ -190,6 +190,8 @@ |
306 |
#include "ewmh.h" |
307 |
#include "luaa.h" |
308 |
- |
309 |
+ |
310 |
+lua_class_t tag_class; |
311 |
+ |
312 |
/** |
313 |
* @signal request::select |
314 |
*/ |
315 |
-diff --git a/objects/tag.h b/objects/tag.h |
316 |
-index d6bb40e0d8..f830b1e2c5 100644 |
317 |
--- a/objects/tag.h |
318 |
+++ b/objects/tag.h |
319 |
@@ -46,7 +46,7 @@ struct tag |
320 |
@@ -213,8 +156,6 @@ index d6bb40e0d8..f830b1e2c5 100644 |
321 |
LUA_OBJECT_FUNCS(tag_class, tag_t, tag) |
322 |
|
323 |
void tag_class_setup(lua_State *); |
324 |
-diff --git a/objects/window.c b/objects/window.c |
325 |
-index 440970f3d0..371d06bcd3 100644 |
326 |
--- a/objects/window.c |
327 |
+++ b/objects/window.c |
328 |
@@ -59,6 +59,7 @@ |
329 |
@@ -225,8 +166,6 @@ index 440970f3d0..371d06bcd3 100644 |
330 |
LUA_CLASS_FUNCS(window, window_class) |
331 |
|
332 |
static xcb_window_t |
333 |
-diff --git a/objects/window.h b/objects/window.h |
334 |
-index 5386fafead..fbc5296cf5 100644 |
335 |
--- a/objects/window.h |
336 |
+++ b/objects/window.h |
337 |
@@ -80,7 +80,7 @@ typedef struct |
338 |
@@ -237,4 +176,4 @@ index 5386fafead..fbc5296cf5 100644 |
339 |
+extern lua_class_t window_class; |
340 |
|
341 |
void window_class_setup(lua_State *); |
342 |
- |
343 |
+ |