Compare commits

..

No commits in common. "rawhide" and "f39" have entirely different histories.

4 changed files with 36 additions and 9 deletions

3
.gitignore vendored
View file

@ -1,5 +1,2 @@
/wmenu-0.1.6.tar.gz
/wmenu-0.1.7.tar.gz
/wmenu-0.1.8.tar.gz
/wmenu-0.1.9.tar.gz
/wmenu-0.2.0.tar.gz

View file

@ -1 +1 @@
SHA512 (wmenu-0.2.0.tar.gz) = 5ddb0a6ac2865c06c80778b1d947a7f89cdcec06d66d7fb2470549d29a1c59572eeaa1ff3e9e4df5b54b4f4c1fc671acd9d329d2e7f945ddeaa5f4a415b9eac4
SHA512 (wmenu-0.1.7.tar.gz) = 2e949bc1b14e74b65aafa523a01acda3cb7b546dbd0fb4d6561ae0fbae9a017eaf15962e6231b9cd81df22f870477725c2279c2cb1f3d99ac802701b788a306e

View file

@ -0,0 +1,29 @@
From 2856dddcac861ddf248143e66ba164d7aa05a0bb Mon Sep 17 00:00:00 2001
From: Adnan Maolood <adnan@maolood.com>
Date: Sun, 17 Mar 2024 07:01:23 -0400
Subject: [PATCH] Don't destroy wl_data_offer twice
The data offer is destroyed after it is used. There is no need to
destroy it again.
This also fixes an issue where calling wl_data_offer_destroy with a NULL
data offer would segfault.
---
menu.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/menu.c b/menu.c
index 0acfcab..f48a8f0 100644
--- a/menu.c
+++ b/menu.c
@@ -740,7 +740,6 @@ void menu_destroy(struct menu *menu) {
wl_data_device_destroy(menu->data_device);
wl_surface_destroy(menu->surface);
zwlr_layer_surface_v1_destroy(menu->layer_surface);
- wl_data_offer_destroy(menu->data_offer);
free_pages(menu);
free_items(menu);
--
2.43.0

View file

@ -1,13 +1,15 @@
Name: wmenu
Version: 0.2.0
Version: 0.1.7
Release: %autorelease
Summary: Efficient dynamic menu for Wayland
# Main source: MIT
# protocols/wlr-layer-shell-unstable-v1.xml: HPND-sell-variant
License: MIT
URL: https://codeberg.org/adnano/wmenu
Source: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
URL: https://sr.ht/~adnano/wmenu
%global forgeurl https://git.sr.ht/~adnano/wmenu
Source: %{forgeurl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch: %{forgeurl}/commit/2856ddd.patch#/wmenu-0.1.7-Don-t-destroy-wl_data_offer-twice.patch
BuildRequires: gcc
BuildRequires: meson >= 0.47
@ -25,7 +27,7 @@ An efficient dynamic menu for Sway and wlroots based Wayland compositors.
%prep
%autosetup -n %{name} -p1
%autosetup -p1
%build
@ -42,7 +44,6 @@ An efficient dynamic menu for Sway and wlroots based Wayland compositors.
%license LICENSE
%doc README.md
%{_bindir}/%{name}
%{_bindir}/%{name}-run
%{_mandir}/man1/%{name}.1*