From bfc1564fd8b9c20d7ab83f98d519d93b30e22c06 Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Thu, 4 Feb 2021 14:05:10 +0100 Subject: [PATCH] wofi: update to 1.2.4. --- srcpkgs/wofi/patches/fix-mode-thread.patch | 30 ---------------------- srcpkgs/wofi/template | 4 +-- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/wofi/patches/fix-mode-thread.patch diff --git a/srcpkgs/wofi/patches/fix-mode-thread.patch b/srcpkgs/wofi/patches/fix-mode-thread.patch deleted file mode 100644 index 93888b1c45a..00000000000 --- a/srcpkgs/wofi/patches/fix-mode-thread.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User Scoopta -# Date 1601697276 25200 -# Fri Oct 02 20:54:36 2020 -0700 -# Node ID 8a4a5e29ca9c1fb0a11ed9b329d275f5c02154a6 -# Parent ac8dc17ab751b13b6d4ddcc1a1467e4beb8d7d26 -The mode thread will not be joined multiple times as this causes segfaults under musl - ---- src/wofi.c -+++ src/wofi.c -@@ -103,6 +103,7 @@ - static bool dynamic_lines; - static struct wl_list mode_list; - static pthread_t mode_thread; -+static bool has_joined_mode = false; - - static struct map* keys; - -@@ -596,7 +597,10 @@ - } - - static gboolean insert_all_widgets(gpointer data) { -- pthread_join(mode_thread, NULL); -+ if(!has_joined_mode) { -+ pthread_join(mode_thread, NULL); -+ has_joined_mode = true; -+ } - struct wl_list* modes = data; - if(modes->prev == modes) { - return FALSE; diff --git a/srcpkgs/wofi/template b/srcpkgs/wofi/template index 80863c765ef..e9125320aed 100644 --- a/srcpkgs/wofi/template +++ b/srcpkgs/wofi/template @@ -1,6 +1,6 @@ # Template file for 'wofi' pkgname=wofi -version=1.2.3 +version=1.2.4 revision=1 wrksrc="${pkgname}-v${version}" build_style=meson @@ -11,4 +11,4 @@ maintainer="Zach Dykstra " license="GPL-3.0-or-later" homepage="https://hg.sr.ht/~scoopta/wofi" distfiles="https://hg.sr.ht/~scoopta/wofi/archive/v${version}.tar.gz" -checksum=@3ef3ff39eb6c72f20a70486a40f0060150044b701db84489f9773f309673f8e7 +checksum=@fee85efc35e97946d3a94562775b902982c4ab1f521208308ecc4bb41547a5e3