* [PR PATCH] wofi: revert the old patch for musl
@ 2021-02-05 6:25 FollieHiyuki
2021-02-05 12:07 ` ericonr
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: FollieHiyuki @ 2021-02-05 6:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1780 bytes --]
There is a new pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages wofi
https://github.com/void-linux/void-packages/pull/28508
wofi: revert the old patch for musl
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
My fault to suggest deleting the patch in previous commit.
1.2.4 only fixes the version number, and doesn't include this patch (even though this patch is already upstreamed)
A patch file from https://github.com/void-linux/void-packages/pull/28508.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wofi-28508.patch --]
[-- Type: text/x-diff, Size: 1453 bytes --]
From 6f587dad6885b2f19538562aa37c65cc583378a3 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 5 Feb 2021 09:21:40 +0300
Subject: [PATCH] wofi: revert the old patch for musl
---
srcpkgs/wofi/patches/fix-mode-thread.patch | 30 ++++++++++++++++++++++
1 file changed, 30 insertions(+)
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..51a24f93f1c
--- /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;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: wofi: revert the old patch for musl
2021-02-05 6:25 [PR PATCH] wofi: revert the old patch for musl FollieHiyuki
@ 2021-02-05 12:07 ` ericonr
2021-02-05 12:17 ` ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-02-05 12:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28508#issuecomment-773993967
Comment:
Ugh, really? I tried it a few times and it seemed fine :/
Thanks for noticing
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: wofi: revert the old patch for musl
2021-02-05 6:25 [PR PATCH] wofi: revert the old patch for musl FollieHiyuki
2021-02-05 12:07 ` ericonr
@ 2021-02-05 12:17 ` ericonr
2021-02-05 23:40 ` [PR PATCH] [Updated] " FollieHiyuki
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-02-05 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28508#issuecomment-773998530
Comment:
@FollieHiyuki you need to increase package revision.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] wofi: revert the old patch for musl
2021-02-05 6:25 [PR PATCH] wofi: revert the old patch for musl FollieHiyuki
2021-02-05 12:07 ` ericonr
2021-02-05 12:17 ` ericonr
@ 2021-02-05 23:40 ` FollieHiyuki
2021-02-05 23:40 ` FollieHiyuki
2021-02-06 2:07 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: FollieHiyuki @ 2021-02-05 23:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1785 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages wofi
https://github.com/void-linux/void-packages/pull/28508
wofi: revert the old patch for musl
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
My fault to suggest deleting the patch in previous commit.
1.2.4 only fixes the version number, and doesn't include this patch (even though this patch is already upstreamed)
A patch file from https://github.com/void-linux/void-packages/pull/28508.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wofi-28508.patch --]
[-- Type: text/x-diff, Size: 1853 bytes --]
From 6de17bd8611d8882fd729ed73a726c73a9b33638 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Fri, 5 Feb 2021 09:21:40 +0300
Subject: [PATCH] wofi: revert the old patch for 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..51a24f93f1c
--- /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 e9125320aed..5fe2c5b63ed 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,7 +1,7 @@
# Template file for 'wofi'
pkgname=wofi
version=1.2.4
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=meson
hostmakedepends="pkg-config"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: wofi: revert the old patch for musl
2021-02-05 6:25 [PR PATCH] wofi: revert the old patch for musl FollieHiyuki
` (2 preceding siblings ...)
2021-02-05 23:40 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-02-05 23:40 ` FollieHiyuki
2021-02-06 2:07 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: FollieHiyuki @ 2021-02-05 23:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28508#issuecomment-774346559
Comment:
Done
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: wofi: revert the old patch for musl
2021-02-05 6:25 [PR PATCH] wofi: revert the old patch for musl FollieHiyuki
` (3 preceding siblings ...)
2021-02-05 23:40 ` FollieHiyuki
@ 2021-02-06 2:07 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-02-06 2:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1622 bytes --]
There's a merged pull request on the void-packages repository
wofi: revert the old patch for musl
https://github.com/void-linux/void-packages/pull/28508
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
My fault to suggest deleting the patch in previous commit.
1.2.4 only fixes the version number, and doesn't include this patch (even though this patch is already upstreamed)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-06 2:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-05 6:25 [PR PATCH] wofi: revert the old patch for musl FollieHiyuki
2021-02-05 12:07 ` ericonr
2021-02-05 12:17 ` ericonr
2021-02-05 23:40 ` [PR PATCH] [Updated] " FollieHiyuki
2021-02-05 23:40 ` FollieHiyuki
2021-02-06 2:07 ` [PR PATCH] [Merged]: " ericonr
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).