Skip to Content.
Sympa Menu

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

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 (9de83e25f97767ea36f5dbfc461909eb90f4f696)
  • Date: Tue, 11 Jul 2023 00:51:08 +0000

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

windowmanagers/awesome/BUILD | 4
windowmanagers/awesome/CONFIGURE | 1
windowmanagers/awesome/DEPENDS | 43 +-
windowmanagers/awesome/DETAILS | 11
windowmanagers/awesome/HISTORY | 9
windowmanagers/awesome/PRE_BUILD | 3
windowmanagers/awesome/patches/awesome-4.3-fno-common.patch | 242
++++++++++++
7 files changed, 281 insertions(+), 32 deletions(-)

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

awesome: version 4.3

Switched to using CMAKE files for spell, added
patch from upstream that fixes building with gcc
added missing xcb-util-cursor & xcb-util-xrm deps

diff --git a/windowmanagers/awesome/BUILD b/windowmanagers/awesome/BUILD
deleted file mode 100755
index f9fc648..0000000
--- a/windowmanagers/awesome/BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-export PATH="/sbin:/bin:/usr/bin:/usr/sbin" &&
-cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr \
- -DSYSCONFDIR=$INSTALLROOT/etc . &&
-make
diff --git a/windowmanagers/awesome/CONFIGURE
b/windowmanagers/awesome/CONFIGURE
new file mode 100755
index 0000000..90942b1
--- /dev/null
+++ b/windowmanagers/awesome/CONFIGURE
@@ -0,0 +1 @@
+. "${GRIMOIRE}/CMAKE_CONFIGURE"
diff --git a/windowmanagers/awesome/DEPENDS b/windowmanagers/awesome/DEPENDS
index 3c995fe..930094b 100755
--- a/windowmanagers/awesome/DEPENDS
+++ b/windowmanagers/awesome/DEPENDS
@@ -1,24 +1,24 @@
-depends cairo &&
-sub_depends cairo XCB &&
-depends pango &&
-depends PKG-CONFIG &&
-depends -sub XCB libx11 &&
-depends libxrandr &&
-depends libxinerama &&
-depends cmake &&
-depends lua51 &&
-depends libev &&
-depends glib2 &&
-#depends xcb &&
-depends xcb-util &&
-depends xcb-util-image &&
-depends xcb-util-keysyms &&
-depends xcb-util-wm &&
-depends gperf &&
-depends imagemagick &&
-depends startup-notification &&
-depends imlib2 &&
-depends libxdg-basedir &&
+. "${GRIMOIRE}/CMAKE_DEPENDS" &&
+depends PKG-CONFIG &&
+depends -sub XCB cairo &&
+depends pango &&
+depends -sub XCB libx11 &&
+depends libxrandr &&
+depends libxinerama &&
+depends lua51 &&
+depends libev &&
+depends glib2 &&
+depends xcb-util &&
+depends xcb-util-image &&
+depends xcb-util-keysyms &&
+depends xcb-util-wm &&
+depends xcb-util-cursor &&
+depends xcb-util-xrm &&
+depends gperf &&
+depends imagemagick &&
+depends startup-notification &&
+depends imlib2 &&
+depends libxdg-basedir &&

optional_depends dbus '' '-DWITH_DBUS=OFF' 'Make use of dbus?' &&

@@ -28,4 +28,3 @@ optional_depends asciidoc '' '' 'For manpage generation'
&&
optional_depends luadoc '' '' 'For generating LUA API documentation' &&
optional_depends graphviz '' '' 'For the sourcecode reference' &&
optional_depends doxygen '' '' 'For the sourcecode reference'
-
diff --git a/windowmanagers/awesome/DETAILS b/windowmanagers/awesome/DETAILS
index 0bb21ef..aafefc1 100755
--- a/windowmanagers/awesome/DETAILS
+++ b/windowmanagers/awesome/DETAILS
@@ -1,12 +1,13 @@
+. "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=awesome
- VERSION=3.4.13
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=4.3
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://awesome.naquadah.org/download/$SOURCE
-
SOURCE_HASH=sha512:9b30667c43c7f84f5347fbec7fbe669fbd78533c863536f3c530e3eb7183e6f2f855fcb5b0ffe18f02f67c1626f6bd121e029ddb67b54272f66d59e917edaccb
+
SOURCE_URL[0]=https://github.com/${SPELL}WM/${SPELL}/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha256:b8a509464fb964acfc0cfaa4c689beaceb0f720de3983053d54d440158c281dd
LICENSE[0]=MIT
KEYWORDS="windowmanagers"
- WEB_SITE=http://awesome.naquadah.org/
+ WEB_SITE=https://awesomewm.org/
ENTERED=20080324
SHORT='A dwm-based window manager with many layouts'
cat << EOF
diff --git a/windowmanagers/awesome/HISTORY b/windowmanagers/awesome/HISTORY
index b0194b8..7d8df78 100644
--- a/windowmanagers/awesome/HISTORY
+++ b/windowmanagers/awesome/HISTORY
@@ -1,3 +1,12 @@
+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
+ * CONFIGURE: added, CMAKE_CONFIGURE
+ * DEPENDS: added CMAKE_DEPENDS, xcb-util-cursor, xcb-util-xrm,
+ cleaned up structure
+ * patches/awesome-4.3-fno-common.patch: added, fixes build with gcc
+ * PRE_BUILD: added patches line
+
2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: switch to PKG-CONFIG provider (automated)

diff --git a/windowmanagers/awesome/PRE_BUILD
b/windowmanagers/awesome/PRE_BUILD
index 0a1261e..d3e4fa8 100755
--- a/windowmanagers/awesome/PRE_BUILD
+++ b/windowmanagers/awesome/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
-sedit 's#glib/gspawn.h#glib-2.0/glib.h#' spawn.c
+sedit 's#glib/gspawn.h#glib-2.0/glib.h#' spawn.c &&
+apply_patch_dir patches
diff --git a/windowmanagers/awesome/patches/awesome-4.3-fno-common.patch
b/windowmanagers/awesome/patches/awesome-4.3-fno-common.patch
new file mode 100644
index 0000000..8fdde95
--- /dev/null
+++ b/windowmanagers/awesome/patches/awesome-4.3-fno-common.patch
@@ -0,0 +1,242 @@
+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
+
+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)
+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(-)
+
+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 @@
+ #include "common/lualib.h"
+ #include "luaa.h"
+
++lua_CFunction lualib_dofunction_on_error;
++
+ 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 @@
+ #include "common/util.h"
+
+ /** Lua function to call on dofunction() error */
+-lua_CFunction lualib_dofunction_on_error;
++extern lua_CFunction lualib_dofunction_on_error;
+
+ 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[];
+ extern const struct luaL_Reg awesome_root_methods[];
+ extern const struct luaL_Reg awesome_root_meta[];
+
++signal_array_t global_signals;
++
+ /** 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 *);
+ bool luaA_parserc(xdgHandle *, const char *);
+
+ /** 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 *);
+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 @@
+
+ #include "button.h"
+
++lua_class_t button_class;
++
+ /** 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
+ xcb_button_t button;
+ } button_t;
+
+-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)
+
+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 @@
+ #include <xcb/shape.h>
+ #include <cairo-xcb.h>
+
++lua_class_t client_class;
++
+ /** 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
+ 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)
+
+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 @@
+ #include <cairo-xcb.h>
+ #include <xcb/shape.h>
+
++lua_class_t drawin_class;
++
+ /** 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 *);
+
+ void drawin_class_setup(lua_State *);
+
+-lua_class_t drawin_class;
++extern lua_class_t drawin_class;
+
+ #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 @@
+ #include <xkbcommon/xkbcommon.h>
+ #include <glib.h>
+
++lua_class_t key_class;
++
+ /** 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
+ 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)
+
+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 @@
+ #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
+ client_array_t clients;
+ };
+
+-lua_class_t tag_class;
++extern lua_class_t tag_class;
+ 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 @@
+ #include "property.h"
+ #include "xwindow.h"
+
++lua_class_t window_class;
+ 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
+ WINDOW_OBJECT_HEADER
+ } window_t;
+
+-lua_class_t window_class;
++extern lua_class_t window_class;
+
+ void window_class_setup(lua_State *);
+



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

Archive powered by MHonArc 2.6.24.

Top of Page