Subject: [PATCH 1/5] testing/oksh: fix oksh.post-upgrade

From: Alex Raschi <[email-masked]>
Date: Wed, 2 Dec 2020 15:03:55 +0100

---
 testing/oksh/APKBUILD          | 2 +-
 testing/oksh/oksh.post-upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 120000 testing/oksh/oksh.post-upgrade

diff --git a/testing/oksh/APKBUILD b/testing/oksh/APKBUILD
index 3b2f3d22cb..89e199c865 100644
--- a/testing/oksh/APKBUILD
+++ b/testing/oksh/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Matthew T Hoare <[email-masked]>
 pkgname=oksh
 pkgver=6.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Portable OpenBSD ksh, based on the Public Domain KornShell (pdksh)"
 url="https://github.com/ibara/oksh"
 arch="all"
diff --git a/testing/oksh/oksh.post-upgrade b/testing/oksh/oksh.post-upgrade
deleted file mode 100644
index c5b5707c7b..0000000000
--- a/testing/oksh/oksh.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-oksh.post-install
diff --git a/testing/oksh/oksh.post-upgrade b/testing/oksh/oksh.post-upgrade
new file mode 120000
index 0000000000..7a39668577
--- /dev/null
+++ b/testing/oksh/oksh.post-upgrade
@@ -0,0 +1 @@
+oksh.post-install
\ No newline at end of file
-- 
2.29.2

---

From: Alex Raschi <[email-masked]>
Date: Wed, 2 Dec 2020 15:03:56 +0100

---
 testing/nomacs/APKBUILD | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/testing/nomacs/APKBUILD b/testing/nomacs/APKBUILD
index 8fff7611c7..f937c0c28a 100644
--- a/testing/nomacs/APKBUILD
+++ b/testing/nomacs/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Alex Raschi <[email-masked]>
 pkgname=nomacs
-pkgver=3.14.2
+pkgver=3.16.224
 pkgrel=0
 pkgdesc="Small and fast Qt image viewer"
 url="https://nomacs.org/"
@@ -12,6 +12,10 @@ makedepends="cmake
 	qt5-qttools-dev
 	qt5-qtsvg-dev
 	exiv2-dev
+	libraw-dev
+	opencv
+	opencv-dev
+	tiff-dev
 	quazip-dev
 	libwebp-dev
 	lcov
@@ -26,15 +30,12 @@ build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake \
+	cmake -Wno-dev \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_SHARED_LIBS=True \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DENABLE_OPENCV=False \
-		-DENABLE_RAW=False \
-		-DENABLE_TIFF=False \
 		-DENABLE_QT_DEBUG=False \
 		-DENABLE_TRANSLATIONS=True \
 		-DENABLE_PLUGINS=False \
@@ -54,7 +55,8 @@ lang() {
 
 	mkdir -p "$subpkgdir"/"$langdir"
 	mv "$pkgdir"/"$langdir"/* "$subpkgdir"/"$langdir"/
+	rmdir "$pkgdir"/"$langdir"
 }
 
-sha512sums="58104c85078bdbff7f65625658bb01b152631470eea93a43494eed55ae5e2441b7bcf3ed6c8f1aef07831bc99c80af94467fcc0e15dc1d282ef313bfcb3c81e9  nomacs-3.14.2.tar.gz
+sha512sums="7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257  nomacs-3.16.224.tar.gz
 1530398feaa341687fd5e0117507b2262d46deb3052988e97156beee81d9611c8035be03ab616868a2dcff93fa5e82279f6a73af7edc70630451cfa28f9a4765  fix-std-cout.patch"
-- 
2.29.2

---

From: Alex Raschi <[email-masked]>
Date: Wed, 2 Dec 2020 15:03:57 +0100

---
 community/xdm/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/community/xdm/APKBUILD b/community/xdm/APKBUILD
index 939363eb33..f1d9ad643c 100644
--- a/community/xdm/APKBUILD
+++ b/community/xdm/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Johannes Matheis <[email-masked]>
 pkgname=xdm
 pkgver=1.1.12
-pkgrel=2
+pkgrel=3
 pkgdesc="X Display Manager"
 options="!check" # No testsuite
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="MIT"
 depends="sessreg"
-makedepends="linux-pam-dev libxmu-dev libxaw-dev"
+makedepends="linux-pam-dev libxmu-dev libxaw-dev libxft-dev libxinerama-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="
 	$url/releases/individual/app/$pkgname-$pkgver.tar.bz2
-- 
2.29.2

---

From: Alex Raschi <[email-masked]>
Date: Wed, 2 Dec 2020 15:03:58 +0100

https://github.com/fcambus/spleen
Spleen is a monospaced bitmap font for consoles and terminals
---
 testing/font-spleen/APKBUILD | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 testing/font-spleen/APKBUILD

diff --git a/testing/font-spleen/APKBUILD b/testing/font-spleen/APKBUILD
new file mode 100644
index 0000000000..60f813ed07
--- /dev/null
+++ b/testing/font-spleen/APKBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Alex Raschi <[email-masked]>
+_pkgname=spleen
+pkgname=font-$_pkgname
+pkgver=1.8.2
+pkgrel=0
+pkgdesc="Spleen is a monospaced bitmap font for consoles and terminals"
+url="https://github.com/fcambus/$_pkgname"
+arch="noarch"
+license="BSD-2-Clause"
+subpackages="$pkgname-doc"
+options="!check" # no test suite
+source="$url/releases/download/$pkgver/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+package() {
+	local fonts="$pkgdir"/usr/share/fonts/"$_pkgname"
+	local consolefonts="$pkgdir"/usr/share/consolefonts
+	local doc="$pkgdir"/usr/share/doc/"$_pkgname"
+
+	gzip -9 *.pcf *.psfu
+	install -d "$fonts" "$consolefonts" "$doc"
+	install -m 644 -t "$fonts" fonts.alias *.pcf.gz *.otf
+	install -m 644 -t "$consolefonts" *.psfu.gz
+	install -m 644 -t "$doc" README.md
+}
+
+sha512sums="13858adcaefcc7f8f075110e7720ed48a4498d1e32d43039dbb1f2a197b9ec94bd3b2e16256f6aaf0ebbfce42e4fd80fae092f33251484d5d29f5bb7b9b2fbd3  spleen-1.8.2.tar.gz"
-- 
2.29.2

---

From: Alex Raschi <[email-masked]>
Date: Wed, 2 Dec 2020 15:03:59 +0100

---
 testing/b2sum/APKBUILD  | 2 +-
 testing/neatvi/APKBUILD | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/b2sum/APKBUILD b/testing/b2sum/APKBUILD
index 0097c45e84..8407657d96 100644
--- a/testing/b2sum/APKBUILD
+++ b/testing/b2sum/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Alex Raschi <[email-masked]>
+# Maintainer:
 pkgname=b2sum
 _pkgname=BLAKE2
 pkgver=20190729
diff --git a/testing/neatvi/APKBUILD b/testing/neatvi/APKBUILD
index 739ea78008..36e13841b9 100644
--- a/testing/neatvi/APKBUILD
+++ b/testing/neatvi/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Alex Raschi <[email-masked]>
+# Maintainer:
 pkgname=neatvi
 pkgver=08
 pkgrel=0
-- 
2.29.2