From 955cd643054e8725b94f0ae506efa552263d4c21 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Thu, 30 Dec 2021 23:43:44 +0100
Subject: community/imv: move imv-wayland and imv-x11 to /usr/libexec

---
 community/imv/APKBUILD                             |  9 ++++---
 .../imv/move-wayland-and-x11-to-libexec.patch      | 29 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 community/imv/move-wayland-and-x11-to-libexec.patch

diff --git a/community/imv/APKBUILD b/community/imv/APKBUILD
index de6dba5da30..1958f90a926 100644
--- a/community/imv/APKBUILD
+++ b/community/imv/APKBUILD
@@ -26,7 +26,9 @@ checkdepends="
 	cmocka-dev
 	"
 subpackages="$pkgname-doc $pkgname-wayland $pkgname-x11"
-source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~exec64/imv/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~exec64/imv/archive/v$pkgver.tar.gz
+	move-wayland-and-x11-to-libexec.patch
+	"
 builddir="$srcdir/$pkgname-v$pkgver"
 
 build() {
@@ -58,7 +60,7 @@ wayland() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 	install_if="$pkgname=$pkgver-r$pkgrel wayland-libs-server"
 
-	amove usr/bin/imv-wayland
+	amove usr/libexec/imv-wayland
 }
 
 x11() {
@@ -66,9 +68,10 @@ x11() {
 	depends="$pkgname=$pkgver-r$pkgrel"
 	install_if="$pkgname=$pkgver-r$pkgrel libx11"
 
-	amove usr/bin/imv-x11
+	amove usr/libexec/imv-x11
 }
 
 sha512sums="
 f70b95f3f99d7d6a9276370650cef0885938464e3a40ab1768231292ba35d9040f7196a5853ea1268fe6d47cf08d129b3fbae1ca215df96d12ccd85b7efd1ee6  imv-4.3.1.tar.gz
+e14260a79083393a5e81933adafe654892d6fc9e33f18eb906e9bcccc4227a9862851e234a0f14b457e87b8a9a7de71168d8b4fa18677b83105ab24bf3dcc60f  move-wayland-and-x11-to-libexec.patch
 "
diff --git a/community/imv/move-wayland-and-x11-to-libexec.patch b/community/imv/move-wayland-and-x11-to-libexec.patch
new file mode 100644
index 00000000000..064ccba8f37
--- /dev/null
+++ b/community/imv/move-wayland-and-x11-to-libexec.patch
@@ -0,0 +1,29 @@
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Thu, 30 Dec 2021 23:36:48 +0100
+Subject: [PATCH] Move imv-wayland and imv-x11 to /usr/libexec
+
+These bins are normally not executed directly, but by /usr/bin/imv script.
+Avoid polluting PATH.
+
+--- a/files/imv
++++ b/files/imv
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ if [ -n "${WAYLAND_DISPLAY}" ]; then
+-  exec imv-wayland "$@"
++  exec /usr/libexec/imv-wayland "$@"
+ else
+-  exec imv-x11 "$@"
++  exec /usr/libexec/imv-x11 "$@"
+ fi
+--- a/meson.build
++++ b/meson.build
+@@ -152,7 +152,7 @@
+       [get_variable('files_' + ws), files_imv],
+       dependencies: [deps_for_imv, get_variable('deps_for_' + ws)],
+       install: true,
+-      install_dir: get_option('bindir'),
++      install_dir: get_option('libexecdir'),
+     )
+   endif
+ endforeach
-- 
cgit v1.2.3