From 70baa2ad5f9612085eddb33e19d5f92b41156334 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Sun, 5 Jul 2026 13:14:15 +0200
Subject: [PATCH] alcatel-pop7lte: remove nonfree-firmware subpackage

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7715>
---
 .../device-alcatel-pop7lte/APKBUILD           | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/device/downstream/device-alcatel-pop7lte/APKBUILD b/device/downstream/device-alcatel-pop7lte/APKBUILD
index 07f8da379..cea109990 100644
--- a/device/downstream/device-alcatel-pop7lte/APKBUILD
+++ b/device/downstream/device-alcatel-pop7lte/APKBUILD
@@ -2,18 +2,22 @@
 maintainer="Lauren Kelly <lauren.kelly@msn.com>"
 pkgname=device-alcatel-pop7lte
 pkgdesc="Alcatel OneTouch Pop 7S"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-alcatel-pop7lte mkbootimg msm-fb-refresher mdss-fb-init-hack"
-makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
+depends="
+	firmware-alcatel-pop7lte-adsp
+	firmware-alcatel-pop7lte-wcnss
+	linux-alcatel-pop7lte
+	mdss-fb-init-hack
+	mkbootimg
+	msm-fb-refresher
+	postmarketos-base
 "
-
+makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	kernel-cmdline.conf
@@ -28,12 +32,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Audio/WiFi/BT firmware"
-	depends="firmware-alcatel-pop7lte-adsp firmware-alcatel-pop7lte-wcnss"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 967aca1b160345d8d0082ddd39f7c6687ccea4ccccfc8b4ab0b1afbe65d117a12c42e756970b6f752a557cccbef3d0e7230dbc3b59c2d82f79183b67473fd627  deviceinfo
 d0ce0f812c12d8b293755ae683d309d10b79e8b11b5bc839bd2c76a0fba6c082ffc22f1c244fbc44e5636f7469a3e74d629b6c63a93a9978bf50fcc2436cb212  kernel-cmdline.conf