aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-08-17 20:36:13 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-08-17 20:36:17 -0300
commit44b733238227a81195743e7ca9cb1ed66ca0c878 (patch)
tree742e8525b47b20d0563d36d49ee5a6cdfa134fcb
parent09ce1a04cf3b82ff6d8299ac0f84246f8684ad0f (diff)
downloadaports-44b733238227a81195743e7ca9cb1ed66ca0c878.tar.gz
aports-44b733238227a81195743e7ca9cb1ed66ca0c878.tar.bz2
aports-44b733238227a81195743e7ca9cb1ed66ca0c878.tar.xz
testing/alttab: upgrade to 1.5.0
-rw-r--r--testing/alttab/0001-Fix-memleaks-in-error-case.patch41
-rw-r--r--testing/alttab/0002-Remove-check-around-free.patch27
-rw-r--r--testing/alttab/APKBUILD10
3 files changed, 3 insertions, 75 deletions
diff --git a/testing/alttab/0001-Fix-memleaks-in-error-case.patch b/testing/alttab/0001-Fix-memleaks-in-error-case.patch
deleted file mode 100644
index 730e0fff54..0000000000
--- a/testing/alttab/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
---- 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
deleted file mode 100644
index a3f26b3b90..0000000000
--- a/testing/alttab/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
---- 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 ff90e2938b..fd8f9408cc 100644
--- a/testing/alttab/APKBUILD
+++ b/testing/alttab/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Alexander Kulak <sa-dev@rainbow.by>
# Maintainer: Alexander Kulak <sa-dev@rainbow.by>
pkgname=alttab
-pkgver=1.4.0
+pkgver=1.5.0
pkgrel=0
pkgdesc="X11 window switcher designed for minimalistic window managers"
url="https://github.com/sagb/alttab"
@@ -9,11 +9,9 @@ options="!check"
arch="all"
license="GPL-3.0-or-later"
makedepends="libx11-dev libxft-dev fts-dev libxrender-dev libxrandr-dev
- libpng-dev uthash-dev"
+ libpng-dev uthash-dev libxpm-dev"
subpackages="$pkgname-doc"
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() {
@@ -36,6 +34,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="263625e4dfabcb697fdf38b330fd7e179a36e5c1111fe8a2aa98a6eb1434c8ff20400f0317845bd5a0f0454baf6b59369ab25270953690f544d0923fc4deab3b alttab-1.4.0.tar.gz
-7368b0706ccca5ae70cb050912be06b718a9727f3460abd5f349834f16f0d45a643e3f0914875a0aaa5d275d55d10953b302eb1d0891e179a3ecf62fdd34fbd7 0001-Fix-memleaks-in-error-case.patch
-d69d5b9d90d84cc8c7f54ba7132602ab4e3ed8b0bdcf3ff07cc317f093c925855dfd15f883809e710fb0cbfebcf05dbcdca58e69842e050ef7ad6dc903a52c1b 0002-Remove-check-around-free.patch"
+sha512sums="4113ef7f72a667dce4c4315f47a6588750288127d223e54868627a1233e520e2e44808a08204685f069ad6ec3048cacd840b575a81503e3cfacbbddf6796765f alttab-1.5.0.tar.gz"