From 1da21fc197a8f32ff76b0f4feddb3a09615e2421 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Thu, 5 Sep 2024 12:41:32 -0700
Subject: Updated to 1.48.10

---
 PKGBUILD | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 2314e10..5025589 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,9 +21,9 @@ pkgname=(
   nm-cloud-setup
   networkmanager-docs
 )
-_basever=1.46
-pkgver=${_basever}.0
-pkgrel=2
+_basever=1.48
+pkgver=${_basever}.10
+pkgrel=1
 pkgdesc="Network connection manager and user applications"
 pkgdesc+=", modified for openrc"
 url="https://networkmanager.dev/"
@@ -31,11 +31,16 @@ arch=(x86_64)
 license=(LGPL-2.1-or-later)
 makedepends=(
   audit
+  bash
   curl
   dhclient
   dhcpcd
   dnsmasq
-  glib2-docs
+  gcc-libs
+  git
+  glib2
+  glib2-devel
+  glibc
   gobject-introspection
   gtk-doc
   iproute2
@@ -50,6 +55,7 @@ makedepends=(
   meson
   modemmanager
   nftables
+  nspr
   nss
   openresolv
   pacrunner
@@ -57,6 +63,7 @@ makedepends=(
   polkit
   ppp
   python-gobject
+  readline
   libelogind
   vala
   wpa_supplicant
@@ -66,9 +73,20 @@ checkdepends=(
   python-dbus
 )
 source=(https://download.gnome.org/sources/${_altname}/${_basever}/${_altname}-${pkgver}.tar.xz)
-# https://download.gnome.org/sources/NetworkManager/1.46/NetworkManager-1.46.0.sha256sum
-sha256sums=('722649e25362693b334371473802a729b0ec9ee283375096905f868808e74068')
-b2sums=('db190876105d83c8d2ef7e827fa653ab14f9687ab18392600e04d20020d1dc797d3857c9fb05111fcafd18fe477b93947566100ea7113758703842cded71ed40')
+# https://download.gnome.org/sources/NetworkManager/1.48/NetworkManager-1.48.10.sha256sum
+sha256sums=('5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613')
+b2sums=('8f615b1afec72ac600fd2cbe458644c4e83312e76c5ecf0e84484dce60510867350ec1fc2fb68fdee40ae4aca3d9e935ef8e433ea60ebe431b96699c0ce01222')
+validpgpkeys=(
+  3D10AD045AB4AAFF8E8F36AF9B980AC2FB874FEB # Ana Cabral <acabral@redhat.com>
+  F07F7C1EABD382F81CBFBA3B998D4828CD7E1656 # Beniamino Galvani <bgalvani@redhat.com>
+  2B5F3B2028801E15F57AAA309906C97AA15D984F # Fernando Fernandez Mancera <ffmancera@riseup.net>
+  48FD6FAE515A77B48436821C8789567B8715CEBC # Gris Ge <fge@redhat.com>
+  # Could not locate key ACFA41513D2854D0A72F55BE9A2C77A85F2D72FE # Ján Václav <jvaclav@redhat.com>
+  4B8EF9745A973724E965939189A2DA5AF73D5E3D # Lubomir Rintel <lkundrak@v3.sk>
+  E472337703D0C46002928B5790617850A125DE59 # Stanislas FAYE <sfaye@redhat.com>
+  49EA7C670E0850E7419514F629C2366E4DFC5728 # Thomas Haller <thaller@redhat.com>
+  07F9AEC86144386D9576210B66A44781B4EBC2D0 # Íñigo Huguet <ihuguet@redhat.com>
+)
 
 prepare() {
   cd $_altname-$pkgver
@@ -113,12 +131,9 @@ build() {
     -D more_asserts=no
     -D more_logging=false
     -D qt=false
+    -D modem_manager=false # It uses an entire core constantly, and NM tries to invoke it every 2 minutes clogging up the logs
   )
 
-  # NM uses malloc_usable_size in code copied from systemd
-  CFLAGS="${CFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
-  CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
-
   arch-meson ${_altname}-${pkgver} build "${meson_options[@]}"
   meson compile -C build ${MAKEFLAGS}
 }
@@ -144,6 +159,9 @@ package_networkmanager() {
   depends=(
     audit
     curl
+    gcc-libs
+    glib2
+    glibc
     iproute2
     jansson
     libmm-glib
@@ -153,6 +171,10 @@ package_networkmanager() {
     libpsl
     libteam
     mobile-broadband-provider-info
+    nspr
+    nss
+    readline
+    libelogind
     wpa_supplicant
   )
   optdepends=(
@@ -214,7 +236,10 @@ END
 package_libnm() {
   pkgdesc="NetworkManager client library"
   depends=(
+    gcc-libs
     glib2
+    glibc
+    nspr
     nss
     libelogind
     util-linux-libs
@@ -226,7 +251,15 @@ package_libnm() {
 
 package_nm-cloud-setup() {
   pkgdesc="Automatically configure NetworkManager in cloud"
-  depends=(networkmanager)
+  depends=(
+    bash
+    curl
+    gcc-libs
+    glib2
+    glibc
+    libnm
+    networkmanager
+  )
 
   mv cloud/* "$pkgdir"
 }
-- 
cgit v1.2.1