~ruther/guix-local

56af9e3acf882d07c8d502d69ef0265bad864e35 — Liliana Marie Prikler 1 year, 10 months ago 9b8ef0a
gnu: network-manager: Update to 1.48.2.

* gnu/packages/gnome.scm (network-manager): Update to 1.48.2.
[source]: Drop “network-manager-meson.patch”.
* gnu/packages/patches/network-manager-meson.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
3 files changed, 3 insertions(+), 26 deletions(-)

M gnu/local.mk
M gnu/packages/gnome.scm
D gnu/packages/patches/network-manager-meson.patch
M gnu/local.mk => gnu/local.mk +0 -1
@@ 1898,7 1898,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch	\
  %D%/packages/patches/ngircd-handle-zombies.patch		\
  %D%/packages/patches/network-manager-plugin-path.patch	\
  %D%/packages/patches/network-manager-meson.patch		\
  %D%/packages/patches/newlib-getentropy.patch			\
  %D%/packages/patches/nginx-socket-cloexec.patch		\
  %D%/packages/patches/nickle-man-release-date.patch		\

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +3 -4
@@ 8483,17 8483,16 @@ users.")
    (name "network-manager")
    ;; Note: NetworkManager still follows the odd/even major version number
    ;; for development/stable releases scheme; be sure to use a stable one.
    (version "1.44.0")
    (version "1.48.2")
    (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/NetworkManager/"
                                  (version-major+minor version) "/"
                                  "NetworkManager-" version ".tar.xz"))
              (patches (search-patches "network-manager-plugin-path.patch"
                                       "network-manager-meson.patch"))
              (patches (search-patches "network-manager-plugin-path.patch"))
              (sha256
               (base32
                "17zvg63jjbqdw8xyc6narirvvbbv7micbn0j7dmq0bqqgmihkjpd"))))
                "18c6bbfiln03fwksw52ir6w6hxg10c36zl7m647dykcncb67341x"))))
    (build-system meson-build-system)
    (outputs '("out"
               "doc"))                  ; 8 MiB of gtk-doc HTML

D gnu/packages/patches/network-manager-meson.patch => gnu/packages/patches/network-manager-meson.patch +0 -21
@@ 1,21 0,0 @@
Since libnm-wwan.so is not just a loadable module but also a shared library
that some plugin links against, build it as a shared library while avoiding
'-Wl,--no-undefined':

  https://github.com/mesonbuild/meson/issues/9492#issuecomment-973117289

diff --git a/src/core/devices/wwan/meson.build b/src/core/devices/wwan/meson.build
index 37ef738..18ac54f 100644
--- a/src/core/devices/wwan/meson.build
+++ b/src/core/devices/wwan/meson.build
@@ -4,8 +4,9 @@ wwan_inc = include_directories('.')
 
 linker_script = join_paths(meson.current_source_dir(), 'libnm-wwan.ver')
 
-libnm_wwan = shared_module(
+libnm_wwan = shared_library(
   'nm-wwan',
+  override_options: ['b_lundef=false'],
   sources: files(
   'nm-service-providers.c',
   'nm-modem-broadband.c',