[packages/foot] up to 1.15.1

[atler]

commit 4885a5b78b5887a70b1eef6ab1abc59661bdd706
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Jul 22 00:06:52 2023 +0200

    up to 1.15.1

 foot.spec             | 19 +++++++++++--------
 no-cursor-shape.patch | 31 -------------------------------
 2 files changed, 11 insertions(+), 39 deletions(-)
---
diff --git a/foot.spec b/foot.spec
index 7cfd65d..49fdf1f 100644
--- a/foot.spec
+++ b/foot.spec
@@ -4,14 +4,13 @@
 
 Summary:	A fast, lightweight and minimalistic Wayland terminal emulator
 Name:		foot
-Version:	1.15.0
-Release:	2
+Version:	1.15.1
+Release:	1
 License:	MIT
 Group:		Applications/Terminal
 Source0:	https://codeberg.org/dnkl/foot/archive/%{version}.tar.gz
-# Source0-md5:	7c73f8008529c42c353f2b1e1b38ffff
+# Source0-md5:	a0fc6e3e0fb1f3b10edb2887779aeae7
 Patch0:		x32.patch
-Patch1:		no-cursor-shape.patch
 URL:		https://codeberg.org/dnkl/foot/
 BuildRequires:	fcft-devel < 4.0.0
 BuildRequires:	fcft-devel >= 3.0.1
@@ -23,7 +22,7 @@ BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python3
 BuildRequires:	rpm-build >= 4.6
-BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	rpmbuild(macros) >= 2.011
 BuildRequires:	scdoc
 BuildRequires:	systemd-devel
 BuildRequires:	tllist-devel >= 1.1.0
@@ -36,6 +35,7 @@ BuildRequires:	fonts-TTF-DejaVu
 %endif
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
+Requires(post,preun):	systemd-units >= 1:250.1
 Requires:	fcft < 4.0.0
 Requires:	fcft >= 3.0.1
 Requires:	hicolor-icon-theme
@@ -83,7 +83,6 @@ ZSH completion for foot command line.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %meson build \
@@ -116,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 %post
 %update_desktop_database_post
 %update_icon_cache hicolor
+%systemd_user_post foot-server.service foot-server.socket
+
+%preun
+%systemd_user_preun foot-server.service foot-server.socket
 
 %postun
 %update_desktop_database_postun
@@ -128,8 +131,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xdg/foot/foot.ini
 %attr(755,root,root) %{_bindir}/foot
 %attr(755,root,root) %{_bindir}/footclient
-%{systemduserunitdir}/foot-server at .service
-%{systemduserunitdir}/foot-server at .socket
+%{systemduserunitdir}/foot-server.service
+%{systemduserunitdir}/foot-server.socket
 %{_datadir}/foot
 %{_desktopdir}/org.codeberg.dnkl.foot.desktop
 %{_desktopdir}/org.codeberg.dnkl.foot-server.desktop
diff --git a/no-cursor-shape.patch b/no-cursor-shape.patch
deleted file mode 100644
index 9ae1d3f..0000000
--- a/no-cursor-shape.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8ebde9f03411593f7652363a82d802ae4e5409c4 Mon Sep 17 00:00:00 2001
-From: xdavidwu <xdavidwuph at gmail.com>
-Date: Tue, 18 Jul 2023 21:09:24 +0800
-Subject: [PATCH] wayland: fix pointer cap lost handling
-
-Before this, on compositor without cursor-shape support, a pointer
-capability lost of the seat makes foot crash.
----
- wayland.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/wayland.c b/wayland.c
-index 9195797e..0e333573 100644
---- a/wayland.c
-+++ b/wayland.c
-@@ -341,8 +341,10 @@ seat_handle_capabilities(void *data, struct wl_seat *wl_seat,
-     } else {
-         if (seat->wl_pointer != NULL) {
- #if defined(HAVE_CURSOR_SHAPE)
--            wp_cursor_shape_device_v1_destroy(seat->pointer.shape_device);
--            seat->pointer.shape_device = NULL;
-+            if (seat->pointer.shape_device != NULL) {
-+                wp_cursor_shape_device_v1_destroy(seat->pointer.shape_device);
-+                seat->pointer.shape_device = NULL;
-+            }
- #endif
- 
-             wl_pointer_release(seat->wl_pointer);
--- 
-2.30.8
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/foot.git/commitdiff/4885a5b78b5887a70b1eef6ab1abc59661bdd706