virt-manager/virtman-revert-use-of-AyatanaAppIndicator3.patch
Charles Arnold 0b51f8ff5d - bsc#1196202 - virt-install crashes on a time-of-check time-of-use
(TOCTOU) race condition
  Resolved by upgrade to version 4.0.0 (jsc#SLE-16582)
  virt-manager-4.0.0.tar.gz
- Other features and bug fixes (bsc#1027942)
  virt-install –os-variant/–osinfo is now a hard requirement for most cases
  Add ‘Enable shared memory’ UI checkbox (Lin Ma)
  add UI preference to default to UEFI for new VMs (Charles Arnold)
  Add virtiofs filesystem driver UI option
  Fill in all –cputune, –cpu, –shmem, –input, and –boot suboptions (Hugues Fafard)
  virt-* mdev improvements (Shalini Chellathurai Saroja)
  bhyve improvments (Roman Bogorodskiy)
  Revive network portgroup UI
  enable a TPM by default when UEFI is used (Daniel P. Berrangé)
  Use cpu host-passthrough by default on qemu x86
  use virtio-gpu video for most modern distros
  Default to extra pcie root ports for q35
  set discard=unmap by default for sparse disks and block devices
  We now require xorissofs for –location ISO
  We now use setuptools rather than just plain distutils
- Add virtman-revert-use-of-AyatanaAppIndicator3.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=558
2022-03-03 04:17:21 +00:00

47 lines
1.4 KiB
Diff

While AyatanaAppIndicator3 is available on Tumbleweed,
it is not available on SLE15.
Index: virt-manager-3.3.0/virtManager/systray.py
===================================================================
--- virt-manager-3.3.0.orig/virtManager/systray.py
+++ virt-manager-3.3.0/virtManager/systray.py
@@ -6,7 +6,6 @@
import os
-import gi
from gi.repository import Gio
from gi.repository import Gtk
@@ -17,25 +16,14 @@ from . import vmmenu
from .baseclass import vmmGObject
from .connmanager import vmmConnectionManager
-
-# pylint: disable=ungrouped-imports
-# Prefer AyatantaAppIndicator3 which is the modern maintained
-# appindicator library.
-try: # pragma: no cover
- # pylint: disable=no-name-in-module
- gi.require_version('AyatanaAppIndicator3', '0.1')
- from gi.repository import AyatanaAppIndicator3 as AppIndicator3
+try:
+ # pylint: disable=ungrouped-imports
+ import gi
+ gi.require_version('AppIndicator3', '0.1')
+ from gi.repository import AppIndicator3
except Exception: # pragma: no cover
AppIndicator3 = None
-if not AppIndicator3:
- try: # pragma: no cover
- # pylint: disable=no-name-in-module
- gi.require_version('AppIndicator3', '0.1')
- from gi.repository import AppIndicator3
- except Exception: # pragma: no cover
- AppIndicator3 = None
-
def _toggle_manager(*args, **kwargs):
ignore = args