From 6ba65abb4b8a33287e090affd756e600294b678b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 19 Aug 2020 00:58:49 +0200
Subject: [PATCH] alttab: update to 1.5.0.

---
 .../0001-Fix-memleaks-in-error-case.patch     | 41 -------------------
 .../0002-Remove-check-around-free.patch       | 27 ------------
 srcpkgs/alttab/template                       |  8 ++--
 3 files changed, 4 insertions(+), 72 deletions(-)
 delete mode 100644 srcpkgs/alttab/patches/0001-Fix-memleaks-in-error-case.patch
 delete mode 100644 srcpkgs/alttab/patches/0002-Remove-check-around-free.patch

diff --git a/srcpkgs/alttab/patches/0001-Fix-memleaks-in-error-case.patch b/srcpkgs/alttab/patches/0001-Fix-memleaks-in-error-case.patch
deleted file mode 100644
index 23f8e4f2755..00000000000
--- a/srcpkgs/alttab/patches/0001-Fix-memleaks-in-error-case.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
---- src/pngd.c
-+++ 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/srcpkgs/alttab/patches/0002-Remove-check-around-free.patch b/srcpkgs/alttab/patches/0002-Remove-check-around-free.patch
deleted file mode 100644
index 8f76fd7dfab..00000000000
--- a/srcpkgs/alttab/patches/0002-Remove-check-around-free.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
---- src/randr.c
-+++ 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/srcpkgs/alttab/template b/srcpkgs/alttab/template
index 591aad4a213..e17903fff24 100644
--- a/srcpkgs/alttab/template
+++ b/srcpkgs/alttab/template
@@ -1,17 +1,17 @@
 # Template file for 'alttab'
 pkgname=alttab
-version=1.4.0
-revision=2
+version=1.5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXft-devel libXmu-devel libXrandr-devel
- libXrender-devel libpng-devel uthash"
+ libXrender-devel libpng-devel libXpm-devel uthash"
 short_desc="Task switcher for minimalistic window managers"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/sagb/alttab"
 distfiles="https://github.com/sagb/alttab/archive/v${version}.tar.gz"
-checksum=f0d3e7b92fd1641251f9e8669970ff922d18752663f2456424373f9b2a78aa0a
+checksum=d170425a34d1a92cf0eb5ba7306bf77729a6c04f211593cc5fdd8a0ab583a280
 
 case "$XBPS_TARGET_MACHINE" in
 *-musl)