12 files changed, 267 insertions, 19 deletions
diff --git a/user/brillo/APKBUILD b/user/brillo/APKBUILD
new file mode 100644
index 000000000..f377b047f
--- /dev/null
+++ b/user/brillo/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
+pkgname=brillo
+pkgver=1.4.12
+pkgrel=0
+pkgdesc="Utility for controlling display brightness"
+url="https://gitlab.com/cameronnemo/brillo"
+arch="all"
+options="!check"  # no testsuite
+license="GPL-3.0-only AND 0BSD"
+depends="udev polkit"
+makedepends=""
+subpackages=""
+source="https://gitlab.com/cameronnemo/brillo/-/archive/v$pkgver/brillo-v$pkgver.tar.bz2"
+builddir="$srcdir/brillo-v$pkgver"
+
+build() {
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install.bin install.udev install.polkit
+}
+
+sha512sums="f7bb6df12a8ddd7df6ac3c973cf24a0b4974387479d20477c7cec75503ca0bfbff8d16645464f79f73074711e62614ffcc5c9388384100274ba8be0bfaae26b8  brillo-v1.4.12.tar.bz2"
diff --git a/user/darkman/APKBUILD b/user/darkman/APKBUILD
new file mode 100644
index 000000000..1600fae79
--- /dev/null
+++ b/user/darkman/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
+pkgname=darkman
+pkgver=2.0.1
+pkgrel=0
+pkgdesc="Framework for managing dark- and light-mode transitions"
+url="https://darkman.whynothugo.nl/"
+arch="all"
+options="!check"  # no testsuite
+license="0BSD"
+depends=""
+makedepends="gcc-go scdoc"
+subpackages="$pkgname-doc $pkgname-systemd"
+source="https://gitlab.com/WhyNotHugo/darkman/-/archive/v$pkgver/darkman-v$pkgver.tar.bz2"
+builddir="$srcdir/darkman-v$pkgver"
+
+build() {
+	make VERSION="$pkgver"
+}
+
+package() {
+	make VERSION="$pkgver" DESTDIR="$pkgdir" install
+}
+
+sha512sums="8036e3470d22e1f689d8305cb3faf81a1fc2f0692afd8fb9657c2c22af417f25fd928189fcda42df7c053cb9129c90cdf11df64e6f597498af95f330de76f282  darkman-v2.0.1.tar.bz2"
diff --git a/user/dwl/APKBUILD b/user/dwl/APKBUILD
new file mode 100644
index 000000000..000ac4151
--- /dev/null
+++ b/user/dwl/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
+pkgname=dwl
+pkgver=0.7
+pkgrel=0
+pkgdesc="Minimal, DWM-like compositor for Wayland"
+url="https://codeberg.org/dwl/dwl"
+arch="all"
+options="!check"  # no testsuite
+license="GPL-3.0+ AND MIT AND CC0-1.0"
+depends="wlroots-0.18"
+makedepends="libinput-dev libxkbcommon-dev wayland-dev wayland-protocols wlroots-0.18-dev"
+subpackages="$pkgname-doc"
+source="https://codeberg.org/dwl/dwl/releases/download/v$pkgver/dwl-v$pkgver.tar.gz"
+builddir="$srcdir/dwl-v$pkgver"
+
+build() {
+	make PREFIX="/usr"
+}
+
+package() {
+	make PREFIX="/usr" DESTDIR="$pkgdir" install
+}
+
+sha512sums="d2ec9467bb7758ea52e0face555cb505624062eb66c8959b59e715b7d1c7bb74c649029f365c9bfd07d7b5806fdef018f555d7e64bd62e7e413ead45b5d73986  dwl-v0.7.tar.gz"
diff --git a/user/flameshot/APKBUILD b/user/flameshot/APKBUILD
new file mode 100644
index 000000000..3ac292020
--- /dev/null
+++ b/user/flameshot/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
+pkgname=flameshot
+pkgver=12.1.0
+pkgrel=0
+pkgdesc="Simple, powerful screenshot utility"
+url="https://flameshot.org/"
+arch="all"
+license="GPL-3.0+ AND LGPL-3.0+ AND MIT AND (GPL-3.0+ AND GPL-2.0-only) AND Apache-2.0 AND CC0-1.0 AND FAL-1.3"
+depends=""
+makedepends="cmake qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="flameshot-$pkgver.tar.gz::https://github.com/flameshot-org/flameshot/archive/refs/tags/v$pkgver.tar.gz"
+langdir="/usr/share/flameshot/translations"
+
+build() {
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		${CMAKE_CROSSOPTS} \
+		.
+	make
+}
+
+check() {
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="159bf3a8ff406b3881dcc77fc48d9e7cc0d595bd47ee2363396d7efc95f69160cf25ccf99cd1b2c2b527baeadf91c209784a7bca23ed5f17caacc385e161c83c  flameshot-12.1.0.tar.gz"
diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD
index e6268e4c9..cd1ac322d 100644
--- a/user/gdk-pixbuf/APKBUILD
+++ b/user/gdk-pixbuf/APKBUILD
@@ -13,7 +13,9 @@ makedepends="glib-dev gobject-introspection-dev libjpeg-turbo-dev libpng-dev
 install="$pkgname.pre-deinstall"
 triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz
+	fix-pkgconfig.patch
+	"
 
 # secfixes:
 #   2.36.6-r1:
@@ -37,4 +39,5 @@ package() {
 	DESTDIR="$pkgdir" meson install -C build
 }
 
-sha512sums="ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8  gdk-pixbuf-2.42.12.tar.xz"
+sha512sums="ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8  gdk-pixbuf-2.42.12.tar.xz
+24d461273c262e52299b9a70bc89e6fd4bd4425c1aef9575f5fcd6f3fb6d0ee0d05c4151f6bb9a28708f189ad26764b3c9b76a9d1e5094405a679abdf3905663  fix-pkgconfig.patch"
diff --git a/user/gdk-pixbuf/fix-pkgconfig.patch b/user/gdk-pixbuf/fix-pkgconfig.patch
new file mode 100644
index 000000000..a15c2c29c
--- /dev/null
+++ b/user/gdk-pixbuf/fix-pkgconfig.patch
@@ -0,0 +1,11 @@
+diff '--color=auto' -Nurd gdk-pixbuf-2.42.12/gdk-pixbuf/meson.build gdk-pixbuf-2.42.12.new/gdk-pixbuf/meson.build
+--- gdk-pixbuf-2.42.12/gdk-pixbuf/meson.build	2025-07-01 18:58:08.263906972 -0700
++++ gdk-pixbuf-2.42.12.new/gdk-pixbuf/meson.build	2025-07-01 18:54:50.384849537 -0700
+@@ -383,6 +383,7 @@
+     'gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders',
+   ],
+   requires: 'gobject-2.0',
++  requires_private: 'libpng',
+   subdirs: gdk_pixbuf_api_name,
+   filebase: gdk_pixbuf_api_name,
+ )
diff --git a/user/gtk4/APKBUILD b/user/gtk4/APKBUILD
index e1eb0ee41..1795d2107 100644
--- a/user/gtk4/APKBUILD
+++ b/user/gtk4/APKBUILD
@@ -1,27 +1,29 @@
 # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
 # Maintainer: Sile Ekaterin Liszka <sheila@vulpine.house>
 pkgname=gtk4
-pkgver=4.8.3
-pkgrel=1
+pkgver=4.18.5
+pkgrel=0
 pkgdesc="Version 4 of the GNOME graphics toolkit"
 url="https://www.gtk.org"
 arch="all"
-options="!check"  # Requires X11
+options="!check"  # Requires Wayland environment running
 license="LGPL-2.0+ AND LGPL-2.1+ AND LGPL-2.0-only AND Expat"
 depends=""
 makedepends="cairo-dev cmake cups-dev ffmpeg-dev ffmpeg-libs gdk-pixbuf-dev
 	gi-docgen glib-dev gobject-introspection-dev graphene-dev gstreamer-dev
 	gst-plugins-bad-dev iso-codes-dev libepoxy-dev libexecinfo-dev
-	libxcursor-dev libxdamage-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev
-	meson ninja pango-dev>=1.50.0 py3-docutils py3-jinja2 py3-markdown
-	py3-pygments py3-pygobject py3-toml py3-typogrify tiff-dev
+	librsvg-dev libxcursor-dev libxdamage-dev libxi-dev libxinerama-dev
+	libxkbcommon-dev libxrandr-dev meson pango-dev py3-docutils py3-jinja2
+	py3-markdown py3-pygments py3-pygobject py3-toml py3-typogrify tiff-dev
 	wayland-dev wayland-protocols"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz
+	vulkan-nullref.patch
+	"
 builddir="$srcdir/gtk-$pkgver"
 
 build() {
-	meson \
+	meson setup \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -29,21 +31,21 @@ build() {
 		--buildtype=release \
 		--wrap-mode=nofallback \
 		-Dc_link_args='-lexecinfo' \
-		-Dgtk_doc=true \
 		-Dman-pages=true \
-		-Ddemos=false \
 		-Dbuild-examples=false \
+		-Dvulkan=disabled \
 		build
-	ninja -C build
+	meson compile -C build
 }
 
 check() {
-	ninja -C build test
+	meson test -C build
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install -C build
 }
 
 
-sha512sums="56be0f5ce85a9cbbda4a5de53baeeb6b8cc527a5d34723ae5548759ec7c28f03d204b6b6758dffed02a9e226f3bfcd1f15971105c2f2f7be7cef22538be27754  gtk-4.8.3.tar.xz"
+sha512sums="4a09188fdbeb532d8c2064199126eaf60d806118bb637d5182121f3d80d374acdf343568c3423effb9574c364279ded7d7cbd4e0331dc1fb647970f60c98bff0  gtk-4.18.5.tar.xz
+1dca0747e2f572354c0d47e443270d64f5855d9fba592621d570be5eed49213ce8303e7d028bbe4d493cceebea9b3c90d6dc4f0671b1cae153a15384aa35d63e  vulkan-nullref.patch"
diff --git a/user/gtk4/vulkan-nullref.patch b/user/gtk4/vulkan-nullref.patch
new file mode 100644
index 000000000..464415901
--- /dev/null
+++ b/user/gtk4/vulkan-nullref.patch
@@ -0,0 +1,69 @@
+From d4350c0fe535a759abd7898c7f251738242d1408 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Thu, 24 Apr 2025 03:36:15 +0200
+Subject: [PATCH] vulkan: Handle not being compiled against Vulkan
+
+The Vulkan renderer should work and just fail to realize.
+Currently it SEGVs with a NULL function call.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8506>
+---
+ gsk/gpu/gskvulkanrenderer.c | 22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/gsk/gpu/gskvulkanrenderer.c b/gsk/gpu/gskvulkanrenderer.c
+index a5f827df839..6282c0b51c1 100644
+--- a/gsk/gpu/gskvulkanrenderer.c
++++ b/gsk/gpu/gskvulkanrenderer.c
+@@ -4,6 +4,8 @@
+ 
+ #include "gskgpurendererprivate.h"
+ 
++#include <glib/gi18n-lib.h>
++
+ #ifdef GDK_RENDERING_VULKAN
+ 
+ #include "gskvulkandeviceprivate.h"
+@@ -143,14 +145,28 @@ gsk_vulkan_renderer_unrealize (GskRenderer *renderer)
+ 
+   GSK_RENDERER_CLASS (gsk_vulkan_renderer_parent_class)->unrealize (renderer);
+ }
+-#endif
++
++#else /* !GDK_RENDERING_VULKAN */
++
++static gboolean
++gsk_vulkan_renderer_realize (GskRenderer  *renderer,
++                             GdkDisplay   *display,
++                             GdkSurface   *surface,
++                             GError      **error)
++{
++  g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE,
++                       _("Vulkan support disabled during GTK build"));
++
++  return FALSE;
++}
++#endif /* GDK_RENDERING_VULKAN */
+ 
+ static void
+ gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass)
+ {
++  GskRendererClass *renderer_class = GSK_RENDERER_CLASS (klass);
+ #ifdef GDK_RENDERING_VULKAN
+   GskGpuRendererClass *gpu_renderer_class = GSK_GPU_RENDERER_CLASS (klass);
+-  GskRendererClass *renderer_class = GSK_RENDERER_CLASS (klass);
+ 
+   gpu_renderer_class->frame_type = GSK_TYPE_VULKAN_FRAME;
+ 
+@@ -162,6 +178,8 @@ gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass)
+   gpu_renderer_class->get_backbuffer = gsk_vulkan_renderer_get_backbuffer;
+ 
+   renderer_class->unrealize = gsk_vulkan_renderer_unrealize;
++#else
++  renderer_class->realize = gsk_vulkan_renderer_realize;
+ #endif
+ }
+ 
+-- 
+GitLab
+
diff --git a/user/libxcvt/APKBUILD b/user/libxcvt/APKBUILD
index 9efeb5b24..1888d3ccc 100644
--- a/user/libxcvt/APKBUILD
+++ b/user/libxcvt/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Milan P. Stanić <mps@arvanta.net>
-# Maintainer: Ermine <mustela@arvanta.net>
+# Maintainer: Ermine <mustela@erminea.space>
 pkgname=libxcvt
 pkgver=0.1.2
 pkgrel=0
diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD
index 06968019c..4ccdec0ef 100644
--- a/user/marco/APKBUILD
+++ b/user/marco/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
 pkgname=marco
 pkgver=1.26.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Window manager for the MATE desktop environment"
 url="https://mate-desktop.org"
 arch="all"
 license="GPL-2.0+ AND MIT-advertising AND MIT-CMU"
-depends=""
+depends="mate-desktop mate-settings-daemon"
 makedepends="gtk+3.0-dev intltool itstool libcanberra-dev libice-dev libsm-dev
 	libxml2-utils libxres-dev startup-notification-dev wayland-protocols zenity"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/user/waypipe/0.9.2-fix-compile.patch b/user/waypipe/0.9.2-fix-compile.patch
new file mode 100644
index 000000000..096e4851b
--- /dev/null
+++ b/user/waypipe/0.9.2-fix-compile.patch
@@ -0,0 +1,11 @@
+diff '--color=auto' -Nurd waypipe-v0.9.2/src/secctx.c waypipe-v0.9.2.new/src/secctx.c
+--- waypipe-v0.9.2/src/secctx.c	2024-11-18 14:29:20.000000000 -0800
++++ waypipe-v0.9.2.new/src/secctx.c	2024-11-25 10:20:47.643421280 -0800
+@@ -2,6 +2,7 @@
+ #include "util.h"
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <wayland-client.h>
+ 
diff --git a/user/waypipe/APKBUILD b/user/waypipe/APKBUILD
new file mode 100644
index 000000000..311c4e8c6
--- /dev/null
+++ b/user/waypipe/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house>
+# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house>
+pkgname=waypipe
+pkgver=0.9.2
+pkgrel=0
+pkgdesc="proxy for Wayland clients"
+url="https://gitlab.freedesktop.org/mstoeckl/waypipe"
+arch="all"
+license="MIT"
+depends=""
+makedepends="ffmpeg-dev libdrm-dev libva-dev lz4-dev mesa-dev meson scdoc wayland-dev wayland-protocols"
+subpackages="$pkgname-doc"
+source="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2
+	0.9.2-fix-compile.patch"
+builddir="$srcdir/$pkgname-v$pkgver"
+
+build() {
+	meson setup \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var \
+		--buildtype=release \
+		. output
+	meson compile -C output
+}
+
+check() {
+	meson test -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install -C output
+}
+
+sha512sums="0ffdb49cb5dbee717798721505e4661710fcd234a55bbfe2452888024d4a8b99a0e0e99cdce23ba0b92ee456aeb9f14324baba1c7c5724cb8cca7bb6e9c276bb  waypipe-v0.9.2.tar.bz2
+30c818075c95b198d351cad94e48e3d7eb3dc18f9b38964c2090483131365bf37f7eeb12ba89f17822c8cab9dbb658e7e2efcc81f0433e79c9a2cdb8bbf92dc6  0.9.2-fix-compile.patch"