Skip to Content.
Sympa Menu

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

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 (4099e3a8e2010b51e2285181c40c179f84468c18)
  • Date: Wed, 8 May 2024 23:52:02 +0000

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

wm-addons/waybar/CONFIGURE | 3 +--
wm-addons/waybar/DEPENDS | 14 ++++----------
wm-addons/waybar/DETAILS | 14 ++++++++++++--
wm-addons/waybar/FINAL | 12 ------------
wm-addons/waybar/HISTORY | 8 ++++++++
wm-addons/waybar/PREPARE | 2 ++
wm-addons/waybar/PRE_BUILD | 6 ------
7 files changed, 27 insertions(+), 32 deletions(-)

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

wm-addons/waybar: version 0.10.3; add scm branch

gtk-layer-shell is now a hard dependency, as well as gtk+3 and gobj.
waybar now has proper hyprland support, so no need to patch anymore.

diff --git a/wm-addons/waybar/CONFIGURE b/wm-addons/waybar/CONFIGURE
index b2db2a2..80745f9 100755
--- a/wm-addons/waybar/CONFIGURE
+++ b/wm-addons/waybar/CONFIGURE
@@ -1,4 +1,3 @@
. "${GRIMOIRE}/MESON_CONFIGURE" &&
config_query_option WAYBAR_OPTS "Build tests?" n "tests=enabled"
"tests=disabled" &&
-config_query_option WAYBAR_OPTS "Enable experimental features?" n
"experimental=true" "experimental=false" &&
-config_query HYPR_WORKSPACES "Patch in support for hyprland workspaces?" n
+config_query_option WAYBAR_OPTS "Enable experimental features?" n
"experimental=true" "experimental=false"
diff --git a/wm-addons/waybar/DEPENDS b/wm-addons/waybar/DEPENDS
index 22a55f0..e254881 100755
--- a/wm-addons/waybar/DEPENDS
+++ b/wm-addons/waybar/DEPENDS
@@ -9,6 +9,10 @@ depends wayland-protocols &&
depends glib2 &&
depends libxkbcommon &&
depends chrono-date &&
+depends gtk-layer-shell &&
+depends gtk+3 &&
+depends gobject-introspection &&
+

optional_depends libinput \
'libinput=enabled' \
@@ -65,16 +69,6 @@ optional_depends libmpdclient
\
'mpd=disabled' \
'Enable support for the Music Player Daemon?' &&

-optional_depends gtk-layer-shell \
- 'gtk-layer-shell=enabled' \
- 'gtk-layer-shell=disabled' \
- 'User gtk-layer-shell library for popups support?' &&
-
-if is_depends_enabled $SPELL gtk-layer-shell; then
- depends gobject-introspection &&
- depends gtk+3
-fi &&
-
optional_depends util-linux \
'rfkill=enabled' \
'rfkill=disabled' \
diff --git a/wm-addons/waybar/DETAILS b/wm-addons/waybar/DETAILS
index f4e65e3..f3d95b6 100755
--- a/wm-addons/waybar/DETAILS
+++ b/wm-addons/waybar/DETAILS
@@ -1,12 +1,22 @@
# Watch: https://github.com/Alexays/Waybar/tags /tags/([0-9.]+)[.]tar
. "${GRIMOIRE}/MESON_FUNCTIONS"
+. "${GRIMOIRE}/FUNCTIONS"
SPELL=waybar
SPELLX=Waybar
- VERSION=0.9.22
+if [[ "${WAYBAR_BRANCH}" == scm ]]; then
+ VERSION=$(get_scm_version)
+ SOURCE=${SPELL}-git.tar.xz
+ SOURCE_URL[0]=git_http://github.com/Alexays/${SPELLX}.git:${SPELLX}.git
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+else
+ VERSION=0.10.3
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
SOURCE_URL[0]=https://github.com/Alexays/Waybar/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:0cd2d4fdf51528d1246da756ec1d4be5dd897208f4ec1aef5ab2d2801ab72145bcccef68fa62e55f0b1bb9913d471ce5c748de97f9d785d55c06a5f6717c9849
+
SOURCE_HASH=sha512:2e90007056b79bccad06902db2e8b6f25103bb7c86736cb0b7dc260795bc4a1b5db7a7b8a4bebe9169f0590585fd6b170193cf8aa5437d69bab0f78d66922084
+fi
LICENSE[0]=MIT
WEB_SITE=https://github.com/Alexays/Waybar/
ENTERED=20230227
diff --git a/wm-addons/waybar/FINAL b/wm-addons/waybar/FINAL
deleted file mode 100755
index 2d611a2..0000000
--- a/wm-addons/waybar/FINAL
+++ /dev/null
@@ -1,12 +0,0 @@
-if [[ $HYPR_WORKSPACES == "y" ]]; then
- message "\n" \
- "-----------------------------------\n" \
- "${PROBLEM_COLOR}ATTENTION!\n" \
- "${MESSAGE_COLOR}\n" \
- "Hyprland workspace support has been patched in. In order to make
it work,\n" \
- "edit your waybar config (~/.config/waybar/config) and replace all
instances\n" \
- "of 'sway/workspaces' with 'wlr/workspaces'\n" \
- "this can be accomplished by running (from your ~/.config/waybar/
directory):\n" \
- "${YELLOW}sed -i \"s#sway/workspaces#wlr/workspaces#g\"
config${DEFAULT_COLOR}\n" \
- "-----------------------------------\n"
-fi
diff --git a/wm-addons/waybar/HISTORY b/wm-addons/waybar/HISTORY
index 6efc96e..139f91d 100644
--- a/wm-addons/waybar/HISTORY
+++ b/wm-addons/waybar/HISTORY
@@ -1,3 +1,11 @@
+2024-05-08 Conner Clere <xenanthropy AT sourcemage.org>
+ * DETAILS: version 0.10.3, add scm option
+ * DEPENDS: remove gtk-layer-shell optional dep, now hard dep
+ added gtk+3 and gobject-introspection as hard deps
+ * FINAL, PRE_BUILD: removed, no more hyprland patch
+ * CONFIGURE: hyprland question removed, no longer needed
+ * PREPARE: add scm option
+
2023-09-15 Conner Clere <xenanthropy AT sourcemage.org>
* DETAILS: version 0.9.22
* BUILD: switch from OPTS+= to OPTS=
diff --git a/wm-addons/waybar/PREPARE b/wm-addons/waybar/PREPARE
new file mode 100755
index 0000000..e38d86f
--- /dev/null
+++ b/wm-addons/waybar/PREPARE
@@ -0,0 +1,2 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+prepare_select_branch stable scm
diff --git a/wm-addons/waybar/PRE_BUILD b/wm-addons/waybar/PRE_BUILD
deleted file mode 100755
index 0864d79..0000000
--- a/wm-addons/waybar/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-if [[ $HYPR_WORKSPACES == "y" ]]; then
- sed -i 's/zext_workspace_handle_v1_activate(workspace_handle_);/const
std::string command = "hyprctl dispatch workspace " +
name_;\n\tsystem(command.c_str());/g' src/modules/wlr/workspace_manager.cpp
-fi


  • [[SM-Commit] ] GIT changes to master grimoire by Conner Clere (4099e3a8e2010b51e2285181c40c179f84468c18), Conner Clere, 05/08/2024

Archive powered by MHonArc 2.6.24.

Top of Page