* [PR PATCH] wofi: update to 1.3.
@ 2022-10-11 13:20 heittpr
2022-10-11 13:21 ` [PR PATCH] [Updated] " heittpr
2022-10-11 19:28 ` [PR PATCH] [Merged]: " paper42
0 siblings, 2 replies; 3+ messages in thread
From: heittpr @ 2022-10-11 13:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
There is a new pull request by heittpr against master on the void-packages repository
https://github.com/heittpr/void-packages wofi
https://github.com/void-linux/void-packages/pull/39889
wofi: update to 1.3.
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, x86_64
`fix-mode-thread.patch` is no longer needed since [8a4a5e29ca9c](https://hg.sr.ht/~scoopta/wofi/rev/8a4a5e29ca9c1fb0a11ed9b329d275f5c02154a6)
A patch file from https://github.com/void-linux/void-packages/pull/39889.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wofi-39889.patch --]
[-- Type: text/x-diff, Size: 2179 bytes --]
From 9649a4b0ed160a71174d3a9b3f3766023e887016 Mon Sep 17 00:00:00 2001
From: heitor <heitorleite.dev@gmail.com>
Date: Tue, 11 Oct 2022 10:17:26 -0300
Subject: [PATCH] wofi: update to 1.3.
---
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 ac57ca3c5014..000000000000
--- a/srcpkgs/wofi/patches/fix-mode-thread.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
-
---- a/src/wofi.c
-+++ b/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 5fe2c5b63ed2..00483f13a1c3 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,6 +1,6 @@
# Template file for 'wofi'
pkgname=wofi
-version=1.2.4
+version=1.3
revision=2
wrksrc="${pkgname}-v${version}"
build_style=meson
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
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=@fee85efc35e97946d3a94562775b902982c4ab1f521208308ecc4bb41547a5e3
+checksum=7644e4e995bc027b7f3f411ceda82b3e2a72a4a424f6193663c27bbf00f23067
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] wofi: update to 1.3.
2022-10-11 13:20 [PR PATCH] wofi: update to 1.3 heittpr
@ 2022-10-11 13:21 ` heittpr
2022-10-11 19:28 ` [PR PATCH] [Merged]: " paper42
1 sibling, 0 replies; 3+ messages in thread
From: heittpr @ 2022-10-11 13:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
There is an updated pull request by heittpr against master on the void-packages repository
https://github.com/heittpr/void-packages wofi
https://github.com/void-linux/void-packages/pull/39889
wofi: update to 1.3.
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, x86_64
`fix-mode-thread.patch` is no longer needed since [8a4a5e29ca9c](https://hg.sr.ht/~scoopta/wofi/rev/8a4a5e29ca9c1fb0a11ed9b329d275f5c02154a6)
A patch file from https://github.com/void-linux/void-packages/pull/39889.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wofi-39889.patch --]
[-- Type: text/x-diff, Size: 2223 bytes --]
From 1ab78c38869e36f0d42f5c2e840473e99e190997 Mon Sep 17 00:00:00 2001
From: heitor <heitorleite.dev@gmail.com>
Date: Tue, 11 Oct 2022 10:17:26 -0300
Subject: [PATCH] wofi: update to 1.3.
---
srcpkgs/wofi/patches/fix-mode-thread.patch | 30 ----------------------
srcpkgs/wofi/template | 6 ++---
2 files changed, 3 insertions(+), 33 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 ac57ca3c5014..000000000000
--- a/srcpkgs/wofi/patches/fix-mode-thread.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
-
---- a/src/wofi.c
-+++ b/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 5fe2c5b63ed2..448e17de8691 100644
--- a/srcpkgs/wofi/template
+++ b/srcpkgs/wofi/template
@@ -1,7 +1,7 @@
# Template file for 'wofi'
pkgname=wofi
-version=1.2.4
-revision=2
+version=1.3
+revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
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=@fee85efc35e97946d3a94562775b902982c4ab1f521208308ecc4bb41547a5e3
+checksum=7644e4e995bc027b7f3f411ceda82b3e2a72a4a424f6193663c27bbf00f23067
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: wofi: update to 1.3.
2022-10-11 13:20 [PR PATCH] wofi: update to 1.3 heittpr
2022-10-11 13:21 ` [PR PATCH] [Updated] " heittpr
@ 2022-10-11 19:28 ` paper42
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-10-11 19:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 404 bytes --]
There's a merged pull request on the void-packages repository
wofi: update to 1.3.
https://github.com/void-linux/void-packages/pull/39889
Description:
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, x86_64
`fix-mode-thread.patch` is no longer needed since [8a4a5e29ca9c](https://hg.sr.ht/~scoopta/wofi/rev/8a4a5e29ca9c1fb0a11ed9b329d275f5c02154a6)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-11 19:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-11 13:20 [PR PATCH] wofi: update to 1.3 heittpr
2022-10-11 13:21 ` [PR PATCH] [Updated] " heittpr
2022-10-11 19:28 ` [PR PATCH] [Merged]: " paper42
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).