Merge i3status bump

user/i3status: Bump to 2.13

See merge request adelie/packages!275

3 files changed, 90 insertions, 29 deletions

diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD
index 554916af7..b892fef2f 100644
--- a/user/i3status/APKBUILD
+++ b/user/i3status/APKBUILD
@@ -1,35 +1,40 @@
 # Contributor: Luis Ressel <aranea@aixah.de>
 # Maintainer: Luis Ressel <aranea@aixah.de>
 pkgname=i3status
-pkgver=2.12
+pkgver=2.13
 pkgrel=0
 pkgdesc="Status bar generator for dzen2, xmobar or similar"
 url="https://i3wm.org/i3status/"
 arch="all"
-options="!check"  # No test suite
+options="!check" # No test suite
 license="MIT"
 depends=""
-makedepends="alsa-lib-dev confuse-dev libnl3-dev pkgconf pulseaudio-dev yajl-dev"
+makedepends="alsa-lib-dev asciidoctor confuse-dev libnl3-dev pkgconf
+	pulseaudio-dev yajl-dev"
 subpackages="$pkgname-doc"
 source="$url/$pkgname-$pkgver.tar.bz2
+	asciidoctor.patch
 	glob_tilde.patch"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
-	# TODO: The setcap part can be dropped after the 2.13 release
-	sed -i -e '/^CFLAGS+=-g$/d' -e '/setcap/d' Makefile
+	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
-	make i3status
+	mkdir build
+	cd build
+
+	PATH_ASCIIDOC=/usr/bin/asciidoctor ../configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
+	make -C build DESTDIR="$pkgdir" install
 }
-
-sha512sums="687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3  i3status-2.12.tar.bz2
-2a0a85dba02b9e9962f13d4bc151fd1672f215292800d9eeff5a10bd363b74f422d3b320851f31b73062ceeded974f5b105aec914c84f78ba418312bed189aa4  glob_tilde.patch"
+sha512sums="6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2  i3status-2.13.tar.bz2
+26527b9a0053d363f2b2991f9be3a15cb5fbf5553dca9498a9cff1c1a65e887f392215b60a484e329e6ef8efd63f9b67727826fb6ccfe1033c653feef34aaab8  asciidoctor.patch
+765a5b64d79f61cd68280d77a7316e7f571a3c2e385d9a227885cde5fc057b1a892e92a65c0fc54832bfdda30743df6e9f82a847b55c9e7389575c7fbad9e0d4  glob_tilde.patch"
diff --git a/user/i3status/asciidoctor.patch b/user/i3status/asciidoctor.patch
new file mode 100644
index 000000000..575a00e1b
--- /dev/null
+++ b/user/i3status/asciidoctor.patch
@@ -0,0 +1,50 @@
+From 1821c7cd94e2424352f0fcb1f2933b368a4c381c Mon Sep 17 00:00:00 2001
+From: Luis Ressel <aranea@aixah.de>
+Date: Tue, 9 Jul 2019 13:18:43 +0200
+Subject: [PATCH] Build man pages with asciidoctor
+
+asciidoctor doesn't support the -f option. Furthermore, its docbook
+output appears to be unsuitable for xmlto, so make it generate a manpage
+directly.
+---
+ Makefile.am  | 7 ++-----
+ configure.ac | 3 ---
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bb251f0..93ef552 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,13 +11,10 @@ dist_man1_MANS = \
+ asciidoc_MANS = \
+ 	man/i3status.1
+ 
+-$(asciidoc_MANS): man/%.1: man/%.xml man/$(dirstamp)
+-	$(AM_V_GEN) out='$@'; @PATH_XMLTO@ man -o "$${out%/*}" $<
++$(asciidoc_MANS): man/%.1: man/%.man man/$(dirstamp)
++	$(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b manpage -o $@ $<
+ 	@stamp='$@'; $(MKDIR_P) "$${stamp%/*}"
+ 
+-man/%.xml: man/%.man man/asciidoc.conf man/$(dirstamp)
+-	$(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b docbook -f $(top_builddir)/man/asciidoc.conf -o $@ $<
+-
+ AM_CPPFLAGS = \
+ 	-DSYSCONFDIR="\"$(sysconfdir)\"" \
+ 	-I$(top_srcdir)/include \
+diff --git a/configure.ac b/configure.ac
+index cf9e430..78c4aa5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,9 +104,6 @@ AC_PROG_LN_S
+ AC_PATH_PROG([PATH_ASCIIDOC], [asciidoc], [no])
+ AS_IF([test x"$PATH_ASCIIDOC" = x"no"],
+       [AC_MSG_ERROR([asciidoc is required for generating man pages])])
+-AC_PATH_PROG([PATH_XMLTO], [xmlto], [no])
+-AS_IF([test x"$PATH_XMLTO" = x"no"],
+-      [AC_MSG_ERROR([xmlto is required for generating man pages])])
+ 
+ AM_PROG_AR
+ 
+-- 
+2.22.0
+
diff --git a/user/i3status/glob_tilde.patch b/user/i3status/glob_tilde.patch
index b1f2ba667..87177d78e 100644
--- a/user/i3status/glob_tilde.patch
+++ b/user/i3status/glob_tilde.patch
@@ -1,8 +1,14 @@
-diff --git i/i3status.c w/i3status.c
-index 5088c96..3c18214 100644
---- i/i3status.c
-+++ w/i3status.c
-@@ -210,29 +210,19 @@ static int valid_color(const char *value) {
+diff --git a/i3status.c b/i3status.c
+index 0898da3..f4b10fd 100644
+--- a/i3status.c
++++ b/i3status.c
+@@ -207,35 +207,23 @@ static int valid_color(const char *value) {
+ 
+ /*
+  * This function resolves ~ in pathnames.
+- * It may resolve wildcards in the first part of the path, but if no match
+- * or multiple matches are found, it just returns a copy of path as given.
++ * The syntax '~user' is not supported.
   *
   */
  static char *resolve_tilde(const char *path) {
@@ -22,19 +28,19 @@ index 5088c96..3c18214 100644
 -    } else {
 -        head = globbuf.gl_pathv[0];
 -        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1);
--        strncpy(result, head, strlen(head));
--        if (tail)
--            strncat(result, tail, strlen(tail));
+-        strcpy(result, head);
+-        if (tail) {
+-            strcat(result, tail);
 +    char *home, *result = NULL;
 +
-+    if (strncmp(path, "~/", 2) == 0) {
++    if (path[0] == '~' && (path[1] == '/' || path[1] == '\0')) {
 +        home = getenv("HOME");
 +        if (home != NULL) {
 +            result = scalloc(strlen(home) + strlen(path));
 +            strcpy(result, home);
-+            strcat(result, path+1);
++            strcat(result, path + 1);
 +            return result;
-+        }
+         }
      }
 -    globfree(&globbuf);
  
@@ -43,11 +49,11 @@ index 5088c96..3c18214 100644
  }
  
  static char *get_config_path(void) {
-diff --git i/include/i3status.h w/include/i3status.h
-index 9ac471d..27ecae4 100644
---- i/include/i3status.h
-+++ w/include/i3status.h
-@@ -236,4 +236,9 @@ extern cfg_t *cfg, *cfg_general, *cfg_section;
+diff --git a/include/i3status.h b/include/i3status.h
+index 217376a..34e44a0 100644
+--- a/include/i3status.h
++++ b/include/i3status.h
+@@ -241,4 +241,9 @@ extern cfg_t *cfg, *cfg_general, *cfg_section;
  extern void **cur_instance;
  
  extern pthread_t main_thread;