From 1fa964b1495bf096716f85fd8641ee23f28edb86 Mon Sep 17 00:00:00 2001
From: John Vogel <jvogel4@stny.rr.com>
Date: Wed, 11 Oct 2023 09:32:46 -0400
Subject: local/xlsw: pull in upstream changes, fix build

---
 ...roper-type-for-the-return-value-of-getopt.patch | 25 ++++++++++++++++++++++
 xlsw/0002-Pass-tags-to-git-describe.patch          | 23 ++++++++++++++++++++
 ...file-use-explicit-target-for-final-binary.patch | 25 ++++++++++++++++++++++
 xlsw/APKBUILD                                      | 11 ++++++++--
 4 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 xlsw/0001-Use-the-proper-type-for-the-return-value-of-getopt.patch
 create mode 100644 xlsw/0002-Pass-tags-to-git-describe.patch
 create mode 100644 xlsw/0003-Makefile-use-explicit-target-for-final-binary.patch

(limited to 'xlsw')

diff --git a/xlsw/0001-Use-the-proper-type-for-the-return-value-of-getopt.patch b/xlsw/0001-Use-the-proper-type-for-the-return-value-of-getopt.patch
new file mode 100644
index 0000000..57776d4
--- /dev/null
+++ b/xlsw/0001-Use-the-proper-type-for-the-return-value-of-getopt.patch
@@ -0,0 +1,25 @@
+From 41e5323c895f613a62b9e5b2ab1b7e85ddd793ec Mon Sep 17 00:00:00 2001
+From: Bastien Dejean <nihilhill@gmail.com>
+Date: Tue, 12 Apr 2016 10:43:08 +0200
+Subject: [PATCH 1/3] Use the proper type for the return value of getopt
+
+---
+ xlsw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xlsw.c b/xlsw.c
+index 174b82c..cb90133 100644
+--- a/xlsw.c
++++ b/xlsw.c
+@@ -13,7 +13,7 @@
+ int main(int argc, char *argv[])
+ {
+     recursive = false;
+-    char opt;
++    int opt;
+ 
+     while ((opt = getopt(argc, argv, "hvr")) != -1) {
+         switch (opt) {
+-- 
+2.42.0
+
diff --git a/xlsw/0002-Pass-tags-to-git-describe.patch b/xlsw/0002-Pass-tags-to-git-describe.patch
new file mode 100644
index 0000000..61e598a
--- /dev/null
+++ b/xlsw/0002-Pass-tags-to-git-describe.patch
@@ -0,0 +1,23 @@
+From d025c6d96bed162b5199653ea7df491c823aa0a0 Mon Sep 17 00:00:00 2001
+From: Bastien Dejean <nihilhill@gmail.com>
+Date: Mon, 26 Aug 2019 17:18:05 +0200
+Subject: [PATCH 2/3] Pass `--tags` to `git describe`
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 17a5b57..a091d66 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ OUT = xlsw
+-VERCMD  ?= git describe 2> /dev/null
++VERCMD  ?= git describe --tags 2> /dev/null
+ VERSION := $(shell $(VERCMD) || cat VERSION)
+ 
+ CPPFLAGS += -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
+-- 
+2.42.0
+
diff --git a/xlsw/0003-Makefile-use-explicit-target-for-final-binary.patch b/xlsw/0003-Makefile-use-explicit-target-for-final-binary.patch
new file mode 100644
index 0000000..e716153
--- /dev/null
+++ b/xlsw/0003-Makefile-use-explicit-target-for-final-binary.patch
@@ -0,0 +1,25 @@
+From b7205540bf89c366fe1b03ab9637b7dd01f03488 Mon Sep 17 00:00:00 2001
+From: John Vogel <jvogel4@stny.rr.com>
+Date: Wed, 11 Oct 2023 09:28:58 -0400
+Subject: [PATCH 3/3] Makefile: use explicit target for final binary
+
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index a091d66..b9b0017 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,6 +19,8 @@ debug: $(OUT)
+ 
+ include Sourcedeps
+ 
++$(OUT): $(OBJ)
++
+ $(OBJ): Makefile
+ 
+ install:
+-- 
+2.42.0
+
diff --git a/xlsw/APKBUILD b/xlsw/APKBUILD
index 510a54f..35e17ca 100644
--- a/xlsw/APKBUILD
+++ b/xlsw/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: John Vogel <jvogel4@stny.rr.com>
 pkgname=xlsw
 pkgver=0.2.3
-pkgrel=0
+pkgrel=1
 pkgdesc="List the X window tree contents"
 url="https://github.com/baskerville/xlsw/"
 arch="all"
@@ -10,7 +10,11 @@ license="Unlicense"
 makedepends="libxcb-dev xcb-util-dev xcb-util-wm-dev"
 options="!check"
 subpackages=""
-source="https://github.com/baskerville/xlsw/archive/$pkgver/xlsw-$pkgver.tar.gz"
+source="https://github.com/baskerville/xlsw/archive/$pkgver/xlsw-$pkgver.tar.gz
+	0001-Use-the-proper-type-for-the-return-value-of-getopt.patch
+	0002-Pass-tags-to-git-describe.patch
+	0003-Makefile-use-explicit-target-for-final-binary.patch
+	"
 builddir="$srcdir/xlsw-$pkgver"
 
 build() {
@@ -23,4 +27,7 @@ package() {
 
 sha512sums="
 f9976df9715b091ed82a99252c390196edbf306852ffa20a12ba63c35efdabf63593a3fad7c672a6ed0e9f447ff6c9b076f73d7013bf4c8c454481f117d8925f  xlsw-0.2.3.tar.gz
+58d76707f2a6c8bd5a790787291d0f1b5ee80df9256c4ce739ab394c0bb661f79764c4a614ec5d2f53cb18bbc14606d849686529940b5584c725f103f81765c3  0001-Use-the-proper-type-for-the-return-value-of-getopt.patch
+8422daf8e50ce21e2b25eb308064d736ef479bf2ac10f452b51ca6f9b6e9d0e81fee0e0cbaa270dc716177582c7b5d4a79ae35ed6467cc433f5ccf4a24146a60  0002-Pass-tags-to-git-describe.patch
+dec2533049fe974b52d60e950b7be4b1d00f89ca0f55f1d898120e5b9b06e5e01b027388f86dcffc30a6dfc99d86853e7368ae8fcc7843ab3680ebd6de83987a  0003-Makefile-use-explicit-target-for-final-binary.patch
 "
-- 
cgit v1.2.3