community/docker/APKBUILD

@@ -109,7 +109,7 @@ build() {
 	export GOBIN="$GOPATH/bin"
 	export PATH="$GOBIN:$PATH"
 	# go-md2man package installs go-md2man, but this looks for md2man
-	if ! command -v md2man &> /dev/null; then
+	if ! command -v md2man >/dev/null 2>&1; then
 		mkdir -p /tmp/bin
 		ln -sf /usr/bin/go-md2man /tmp/bin/md2man
 		export PATH="/tmp/bin:$PATH"

community/ezstream/APKBUILD

@@ -9,7 +9,7 @@ arch="all"
 license="GPL-2.0"
 makedepends="libshout-dev libxml2-dev libvorbis-dev check-dev taglib-dev bsd-compat-headers"
 subpackages="$pkgname-doc"
-source="http://downloads.xiph.org/releases/ezstream/ezstream-$pkgver.tar.gz"
+source="https://downloads.xiph.org/releases/ezstream/ezstream-$pkgver.tar.gz"
 
 build() {
 	./configure \

community/libao/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libao
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Cross-platform audio output library and plugins"
-url="http://www.xiph.org/ao"
+url="https://www.xiph.org/ao"
 arch="all"
 options="!check"  # No test suite.
 license="GPL-2.0-or-later"
@@ -31,15 +31,15 @@ build() {
 		--disable-esd \
 		--disable-arts \
 		--enable-alsa-mmap \
-                --enable-pulse
+		--enable-pulse
 	make
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
 
-        # No need for the liboss plugin
-        rm -f "$pkgdir"/usr/lib/ao/plugins-4/liboss.so
+	# No need for the liboss plugin
+	rm -f "$pkgdir"/usr/lib/ao/plugins-4/liboss.so
 }
 
 pulse() {

community/tio/APKBUILD

 # Contributor: Sodface <sod@sodface.com>
 # Maintainer: Sodface <sod@sodface.com>
 pkgname=tio
-pkgver=1.47
+pkgver=2.0
 pkgrel=0
 pkgdesc="Simple TTY Terminal I/O Application"
 url="https://github.com/tio/tio"
@@ -27,5 +27,5 @@ package() {
 }
 
 sha512sums="
-0fe95f950ab07ff19d7f70bab8ae6474eb0e2e7b6d22dec529450a7c5f02ca746253bee55c35e63b36509c01403c4b92e383b2544959b086e7ce12bb589449ef  tio-1.47.tar.xz
+620a4fef915104f3ad154e2e45cce34bb461192900a7b01d456029aee550417577b5d20e4334e01edc29e3afb1a80fa4d3c94273c1f4026fe3658e7462de1fc9  tio-2.0.tar.xz
 "

community/vorbis-tools/APKBUILD

@@ -9,7 +9,7 @@ arch="all"
 license="GPL-2.0-only"
 makedepends="curl-dev flac-dev libvorbis-dev libao-dev speex-dev"
 subpackages="$pkgname-doc $pkgname-lang"
-source="http://downloads.xiph.org/releases/vorbis/vorbis-tools-$pkgver.tar.gz"
+source="https://downloads.xiph.org/releases/vorbis/vorbis-tools-$pkgver.tar.gz"
 
 build() {
 	./configure \

community/zathura/APKBUILD

@@ -4,8 +4,8 @@
 # Contributor: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 # Maintainer: Jean-Louis Fuchs <jean-louis.fuchs@adfinis-sygroup.ch>
 pkgname=zathura
-pkgver=0.4.9
-pkgrel=1
+pkgver=0.5.1
+pkgrel=0
 pkgdesc="zathura - highly customizable and functional document viewer"
 url="https://git.pwmt.org/pwmt/zathura"
 arch="all"
@@ -68,6 +68,6 @@ fishcomp() {
 }
 
 sha512sums="
-fbab65cba7ac37e4021233a4ae0356a85f4a88d2c1a2d8337cd627eae389856b6b4e692904233332d2fa14ad0300e8c52732059a75314a0ef147a02ca9f8db10  zathura-0.4.9.tar.gz
+2e2ce63e975239673598d7fb9719658ed86f544b1e0aa795792bf2e17ea7142da699e149eda47c4649a836914aaa6e9d7a79ea0c1b5a1a3dfc3ad6cd94d7b6dc  zathura-0.5.1.tar.gz
 c127c895b246e613690c13333ef18ceaf5b36f8383678c2625846743b549962c82b926d054da68d6e5c2d1ed58a9670a525274305f57ae309237f65a2af3aca4  fix-fish-completion.patch
 "

main/cdparanoia/APKBUILD

@@ -2,15 +2,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cdparanoia
 pkgver=10.2
-pkgrel=10
+pkgrel=11
 pkgdesc="An audio CD extraction application"
-url="http://www.xiph.org/paranoia"
+url="https://www.xiph.org/paranoia"
 arch="all"
 options="!check"  # Build system has test suite commented out.
 license="LGPL-2.0-or-later"
 makedepends="libtool autoconf automake linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
-source="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz
+source="https://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz
 	gcc.patch
 	fix-includes.patch"
 builddir="$srcdir/$pkgname-III-$pkgver"

main/icecast/APKBUILD

@@ -13,7 +13,7 @@ pkgusers="icecast"
 pkggroups="icecast"
 makedepends="libxslt-dev libxml2-dev libogg-dev libvorbis-dev libtheora-dev openssl-dev>3 curl-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="http://downloads.xiph.org/releases/icecast/icecast-$pkgver.tar.gz
+source="https://downloads.xiph.org/releases/icecast/icecast-$pkgver.tar.gz
 	conf-change-owner.patch
 	icecast.initd
 "

main/libogg/APKBUILD

@@ -9,7 +9,7 @@ arch="all"
 license="BSD-3-Clause"
 makedepends="cmake samurai"
 subpackages="$pkgname-doc $pkgname-dev"
-source="http://downloads.xiph.org/releases/ogg/libogg-$pkgver.tar.gz"
+source="https://downloads.xiph.org/releases/ogg/libogg-$pkgver.tar.gz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then

main/libshout/APKBUILD

@@ -9,7 +9,7 @@ arch="all"
 license="GPL-2.0-only"
 makedepends="speex-dev libtheora-dev libvorbis-dev openssl-dev>3"
 subpackages="$pkgname-static $pkgname-doc $pkgname-dev"
-source="http://downloads.xiph.org/releases/libshout/libshout-$pkgver.tar.gz"
+source="https://downloads.xiph.org/releases/libshout/libshout-$pkgver.tar.gz"
 
 build() {
 	./configure \

main/libtheora/APKBUILD

@@ -10,7 +10,7 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 depends_dev="libogg-dev"
 makedepends="libvorbis-dev libogg-dev autoconf automake libtool
 	linux-headers"
-source="http://downloads.xiph.org/releases/theora/libtheora-$pkgver.tar.bz2
+source="https://downloads.xiph.org/releases/theora/libtheora-$pkgver.tar.bz2
 	libtheora-flags.patch
 	enc.patch
 	fix-timeb.patch

testing/fheroes2/APKBUILD

 # Contributor: Grigory Kirillov <txgk@bk.ru>
 # Maintainer: Grigory Kirillov <txgk@bk.ru>
 pkgname=fheroes2
-pkgver=0.9.18
-pkgrel=2
-pkgdesc="Recreation of HoMM2 game engine"
+pkgver=0.9.19
+pkgrel=0
+pkgdesc="Recreation of Heroes of Might and Magic II game engine"
 url="https://github.com/ihhub/fheroes2"
 arch="all"
 license="GPL-2.0-only"
@@ -26,12 +26,9 @@ langdir="/usr/share/$pkgname/files/lang"
 
 build() {
 	make FHEROES2_WITH_IMAGE=1 FHEROES2_DATA=/usr/share/fheroes2
-
 	# Use GNU iconv instead of musl-based one, because this project uses
 	# TRANSLIT iconv extension which is not present in musl implementation.
-	sed -i s/iconv/gnu-iconv/g files/lang/Makefile
-
-	make -C files/lang
+	make -C files/lang ICONV=gnu-iconv
 }
 
 package() {
@@ -47,5 +44,5 @@ package() {
 }
 
 sha512sums="
-3f435b578a89b079c2ccd63006b03c0f0f19255eae19ad8f0fb3bb11cf7e978f9557c1cd5f0ea4c77fbce2c2a328e646dec62ad6424ca36c1c89ce8b23621628  fheroes2-0.9.18.tar.gz
+55e30c4a44e98460f33032bab06d16ac7c7c09341af6d8cc123b34db38b9c6ad330bbcd271a2f65197b983d60d9471bc1327d16495f9d8d7c7186ad04a0862da  fheroes2-0.9.19.tar.gz
 "

testing/libfishsound/APKBUILD

@@ -9,7 +9,7 @@ arch="all"
 license="BSD-3-Clause"
 makedepends="libvorbis-dev speex"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.xiph.org/releases/libfishsound/libfishsound-$pkgver.tar.gz"
+source="https://downloads.xiph.org/releases/libfishsound/libfishsound-$pkgver.tar.gz"
 
 prepare() {
 	default_prepare

testing/liboggz/APKBUILD

@@ -9,7 +9,7 @@ arch="all"
 license="BSD-3-Clause"
 makedepends="libogg-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://downloads.xiph.org/releases/liboggz/liboggz-$pkgver.tar.gz"
 
 prepare() {
 	default_prepare

testing/py3-fastavro/APKBUILD

@@ -3,7 +3,7 @@
 # Contributor: Iztok Fister, Jr. <iztok@iztok-jr-fister.eu>
 pkgname=py3-fastavro
 _pkgname=fastavro
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=0
 pkgdesc="Fast Avro for Python"
 # Tests for optional zstd and snappy codecs require
@@ -31,5 +31,5 @@ package() {
 }
 
 sha512sums="
-dc31368e17568ff2cc132fe09ab366f44732be08fed8d1fc2b6f9bcaeae8b0d85730518458530b2429e83aa8fc4e2c9311d154032c670f127f90b658d15b1796  py3-fastavro-1.6.0.tar.gz
+32c6d9e550480edc7f8eb0fd28ddef7936bd18719d10b10ac328f61a25d7708a45d4b3ab5db3595b7fb837916c75021333774d405b9ceb05e4f121e615a859b8  py3-fastavro-1.6.1.tar.gz
 "

testing/sigil/APKBUILD

+# Contributor: OIS <mistresssilvara@hotmail.com>
+# Maintainer: OIS <mistresssilvara@hotmail.com>
+pkgname=sigil
+pkgver=1.9.20
+pkgrel=0
+pkgdesc="EPUB editor"
+url="https://sigil-ebook.com/sigil"
+# qt5-qtwebengine
+arch="all !ppc64le !s390x !riscv64"
+license="GPL-3.0-or-later AND Apache-2.0 AND MIT"
+depends="
+	py3-dulwich
+	py3-lxml
+	python3
+	qt5-qtsvg
+	"
+makedepends="
+	cmake
+	hunspell-dev
+	minizip-dev
+	pcre2-dev
+	python3-dev
+	qt5-qttools-dev
+	qt5-qtwebengine-dev
+	samurai
+	zlib-dev
+	"
+subpackages="$pkgname-lang"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Sigil-Ebook/Sigil/archive/refs/tags/$pkgver.tar.gz"
+builddir="$srcdir/Sigil-$pkgver/"
+# no tests
+options="!check"
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DUSE_SYSTEM_LIBS=1 \
+		-DINSTALL_BUNDLED_DICTS=0 \
+		$CMAKE_CROSSOPTS
+
+	cmake --build build
+}
+
+lang() {
+	pkgdesc="Languages for package $pkgname"
+	install_if="$pkgname=$pkgver-r$pkgrel lang"
+
+	amove usr/share/sigil/translations
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+07aff142f65084b7900b25b089fca1d9a36022e690acaf0db3c7b2eb310a847834baff42884e73bbe6b31ff2dd7f73e76819c5c7a4292578fbea2edcebec5ad1  sigil-1.9.20.tar.gz
+"

testing/xplr/APKBUILD

 # Contributor: Jakub Panek <me@panekj.dev>
 # Maintainer: Jakub Panek <me@panekj.dev>
 pkgname=xplr
-pkgver=0.19.0
+pkgver=0.19.3
 pkgrel=0
 pkgdesc="A hackable, minimal, fast TUI file explorer"
 url="https://xplr.dev"
-# s390x, riscv64 limited by rust
-arch="all !s390x !riscv64"
+arch="all"
 license="MIT"
 makedepends="cargo luajit-dev"
 options="net"
@@ -50,6 +49,6 @@ package() {
 }
 
 sha512sums="
-0b1e229320f30ce5c49f043c6ee6e1dc33eae4611398bc19a2436fe3b36b4e57cc1644733c3c6d279b199d3e0165301c83669093dfc46e06cdeed44ad55f8968  xplr-0.19.0.tar.gz
-1f77540b2278414da92c292fa68ed7c91b7eae1821895286a2c711580fb4e50777a02ca73035636e7801fa57843b01106bad538821d5df47d604380a8778348b  remove-vendored-lua.patch
+82c77c6bda5b690b2311de26e407715189f77d462e0d13365d2790db358b323302e07306b66d45b0527af28286b6612c45328ff3cdd6ddf6b33b72a778e77a17  xplr-0.19.3.tar.gz
+aaf27fcff5c9e5f1e4abfca483b68725ef59e3285fc36dd9eed312682498e211665885503e8290b72fe59d98e0df160fea741b77bae61e80848e1b27769cb315  remove-vendored-lua.patch
 "

testing/xplr/remove-vendored-lua.patch

-diff --git a/Cargo.lock b/Cargo.lock
-index 582efbd..7688683 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -434,24 +434,6 @@ dependencies = [
-  "cfg-if",
+@@ -481,24 +481,6 @@ dependencies = [
  ]
-
--[[package]]
+ 
+ [[package]]
 -name = "lua-src"
 -version = "544.0.1"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -17,17 +14,18 @@ index 582efbd..7688683 100644
 -
 -[[package]]
 -name = "luajit-src"
--version = "210.4.0+resty124ff8d"
+-version = "210.4.1+restyaa7a722"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f76fb2e2c0c7192e18719d321c9a148f7625c4dcbe3df5f4c19e685e4c286f6c"
+-checksum = "c92879345f9a97ee140cfe2e08eff49b101533d784527d46ce6d2dc0096d27b3"
 -dependencies = [
 - "cc",
 -]
 -
- [[package]]
+-[[package]]
  name = "memchr"
  version = "2.5.0"
-@@ -504,8 +486,6 @@ dependencies = [
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -556,8 +538,6 @@ dependencies = [
   "bstr",
   "cc",
   "erased-serde",
@@ -36,16 +34,14 @@ index 582efbd..7688683 100644
   "num-traits",
   "once_cell",
   "pkg-config",
-diff --git a/Cargo.toml b/Cargo.toml
-index 9149ba2..4430eee 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -60,7 +60,7 @@ features = ['serde']
-
+@@ -63,7 +63,7 @@ features = ['serde']
+ 
  [dependencies.mlua]
- version = "0.7.4"
+ version = "0.8.3"
 -features = ['luajit', 'vendored', 'serialize', 'send']
 +features = ['luajit', 'serialize', 'send']
-
+ 
  [dependencies.tui-input]
- version = "0.4.2"
+ version = "0.5.1"