From 2019e158aab741a8f0d29d0f5dd81e3fd78b3224 Mon Sep 17 00:00:00 2001
From: Jorijn van der Graaf <jorijnvdgraaf@catcrafts.net>
Date: Sat, 8 Aug 2026 22:39:14 +0200
Subject: [PATCH] modemmanager: versioned libqmi-dev makedep; kernel pkgver
 date stamping

pmbootstrap's build plan is not dependency-ordered: MM built first and
grabbed the cached 1.39.0 libqmi from the volume's package repo. The
versioned makedepend states the real requirement and forces our bumped
libqmi to build first. Kernel pkgver gains the source commit date so
registry-subscribed phones receive kernel updates.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 aports/temp/modemmanager/APKBUILD | 2 +-
 build.sh                          | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/aports/temp/modemmanager/APKBUILD b/aports/temp/modemmanager/APKBUILD
index db2452b..b746519 100644
--- a/aports/temp/modemmanager/APKBUILD
+++ b/aports/temp/modemmanager/APKBUILD
@@ -29,7 +29,7 @@ makedepends="
 	gtk-doc
 	libgudev-dev
 	libmbim-dev
-	libqmi-dev
+	libqmi-dev>=1.39.1
 	linux-headers
 	meson
 	polkit-dev
diff --git a/build.sh b/build.sh
index c5cc462..95bc6ec 100755
--- a/build.sh
+++ b/build.sh
@@ -117,6 +117,12 @@ KAPORT="$WORK/pmaports/device/testing/linux-postmarketos-qcom-milos"
 git -C "$WORK/milos-src" archive --prefix=milos-linux/ \
 	-o "$KAPORT/milos-linux-$COMMIT.tar.gz" HEAD
 sed -i "s/^_commit=.*/_commit=\"$COMMIT\"/" "$KAPORT/APKBUILD"
+# Stamp the kernel pkgver with the source commit date (7.1.2 ->
+# 7.1.2_git20260808): a rebuilt combined-stable must produce a HIGHER
+# package version, or phones subscribed to the package registry would
+# never see kernel updates.
+KDATE=$(git -C "$WORK/milos-src" log -1 --format=%cd --date=format:%Y%m%d)
+sed -i "s/^pkgver=\([0-9.]*\)\$/pkgver=\1_git$KDATE/" "$KAPORT/APKBUILD"
 
 # Same dance for imsd, pinned to a reviewed commit rather than branch tip.