testing/i3status: upgrade to 2.13

2 files changed, 88 insertions, 36 deletions

diff --git a/testing/i3status/APKBUILD b/testing/i3status/APKBUILD
index 9c583d0c9c..a83658727a 100644
--- a/testing/i3status/APKBUILD
+++ b/testing/i3status/APKBUILD
@@ -1,30 +1,32 @@
 # Contributor: k0r10n <k0r10n.dev@gmail.com>
 # Maintainer: Brian Cole <git@brianecole.com>
 pkgname=i3status
-pkgver=2.12
-pkgrel=1
+pkgver=2.13
+pkgrel=0
 pkgdesc="Generates status bar for dzen2, xmobar or similar"
 url="https://i3.zekjur.net/i3status"
 arch="all"
 license="BSD-3-Clause"
 options="!check" # No test suite
-makedepends="alsa-lib-dev asciidoc confuse-dev libnl3-dev linux-headers yajl-dev"
+makedepends="alsa-lib-dev asciidoc autoconf automake confuse-dev libnl3-dev linux-headers yajl-dev xmlto"
 subpackages="$pkgname-doc"
 source="https://i3wm.org/i3status/$pkgname-$pkgver.tar.bz2
 	musl-fix.patch
 	no-pulseaudio.patch"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
-	make HAVE_PULSE=0
+	autoreconf -vif
+	mkdir -p build && cd build
+	../configure --prefix=/usr \
+		--disable-pulseaudio
+	make
 }
 
 package() {
-	cd "$builddir"
+	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3  i3status-2.12.tar.bz2
+sha512sums="6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2  i3status-2.13.tar.bz2
 b9d853879885ac04284eb57198251d39bd00b9fae2a0bc8f5b7475a6787699f4f27e40985363efd5a52d4ceee21a4afb58c7b37778e8270b5aade7e0e13e217f  musl-fix.patch
-a681945ddde9a111d0034c68103d8966e10a9d9417ff6bd691d5c1e3d0be6b184195ded70cb5d41c0a9ab0acac2319fdbae5d7c5d87f5499f4d58606b59f54cf  no-pulseaudio.patch"
+759f8e8aba9e5b5b6d390935c440ecfab2a1aaffb92b9cc20aec80e8f0bce2f0b79119991aee349573daf55b421bc1f80a5dc69e554fd16ff7e0ddf69d24c39b  no-pulseaudio.patch"
diff --git a/testing/i3status/no-pulseaudio.patch b/testing/i3status/no-pulseaudio.patch
index 532e4ef623..863d2ad824 100644
--- a/testing/i3status/no-pulseaudio.patch
+++ b/testing/i3status/no-pulseaudio.patch
@@ -1,38 +1,88 @@
---- a/Makefile
-+++ b/Makefile
-@@ -24,7 +24,6 @@
- CFLAGS+=-Iinclude
- LIBS+=-lconfuse
- LIBS+=-lyajl
--LIBS+=-lpulse
- LIBS+=-lm
- LIBS+=-lpthread
+diff --git a/configure.ac b/configure.ac
+index a6c31d7..11caa33 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,11 +80,24 @@
+ PKG_CHECK_MODULES([CONFUSE], [libconfuse])
+ PKG_CHECK_MODULES([YAJL], [yajl])
  
-@@ -80,7 +79,14 @@
- OBJS:=$(sort $(wildcard src/*.c *.c))
- OBJS:=$(OBJS:.c=.o)
++AC_ARG_ENABLE(pulseaudio,
++  AS_HELP_STRING(
++    [--disable-pulseaudio],
++    [build without pulseaudio support]),
++  [ax_pulse=$enableval],
++  [ax_pulse=yes])
++AM_CONDITIONAL([PULSE], [test x$ax_pulse = xyes])
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [PKG_CHECK_MODULES([PULSE], [libpulse])])
++pulse_def=0
++AS_IF([test x"$ax_pulse" = x"yes"],
++      [pulse_def=1])
++AC_DEFINE_UNQUOTED([HAS_PULSEAUDIO], [$pulse_def], [Build with pulseaudio])
++
+ case $host_os in
+ 	linux*)
+ 	PKG_CHECK_MODULES([NLGENL], [libnl-genl-3.0])
+ 	PKG_CHECK_MODULES([ALSA], [alsa])
+-	PKG_CHECK_MODULES([PULSE], [libpulse])
+ 	;;
+ 	netbsd*)
+ 	AC_SEARCH_LIBS([prop_string_create], [prop])
+@@ -151,6 +164,7 @@
+ AS_HELP_STRING([enable debug flags:], [${ax_enable_debug}])
+ AS_HELP_STRING([code coverage:], [${CODE_COVERAGE_ENABLED}])
+ AS_HELP_STRING([enabled sanitizers:], [${ax_enabled_sanitizers}])
++AS_HELP_STRING([pulseaudio support:], [${ax_pulse}])
  
--ifeq ($(OS),OpenBSD)
-+ifneq ($(OS),OpenBSD)
-+HAVE_PULSE ?=1
-+endif
+ To compile, run:
+ 
+diff --git a/Makefile.am b/Makefile.am
+index bb251f0..c2c1c0a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -68,8 +68,11 @@ i3status_SOURCES = \
+ 	src/print_volume.c \
+ 	src/print_wireless_info.c \
+ 	src/print_file_contents.c \
+-	src/process_runs.c \
+-	src/pulse.c
++	src/process_runs.c
 +
-+ifeq ($(HAVE_PULSE),1)
-+LIBS+=-lpulse
-+CFLAGS+=-DHAVE_PULSE
-+else
- OBJS:=$(filter-out src/pulse.o, $(OBJS))
- LIBS:=$(filter-out -lpulse, $(LIBS))
- endif
-Only in /tmp/i3status-2.12/: Makefile.orig
++if PULSE
++i3status_SOURCES += src/pulse.c
++endif
+ 
+ dist_sysconf_DATA = \
+ 	i3status.conf
+diff --git a/i3status.c b/i3status.c
+index 0898da3..1ab8400 100644
+--- a/i3status.c
++++ b/i3status.c
+@@ -565,7 +565,13 @@ int main(int argc, char *argv[]) {
+                 return 0;
+                 break;
+             case 'v':
+-                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n");
++                printf("i3status " VERSION " © 2008 Michael Stapelberg and contributors\n"
++#if HAS_PULSEAUDIO
++                       "Built with pulseaudio support\n"
++#else
++                       "Built without pulseaudio support\n"
++#endif
++                       );
+                 return 0;
+                 break;
+             case 0:
+diff --git a/src/print_volume.c b/src/print_volume.c
+index 91e8ce2..7364d47 100644
 --- a/src/print_volume.c
 +++ b/src/print_volume.c
-@@ -61,7 +61,7 @@
+@@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
          free(instance);
      }
  
--#ifndef __OpenBSD__
-+#if defined(HAVE_PULSE)
+-#if !defined(__DragonFly__) && !defined(__OpenBSD__)
++#if HAS_PULSEAUDIO
      /* Try PulseAudio first */
  
      /* If the device name has the format "pulse[:N]" where N is the