From a3fe27a363b1840a2f5ffa5580a13ca14ce596ee Mon Sep 17 00:00:00 2001
From: Ermine <mustela@erminea.space>
Date: Fri, 30 Aug 2024 10:41:35 +0000
Subject: user/xscope: upgrade to 1.4.4

---
 user/xscope/APKBUILD             |  9 +++------
 user/xscope/disable-xtrans.patch | 31 -------------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 user/xscope/disable-xtrans.patch

(limited to 'user')

diff --git a/user/xscope/APKBUILD b/user/xscope/APKBUILD
index 3d0013081..a7e5a5dd0 100644
--- a/user/xscope/APKBUILD
+++ b/user/xscope/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=xscope
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=0
 pkgdesc="Monitor communication between an X11 client and server"
 url="https://www.X.Org/"
@@ -10,9 +10,7 @@ license="X11"
 depends=""
 makedepends="util-macros xorgproto-dev"
 subpackages="$pkgname-doc"
-source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz
-	disable-xtrans.patch
-	"
+source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.xz"
 
 build() {
 	./configure \
@@ -33,5 +31,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="588a3668d07cc42fd44dc9cea55cd31bc67bfeddf3d07b0b0a39202304b2502dc322ff3bf5310eb689622485390fa8851ffe68b672c9b13742b9ab89d9495327  xscope-1.4.3.tar.xz
-2816a136d874af7e0b0892e601c8cf556f46d75d6c39e3411bfcbcf8ef5432c8413c14dd1e68b3be7ba27d221c73c473d0fd6d23eaded98bfb2633b665409b96  disable-xtrans.patch"
+sha512sums="3a9fe1e58fa7671a91a2364d7b50cf005c9b1aac18b958e8356d5733e0758534d0974c6b982935270f17277224d4efe9b2e4553f45fdb7b3aab0cbf059a8b843  xscope-1.4.4.tar.xz"
diff --git a/user/xscope/disable-xtrans.patch b/user/xscope/disable-xtrans.patch
deleted file mode 100644
index ebc44ca66..000000000
--- a/user/xscope/disable-xtrans.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4e297db3cf54a629a2c8f38b068cd4f8434afa4c Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 13 Jul 2022 15:51:58 -0700
-Subject: [PATCH] fd.h: fix build when not building with xtrans
-
-Always include <X11/Xfuncproto.h> for the definition of _X_NORETURN,
-instead of relying on Xtrans.h to include it indirectly for us.
-
-Fixes: #2
-Fixes: commit cc298d1f559240976344588f9f765ee60ca3d6f3
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
- fd.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/fd.h b/fd.h
-index c317aa4..55c5b01 100644
---- a/fd.h
-+++ b/fd.h
-@@ -65,6 +65,7 @@
- typedef void *XtransConnInfo;
- #endif
- #include <sys/select.h>
-+#include <X11/Xfuncproto.h>
- 
- typedef int FD;
- 
--- 
-GitLab
-
-- 
cgit v1.2.3-70-g09d2