From d8d8e19235e9a480c284ee6f7405ee3e60c3c132 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Mon, 29 Dec 2025 14:16:59 +0100
Subject: [PATCH] temp/usb-moded: use version schema from Alpine

Use the same version schema as in Alpine, so the upstream compat script
can compare them properly. Currently we have:

  master: usb-moded: 0.86.0+mer69 != 0.86.0.68 (downstream != upstream)

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7665>
---
 temp/usb-moded/APKBUILD | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/temp/usb-moded/APKBUILD b/temp/usb-moded/APKBUILD
index afe29d38f..c473fe9b8 100644
--- a/temp/usb-moded/APKBUILD
+++ b/temp/usb-moded/APKBUILD
@@ -1,8 +1,7 @@
 # Forked from Alpine to adjust for mainline
 pkgname=usb-moded
-_pkgver=0.86.0
+_pkgver=0.86.0.69
 pkgver="999$_pkgver"
-_pkgver=$_pkgver+mer69
 pkgrel=0
 _commit_dbus_glib="d42176ae4763e5288ef37ea314fe58387faf2005"
 pkgdesc="A daemon activating a certain USB profile based on the usb cable connection status"
@@ -30,7 +29,7 @@ subpackages="
 	$pkgname-openrc
 	$pkgname-systemd
 	"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sailfishos/usb-moded/archive/refs/tags/mer/${_pkgver/\//-}.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/sailfishos/usb-moded/archive/refs/tags/mer/${_pkgver%.*}+mer${_pkgver##*.}.tar.gz
 	https://github.com/sailfishos-mirror/dbus-glib/archive/$_commit_dbus_glib/dbus-glib-$_commit_dbus_glib.tar.gz
 	usb-moded.confd
 	usb-moded.initd
@@ -43,7 +42,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/sailfishos/usb-moded/archive
 	0005-usb-moded-Allow-disabling-rescue-mode.patch
 	"
 options="!check" # No test suite available
-builddir="$srcdir/$pkgname-mer-${_pkgver/+/-}"
+builddir="$srcdir/$pkgname-mer-${_pkgver%.*}-mer${_pkgver##*.}"
 
 prepare() {
 	default_prepare
@@ -87,7 +86,7 @@ package() {
 }
 
 sha512sums="
-55c8892c9f9c5a9cc6b526e8c1f9c55cd5f61922dbc52b1c85abb2850a00d1146c0d8e4f7a631bd0d7927e40908dae2541870bf1cc591b9d527ce29306051829  usb-moded-9990.86.0.tar.gz
+55c8892c9f9c5a9cc6b526e8c1f9c55cd5f61922dbc52b1c85abb2850a00d1146c0d8e4f7a631bd0d7927e40908dae2541870bf1cc591b9d527ce29306051829  usb-moded-9990.86.0.69.tar.gz
 665cd6395ee0ea14086ba30188c62a72697b3f63484681e18fc7f54109c9aca162f2e33aa2fa4d45287c6c0b590e81ca310c143dac0232cd5887692cdaf51256  dbus-glib-d42176ae4763e5288ef37ea314fe58387faf2005.tar.gz
 b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706  usb-moded.confd
 28c2d1e594d0be7d480885c1d3d38a2e33d310363a51093f19daf69221d173df5a03d04f1b7dfba3bcdb00697715123313441216a016efc8d11151daaa0ae4ea  usb-moded.initd