NetworkManager ver. bump

This commit is contained in:
Rmys
2025-04-11 17:26:58 +03:00
parent 9ec2446024
commit d6bf37c9d5
2 changed files with 102 additions and 2 deletions
@@ -0,0 +1,93 @@
From 12eff9a7fdfeabab12ce56e5f7d515a13a3d704c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 23 Mar 2025 16:35:44 +0100
Subject: [PATCH] meson: Fix docs generation with PyGObject 3.52
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
PyGObject 3.52 switched from gobject-introspections libgirepository 1.0
to glibs libgirepository 2.0. As a result, the Python script would
no longer be able to find the `GIRepository` 2.0 typelib:
(process:1944): GLib-GIRepository-DEBUG: 15:25:14.521: Ignoring GIRepository-2.0.typelib because this libgirepository corresponds to GIRepository-3.0.typelib
We could update the script to support both versions of the typelib
but it is not really necessary. It was only used to add extra directories
from `$LD_LIBRARY_PATH` and the CLI argument to repositorys library path
but libgirepository already supports using `LD_LIBRARY_PATH` directly:
https://docs.gtk.org/girepository/method.Repository.prepend_library_path.html
---
src/libnm-client-impl/meson.build | 1 -
tools/generate-docs-nm-settings-docs-gir.py | 28 ---------------------
2 files changed, 29 deletions(-)
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
index e50e8fbdbb9..b49366292f5 100644
--- a/src/libnm-client-impl/meson.build
+++ b/src/libnm-client-impl/meson.build
@@ -209,7 +209,6 @@ if enable_introspection
'LD_LIBRARY_PATH=' + ld_library_path,
python_path,
gen_gir_cmd,
- '--lib-path', meson.current_build_dir(),
'--gir', libnm_gir[0],
'--output', '@OUTPUT@',
'--target', name
diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py
index e438d87ad40..40fab200030 100755
--- a/tools/generate-docs-nm-settings-docs-gir.py
+++ b/tools/generate-docs-nm-settings-docs-gir.py
@@ -6,26 +6,9 @@
from __future__ import print_function, unicode_literals
import xml.etree.ElementTree as ET
import argparse
-import os
import gi
import re
-gi.require_version("GIRepository", "2.0")
-from gi.repository import GIRepository
-
-try:
- libs = os.environ["LD_LIBRARY_PATH"].split(":")
- libs.reverse()
- for lib in libs:
- GIRepository.Repository.prepend_library_path(lib)
-except AttributeError:
- # An old GI version, that has no prepend_library_path
- # It's alright, it probably interprets LD_LIBRARY_PATH
- # correctly.
- pass
-except KeyError:
- pass
-
gi.require_version("NM", "1.0")
from gi.repository import NM, GObject
@@ -354,13 +337,6 @@ def main(gir_path_str, output_path_str, output_target):
if __name__ == "__main__":
parser = argparse.ArgumentParser()
- parser.add_argument(
- "-l",
- "--lib-path",
- metavar="PATH",
- action="append",
- help="path to scan for shared libraries",
- )
parser.add_argument(
"-g",
"--gir",
@@ -384,8 +360,4 @@ if __name__ == "__main__":
args = parser.parse_args()
- if args.lib_path:
- for lib in args.lib_path:
- GIRepository.Repository.prepend_library_path(lib)
-
main(args.gir, args.output, args.target)
--
GitLab
+9 -2
View File
@@ -13,7 +13,7 @@
<Icon>NetworkManager</Icon>
<Summary>Network connection manager powered by D-Bus and UDEV</Summary>
<Description>NetworkManager attempts to keep an active network connection available at all times.</Description>
<Archive sha1sum="5ab30cb4696d035b81d56fbe69b7e5cb527e4ec7" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.50/NetworkManager-1.50.0.tar.xz</Archive>
<Archive sha1sum="44942a87c9e4a62e84b5e5917e7a81ba41547067" type="tarxz">https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/1.52.0/downloads/NetworkManager-1.52.0.tar.xz</Archive>
<AdditionalFiles>
<!-- <AdditionalFile target="po/tr.po">tr.po</AdditionalFile> -->
</AdditionalFiles>
@@ -62,7 +62,7 @@
<Dependency>libpsl-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>abc6e1cf.patch</Patch> -->
<Patch>12eff9a7.patch</Patch>
</Patches>
</Source>
@@ -161,6 +161,13 @@
</Package>
<History>
<Update release="51">
<Date>2025-04-11</Date>
<Version>1.52.0</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="50">
<Date>2024-12-26</Date>
<Version>1.50.0</Version>