* [PR PATCH] wofi: fix segfaults under musl
@ 2020-10-04 21:41 glats
2020-10-04 21:44 ` glats
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: glats @ 2020-10-04 21:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
There is a new pull request by glats against master on the void-packages repository
https://github.com/glats/void-packages master
https://github.com/void-linux/void-packages/pull/25347
wofi: fix segfaults under musl
further info: https://todo.sr.ht/~scoopta/wofi/129
A patch file from https://github.com/void-linux/void-packages/pull/25347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-25347.patch --]
[-- Type: text/x-diff, Size: 1836 bytes --]
From aa7008bc38cb16a430a785bea73646d63050cdf0 Mon Sep 17 00:00:00 2001
From: Juan <jcuzmar@protonmail.com>
Date: Sun, 4 Oct 2020 18:41:22 -0300
Subject: [PATCH] wofi: fix segfaults under musl
---
srcpkgs/wofi/patches/fix-mode-thread.patch | 30 ++++++++++++++++++++++
srcpkgs/wofi/template | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
create 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
new file mode 100644
index 00000000000..93888b1c45a
--- /dev/null
+++ b/srcpkgs/wofi/patches/fix-mode-thread.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Scoopta <scoopta@scoopta.email>
+# 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 5f6b75dca57..4c21a047785 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,7 +1,7 @@
# Template file for 'wofi'
pkgname=wofi
version=1.2.2
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=meson
hostmakedepends="pkg-config"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: wofi: fix segfaults under musl
2020-10-04 21:41 [PR PATCH] wofi: fix segfaults under musl glats
@ 2020-10-04 21:44 ` glats
2020-10-04 22:39 ` ericonr
2020-10-04 23:39 ` [PR PATCH] [Closed]: " ericonr
2 siblings, 0 replies; 5+ messages in thread
From: glats @ 2020-10-04 21:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
New comment by glats on void-packages repository
https://github.com/void-linux/void-packages/pull/25347#issuecomment-703320601
Comment:
@ericonr sorry I messed up the last PR. I don't know how to work with rebase when there were commits between my commit and the merge in the HEAD. I think with this PR is just enough.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: wofi: fix segfaults under musl
2020-10-04 21:41 [PR PATCH] wofi: fix segfaults under musl glats
2020-10-04 21:44 ` glats
@ 2020-10-04 22:39 ` ericonr
2020-10-04 23:39 ` [PR PATCH] [Closed]: " ericonr
2 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2020-10-04 22:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25347#issuecomment-703326088
Comment:
Next time, you can force push into the branch on the machine with a different branch which doesn't have issues. This helps avoid the noise.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: wofi: fix segfaults under musl
2020-10-04 21:41 [PR PATCH] wofi: fix segfaults under musl glats
2020-10-04 21:44 ` glats
2020-10-04 22:39 ` ericonr
@ 2020-10-04 23:39 ` ericonr
2 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2020-10-04 23:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
There's a closed pull request on the void-packages repository
wofi: fix segfaults under musl
https://github.com/void-linux/void-packages/pull/25347
Description:
further info: https://todo.sr.ht/~scoopta/wofi/129
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: wofi: fix segfaults under musl
2020-10-04 15:44 [PR PATCH] " glats
@ 2020-10-04 21:33 ` glats
0 siblings, 0 replies; 5+ messages in thread
From: glats @ 2020-10-04 21:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
There's a closed pull request on the void-packages repository
wofi: fix segfaults under musl
https://github.com/void-linux/void-packages/pull/25340
Description:
Further info https://todo.sr.ht/~scoopta/wofi/129
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-04 23:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-04 21:41 [PR PATCH] wofi: fix segfaults under musl glats
2020-10-04 21:44 ` glats
2020-10-04 22:39 ` ericonr
2020-10-04 23:39 ` [PR PATCH] [Closed]: " ericonr
-- strict thread matches above, loose matches on Subject: below --
2020-10-04 15:44 [PR PATCH] " glats
2020-10-04 21:33 ` [PR PATCH] [Closed]: " glats
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).