[packages/awesome] Rel 6
arekm
arekm at pld-linux.org
Mon May 18 16:25:38 CEST 2026
commit 32635aac46a7eb6dc9ad6f7a1c18c7f03cdc769f
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon May 18 16:25:07 2026 +0200
Rel 6
awesome-gcc15.patch | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++++
awesome.spec | 12 ++--
2 files changed, 195 insertions(+), 5 deletions(-)
---
diff --git a/awesome.spec b/awesome.spec
index b04cb66..6350126 100644
--- a/awesome.spec
+++ b/awesome.spec
@@ -4,7 +4,7 @@ Summary(hu.UTF-8): awesome ablakkezelő
Summary(pl.UTF-8): Zarządca okien X - Awesome
Name: awesome
Version: 3.4.12
-Release: 5
+Release: 6
License: GPL v2
Group: X11/Window Managers
Source0: http://awesome.naquadah.org/download/%{name}-%{version}.tar.xz
@@ -14,6 +14,7 @@ Patch0: %{name}-3.0-lua-files.patch
Patch1: %{name}-magnifier.patch
Patch2: normalize-icon-path-names.patch
Patch3: xcb-util.patch
+Patch4: %{name}-gcc15.patch
URL: http://awesome.naquadah.org/
BuildRequires: ImageMagick-coder-png
BuildRequires: asciidoc
@@ -227,6 +228,7 @@ Motyw Zenburn dla zarządcy okien awesome.
%patch -P1 -p1
# %%patch2 -p1
# %%patch3 -p1
+%patch -P4 -p1
%build
%cmake \
@@ -299,6 +301,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/awesome/themes
%{_datadir}/awesome/lib/beautiful.lua
+%files doc
+%defattr(644,root,root,755)
+%doc %{_docdir}/%{name}-%{version}/luadoc
+
%files client
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/%{name}-client
@@ -309,10 +315,6 @@ rm -rf $RPM_BUILD_ROOT
%lang(it) %{_mandir}/it/man1/awesome-client.1*
%lang(ru) %{_mandir}/ru/man1/awesome-client.1*
-%files doc
-%defattr(644,root,root,755)
-%doc %{_docdir}/%{name}-%{version}/luadoc
-
%files example-config
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/awesome
diff --git a/awesome-gcc15.patch b/awesome-gcc15.patch
new file mode 100644
index 0000000..7599dc9
--- /dev/null
+++ b/awesome-gcc15.patch
@@ -0,0 +1,188 @@
+--- awesome-3.4.12.orig/luaa.h 2026-05-17 14:14:33.979635062 +0200
++++ awesome-3.4.12/luaa.h 2026-05-17 14:14:44.382968379 +0200
+@@ -204,7 +204,7 @@
+ } while(0);
+
+ /** Global signals */
+-signal_array_t global_signals;
++extern signal_array_t global_signals;
+
+ int luaA_class_index_miss_property(lua_State *, lua_object_t *);
+ int luaA_class_newindex_miss_property(lua_State *, lua_object_t *);
+--- awesome-3.4.12.orig/image.h 2026-05-17 14:14:33.982968395 +0200
++++ awesome-3.4.12/image.h 2026-05-17 14:15:11.959635008 +0200
+@@ -35,7 +35,7 @@
+
+ xcb_pixmap_t image_to_1bit_pixmap(image_t *, xcb_drawable_t);
+
+-lua_class_t image_class;
++extern lua_class_t image_class;
+
+ #endif
+ // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
+--- awesome-3.4.12.orig/button.h 2026-05-17 14:14:33.986301729 +0200
++++ awesome-3.4.12/button.h 2026-05-17 14:15:25.802968324 +0200
+@@ -34,7 +34,7 @@
+ xcb_button_t button;
+ };
+
+-lua_class_t button_class;
++extern lua_class_t button_class;
+ LUA_OBJECT_FUNCS(button_class, button_t, button)
+ ARRAY_FUNCS(button_t *, button, DO_NOTHING)
+
+--- awesome-3.4.12.orig/key.h 2026-05-17 14:14:33.986301729 +0200
++++ awesome-3.4.12/key.h 2026-05-17 14:15:43.839634974 +0200
+@@ -35,7 +35,7 @@
+ xcb_keycode_t keycode;
+ } keyb_t;
+
+-lua_class_t key_class;
++extern lua_class_t key_class;
+ LUA_OBJECT_FUNCS(key_class, keyb_t, key)
+ DO_ARRAY(keyb_t *, key, DO_NOTHING)
+
+--- awesome-3.4.12.orig/widget.h 2026-05-17 14:14:33.989635062 +0200
++++ awesome-3.4.12/widget.h 2026-05-17 14:16:07.482968276 +0200
+@@ -69,7 +69,7 @@
+ void widget_invalidate_bywidget(widget_t *);
+ void widget_invalidate_bytype(widget_constructor_t *);
+
+-lua_class_t widget_class;
++extern lua_class_t widget_class;
+ void widget_class_setup(lua_State *);
+
+ widget_constructor_t widget_textbox;
+--- awesome-3.4.12.orig/wibox.h 2026-05-17 14:14:33.989635062 +0200
++++ awesome-3.4.12/wibox.h 2026-05-17 14:16:28.409634911 +0200
+@@ -118,7 +118,7 @@
+
+ void wibox_class_setup(lua_State *);
+
+-lua_class_t wibox_class;
++extern lua_class_t wibox_class;
+
+ void wibox_clear_mouse_over(wibox_t *);
+
+--- awesome-3.4.12.orig/client.h 2026-05-17 14:14:33.992968396 +0200
++++ awesome-3.4.12/client.h 2026-05-17 14:16:46.082968223 +0200
+@@ -156,7 +156,7 @@
+ ARRAY_FUNCS(client_t *, client, DO_NOTHING)
+
+ /** Client class */
+-lua_class_t client_class;
++extern lua_class_t client_class;
+
+ LUA_OBJECT_FUNCS(client_class, client_t, client)
+
+--- awesome-3.4.12.orig/common/lualib.h 2026-05-17 14:14:33.992968396 +0200
++++ awesome-3.4.12/common/lualib.h 2026-05-17 14:15:04.829635015 +0200
+@@ -26,7 +26,7 @@
+ #include "common/util.h"
+
+ /** Lua function to call on dofuction() error */
+-lua_CFunction lualib_dofunction_on_error;
++extern lua_CFunction lualib_dofunction_on_error;
+
+ #define luaA_checkfunction(L, n) \
+ do { \
+--- awesome-3.4.12.orig/luaa.c 2026-05-17 14:14:33.996301729 +0200
++++ awesome-3.4.12/luaa.c 2026-05-17 14:14:56.542968360 +0200
+@@ -57,6 +57,9 @@
+ extern const struct luaL_reg awesome_screen_methods[];
+ extern const struct luaL_reg awesome_screen_meta[];
+
++signal_array_t global_signals;
++lua_CFunction lualib_dofunction_on_error;
++
+ /** Quit awesome.
+ * \param L The Lua VM state.
+ * \return The number of elements pushed on stack.
+--- awesome-3.4.12.orig/image.c 2026-05-17 14:14:33.996301729 +0200
++++ awesome-3.4.12/image.c 2026-05-17 14:15:18.866301667 +0200
+@@ -40,6 +40,7 @@
+ bool isupdated;
+ };
+
++lua_class_t image_class;
+ LUA_OBJECT_FUNCS(image_class, image_t, image)
+
+ static int
+--- awesome-3.4.12.orig/button.c 2026-05-17 14:14:33.999635062 +0200
++++ awesome-3.4.12/button.c 2026-05-17 14:15:36.929634979 +0200
+@@ -24,6 +24,8 @@
+ #include "key.h"
+ #include "common/luaobject.h"
+
++lua_class_t button_class;
++
+ /** Create a new mouse button bindings.
+ * \param L The Lua VM state.
+ * \return The number of elements pushed on stack.
+--- awesome-3.4.12.orig/key.c 2026-05-17 14:14:33.999635062 +0200
++++ awesome-3.4.12/key.c 2026-05-17 14:15:50.969634964 +0200
+@@ -32,6 +32,8 @@
+ #include "common/xutil.h"
+ #include "common/luaobject.h"
+
++lua_class_t key_class;
++
+ /** XCB equivalent of XLookupString which translate the keycode given
+ * by PressEvent to a KeySym and a string
+ * \todo use XKB!
+--- awesome-3.4.12.orig/widget.c 2026-05-17 14:14:34.002968395 +0200
++++ awesome-3.4.12/widget.c 2026-05-17 14:16:14.459634936 +0200
+@@ -33,6 +33,7 @@
+ #include "common/atoms.h"
+ #include "common/xutil.h"
+
++lua_class_t widget_class;
+ LUA_OBJECT_FUNCS(widget_class, widget_t, widget);
+
+ /** Collect a widget structure.
+--- awesome-3.4.12.orig/wibox.c 2026-05-17 14:14:34.002968395 +0200
++++ awesome-3.4.12/wibox.c 2026-05-17 14:16:39.042968234 +0200
+@@ -32,6 +32,7 @@
+ #include "common/xcursor.h"
+ #include "common/xutil.h"
+
++lua_class_t wibox_class;
+ LUA_OBJECT_FUNCS(wibox_class, wibox_t, wibox)
+
+ /** Take care of garbage collecting a wibox.
+--- awesome-3.4.12.orig/client.c 2026-05-17 14:14:34.006301729 +0200
++++ awesome-3.4.12/client.c 2026-05-17 14:16:53.119634884 +0200
+@@ -33,6 +33,8 @@
+ #include "common/atoms.h"
+ #include "common/xutil.h"
+
++lua_class_t client_class;
++
+ client_t *
+ luaA_client_checkudata(lua_State *L, int ud)
+ {
+--- awesome-3.4.12.orig/common/util.h
++++ awesome-3.4.12/common/util.h
+@@ -123,6 +123,11 @@
+
+ #endif
+
++/* X11/Xthreads.h defines xmalloc/xfree as aliases for malloc/free, which
++ * collides with awesome's own xmalloc/xfree helpers. */
++#undef xmalloc
++#undef xfree
++
+ static inline void * __attribute__ ((malloc)) xmalloc(ssize_t size)
+ {
+ void *ptr;
+--- awesome-3.4.12.orig/build-utils/gperf.sh
++++ awesome-3.4.12/build-utils/gperf.sh
+@@ -85,7 +85,7 @@
+ #include <string.h>
+ #include "common/tokenize.h"
+
+-static const struct tok *a_tokenize_aux(const char *str, unsigned int len);
++static const struct tok *a_tokenize_aux(const char *str, size_t len);
+
+ %}
+ struct tok { const char *name; int val; };
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/awesome.git/commitdiff/32635aac46a7eb6dc9ad6f7a1c18c7f03cdc769f
More information about the pld-cvs-commit
mailing list