Updated to 1.46.0

2 files changed, 26 insertions, 50 deletions

diff --git a/0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch b/0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch
deleted file mode 100644
index f3f547c..0000000
--- a/0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
-Date: Fri, 13 Oct 2023 16:46:09 +0000
-Subject: [PATCH] connectivity: Make curl timeout callback non-repeating.
-
-The CURLMOPT_TIMERFUNCTION manual says:
-    Your callback function timer_callback should install a *non-repeating*
-    timer with an expire time of timeout_ms milliseconds.
-
-The previous callback returned G_SOURCE_CONTINUE, resulting in a repeating
-firing callback. curl tweaked some internals in v8.4.0 and started giving
-0 timeouts, which caused this to wreak havoc.
-
-Fix it by making the callback non-repeating as specified by the API contract.
----
- src/core/nm-connectivity.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
-index 92de44f17d99..d8b0004c381f 100644
---- a/src/core/nm-connectivity.c
-+++ b/src/core/nm-connectivity.c
-@@ -406,9 +406,10 @@ _con_curl_timeout_cb(gpointer user_data)
- {
-     NMConnectivityCheckHandle *cb_data = user_data;
- 
-+    cb_data->concheck.curl_timer = 0;
-     _con_curl_check_connectivity(cb_data->concheck.curl_mhandle, CURL_SOCKET_TIMEOUT, 0);
-     _complete_queued(cb_data->self);
--    return G_SOURCE_CONTINUE;
-+    return G_SOURCE_REMOVE;
- }
- 
- static int
diff --git a/PKGBUILD b/PKGBUILD
index 5067ff9..24b6312 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,15 +19,16 @@ pkgname=(
   networkmanager
   libnm
   nm-cloud-setup
+  networkmanager-docs
 )
-_basever=1.44
-pkgver=${_basever}.2
-pkgrel=3.2
+_basever=1.46
+pkgver=${_basever}.0
+pkgrel=1
 pkgdesc="Network connection manager and user applications"
 pkgdesc+=", modified for openrc"
 url="https://networkmanager.dev/"
 arch=(x86_64)
-license=(GPL)
+license=(LGPL-2.1-or-later)
 makedepends=(
   audit
   bluez-libs
@@ -65,24 +66,22 @@ checkdepends=(
   libx11
   python-dbus
 )
-source=(https://download.gnome.org/sources/${_altname}/${_basever}/${_altname}-${pkgver}.tar.xz
-        0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch)
-# https://download.gnome.org/sources/NetworkManager/1.44/NetworkManager-1.44.2.sha256sum
-sha256sums=('4b58bf3ac57e2cefb5652efd0945eb0b4bc36a63d92a61ab471d8bb2c9a420e1'
-            'd396d1d3aec56a5e1aeb2b4d92e6c38cda82eeed87c1526688528aa9d52df587')
-b2sums=('2bb5ac06018d45d55623d742fba49c3b485116091992ad56a4680ce00946c96bd0c1b3b5d34f2c36c6347ff51182e00158351c0c6989cdc7db4a49b52564a1b7'
-        '51674577e4a2786b6491fdf90cc90734da3792e0a7e224f0eecc9c485a5f81b68a71bb559b23d294d52dc9065ee82c997c31f9272504c3d753e0ffe1321367e9')
+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')
 
 prepare() {
   cd $_altname-$pkgver
 
-  # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1756
-  patch -Np1 -i "$srcdir"/0001-connectivity-Make-curl-timeout-callback-non-repeatin.patch
 }
 
 build() {
 
   local meson_options=(
+    # build checks this option; injecting just via *FLAGS is broken
+    -D b_lto=true
+
     # system paths
     -D dbus_conf_dir=/usr/share/dbus-1/system.d
 
@@ -130,7 +129,7 @@ build() {
 # tests do not work in an offline build environment
   if [ "${_offline}" == "0" ]; then
 check() {
-  meson test -C build --print-errorlogs
+  NMTST_FORCE_REAL_ROOT=1 meson test -C build --print-errorlogs
 }
   fi
 
@@ -177,6 +176,9 @@ package_networkmanager() {
   )
   backup=(etc/NetworkManager/NetworkManager.conf)
 
+  # NM wants to move to LGPL only, but there's still GPL code left
+  license+=(GPL-2.0-or-later)
+
   meson install -C build --destdir "$pkgdir"
 
   cd "$pkgdir"
@@ -197,12 +199,13 @@ END
 
   shopt -s globstar
 
+  _pick docs usr/share/gtk-doc
+
   _pick libnm usr/include/libnm
   _pick libnm usr/lib/girepository-1.0/NM-*
   _pick libnm usr/lib/libnm.*
   _pick libnm usr/lib/pkgconfig/libnm.pc
   _pick libnm usr/share/gir-1.0/NM-*
-  _pick libnm usr/share/gtk-doc/html/libnm
   _pick libnm usr/share/vala/vapi/libnm.*
 
   _pick cloud usr/lib/**/*nm-cloud-setup*
@@ -214,7 +217,6 @@ END
 
 package_libnm() {
   pkgdesc="NetworkManager client library"
-  license=(LGPL)
   depends=(
     glib2
     nss
@@ -232,3 +234,11 @@ package_nm-cloud-setup() {
 
   mv cloud/* "$pkgdir"
 }
+
+package_networkmanager-docs() {
+  pkgdesc+=" (API documentation)"
+  depends=()
+
+  mv docs/* "$pkgdir"
+}
+