From 117652aa6f87197e0c52117558d7b27e7f1f1949 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 2 Oct 2024 01:03:56 +0000
Subject: [PATCH] sway: update to 1.10

---
 packages/wayland/compositor/sway/package.mk            |  5 ++---
 .../sway/patches/sway-100.01-static-ipc-socket.patch   |  2 +-
 .../patches/sway-100.02-allow-running-as-root.patch    | 10 +++++-----
 .../patches/sway-100.03-do-not-use-git-version.patch   |  4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/wayland/compositor/sway/package.mk b/packages/wayland/compositor/sway/package.mk
index 6462fdff17..cfa246a1be 100644
--- a/packages/wayland/compositor/sway/package.mk
+++ b/packages/wayland/compositor/sway/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="sway"
-PKG_VERSION="1.9"
-PKG_SHA256="b6e4e8d74af744278201792bcc4447470fcb91e15bbda475c647d475bf8e7b0b"
+PKG_VERSION="1.10"
+PKG_SHA256="3f15f8f96238d2f7a7b44dbcd132de6c81b2c06cc3b073f195f07f7105072ccf"
 PKG_LICENSE="MIT"
 PKG_SITE="https://swaywm.org/"
 PKG_URL="https://github.com/swaywm/sway/archive/${PKG_VERSION}.tar.gz"
@@ -16,7 +16,6 @@ PKG_MESON_OPTS_TARGET="-Ddefault-wallpaper=false \
                        -Dfish-completions=false \
                        -Dswaybar=true \
                        -Dswaynag=true \
-                       -Dxwayland=disabled \
                        -Dtray=disabled \
                        -Dgdk-pixbuf=enabled \
                        -Dman-pages=disabled \
diff --git a/packages/wayland/compositor/sway/patches/sway-100.01-static-ipc-socket.patch b/packages/wayland/compositor/sway/patches/sway-100.01-static-ipc-socket.patch
index cf95985129..ef259ada0e 100644
--- a/packages/wayland/compositor/sway/patches/sway-100.01-static-ipc-socket.patch
+++ b/packages/wayland/compositor/sway/patches/sway-100.01-static-ipc-socket.patch
@@ -1,6 +1,6 @@
 --- a/sway/ipc-server.c
 +++ b/sway/ipc-server.c
-@@ -140,7 +140,7 @@ struct sockaddr_un *ipc_user_sockaddr(vo
+@@ -138,7 +138,7 @@ struct sockaddr_un *ipc_user_sockaddr(vo
  		dir = "/tmp";
  	}
  	if (path_size <= snprintf(ipc_sockaddr->sun_path, path_size,
diff --git a/packages/wayland/compositor/sway/patches/sway-100.02-allow-running-as-root.patch b/packages/wayland/compositor/sway/patches/sway-100.02-allow-running-as-root.patch
index b499b6bf83..ab42ecc242 100644
--- a/packages/wayland/compositor/sway/patches/sway-100.02-allow-running-as-root.patch
+++ b/packages/wayland/compositor/sway/patches/sway-100.02-allow-running-as-root.patch
@@ -1,6 +1,6 @@
---- a/sway/main.c
+Since wayland requires XDG_RUNTIME_DIR--- a/sway/main.c
 +++ b/sway/main.c
-@@ -151,7 +151,8 @@
+@@ -112,7 +112,8 @@
  }
  
  static bool detect_suid(void) {
@@ -10,7 +10,7 @@
  		return false;
  	}
  
-@@ -309,11 +310,6 @@
+@@ -266,11 +267,6 @@
  		}
  	}
  
@@ -22,7 +22,7 @@
  	// Since wayland requires XDG_RUNTIME_DIR to be set, abort with just the
  	// clear error message (when not running as an IPC client).
  	if (!getenv("XDG_RUNTIME_DIR") && optind == argc) {
-@@ -363,6 +359,11 @@
+@@ -320,6 +316,11 @@
  		return 0;
  	}
  
@@ -31,7 +31,7 @@
 +		exit(EXIT_FAILURE);
 +	}
 +
- 	detect_proprietary(allow_unsupported_gpu);
  	increase_nofile_limit();
  
+ 	// handle SIGTERM signals
 
diff --git a/packages/wayland/compositor/sway/patches/sway-100.03-do-not-use-git-version.patch b/packages/wayland/compositor/sway/patches/sway-100.03-do-not-use-git-version.patch
index 1468a05813..ae7804e759 100644
--- a/packages/wayland/compositor/sway/patches/sway-100.03-do-not-use-git-version.patch
+++ b/packages/wayland/compositor/sway/patches/sway-100.03-do-not-use-git-version.patch
@@ -6,8 +6,8 @@
  version = '"@0@"'.format(meson.project_version())
 -git = find_program('git', native: true, required: false)
 -if git.found()
--	git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false)
--	git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
+-	git_commit = run_command([git, '--git-dir=.git', 'rev-parse', '--short', 'HEAD'], check: false)
+-	git_branch = run_command([git, '--git-dir=.git', 'rev-parse', '--abbrev-ref', 'HEAD'], check: false)
 -	if git_commit.returncode() == 0 and git_branch.returncode() == 0
 -		version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format(
 -			meson.project_version(),