testing/alttab: upgrade to 1.4.0

3 files changed, 85 insertions, 12 deletions

diff --git a/testing/alttab/0001-Fix-memleaks-in-error-case.patch b/testing/alttab/0001-Fix-memleaks-in-error-case.patch
new file mode 100644
index 00000000000..730e0fff54c
--- /dev/null
+++ b/testing/alttab/0001-Fix-memleaks-in-error-case.patch
@@ -0,0 +1,41 @@
+From 980bdef0fde36772e283e36a7e12ce28ff1901aa Mon Sep 17 00:00:00 2001
+From: Michael Vetter <jubalh@iodoru.org>
+Date: Thu, 3 Oct 2019 17:25:19 +0200
+Subject: [PATCH] Fix memleaks in error case
+
+We should free img.data.
+---
+ src/pngd.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/pngd.c b/src/pngd.c
+index ef46621..fb3fd25 100644
+--- a/src/pngd.c
++++ b/src/pngd.c
+@@ -250,6 +250,7 @@ int pngReadToDrawable(char *pngpath, Drawable d, uint8_t bg_red,
+     fclose(infile);
+     if (!img.data || img.width == 0 || img.height == 0) {
+         fprintf(stderr, "error loading png data\n");
++        pngFree(&img);
+         return 0;
+     }
+     if (debug > 0)
+@@ -259,6 +260,7 @@ int pngReadToDrawable(char *pngpath, Drawable d, uint8_t bg_red,
+     pad = 32;
+     if (!xdata) {
+         fprintf(stderr, "xdata malloc error\n");
++        pngFree(&img);
+         return 0;
+     }
+     ximage =
+@@ -267,6 +269,7 @@ int pngReadToDrawable(char *pngpath, Drawable d, uint8_t bg_red,
+     if (!ximage) {
+         fprintf(stderr, "error creating ximage\n");
+         free(xdata);
++        pngFree(&img);
+         return 0;
+     }
+     ximage->byte_order = MSBFirst;
+-- 
+2.24.0
+
diff --git a/testing/alttab/0002-Remove-check-around-free.patch b/testing/alttab/0002-Remove-check-around-free.patch
new file mode 100644
index 00000000000..a3f26b3b905
--- /dev/null
+++ b/testing/alttab/0002-Remove-check-around-free.patch
@@ -0,0 +1,27 @@
+From f7e8ff30190a3134863d7ff03becc2e397ec9db0 Mon Sep 17 00:00:00 2001
+From: Michael Vetter <jubalh@iodoru.org>
+Date: Thu, 3 Oct 2019 17:20:40 +0200
+Subject: [PATCH] Remove check around free()
+
+free(NULL) is noop. We don't need to check for this.
+---
+ src/randr.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/randr.c b/src/randr.c
+index e4ebe9d..0622c73 100644
+--- a/src/randr.c
++++ b/src/randr.c
+@@ -186,8 +186,7 @@ bool randrGetViewport(quad * res, bool * multihead)
+     if (no < 1) {
+         msg(0, "randr didn't detect any output\n");
+         *multihead = false;
+-        if (oq != NULL)
+-            free(oq);
++        free(oq);
+         return false;
+     }
+     if (no == 1) {
+-- 
+2.24.0
+
diff --git a/testing/alttab/APKBUILD b/testing/alttab/APKBUILD
index b61a7ffd39d..ff90e2938bf 100644
--- a/testing/alttab/APKBUILD
+++ b/testing/alttab/APKBUILD
@@ -1,23 +1,27 @@
 # Contributor: Alexander Kulak <sa-dev@rainbow.by>
 # Maintainer: Alexander Kulak <sa-dev@rainbow.by>
 pkgname=alttab
-pkgver=1.1.0.57
+pkgver=1.4.0
 pkgrel=0
-pkgdesc="X11 window switcher designed for minimalistic window managers or standalone X11 session"
+pkgdesc="X11 window switcher designed for minimalistic window managers"
 url="https://github.com/sagb/alttab"
+options="!check"
 arch="all"
 license="GPL-3.0-or-later"
-depends="libx11 libxft libxrender libpng fts"
-makedepends="libx11-dev libxft-dev uthash-dev libxrender-dev libpng-dev fts-dev"
-install=""
+makedepends="libx11-dev libxft-dev fts-dev libxrender-dev libxrandr-dev
+	libpng-dev uthash-dev"
 subpackages="$pkgname-doc"
-source="${pkgname}-${pkgver}.tar.gz::https://api.github.com/repos/sagb/alttab/tarball/0c14ea2080c5603fbebe9cbca3f198fabb30d2d9"
-builddir="$srcdir/sagb-alttab-0c14ea2"
-options="!check"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sagb/alttab/archive/v$pkgver.tar.gz
+	0001-Fix-memleaks-in-error-case.patch
+	0002-Remove-check-around-free.patch
+	"
+
+prepare() {
+	default_prepare
+	./bootstrap.sh
+}
 
 build() {
-	cd "$builddir" && \
-	./bootstrap.sh && \
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,8 +33,9 @@ build() {
 }
 
 package() {
-	cd "$builddir" && \
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6dd6cc8b28eb05e5148854304e75de31e5975aff213d70d67d12fa3d935639cde6dd57a032690495f603baeea50a7fa057651b672e4d9aa7d602b4ac8f50b3c6  alttab-1.1.0.57.tar.gz"
+sha512sums="263625e4dfabcb697fdf38b330fd7e179a36e5c1111fe8a2aa98a6eb1434c8ff20400f0317845bd5a0f0454baf6b59369ab25270953690f544d0923fc4deab3b  alttab-1.4.0.tar.gz
+7368b0706ccca5ae70cb050912be06b718a9727f3460abd5f349834f16f0d45a643e3f0914875a0aaa5d275d55d10953b302eb1d0891e179a3ecf62fdd34fbd7  0001-Fix-memleaks-in-error-case.patch
+d69d5b9d90d84cc8c7f54ba7132602ab4e3ed8b0bdcf3ff07cc317f093c925855dfd15f883809e710fb0cbfebcf05dbcdca58e69842e050ef7ad6dc903a52c1b  0002-Remove-check-around-free.patch"