From 5445d843440bdbdd23b9fb207c8cb513317f9c1a Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Thu, 4 Jun 2026 15:54:03 -0400
Subject: [PATCH] qubes-libvchan-xen: revert workaround linking against
 non-versionned xen libraries

This reverts commit bcc832b2cedd5aeb7ef6111821416837ba22ccbc.
---
 qubes-libvchan-xen/APKBUILD                   | 20 +++----------------
 .../link-against-patched-libs.patch           | 13 ------------
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 qubes-libvchan-xen/link-against-patched-libs.patch

diff --git a/qubes-libvchan-xen/APKBUILD b/qubes-libvchan-xen/APKBUILD
index 8ec45b5..727f34e 100644
--- a/qubes-libvchan-xen/APKBUILD
+++ b/qubes-libvchan-xen/APKBUILD
@@ -2,30 +2,17 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=qubes-libvchan-xen
 pkgver=4.2.8
-pkgrel=2
+pkgrel=3
 _gittag=v$pkgver
 pkgdesc="The Qubes core libraries for installation inside a Qubes Dom0 and VM."
 arch="x86_64"
 url="https://github.com/QubesOS/qubes-core-vchan-xen"
 license='GPL'
-depends="xen xen-dev"
-makedepends="xen-dev coreutils patchelf"
+makedepends="xen-dev coreutils"
 builddir="$srcdir"/qubes-core-vchan-xen-$pkgver
 subpackages="$pkgname-dev"
 
-source="
-	$pkgname-$_gittag.tar.gz::https://github.com/QubesOS/qubes-core-vchan-xen/archive/refs/tags/$_gittag.tar.gz
-	link-against-patched-libs.patch
-	"
-
-prepare() {
-	default_prepare
-	cd "$builddir"/vchan
-	for i in libxenvchan.so libxenctrl.so; do
-		cp /usr/lib/$i ./
-		patchelf --set-soname $i $i
-	done
-}
+source="$pkgname-$_gittag.tar.gz::https://github.com/QubesOS/qubes-core-vchan-xen/archive/refs/tags/$_gittag.tar.gz"
 
 build() {
 	cd "$builddir"/vchan
@@ -38,5 +25,4 @@ package() {
 
 sha512sums="
 a3c06b44308346b249aac9fea490a134c70647e77e12d64e1696b3ece9ebdaa12fc5cf6201cb42890ea906b584844f0afe44635ad12736a4c5aa01d7ebb016e9  qubes-libvchan-xen-v4.2.8.tar.gz
-db33b54121b172dfdbfddb620d56998f1be893608c23b5fbdfe373005650ab012c0462a4a01d8da12611c22c0bb9877c7b42f0bf58871dfc4474386c44ab2249  link-against-patched-libs.patch
 "
diff --git a/qubes-libvchan-xen/link-against-patched-libs.patch b/qubes-libvchan-xen/link-against-patched-libs.patch
deleted file mode 100644
index b6a512f..0000000
--- a/qubes-libvchan-xen/link-against-patched-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vchan/Makefile.linux.orig b/vchan/Makefile.linux
-index 587cb34..cccb5de 100644
---- a/vchan/Makefile.linux.orig
-+++ b/vchan/Makefile.linux
-@@ -34,7 +34,7 @@ CFLAGS += $(shell if printf '%s\n' '4.18.0' '$(XENCTRL_VERSION)' | \
- SO_VER = 1
- 
- libvchan-xen.so.$(SO_VER): init.o io.o
--	$(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -o $@ $^ -lxenvchan -lxenctrl -lxenstore
-+	$(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -o $@ $^ ./libxenvchan.so ./libxenctrl.so -lxenstore
- 
- libvchan-xen.so: libvchan-xen.so.$(SO_VER)
- 	ln -sf $< $@
-- 
2.52.0