diff options
author | Matthias Maier <tamiko@gentoo.org> | 2021-04-04 12:48:54 -0500 |
---|---|---|
committer | Matthias Maier <tamiko@gentoo.org> | 2021-04-04 12:48:54 -0500 |
commit | 92d8f2e3b23dc6aee90a333e78de63d7b5565097 (patch) | |
tree | 410de91f73bd1012f76d070b9a60d336a2d2aaae /app-emulation/libvirt/files | |
parent | dev-python/libvirt-python: drop version 6.8.0 (diff) | |
download | gentoo-92d8f2e3b23dc6aee90a333e78de63d7b5565097.tar.gz gentoo-92d8f2e3b23dc6aee90a333e78de63d7b5565097.tar.bz2 gentoo-92d8f2e3b23dc6aee90a333e78de63d7b5565097.zip |
app-emulation/libvirt: drop version 6.8.0
Closes: https://bugs.gentoo.org/771015
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation/libvirt/files')
-rw-r--r-- | app-emulation/libvirt/files/libvirt-6.8.0-fix-libvirt-lxc-dbus.patch | 24 | ||||
-rw-r--r-- | app-emulation/libvirt/files/libvirt-6.8.0-meson-properly-handle-libpcap-if-it-s-explicitly-dis.patch | 56 |
2 files changed, 0 insertions, 80 deletions
diff --git a/app-emulation/libvirt/files/libvirt-6.8.0-fix-libvirt-lxc-dbus.patch b/app-emulation/libvirt/files/libvirt-6.8.0-fix-libvirt-lxc-dbus.patch deleted file mode 100644 index ea1a23795330..000000000000 --- a/app-emulation/libvirt/files/libvirt-6.8.0-fix-libvirt-lxc-dbus.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/753761 - -diff --git a/src/util/virgdbus.c b/src/util/virgdbus.c -index 4360a6a..4ad1a5c 100644 ---- a/src/util/virgdbus.c -+++ b/src/util/virgdbus.c -@@ -54,11 +54,15 @@ virGDBusBusInit(GBusType type, GError **error) - if (sharedBus) { - return g_bus_get_sync(type, NULL, error); - } else { -+ GDBusConnectionFlags dbusFlags = -+ G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT | -+ G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION; -+ - address = g_dbus_address_get_for_bus_sync(type, NULL, error); -- if (error) -+ if (*error) - return NULL; - return g_dbus_connection_new_for_address_sync(address, -- G_DBUS_CONNECTION_FLAGS_NONE, -+ dbusFlags, - NULL, - NULL, - error); diff --git a/app-emulation/libvirt/files/libvirt-6.8.0-meson-properly-handle-libpcap-if-it-s-explicitly-dis.patch b/app-emulation/libvirt/files/libvirt-6.8.0-meson-properly-handle-libpcap-if-it-s-explicitly-dis.patch deleted file mode 100644 index 46da07afdf00..000000000000 --- a/app-emulation/libvirt/files/libvirt-6.8.0-meson-properly-handle-libpcap-if-it-s-explicitly-dis.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c8be9ccc36a32cc756d05b2c0838c43a57be15f7 Mon Sep 17 00:00:00 2001 -Message-Id: <c8be9ccc36a32cc756d05b2c0838c43a57be15f7.1607284606.git.mprivozn@redhat.com> -From: Pavel Hrdina <phrdina@redhat.com> -Date: Thu, 8 Oct 2020 13:09:45 +0200 -Subject: [PATCH] meson: properly handle libpcap if it's explicitly disabled - -If libpcap is detected using pkg-config it would ignore the libpcap -option. - -Signed-off-by: Pavel Hrdina <phrdina@redhat.com> -Reviewed-by: Andrea Bolognani <abologna@redhat.com> -Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---- - meson.build | 25 +++++++++++++++---------- - 1 file changed, 15 insertions(+), 10 deletions(-) - -diff --git a/meson.build b/meson.build -index e5a8316668..ec252ddf39 100644 ---- a/meson.build -+++ b/meson.build -@@ -1101,17 +1101,22 @@ if libparted_dep.found() - endif - - libpcap_version = '1.5.0' --libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false) --if not libpcap_dep.found() -- pcap_config_prog = find_program('pcap-config', required: get_option('libpcap')) -- if pcap_config_prog.found() -- pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split() -- pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split() -- libpcap_dep = declare_dependency( -- compile_args: pcap_args, -- link_args: pcap_libs, -- ) -+if not get_option('libpcap').disabled() -+ libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false) -+ -+ if not libpcap_dep.found() -+ pcap_config_prog = find_program('pcap-config', required: get_option('libpcap')) -+ if pcap_config_prog.found() -+ pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split() -+ pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split() -+ libpcap_dep = declare_dependency( -+ compile_args: pcap_args, -+ link_args: pcap_libs, -+ ) -+ endif - endif -+else -+ libpcap_dep = dependency('', required: false) - endif - if libpcap_dep.found() - conf.set('WITH_LIBPCAP', 1) --- -2.26.2 - |