[notify] libnm-32: 1.18.10 -> 1.32.10; dropped dependency: libnm; new dependency: networkmanager, libpsl-32

3 files changed, 52 insertions, 74 deletions

diff --git a/libnm-32/.footprint b/libnm-32/.footprint
index 929b6931..cab5ac88 100644
--- a/libnm-32/.footprint
+++ b/libnm-32/.footprint
@@ -1,19 +1,11 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-lrwxrwxrwx	root/root	usr/lib32/libnm-glib-vpn.so -> libnm-glib-vpn.so.1
-lrwxrwxrwx	root/root	usr/lib32/libnm-glib-vpn.so.1 -> libnm-glib-vpn.so.1.2.0
--rwxr-xr-x	root/root	usr/lib32/libnm-glib-vpn.so.1.2.0
-lrwxrwxrwx	root/root	usr/lib32/libnm-glib.so -> libnm-glib.so.4
-lrwxrwxrwx	root/root	usr/lib32/libnm-glib.so.4 -> libnm-glib.so.4.9.0
--rwxr-xr-x	root/root	usr/lib32/libnm-glib.so.4.9.0
-lrwxrwxrwx	root/root	usr/lib32/libnm-util.so -> libnm-util.so.2
-lrwxrwxrwx	root/root	usr/lib32/libnm-util.so.2 -> libnm-util.so.2.7.0
--rwxr-xr-x	root/root	usr/lib32/libnm-util.so.2.7.0
+drwxr-xr-x	root/root	usr/lib32/NetworkManager/
+drwxr-xr-x	root/root	usr/lib32/NetworkManager/1.32.10/
+-rwxr-xr-x	root/root	usr/lib32/NetworkManager/1.32.10/libnm-device-plugin-adsl.so
+-rwxr-xr-x	root/root	usr/lib32/NetworkManager/1.32.10/libnm-device-plugin-wifi.so
 lrwxrwxrwx	root/root	usr/lib32/libnm.so -> libnm.so.0
 lrwxrwxrwx	root/root	usr/lib32/libnm.so.0 -> libnm.so.0.1.0
 -rwxr-xr-x	root/root	usr/lib32/libnm.so.0.1.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
--rw-r--r--	root/root	usr/lib32/pkgconfig/libnm-glib-vpn.pc
--rw-r--r--	root/root	usr/lib32/pkgconfig/libnm-glib.pc
--rw-r--r--	root/root	usr/lib32/pkgconfig/libnm-util.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libnm.pc
diff --git a/libnm-32/.signature b/libnm-32/.signature
index f7526cfa..4256b29e 100644
--- a/libnm-32/.signature
+++ b/libnm-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXZxDRfoi/Kz+1p8JhbrfGXrSVCP9KvPaSgyH1+xpwIBLrazbbTg7lSsxoGgysFfoQDTYANER9gNzsU7NocYh2gM=
-SHA256 (Pkgfile) = 8c51be71acfb03f1eb03f3b61c619312e2556946342fff56ad48cdbeeb92dc65
-SHA256 (.footprint) = ac476851f28bccdd5ca7f3be24aaee709372e3489b23d52861aefec1a81a8df4
-SHA256 (NetworkManager-1.18.10.tar.xz) = 8e64acf0ef516d4c38ddf008157e21554efb8c5d0a692803fa256d380621e677
+RWSwxGo/zH7eXf8g4QaCLxZhY04dj2q1hX2rZRY01RFWuFmPa69sonE7ElctPWfKxbEMw4J7+Dhb3byaXUzbuzU+mWqkOuHXPAQ=
+SHA256 (Pkgfile) = 03ff36a63c724fec2ab4315e697f6aa86c15550c0eae465f77e64812b41f3b8d
+SHA256 (.footprint) = 344b1f499f306774d9f169401ffcb0d50da7f8c36f625f8eca3795053b75c70f
+SHA256 (NetworkManager-1.32.10.tar.xz) = 3e5ccc66805659e3f11a718e3a599f9726b79a01d6ff14814be6ad8bc5da8bb8
diff --git a/libnm-32/Pkgfile b/libnm-32/Pkgfile
index 04ae5e43..6c77ab71 100644
--- a/libnm-32/Pkgfile
+++ b/libnm-32/Pkgfile
@@ -1,67 +1,53 @@
 # Description: Network configuration tool
 # URL: https://wiki.gnome.org/Projects/NetworkManager/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: curl-32 dbus-glib-32 jansson-32 libndp-32 libnm nss-32
+# Depends on: curl-32 dbus-glib-32 jansson-32 libndp-32 libpsl-32 networkmanager nss-32
 
 name=libnm-32
-version=1.18.10
+version=1.32.10
 release=1
-source=(https://ftp.gnome.org/pub/gnome/sources/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz)
+source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz)
 
 build() {
-  cd NetworkManager-$version
-
-  sed '/initrd/d' -i src/meson.build
-
-  mkdir build
-  cd build
-
-  CXXFLAGS+="-O2 -fPIC" \
-  meson --prefix /usr \
-    --sysconfdir /etc \
-    --localstatedir /var \
-    --libdir /usr/lib32/NetworkManager \
-    --libexecdir /usr/lib32/networkmanager \
-    -Ddbus_conf_dir=/usr/share/dbus-1/system.d \
-    -Dudev_dir=/lib/udev \
-    -Ddhcpcd=/sbin/dhcpcd \
-    -Dresolvconf=true \
-    -Dconfig_dns_rc_manager_default=resolvconf \
-    -Dcrypto=nss \
-    -Dintrospection=false \
-    -Dsession_tracking_consolekit=false \
-    -Dwifi=false \
-    -Dwext=false \
-    -Dpolkit=false \
-    -Dmodify_system=true \
-    -Dlibnm_glib=true \
-    -Difupdown=false \
-    -Dnmtui=false \
-    -Dnmcli=false \
-    -Dsession_tracking=no \
-    -Db_lto=false \
-    -Dlibaudit=no \
-    -Dlibpsl=false \
-    -Dppp=false \
-    -Dofono=false \
-    -Dselinux=false \
-    -Dmodem_manager=false \
-    -Dsystemdsystemunitdir=false \
-    -Dsystemd_journal=false \
-    -Dqt=false \
-    -Ddocs=false \
-    -Dtests=no \
-    -Djson_validation=true \
-    -Dovs=false \
-    -Dmore_logging=false \
-    -Dmore_asserts=0 \
-    -Dlibpsl=false \
-    ..
-  ninja
-  mkdir $SRC/install
-  DESTDIR=$SRC/install/ ninja install
-
-  install -d -m 0755 $PKG/usr/lib32/pkgconfig
-  cp -dr --no-preserve='ownership' $SRC/install/usr/lib32/NetworkManager/{libnm,libnm-glib,libnm-glib-vpn,libnm-util}.so* $PKG/usr/lib32/
-  cp -dr --no-preserve='ownership' $SRC/install/usr/lib32/NetworkManager/pkgconfig/{libnm,libnm-glib,libnm-glib-vpn,libnm-util}.pc $PKG/usr/lib32/pkgconfig/ 
+	meson setup NetworkManager-$version build $PKGMK_NM \
+		--prefix /usr \
+		--libdir /usr/lib32 \
+		--sysconfdir /etc \
+		--localstatedir /var \
+		--libexecdir /usr/lib/networkmanager \
+		--buildtype=plain \
+		--wrap-mode nodownload \
+		-D b_lto=true \
+		-D b_pie=true \
+		-D crypto=nss \
+		-D dbus_conf_dir=/usr/share/dbus-1/system.d \
+		-D udev_dir=/lib/udev \
+		-D introspection=false \
+		-D session_tracking=no \
+		-D libaudit=no \
+		-D bluez5_dun=false \
+		-D concheck=false \
+		-D ebpf=false \
+		-D iwd=false \
+		-D modem_manager=false \
+		-D nm_cloud_setup=false \
+		-D nmcli=false \
+		-D nmtui=false \
+		-D ovs=false \
+		-D ppp=false \
+		-D teamdctl=false \
+		-D tests=no \
+		-D more_asserts=no \
+		-D more_logging=false \
+		-D qt=false \
+		-D systemdsystemunitdir=no \
+		-D systemd_journal=false \
+		-D selinux=false \
+		-D suspend_resume=consolekit \
+		-D polkit=false
+	meson compile -C build
+	mkdir $SRC/install
+	DESTDIR=$PKG meson install -C build
+	rm -r $PKG/usr/{bin,include,lib,sbin,share}
+	rm -r $PKG/{etc,lib,var}
 }