From 009e1db2251ee5c3bd3cfebd304830a26f1160e9 Mon Sep 17 00:00:00 2001
From: EnumDev <enumdev@enumerated.dev>
Date: Wed, 1 Oct 2025 13:36:19 +0300
Subject: [PATCH] Add dnsmasq dependency and switch to new download format

---
 pkg.info  | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
 source.sh | 26 +++++---------------------
 2 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/pkg.info b/pkg.info
index 20179d8..127d283 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,11 +1,54 @@
 name: networkmanager
 description: Network management daemon and tools
 version: 1.54.1
+revision: 2
 url: https://networkmanager.dev/
 license: GPL2-or-later,LGPL2.1-or-later,GFDL1.1-or-later
 architecture: any
-depends: ["curl","elogind","gcc-libs","glib","glibc","iproute2","jansson","libndp","newt","libpsl","mobile-broadband-provider-info","nspr","nss","readline"]
-optional_depends: ["blez","dhcpcd","iptables","iwd","modemmanager","nftables","polkit","wpa_supplicant"]
-make_depends: ["dhcpcd","gobject-introspection","iptables","iwd","meson","modemmanager","polkit","python-pygobject","vala","libx11","python-dbus","wpa_supplicant"]
-keep: ["etc/NetworkManager/NetworkManager.conf"]
 type: source
+keep:
+  - etc/NetworkManager/NetworkManager.conf
+depends:
+  - curl
+  - elogind
+  - gcc-libs
+  - glib
+  - glibc
+  - iproute2
+  - jansson
+  - libndp
+  - newt
+  - libpsl
+  - mobile-broadband-provider-info
+  - nspr
+  - nss
+  - readline
+optional_depends:
+  - bluez
+  - dhcpcd
+  - dnsmasq
+  - iptables
+  - iwd
+  - modemmanager
+  - nftables
+  - polkit
+  - wpa_supplicant
+make_depends:
+  - dhcpcd
+  - dnsmasq
+  - gobject-introspection
+  - iptables
+  - iwd
+  - meson
+  - modemmanager
+  - polkit
+  - python-pygobject
+  - vala
+  - libx11
+  - python-dbus
+  - wpa_supplicant
+downloads:
+  - url: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${BPM_PKG_VERSION}/NetworkManager-${BPM_PKG_VERSION}.tar.gz
+    extract_to_bpm_source: true
+    extract_strip_components: 1
+    checksum: 3bec7f01698e416c58fe823d042de87fdc0e5ddf54d1871a8b65216070eb9a93
diff --git a/source.sh b/source.sh
index 05c5a09..6f0f250 100644
--- a/source.sh
+++ b/source.sh
@@ -2,22 +2,9 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/archive/${BPM_PKG_VERSION}/NetworkManager-${BPM_PKG_VERSION}.tar.gz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
-  mkdir build
-  cd build
-
   meson setup --prefix=/usr              \
               --buildtype=release        \
               -Dlibaudit=no              \
@@ -29,24 +16,21 @@ build() {
               -Dsystemdsystemunitdir=no  \
               -Dsystemd_journal=false    \
               -Dnm_cloud_setup=false     \
-              -Dqt=false
-  meson compile
+              -Dqt=false                 \
+              build
+  meson compile -C build
 }
 
 # The check function is executed in the source directory
 # This function is used to run tests to verify the package has been compiled correctly
 check() {
-  cd build
-
-  meson test --print-errorlogs
+  meson test -C build --print-errorlogs
 }
 
 # The package function is executed in the source directory
 # This function is used to move the compiled files into the output directory
 package() {
-  cd build
-
-  meson install --destdir="$BPM_OUTPUT"
+  meson install -C build --destdir="$BPM_OUTPUT"
 
   # Install configuration file
   install -m644 "$BPM_WORKDIR"/NetworkManager.conf "$BPM_OUTPUT"/etc/NetworkManager/NetworkManager.conf