From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: NetworkManager: update to 1.30.2
Date: Sat, 20 Mar 2021 03:42:22 +0100 [thread overview]
Message-ID: <20210320024222.vSGuYwZvBzJtpDdwiRPSpnVmOy4tnVMxtkd-xKb4t6M@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29342@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 6666 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/29342#issuecomment-803230986
Comment:
```diff
srcpkgs/NetworkManager/patches/fix-cross-gir.patch | 30 ++++++++++++----------
srcpkgs/NetworkManager/patches/no-gtk-doc.patch | 28 ++++++++++++++++++++
srcpkgs/NetworkManager/template | 23 ++++++++---------
3 files changed, 55 insertions(+), 26 deletions(-)
diff --git a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
index c0b4344b1c..b78edfac24 100644
--- a/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
+++ b/srcpkgs/NetworkManager/patches/fix-cross-gir.patch
@@ -1,29 +1,31 @@
Reason: Fix crossbuilding GIR
Upstream: No, not upstreamable since this is very specific to the Void setup
---- libnm/meson.build.orig 2020-12-28 16:03:30.641850261 +0100
-+++ libnm/meson.build 2020-12-28 16:31:54.932136481 +0100
-@@ -276,6 +276,14 @@
- 'GI_TYPELIB_PATH=' + gi_typelib_path,
+Index: b/libnm/meson.build
+===================================================================
+--- a/libnm/meson.build
++++ b/libnm/meson.build
+@@ -274,13 +274,23 @@ if enable_introspection
'LD_LIBRARY_PATH=' + ld_library_path,
]
-+
+
+ if meson.is_cross_build()
-+ qemu = '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static'
-+ qemu_python3_cmd = qemu + ' -L @XBPS_CROSS_BASE@ @XBPS_CROSS_BASE@/bin/python3'
-+ generate_setting_docs = ['sh', '-c', qemu_python3_cmd, join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
++ qemu_python3_cmd = [
++ '/usr/bin/qemu-@XBPS_TARGET_QEMU_MACHINE@-static',
++ '-L', '@XBPS_CROSS_BASE@',
++ '@XBPS_CROSS_BASE@/usr/bin/python3'
++ ]
+ else
-+ generate_setting_docs = [python.path(), join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py')]
++ qemu_python3_cmd = python.path()
+ endif
-
++
nm_settings_docs_xml_gir = custom_target(
'nm-settings-docs-gir.xml',
-@@ -283,8 +291,7 @@
+ input: libnm_gir[0],
output: 'nm-settings-docs-gir.xml',
command: [
generate_setting_docs_env,
- python.path(),
-- join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
-+ generate_setting_docs,
++ qemu_python3_cmd,
+ join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
'--lib-path', meson.current_build_dir(),
'--gir', '@INPUT@',
- '--output', '@OUTPUT@'
diff --git a/srcpkgs/NetworkManager/patches/no-gtk-doc.patch b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
new file mode 100644
index 0000000000..2fffc51604
--- /dev/null
+++ b/srcpkgs/NetworkManager/patches/no-gtk-doc.patch
@@ -0,0 +1,28 @@
+Index: b/meson.build
+===================================================================
+--- a/meson.build
++++ b/meson.build
+@@ -943,10 +943,8 @@ if enable_qt
+ endif
+
+ if enable_docs
+- assert(enable_introspection, '-Ddocs=true requires -Dintrospection=true')
+ assert(meson.version().version_compare('>= 0.46.0'), '-Ddocs requires meson >= 0.46')
+ subdir('man')
+- subdir('docs')
+ endif
+
+ configure_file(
+Index: b/clients/common/meson.build
+===================================================================
+--- a/clients/common/meson.build
++++ b/clients/common/meson.build
+@@ -28,7 +28,7 @@ libnmc_base_dep = declare_dependency(
+ link_with: libnmc_base,
+ )
+
+-if enable_docs
++if enable_docs and enable_introspection
+ settings_docs_source = custom_target(
+ 'settings-docs.h',
+ input: nm_settings_docs_xml_gir,
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index d2287418e8..54288f71f9 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -7,28 +7,28 @@ revision=1
build_style=meson
build_helper="gir qemu"
configure_args="-Dpolkit_agent=true -Dsystemd_journal=false
- -Dlibaudit=no -Dovs=false -Dlibnm_glib=true -Dselinux=false
- -Dmodify_system=true -Dpolkit_agent=true -Dsystemdsystemunitdir=no
+ -Dlibaudit=no -Dovs=false -Dselinux=false
+ -Dmodify_system=true -Dsystemdsystemunitdir=no
-Dpppd=/usr/bin/pppd -Dqt=false
-Dsession_tracking_consolekit=false
-Dpppd_plugin_dir=/usr/lib/pppd/2.4.9 -Dresolvconf=/usr/bin/resolvconf
-Ddhclient=/usr/bin/dhclient -Dkernel_firmware_dir=/usr/lib/firmware
-Ddnsmasq=/usr/bin/dnsmasq -Ddbus_conf_dir=/etc/dbus-1/system.d
-Ddhcpcd=/usr/bin/dhcpcd -Diptables=/usr/bin/iptables
- -Diwd=true
- -Dudev_dir=/usr/lib/udev -Dintrospection=$(vopt_if gir true false)
- -Dvapi=$(vopt_if vala true false)
+ -Diwd=true -Dudev_dir=/usr/lib/udev -Ddocs=true
+ $(vopt_bool gir introspection) $(vopt_bool gir vapi)
-Dsession_tracking=$(vopt_if elogind elogind no)
-Dsuspend_resume=$(vopt_if elogind elogind upower)
-Dconfig_dhcp_default=internal"
hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel $(vopt_if vala vala)
- $(vopt_if gir 'python3-gobject')"
+ intltool dbus-glib-devel jansson-devel docbook-xsl
+ $(vopt_if gir 'vala python3-gobject')"
makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
ModemManager-devel readline-devel libndp-devel newt-devel jansson-devel
libpsl-devel eudev-libudev-devel mobile-broadband-provider-info
- $(vopt_if gir libgirepository-devel) $(vopt_if elogind elogind-devel)"
+ $(vopt_if gir 'libgirepository-devel python3-gobject')
+ $(vopt_if elogind elogind-devel)"
depends="dbus iproute2 openresolv wpa_supplicant mobile-broadband-provider-info"
short_desc="Network Management daemon"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -40,6 +40,7 @@ checksum=0c8e80e77877860e4a4e6ab4a0f7cdc1186e356b65b042a751897188b88944d2
make_check=extended
lib32disabled=yes
conf_files="/etc/${pkgname}/${pkgname}.conf"
+patch_args=-Np1
case "$XBPS_TARGET_MACHINE" in
*-musl)
@@ -50,8 +51,8 @@ case "$XBPS_TARGET_MACHINE" in
esac
# Package build options
-build_options="gir vala elogind"
-build_options_default="gir vala elogind"
+build_options="gir elogind"
+build_options_default="gir elogind"
pre_configure() {
if [ "$CROSS_BUILD" ]; then
@@ -88,8 +89,6 @@ NetworkManager-devel_package() {
vmove "usr/lib/*.so"
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
- fi
- if [ "$build_option_vala" ]; then
vmove usr/share/vala
fi
}
```
next prev parent reply other threads:[~2021-03-20 2:42 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-09 3:41 [PR PATCH] NetworkManager: update to 1.31.1 cinerea0
2021-03-09 3:50 ` cinerea0
2021-03-09 4:37 ` [PR PATCH] [Updated] " cinerea0
2021-03-09 5:07 ` NetworkManager: update to 1.31.1, gnome-control-center: drop NM compat patch cinerea0
2021-03-09 9:04 ` FollieHiyuki
2021-03-15 16:28 ` NetworkManager: update to 1.31.1 cinerea0
2021-03-15 16:55 ` [PR REVIEW] " ericonr
2021-03-15 16:55 ` ericonr
2021-03-15 17:04 ` ericonr
2021-03-16 2:56 ` [PR PATCH] [Updated] " cinerea0
2021-03-16 3:23 ` [PR REVIEW] " cinerea0
2021-03-16 3:33 ` cinerea0
2021-03-16 3:40 ` cinerea0
2021-03-19 18:10 ` [PR PATCH] [Updated] NetworkManager: update to 1.30.2 cinerea0
2021-03-19 18:22 ` cinerea0
2021-03-20 1:03 ` [PR REVIEW] " ericonr
2021-03-20 1:05 ` sgn
2021-03-20 1:26 ` cinerea0
2021-03-20 1:31 ` sgn
2021-03-20 1:35 ` cinerea0
2021-03-20 1:37 ` cinerea0
2021-03-20 2:02 ` sgn
2021-03-20 2:26 ` cinerea0
2021-03-20 2:42 ` sgn [this message]
2021-03-20 5:13 ` cinerea0
2021-03-20 5:34 ` sgn
2021-03-20 6:26 ` Gottox
2021-03-20 16:56 ` [PR PATCH] [Updated] " cinerea0
2021-03-20 17:47 ` cinerea0
2021-03-21 3:48 ` [PR REVIEW] " q66
2021-03-21 4:01 ` cinerea0
2021-03-21 20:29 ` q66
2021-03-21 23:28 ` [PR PATCH] [Updated] " cinerea0
2021-03-21 23:30 ` [PR REVIEW] " cinerea0
2021-03-21 23:43 ` cinerea0
2021-03-22 0:06 ` [PR REVIEW] " q66
2021-03-22 0:19 ` cinerea0
2021-03-22 0:23 ` [PR PATCH] [Updated] " cinerea0
2021-03-22 0:42 ` [PR REVIEW] " ericonr
2021-03-22 1:33 ` cinerea0
2021-03-22 1:48 ` sgn
2021-03-22 1:56 ` [PR REVIEW] " ericonr
2021-03-22 2:43 ` [PR PATCH] [Updated] " cinerea0
2021-03-22 3:38 ` cinerea0
2021-03-22 4:37 ` NetworkManager: update to 1.30.2, gnome-control-center: update to 3.38.5 cinerea0
2021-03-24 0:58 ` [PR REVIEW] " ericonr
2021-03-24 0:58 ` ericonr
2021-03-24 1:11 ` sgn
2021-03-24 1:48 ` ericonr
2021-03-24 2:00 ` cinerea0
2021-03-24 2:11 ` cinerea0
2021-03-24 4:31 ` [PR PATCH] [Updated] " cinerea0
2021-03-24 4:36 ` [PR REVIEW] " cinerea0
2021-03-24 5:04 ` cinerea0
2021-03-24 5:05 ` [PR PATCH] [Updated] " cinerea0
2021-03-24 13:41 ` [PR REVIEW] " ericonr
2021-03-24 15:02 ` [PR PATCH] [Updated] " cinerea0
2021-03-24 15:36 ` cinerea0
2021-03-24 19:28 ` cinerea0
2021-03-24 19:59 ` [PR REVIEW] " cinerea0
2021-03-24 20:21 ` ericonr
2021-03-24 20:22 ` ericonr
2021-03-24 21:24 ` [PR PATCH] [Updated] " cinerea0
2021-03-24 23:53 ` cinerea0
2021-03-25 0:30 ` cinerea0
2021-03-25 1:11 ` [PR REVIEW] " cinerea0
2021-03-25 1:12 ` cinerea0
2021-03-25 1:19 ` cinerea0
2021-03-25 1:49 ` ericonr
2021-03-25 2:20 ` [PR PATCH] [Updated] " cinerea0
2021-03-25 3:14 ` cinerea0
2021-03-25 14:30 ` Gottox
2021-03-25 15:17 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210320024222.vSGuYwZvBzJtpDdwiRPSpnVmOy4tnVMxtkd-xKb4t6M@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).