Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Conner Clere (c56efef46e3bae81eee57dc2b1ffa2e400525a01)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (c56efef46e3bae81eee57dc2b1ffa2e400525a01)
  • Date: Wed, 12 Jul 2023 03:41:15 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

windowmanagers/awesome/HISTORY | 4
windowmanagers/awesome/patches/awesome-4.3-fno-common.patch | 85
++----------
2 files changed, 21 insertions(+), 68 deletions(-)

New commits:
commit c56efef46e3bae81eee57dc2b1ffa2e400525a01
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

awesome: update patch to fix compilation

Old patch ended up not working - going to fall
back on gentoo patch which is a rebase of the
original git commit made in awesomewm git repo.

diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index 7d8df78..591e115 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,7 @@
+2023-07-11 Conner Clere <xenanthropy AT sourcemage.org>
+ * patches/awesome-4.3-fno-common.patch: updated, patch ended up not
working,
+ falling back to using patch that gentoo uses to fix awesome 4.3
+
2023-07-10 Conner Clere <xenanthropy AT sourcemage.org>
* DETAILS: version 4.3, updated source_url and website, add
CMAKE_FUNCTIONS
* BUILD: deleted, no longer needed
diff --git a/windowmanagers/awesome/patches/awesome-4.3-fno-common.patch
b/windowmanagers/awesome/patches/awesome-4.3-fno-common.patch
index 8fdde95..1c1d8ac 100644
--- a/windowmanagers/awesome/patches/awesome-4.3-fno-common.patch
+++ b/windowmanagers/awesome/patches/awesome-4.3-fno-common.patch
@@ -1,40 +1,19 @@
-From d256d9055095f27a33696e0aeda4ee20ed4fb1a0 Mon Sep 17 00:00:00 2001
-From: Reiner Herrmann <reiner AT reiner-h.de>
-Date: Fri, 17 Apr 2020 19:25:40 +0200
-Subject: [PATCH] Move variable declarations from header to C file to fix
build
- with GCC 10
+Taken from:
https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+Author: Reiner Herrmann <reiner AT reiner-h.de>
+Rebased by Eddie Chapman <maracay AT ehuk.net>

-GCC 10 builds with -fno-common by default, which causes linker errors when
-variables are declared in header files and included in multiple places.
-
-See also: https://gcc.gnu.org/gcc-10/porting_to.html
-
-=== Source Mage Notes ===
-Origin: Upstream commit (github commit d256d90, 04/17/20)
+=== Source Mage Notes ===========
+Origin: Gentoo repo, awesome package
+ Based on awesomewm git commit d256d9
Signed-Off-By: Conner Clere <xenanthropy AT sourcemage.org>
-=========================

----
- common/lualib.c | 2 ++
- common/lualib.h | 2 +-
- luaa.c | 2 ++
- luaa.h | 2 +-
- objects/button.c | 2 ++
- objects/button.h | 2 +-
- objects/client.c | 2 ++
- objects/client.h | 2 +-
- objects/drawin.c | 2 ++
- objects/drawin.h | 2 +-
- objects/key.c | 2 ++
- objects/key.h | 2 +-
- objects/tag.c | 2 ++
- objects/tag.h | 2 +-
- objects/window.c | 1 +
- objects/window.h | 2 +-
- 16 files changed, 23 insertions(+), 8 deletions(-)
+Original awesomewm git commit message:
+Move variable declarations from header to C file to fix build with GCC 10
+
+GCC 10 builds with -fno-common by default, which causes linker errors when
+variables are declared in header files and included in multiple places.
+=================================

-diff --git a/common/lualib.c b/common/lualib.c
-index 312fb2d594..bb110ac716 100644
--- a/common/lualib.c
+++ b/common/lualib.c
@@ -20,6 +20,8 @@
@@ -46,8 +25,6 @@ index 312fb2d594..bb110ac716 100644
void luaA_checkfunction(lua_State *L, int idx)
{
if(!lua_isfunction(L, idx))
-diff --git a/common/lualib.h b/common/lualib.h
-index 8a3ef089d7..a91261843c 100644
--- a/common/lualib.h
+++ b/common/lualib.h
@@ -28,7 +28,7 @@
@@ -59,8 +36,6 @@ index 8a3ef089d7..a91261843c 100644

void luaA_checkfunction(lua_State *, int);
void luaA_checktable(lua_State *, int);
-diff --git a/luaa.c b/luaa.c
-index 419a8c2eb2..aeaba9cd1f 100644
--- a/luaa.c
+++ b/luaa.c
@@ -91,6 +91,8 @@ extern const struct luaL_Reg awesome_mouse_meta[];
@@ -72,8 +47,6 @@ index 419a8c2eb2..aeaba9cd1f 100644
/** A call into the Lua code aborted with an error.
*
* This signal is used in the example configuration, @{05-awesomerc.md},
-diff --git a/luaa.h b/luaa.h
-index e159258348..d26c437691 100644
--- a/luaa.h
+++ b/luaa.h
@@ -317,7 +317,7 @@ const char *luaA_find_config(xdgHandle *, const char *,
luaA_config_callback *);
@@ -85,8 +58,6 @@ index e159258348..d26c437691 100644

int luaA_class_index_miss_property(lua_State *, lua_object_t *);
int luaA_class_newindex_miss_property(lua_State *, lua_object_t *);
-diff --git a/objects/button.c b/objects/button.c
-index 892347a928..5ffdcd4432 100644
--- a/objects/button.c
+++ b/objects/button.c
@@ -35,6 +35,8 @@
@@ -98,8 +69,6 @@ index 892347a928..5ffdcd4432 100644
/** Button object.
*
* @tfield int button The mouse button number, or 0 for any button.
-diff --git a/objects/button.h b/objects/button.h
-index fb8bb8da28..8f0b894305 100644
--- a/objects/button.h
+++ b/objects/button.h
@@ -39,7 +39,7 @@ typedef struct button_t
@@ -111,8 +80,6 @@ index fb8bb8da28..8f0b894305 100644
LUA_OBJECT_FUNCS(button_class, button_t, button)
ARRAY_FUNCS(button_t *, button, DO_NOTHING)

-diff --git a/objects/client.c b/objects/client.c
-index 7b2d3a2022..b617a9e7a9 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -108,6 +108,8 @@
@@ -124,8 +91,6 @@ index 7b2d3a2022..b617a9e7a9 100644
/** Client class.
*
* This table allow to add more dynamic properties to the clients. For
example,
-diff --git a/objects/client.h b/objects/client.h
-index 74a23131c5..387e7c2aea 100644
--- a/objects/client.h
+++ b/objects/client.h
@@ -200,7 +200,7 @@ struct client_t
@@ -137,8 +102,6 @@ index 74a23131c5..387e7c2aea 100644

LUA_OBJECT_FUNCS(client_class, client_t, client)

-diff --git a/objects/drawin.c b/objects/drawin.c
-index 3fd1cc4350..3bbd93179c 100644
--- a/objects/drawin.c
+++ b/objects/drawin.c
@@ -46,6 +46,8 @@
@@ -150,8 +113,6 @@ index 3fd1cc4350..3bbd93179c 100644
/** Drawin object.
*
* @field border_width Border width.
-diff --git a/objects/drawin.h b/objects/drawin.h
-index 31f315aac5..2f8887d944 100644
--- a/objects/drawin.h
+++ b/objects/drawin.h
@@ -52,7 +52,7 @@ void luaA_drawin_systray_kickout(lua_State *);
@@ -163,8 +124,6 @@ index 31f315aac5..2f8887d944 100644

#endif
// vim:
filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
-diff --git a/objects/key.c b/objects/key.c
-index c42f7446d8..365ba998cc 100644
--- a/objects/key.c
+++ b/objects/key.c
@@ -43,6 +43,8 @@
@@ -176,8 +135,6 @@ index c42f7446d8..365ba998cc 100644
/** Key object.
*
* @tfield string key The key to trigger an event.
-diff --git a/objects/key.h b/objects/key.h
-index 8aa07ffe3d..45f23cac79 100644
--- a/objects/key.h
+++ b/objects/key.h
@@ -36,7 +36,7 @@ typedef struct keyb_t
@@ -189,21 +146,17 @@ index 8aa07ffe3d..45f23cac79 100644
LUA_OBJECT_FUNCS(key_class, keyb_t, key)
DO_ARRAY(keyb_t *, key, DO_NOTHING)

-diff --git a/objects/tag.c b/objects/tag.c
-index a0050cc2a9..1b1a135762 100644
--- a/objects/tag.c
+++ b/objects/tag.c
-@@ -203,6 +203,8 @@
+@@ -190,6 +190,8 @@
#include "ewmh.h"
#include "luaa.h"
-
+
+lua_class_t tag_class;
+
- /** When a tag requests to be selected.
+ /**
* @signal request::select
- * @tparam string context The reason why it was called.
-diff --git a/objects/tag.h b/objects/tag.h
-index d6bb40e0d8..f830b1e2c5 100644
+ */
--- a/objects/tag.h
+++ b/objects/tag.h
@@ -46,7 +46,7 @@ struct tag
@@ -215,8 +168,6 @@ index d6bb40e0d8..f830b1e2c5 100644
LUA_OBJECT_FUNCS(tag_class, tag_t, tag)

void tag_class_setup(lua_State *);
-diff --git a/objects/window.c b/objects/window.c
-index 440970f3d0..371d06bcd3 100644
--- a/objects/window.c
+++ b/objects/window.c
@@ -59,6 +59,7 @@
@@ -227,8 +178,6 @@ index 440970f3d0..371d06bcd3 100644
LUA_CLASS_FUNCS(window, window_class)

static xcb_window_t
-diff --git a/objects/window.h b/objects/window.h
-index 5386fafead..fbc5296cf5 100644
--- a/objects/window.h
+++ b/objects/window.h
@@ -80,7 +80,7 @@ typedef struct
@@ -239,4 +188,4 @@ index 5386fafead..fbc5296cf5 100644
+extern lua_class_t window_class;

void window_class_setup(lua_State *);
-
+



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (c56efef46e3bae81eee57dc2b1ffa2e400525a01), Conner Clere, 07/11/2023

Archive powered by MHonArc 2.6.24.

Top of Page