Brett Cornwall pushed to branch main at Arch Linux / Packaging / Packages / 
waybar


Commits:
0306af03 by Brett Cornwall at 2024-08-02T00:27:27-07:00
Patch broken SIGUSR visibility toggle

https://github.com/Alexays/Waybar/issues/3477

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + a544f4b2cdcf632f1a4424b89f6e3d85ef5aaa85.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = waybar
        pkgdesc = Highly customizable Wayland bar for Sway and Wlroots based 
compositors
        pkgver = 0.10.4
-       pkgrel = 1
+       pkgrel = 2
        url = https://github.com/Alexays/Waybar/
        arch = x86_64
        license = MIT
@@ -43,7 +43,9 @@ pkgbase = waybar
        backup = etc/xdg/waybar/config.jsonc
        backup = etc/xdg/waybar/style.css
        source = 
waybar-0.10.4.tar.gz::https://github.com/Alexays/Waybar/archive/0.10.4.tar.gz
+       source = 
https://github.com/Alexays/Waybar/commit/a544f4b2cdcf632f1a4424b89f6e3d85ef5aaa85.patch
        b2sums = 
907273e6f1371252aad05212b4c59eabe1662167659d22073ee3bf649d8ee43be852b996dd7b86eecd0384b833cd2d7b9eed69b6b3292cb0b9cdbeb88c9e2391
+       b2sums = 
4b6da361054ae5d0e3807cc1ef91250561f2e777a6fd0cc2f610145c2666cbd828351bcb27b68c0f121f414a253a7068836b42468f5d78e5ea9e83ade90597ca
 
 pkgname = waybar
        depends = atkmm


=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
 
 pkgname=waybar
 pkgver=0.10.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Highly customizable Wayland bar for Sway and Wlroots based 
compositors'
 arch=('x86_64')
 url="https://github.com/Alexays/Waybar/";
@@ -57,8 +57,17 @@ optdepends=(
 )
 source=(
     
"$pkgname-$pkgver.tar.gz::https://github.com/Alexays/Waybar/archive/$pkgver.tar.gz";
+    
"https://github.com/Alexays/Waybar/commit/a544f4b2cdcf632f1a4424b89f6e3d85ef5aaa85.patch";
 )
-b2sums=('907273e6f1371252aad05212b4c59eabe1662167659d22073ee3bf649d8ee43be852b996dd7b86eecd0384b833cd2d7b9eed69b6b3292cb0b9cdbeb88c9e2391')
+b2sums=('907273e6f1371252aad05212b4c59eabe1662167659d22073ee3bf649d8ee43be852b996dd7b86eecd0384b833cd2d7b9eed69b6b3292cb0b9cdbeb88c9e2391'
+        
'4b6da361054ae5d0e3807cc1ef91250561f2e777a6fd0cc2f610145c2666cbd828351bcb27b68c0f121f414a253a7068836b42468f5d78e5ea9e83ade90597ca')
+
+prepare() {
+    cd "Waybar-$pkgver"
+    # Fix regression of broken SIGUSR1 visibility toggle
+    # https://github.com/Alexays/Waybar/issues/3455
+    patch -p1 < ../a544f4b2cdcf632f1a4424b89f6e3d85ef5aaa85.patch
+}
 
 build() {
     cd "Waybar-$pkgver"


=====================================
a544f4b2cdcf632f1a4424b89f6e3d85ef5aaa85.patch
=====================================
@@ -0,0 +1,38 @@
+From a544f4b2cdcf632f1a4424b89f6e3d85ef5aaa85 Mon Sep 17 00:00:00 2001
+From: Austin Horstman <[email protected]>
+Date: Sat, 20 Jul 2024 09:33:13 -0500
+Subject: [PATCH] bar: fix setVisible
+
+Accidentally removed updating the visible variable
+---
+ include/bar.hpp | 2 +-
+ src/bar.cpp     | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/include/bar.hpp b/include/bar.hpp
+index 6900da479..43756bfdc 100644
+--- a/include/bar.hpp
++++ b/include/bar.hpp
+@@ -66,7 +66,7 @@ class Bar {
+   ~Bar();
+ 
+   void setMode(const std::string &mode);
+-  void setVisible(bool visible);
++  void setVisible(bool value);
+   void toggle();
+   void handleSignal(int);
+ 
+diff --git a/src/bar.cpp b/src/bar.cpp
+index 8c75c2c20..8a245ad16 100644
+--- a/src/bar.cpp
++++ b/src/bar.cpp
+@@ -404,7 +404,8 @@ void waybar::Bar::onMap(GdkEventAny* /*unused*/) {
+   setPassThrough(passthrough_);
+ }
+ 
+-void waybar::Bar::setVisible(bool visible) {
++void waybar::Bar::setVisible(bool value) {
++  visible = value;
+   if (auto mode = config.get("mode", {}); mode.isString()) {
+     setMode(visible ? config["mode"].asString() : MODE_INVISIBLE);
+   } else {



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/waybar/-/commit/0306af03fcb6de6aee1e288f42b0bf1b223513bd

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/waybar/-/commit/0306af03fcb6de6aee1e288f42b0bf1b223513bd
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to