commit f4770a3ac2d04faf422e204c07a01267280f9d84 Author: Tim Biermann <tbier@posteo.de> Date: Mon Sep 28 19:55:46 2020 +0000 networkmanager: fixed builds against newer libxslt diff --git a/networkmanager/.signature b/networkmanager/.signature index 8e5fbe313..e6b3a09e7 100644 --- a/networkmanager/.signature +++ b/networkmanager/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xFrQVEO/3zgzZWjbyuA1wONwel8YubTfvlzDVkxK8o+Wu8URyQpYl/H/Ji8sa/+brXiE7SpjO+Jd66NcLgSVQU= -SHA256 (Pkgfile) = 2bb54540fc9de1180983581cd0385bbc7d8dcba74fc74d58efe84aca7d6c9561 +RWSagIOpLGJF39LLh4sgERun9B40lEcK9Gdpx4dZtjj3gL9smhnmI6upT+SOLTnv5OT5iJyARa2SVTMpl63qBsLeEUediYtCTgY= +SHA256 (Pkgfile) = 6b0e0bbcef5eafdc243bbce882d553d710102549792dc62c6256baaa288b11c4 SHA256 (.footprint) = b08926af77d636a60f30b82e6aa40613a200d236dae85e88a97d2b5c61446fa0 SHA256 (NetworkManager-1.26.2.tar.xz) = 2a8368ed1e4485e2ba7ca83b4b2bb07cacc33562951eb77de10d2b6411dce7e6 SHA256 (networkmanager.rc) = dc0b743685214c0402d392a6a9b2632b19714795a04c0f42ba10026250d9f3fc @@ -8,3 +8,4 @@ SHA256 (NetworkManager.conf) = 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec91 SHA256 (polkit.conf) = 7410be567871e4dc8ef1e8204f80b7cfd0dd08abfa514408b7d549bdc70dbaba SHA256 (dhcp.conf) = cd2a4b0079c0726973c1cf226c4e1cb4f2d27d02c16e0e08af7e4d6b8770423c SHA256 (org.freedesktop.NetworkManager.rules) = 7708da5de800684eb7036f29534ac6f3004115695428484e09b712da5bb1e8a5 +SHA256 (docs.patch) = f8471a5965faf204602b8062b68a7623d8736c6b7e9016a0fab218099d44d3b2 diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile index 2c31b0980..2f9406383 100644 --- a/networkmanager/Pkgfile +++ b/networkmanager/Pkgfile @@ -6,17 +6,15 @@ name=networkmanager version=1.26.2 -release=1 +release=2 source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz - networkmanager.rc - NetworkManager.conf - polkit.conf - dhcp.conf - org.freedesktop.NetworkManager.rules) + networkmanager.rc NetworkManager.conf polkit.conf dhcp.conf + org.freedesktop.NetworkManager.rules docs.patch) build() { sed '/initrd/d' -i NetworkManager-$version/src/meson.build + patch -Np1 -d NetworkManager-$version -i $SRC/docs.patch CXXFLAGS+="-O2 -fPIC" \ meson NetworkManager-$version build \ --prefix /usr \ @@ -25,7 +23,6 @@ build() { --libexecdir /usr/lib/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 \ diff --git a/networkmanager/docs.patch b/networkmanager/docs.patch new file mode 100644 index 000000000..b11b3e464 --- /dev/null +++ b/networkmanager/docs.patch @@ -0,0 +1,38 @@ +From 54e25f23f53af889703dfc50d51a8afeeea8a439 Mon Sep 17 00:00:00 2001 +From: Valentin David <valentin.david@codethink.co.uk> +Date: Tue, 8 Sep 2020 17:15:30 +0200 +Subject: [PATCH] build/docs: fix generated XML syntax in + tools/generate-docs-nm-settings-docs-gir.py + +Class description may contains double quotes which is not valid as XML +attribute value. + +[thaller@redhat.com: adjust original patch to reformat code with python black] + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_request... +--- + tools/generate-docs-nm-settings-docs-gir.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tools/generate-docs-nm-settings-docs-gir.py b/tools/generate-docs-nm-settings-docs-gir.py +index ebda99560a..317b32972a 100755 +--- a/tools/generate-docs-nm-settings-docs-gir.py ++++ b/tools/generate-docs-nm-settings-docs-gir.py +@@ -244,8 +244,12 @@ for settingxml in settings: + "%s needs a gtk-doc block with one-line description" % setting.props.name + ) + outfile.write( +- ' <setting name="%s" description="%s" name_upper="%s" >\n' +- % (setting.props.name, class_desc, get_setting_name_define(settingxml)) ++ ' <setting name="%s" description=%s name_upper="%s" >\n' ++ % ( ++ setting.props.name, ++ xml_quoteattr(class_desc), ++ get_setting_name_define(settingxml), ++ ) + ) + + setting_properties = { +-- +GitLab +