From: Pranjal Kole <pranjal.kole7@gmail.com>
To: ~alpine/aports@lists.alpinelinux.org
Cc: Pranjal Kole <pranjal.kole7@gmail.com>
Subject: [PATCH] community/imv: upgrade to 4.3.1
Date: Wed, 15 Dec 2021 12:58:39 +0530
Message-Id: <20211215072839.11466-1-pranjal.kole7@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

---
 community/imv/APKBUILD             | 12 ++++--------
 community/imv/fix-imv-folder.patch | 29 -----------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 community/imv/fix-imv-folder.patch

diff --git a/community/imv/APKBUILD b/community/imv/APKBUILD
index 275a9ab4..2132e719 100644
--- a/community/imv/APKBUILD
+++ b/community/imv/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=imv
-pkgver=4.3.0
-pkgrel=2
+pkgver=4.3.1
+pkgrel=0
 pkgdesc="Image viewer for X11/Wayland"
 url="https://sr.ht/~exec64/imv"
 # s390x, mips64 and riscv64 blocked by librsvg
@@ -26,10 +26,7 @@ checkdepends="
 	cmocka-dev
 	"
 subpackages="$pkgname-doc"
-# TODO: drop patch after next release
-source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~exec64/imv/archive/v$pkgver.tar.gz
-	fix-imv-folder.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~exec64/imv/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-v$pkgver"
 
 build() {
@@ -57,6 +54,5 @@ package() {
 }
 
 sha512sums="
-21d69abc9d0b9ed6ae69b3158fdee159a51f4bd90dfc4789a96036dd797ff720785763c5f037f5689eb40a7d4694c02416c5120503b665e7b2c1ee9a4cc430c0  imv-4.3.0.tar.gz
-edab6db31201278db463205338ac6114ab593a36a7afd2db73f6b7e0660fa327444dba2b73ed0b77b2ba196e79b628545ad2c1ad29c253ce7fac43c7ea3bfc9d  fix-imv-folder.patch
+f70b95f3f99d7d6a9276370650cef0885938464e3a40ab1768231292ba35d9040f7196a5853ea1268fe6d47cf08d129b3fbae1ca215df96d12ccd85b7efd1ee6  imv-4.3.1.tar.gz
 "
diff --git a/community/imv/fix-imv-folder.patch b/community/imv/fix-imv-folder.patch
deleted file mode 100644
index 963174f1..00000000
--- a/community/imv/fix-imv-folder.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From daea88c572d8ef1d92b29ecf622eb11c138ab550 Mon Sep 17 00:00:00 2001
-From: Maxim Karasev <begs@disroot.org>
-Date: Wed, 8 Sep 2021 20:56:41 +0300
-Subject: [PATCH] Simplify imv-folder script
-
-This changes make it more portable by removing bash dependency and not
-using GNU-specific 'sort' syntax. Also this fixes issue with selected
-image not being displayed first.
----
- contrib/imv-folder | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/contrib/imv-folder b/contrib/imv-folder
-index 33ea051..d9fb46f 100755
---- a/contrib/imv-folder
-+++ b/contrib/imv-folder
-@@ -1,10 +1,2 @@
--#!/bin/bash
--image="$1"
--declare -a ARGS order
--readarray -t -d '' order < <(printf '%s\0' "$(dirname "$image")"/* | sort -z --sort=version)
--for a in "${order[@]}"; do
--	if [ -f "$a" ]; then
--		ARGS+=("$a")
--	fi
--done
--exec imv "${ARGS[@]}" -n "$image"
-+#!/bin/sh
-+exec imv -n "$1" "$(dirname "$1")"
-- 
2.34.1