From 1cf1818ee6a11f24a1bc9be366e3f5f1e737470f Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Tue, 21 Jul 2020 00:13:46 +0200
Subject: [PATCH 01/18] bump virt-manager/view-viewer and deps

---
 osinfo-db-tools.rb | 26 ++++++++--------
 osinfo-db.rb       |  8 ++---
 virt-manager.rb    | 75 ++++++++++++++++++++++++----------------------
 virt-viewer.rb     | 16 ++--------
 4 files changed, 59 insertions(+), 66 deletions(-)

diff --git a/osinfo-db-tools.rb b/osinfo-db-tools.rb
index 01f3789..0347af3 100644
--- a/osinfo-db-tools.rb
+++ b/osinfo-db-tools.rb
@@ -1,27 +1,27 @@
 class OsinfoDbTools < Formula
   desc "Tools for managing the libosinfo database files"
   homepage "https://libosinfo.org"
-  url "https://releases.pagure.org/libosinfo/osinfo-db-tools-1.6.0.tar.gz"
-  sha256 "d0d5b1196d73a7abed051be48d0e5b4aa196aac4cdbf8ddf52f57c0c492b2574"
+  url "https://releases.pagure.org/libosinfo/osinfo-db-tools-1.9.0.tar.xz"
+  sha256 "255f1c878bacec70c3020ff5a9cb0f6bd861ca0009f24608df5ef6f62d5243c0"
 
+  depends_on "meson" => :build
+  depends_on "ninja" => :build
   depends_on "pkg-config" => :build
 
-  depends_on "gettext"
   depends_on "glib"
   depends_on "json-glib"
-  depends_on "libarchive" # need >= 3.0.0
+  depends_on "libarchive"
+  depends_on "libxml2"
   depends_on "libsoup"
 
   def install
-    args = %W[
-      --disable-dependency-tracking
-      --disable-silent-rules
-      --prefix=#{prefix}
-      --localstatedir=#{var}
-      --sysconfdir=#{etc}
-    ]
-    system "./configure", *args
-    system "make", "install"
+    mkdir "build" do
+      flags = %W[
+        -Dsysconfdir=#{etc}
+      ]
+      system "meson", *std_meson_args, *flags, ".."
+      system "ninja", "install", "-v"
+    end
   end
 
   test do
diff --git a/osinfo-db.rb b/osinfo-db.rb
index 8a265fe..5f82d4f 100644
--- a/osinfo-db.rb
+++ b/osinfo-db.rb
@@ -1,16 +1,16 @@
 class OsinfoDb < Formula
   desc "Libosinfo database files"
   homepage "https://libosinfo.org/"
-  url "https://releases.pagure.org/libosinfo/osinfo-db-20191125.tar.xz"
-  sha256 "e8f4e8c3e3ee738191511a4549fc8e4895b501312f2a7d383d5bde72a76f5580"
+  url "https://releases.pagure.org/libosinfo/osinfo-db-20210202.tar.xz"
+  sha256 "0bb56aeddf94a2cf48853c0e82cacaeb873d98c19590d81fbceadb06a391b11b"
 
   depends_on "osinfo-db-tools" => :build
 
   def install
     system "osinfo-db-import", "--local", cached_download
 
-    # Copy the archive into the prefix to avoid empty installation error
-    cp_r "./", prefix
+    # Avoid empty installation error
+    (prefix/"keep").write("")
   end
 
   test do
diff --git a/virt-manager.rb b/virt-manager.rb
index bf25378..0ba0d18 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -3,57 +3,61 @@ class VirtManager < Formula
 
   desc "App for managing virtual machines"
   homepage "https://virt-manager.org/"
-  url "https://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz"
-  sha256 "cfd88d66e834513e067b4d3501217e21352fadb673103bacb9e646da9f029a1b"
-  revision 3
+  url "https://releases.pagure.org/virt-manager/virt-manager-3.2.0.tar.gz"
+  sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
 
-  depends_on "intltool" => :build
-  depends_on "pkg-config" => :build
+  depends_on "docutils" => :build
+  depends_on "gettext" => :build
 
-  depends_on "adwaita-icon-theme"
   depends_on "gtk+3"
   depends_on "gtk-vnc"
   depends_on "gtksourceview4"
-  depends_on "hicolor-icon-theme"
   depends_on "libosinfo"
-  depends_on "libvirt"
   depends_on "libvirt-glib"
   depends_on "libxml2" # need python3 bindings
   depends_on "osinfo-db"
-  depends_on "py3cairo"
-  depends_on "pygobject3"
   depends_on "python"
   depends_on "spice-gtk"
   depends_on "vte3"
 
-  resource "libvirt-python" do
-    url "https://libvirt.org/sources/python/libvirt-python-6.10.0.tar.gz"
-    sha256 "47a8e90d9f49bc0296d2817f6009e18dbb69844ce10b81c2a2672bccd6f49fd5"
+  resource "certifi" do
+    url "https://files.pythonhosted.org/packages/06/a9/cd1fd8ee13f73a4d4f491ee219deeeae20afefa914dfb4c130cfc9dc397a/certifi-2020.12.5.tar.gz"
+    sha256 "1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"
+  end
+
+  resource "chardet" do
+    url "https://files.pythonhosted.org/packages/ee/2d/9cdc2b527e127b4c9db64b86647d567985940ac3698eeabc7ffaccb4ea61/chardet-4.0.0.tar.gz"
+    sha256 "0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"
   end
 
   resource "idna" do
-    url "https://pypi.io/packages/source/i/idna/idna-2.8.tar.gz"
-    sha256 "c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"
+    url "https://files.pythonhosted.org/packages/ea/b7/e0e3c1c467636186c39925827be42f16fee389dc404ac29e930e9136be70/idna-2.10.tar.gz"
+    sha256 "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"
   end
 
-  resource "certifi" do
-    url "https://pypi.io/packages/source/c/certifi/certifi-2019.11.28.tar.gz"
-    sha256 "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"
+  resource "libvirt-python" do
+    url "https://files.pythonhosted.org/packages/ee/32/f8f89f58e86ffd0d384d1864bbcefc1894efe5132dbc050489bd7555a6d6/libvirt-python-7.0.0.tar.gz"
+    sha256 "7e1663da2587e87106fc226160b33ae2160989c32176ad17d876315d5c1c36b5"
   end
 
-  resource "chardet" do
-    url "https://pypi.io/packages/source/c/chardet/chardet-3.0.4.tar.gz"
-    sha256 "84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"
+  resource "pycairo" do
+    url "https://files.pythonhosted.org/packages/9d/6e/499d6a6db416eb3cdf0e57762a269908e4ab6638a75a90972afc34885b91/pycairo-1.20.0.tar.gz"
+    sha256 "5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"
   end
 
-  resource "urllib3" do
-    url "https://pypi.io/packages/source/u/urllib3/urllib3-1.25.7.tar.gz"
-    sha256 "f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"
+  resource "pygobject" do
+    url "https://files.pythonhosted.org/packages/3a/a7/de282a4aaedba59d60a895a7821e6497b39cbdfa94a352776ff45ffc6e6f/PyGObject-3.38.0.tar.gz"
+    sha256 "051b950f509f2e9f125add96c1493bde987c527f7a0c15a1f7b69d6d1c3cd8e6"
   end
 
   resource "requests" do
-    url "https://pypi.io/packages/source/r/requests/requests-2.22.0.tar.gz"
-    sha256 "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4"
+    url "https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b/requests-2.25.1.tar.gz"
+    sha256 "27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"
+  end
+
+  resource "urllib3" do
+    url "https://files.pythonhosted.org/packages/d7/8d/7ee68c6b48e1ec8d41198f694ecdc15f7596356f2ff8e6b1420300cf5db3/urllib3-1.26.3.tar.gz"
+    sha256 "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"
   end
 
   # virt-manager doesn't prompt for password on macOS unless --no-fork flag is provided
@@ -94,17 +98,16 @@ def post_install
   end
 end
 __END__
-diff --git a/virt-manager b/virt-manager
-index 15d5109..8ee305a 100755
---- a/virt-manager
-+++ b/virt-manager
-@@ -151,7 +151,8 @@ def parse_commandline():
+diff --git a/virtManager/virtmanager.py b/virtManager/virtmanager.py
+index f6d538b..3e78d3c 100755
+--- a/virtManager/virtmanager.py
++++ b/virtManager/virtmanager.py
+@@ -136,7 +136,7 @@ def parse_commandline():
+     parser.add_argument("--debug", action="store_true",
          help="Print debug output to stdout (implies --no-fork)",
          default=False)
-     parser.add_argument("--no-fork", action="store_true",
--        help="Don't fork into background on startup")
-+        help="Don't fork into background on startup",
-+        default=True)
+-    parser.add_argument("--no-fork", action="store_true",
++    parser.add_argument("--fork", dest='no_fork', action="store_false",
+         help="Don't fork into background on startup")
 
      parser.add_argument("--show-domain-creator", action="store_true",
-         help="Show 'New VM' wizard")
diff --git a/virt-viewer.rb b/virt-viewer.rb
index a81ff1e..0b58ffa 100644
--- a/virt-viewer.rb
+++ b/virt-viewer.rb
@@ -1,27 +1,17 @@
 class VirtViewer < Formula
   desc "App for virtualized guest interaction"
   homepage "https://virt-manager.org/"
-  url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-8.0.tar.gz"
-  sha256 "dcf358ed5d7a4900215133135a6492c04311d84332816d930df9a89d6195b6ed"
+  url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-9.0.tar.gz"
+  sha256 "91b43383a0bd4cf3173269e674d65fd205f7c34bc5a8cb4fb3640deb7f1d4825"
 
-  depends_on "intltool" => :build
-  depends_on "libtool" => :build
+  depends_on "gettext" => :build
   depends_on "pkg-config" => :build
 
-  depends_on "atk"
-  depends_on "cairo"
-  depends_on "gdk-pixbuf"
-  depends_on "gettext"
   depends_on "glib"
   depends_on "gtk+3"
   depends_on "gtk-vnc"
-  depends_on "hicolor-icon-theme"
-  depends_on "libvirt"
   depends_on "libvirt-glib"
-  depends_on "pango"
-  depends_on "shared-mime-info"
   depends_on "spice-gtk"
-  depends_on "spice-protocol"
 
   def install
     args = %W[

From 2c3e81687abef93fee3bea784bfab2339ad55ada Mon Sep 17 00:00:00 2001
From: Marius Bertram <marius.bertram@uni-due.de>
Date: Thu, 4 Mar 2021 09:41:28 +0100
Subject: [PATCH 02/18] update libvirt-python to version 7.1.0

With libvirt-python-7.1.0 it is possible install virt-manager on M1 Macs
---
 virt-manager.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index 0ba0d18..db3c3d2 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -36,8 +36,8 @@ class VirtManager < Formula
   end
 
   resource "libvirt-python" do
-    url "https://files.pythonhosted.org/packages/ee/32/f8f89f58e86ffd0d384d1864bbcefc1894efe5132dbc050489bd7555a6d6/libvirt-python-7.0.0.tar.gz"
-    sha256 "7e1663da2587e87106fc226160b33ae2160989c32176ad17d876315d5c1c36b5"
+    url "https://libvirt.org/sources/python/libvirt-python-7.1.0.tar.gz"	
+	  sha256 "faafd31e407f9cb750a73349c007651ca8954ebd455e55b0a20e96de81c50037"
   end
 
   resource "pycairo" do

From 2dae1bb65aae24af283ed7bc8bd950688788c517 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Thu, 13 May 2021 23:33:33 +0200
Subject: [PATCH 03/18] bump virt-viewer to 10.0

---
 virt-viewer.rb | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/virt-viewer.rb b/virt-viewer.rb
index 0b58ffa..58a3025 100644
--- a/virt-viewer.rb
+++ b/virt-viewer.rb
@@ -1,10 +1,12 @@
 class VirtViewer < Formula
   desc "App for virtualized guest interaction"
   homepage "https://virt-manager.org/"
-  url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-9.0.tar.gz"
-  sha256 "91b43383a0bd4cf3173269e674d65fd205f7c34bc5a8cb4fb3640deb7f1d4825"
+  url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-10.0.tar.xz"
+  sha256 "d23bc0a06e4027c37b8386cfd0286ef37bd738977153740ab1b6b331192389c5"
 
   depends_on "gettext" => :build
+  depends_on "meson" => :build
+  depends_on "ninja" => :build
   depends_on "pkg-config" => :build
 
   depends_on "glib"
@@ -14,15 +16,10 @@ class VirtViewer < Formula
   depends_on "spice-gtk"
 
   def install
-    args = %W[
-      --disable-silent-rules
-      --disable-update-mimedb
-      --with-gtk-vnc
-      --with-spice-gtk
-      --prefix=#{prefix}
-    ]
-    system "./configure", *args
-    system "make", "install"
+    mkdir "build" do
+      system "meson", *std_meson_args, ".."
+      system "ninja", "install", "-v"
+    end
   end
 
   def post_install

From 01070d5b3b343c01303cdc24e8c850852dcbf742 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Fri, 14 May 2021 00:18:42 +0200
Subject: [PATCH 04/18] update virt-manager deps

---
 virt-manager.rb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index db3c3d2..84fabf7 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -5,6 +5,7 @@ class VirtManager < Formula
   homepage "https://virt-manager.org/"
   url "https://releases.pagure.org/virt-manager/virt-manager-3.2.0.tar.gz"
   sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
+  revision 1
 
   depends_on "docutils" => :build
   depends_on "gettext" => :build
@@ -36,8 +37,8 @@ class VirtManager < Formula
   end
 
   resource "libvirt-python" do
-    url "https://libvirt.org/sources/python/libvirt-python-7.1.0.tar.gz"	
-	  sha256 "faafd31e407f9cb750a73349c007651ca8954ebd455e55b0a20e96de81c50037"
+    url "https://files.pythonhosted.org/packages/55/1a/c3862f108a8591c18c54419fe5a0ee1a7ac8652029fa3c2ffc2352c5c9f8/libvirt-python-7.3.0.tar.gz"
+    sha256 "676c260ddb365120404e611a38c514045ef1af1a7fede15c1fc02d0f8241f696"
   end
 
   resource "pycairo" do
@@ -45,9 +46,9 @@ class VirtManager < Formula
     sha256 "5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"
   end
 
-  resource "pygobject" do
-    url "https://files.pythonhosted.org/packages/3a/a7/de282a4aaedba59d60a895a7821e6497b39cbdfa94a352776ff45ffc6e6f/PyGObject-3.38.0.tar.gz"
-    sha256 "051b950f509f2e9f125add96c1493bde987c527f7a0c15a1f7b69d6d1c3cd8e6"
+  resource "PyGObject" do
+    url "https://files.pythonhosted.org/packages/51/2f/4d5d5afb7000b9151e33952b59163c9389bd867ac6fe85d62f85831fa061/PyGObject-3.40.1.tar.gz"
+    sha256 "6fb599aa59ceb9dd05fafb0d72b3862943e7d5e85c8ef6c74856bc6d4321cbab"
   end
 
   resource "requests" do
@@ -56,8 +57,8 @@ class VirtManager < Formula
   end
 
   resource "urllib3" do
-    url "https://files.pythonhosted.org/packages/d7/8d/7ee68c6b48e1ec8d41198f694ecdc15f7596356f2ff8e6b1420300cf5db3/urllib3-1.26.3.tar.gz"
-    sha256 "de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73"
+    url "https://files.pythonhosted.org/packages/cb/cf/871177f1fc795c6c10787bc0e1f27bb6cf7b81dbde399fd35860472cecbc/urllib3-1.26.4.tar.gz"
+    sha256 "e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"
   end
 
   # virt-manager doesn't prompt for password on macOS unless --no-fork flag is provided

From 4f97a2bc29de17343bf5bf4cd7f193510bbd25a2 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Fri, 14 May 2021 00:34:05 +0200
Subject: [PATCH 05/18] bump osinfo-db

---
 osinfo-db.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osinfo-db.rb b/osinfo-db.rb
index 5f82d4f..5050d61 100644
--- a/osinfo-db.rb
+++ b/osinfo-db.rb
@@ -1,8 +1,8 @@
 class OsinfoDb < Formula
   desc "Libosinfo database files"
   homepage "https://libosinfo.org/"
-  url "https://releases.pagure.org/libosinfo/osinfo-db-20210202.tar.xz"
-  sha256 "0bb56aeddf94a2cf48853c0e82cacaeb873d98c19590d81fbceadb06a391b11b"
+  url "https://releases.pagure.org/libosinfo/osinfo-db-20210426.tar.xz"
+  sha256 "66c93b4a5b319b2ff7d40360d9e94486a9a45f2c0dd1c30d4b31de4f223070d0"
 
   depends_on "osinfo-db-tools" => :build
 

From 6b63f835b973385a2d50d57a47735f6d92898b23 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Sat, 15 May 2021 12:04:52 +0200
Subject: [PATCH 06/18] simplify install step

---
 osinfo-db-tools.rb | 13 ++++++-------
 virt-viewer.rb     |  7 +++----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/osinfo-db-tools.rb b/osinfo-db-tools.rb
index 0347af3..824c50b 100644
--- a/osinfo-db-tools.rb
+++ b/osinfo-db-tools.rb
@@ -3,6 +3,7 @@ class OsinfoDbTools < Formula
   homepage "https://libosinfo.org"
   url "https://releases.pagure.org/libosinfo/osinfo-db-tools-1.9.0.tar.xz"
   sha256 "255f1c878bacec70c3020ff5a9cb0f6bd861ca0009f24608df5ef6f62d5243c0"
+  revision 1
 
   depends_on "meson" => :build
   depends_on "ninja" => :build
@@ -15,13 +16,11 @@ class OsinfoDbTools < Formula
   depends_on "libsoup"
 
   def install
-    mkdir "build" do
-      flags = %W[
-        -Dsysconfdir=#{etc}
-      ]
-      system "meson", *std_meson_args, *flags, ".."
-      system "ninja", "install", "-v"
-    end
+    flags = %W[
+      -Dsysconfdir=#{etc}
+    ]
+    system "meson", "setup", "builddir", *std_meson_args, *flags
+    system "ninja", "-C", "builddir", "install", "-v"
   end
 
   test do
diff --git a/virt-viewer.rb b/virt-viewer.rb
index 58a3025..a3fcbf3 100644
--- a/virt-viewer.rb
+++ b/virt-viewer.rb
@@ -3,6 +3,7 @@ class VirtViewer < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-10.0.tar.xz"
   sha256 "d23bc0a06e4027c37b8386cfd0286ef37bd738977153740ab1b6b331192389c5"
+  revision 1
 
   depends_on "gettext" => :build
   depends_on "meson" => :build
@@ -16,10 +17,8 @@ class VirtViewer < Formula
   depends_on "spice-gtk"
 
   def install
-    mkdir "build" do
-      system "meson", *std_meson_args, ".."
-      system "ninja", "install", "-v"
-    end
+    system "meson", "setup", "builddir", *std_meson_args
+    system "ninja", "-C", "builddir", "install", "-v"
   end
 
   def post_install

From 2a013b7a4d60325f1ebc8e7359125ae55413cef4 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Tue, 15 Jun 2021 09:02:08 +0200
Subject: [PATCH 07/18] use virt-manager.org url

---
 virt-manager.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index 84fabf7..c01ace5 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -3,9 +3,9 @@ class VirtManager < Formula
 
   desc "App for managing virtual machines"
   homepage "https://virt-manager.org/"
-  url "https://releases.pagure.org/virt-manager/virt-manager-3.2.0.tar.gz"
+  url "https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
   sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
-  revision 1
+  revision 2
 
   depends_on "docutils" => :build
   depends_on "gettext" => :build

From be42b8c1dfbda922a9729c1f9edceb105b9c1f82 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Mon, 28 Jun 2021 14:02:47 +0200
Subject: [PATCH 08/18] osinfo-db now part of homebrew-core

---
 osinfo-db-tools.rb | 29 -----------------------------
 osinfo-db.rb       | 19 -------------------
 virt-manager.rb    | 18 ++++++------------
 virt-viewer.rb     |  8 ++++----
 4 files changed, 10 insertions(+), 64 deletions(-)
 delete mode 100644 osinfo-db-tools.rb
 delete mode 100644 osinfo-db.rb

diff --git a/osinfo-db-tools.rb b/osinfo-db-tools.rb
deleted file mode 100644
index 824c50b..0000000
--- a/osinfo-db-tools.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class OsinfoDbTools < Formula
-  desc "Tools for managing the libosinfo database files"
-  homepage "https://libosinfo.org"
-  url "https://releases.pagure.org/libosinfo/osinfo-db-tools-1.9.0.tar.xz"
-  sha256 "255f1c878bacec70c3020ff5a9cb0f6bd861ca0009f24608df5ef6f62d5243c0"
-  revision 1
-
-  depends_on "meson" => :build
-  depends_on "ninja" => :build
-  depends_on "pkg-config" => :build
-
-  depends_on "glib"
-  depends_on "json-glib"
-  depends_on "libarchive"
-  depends_on "libxml2"
-  depends_on "libsoup"
-
-  def install
-    flags = %W[
-      -Dsysconfdir=#{etc}
-    ]
-    system "meson", "setup", "builddir", *std_meson_args, *flags
-    system "ninja", "-C", "builddir", "install", "-v"
-  end
-
-  test do
-    system "#{bin}/osinfo-db-path"
-  end
-end
diff --git a/osinfo-db.rb b/osinfo-db.rb
deleted file mode 100644
index 5050d61..0000000
--- a/osinfo-db.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class OsinfoDb < Formula
-  desc "Libosinfo database files"
-  homepage "https://libosinfo.org/"
-  url "https://releases.pagure.org/libosinfo/osinfo-db-20210426.tar.xz"
-  sha256 "66c93b4a5b319b2ff7d40360d9e94486a9a45f2c0dd1c30d4b31de4f223070d0"
-
-  depends_on "osinfo-db-tools" => :build
-
-  def install
-    system "osinfo-db-import", "--local", cached_download
-
-    # Avoid empty installation error
-    (prefix/"keep").write("")
-  end
-
-  test do
-    system "osinfo-db-validate", "--local"
-  end
-end
diff --git a/virt-manager.rb b/virt-manager.rb
index c01ace5..ca01de3 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -15,7 +15,7 @@ class VirtManager < Formula
   depends_on "gtksourceview4"
   depends_on "libosinfo"
   depends_on "libvirt-glib"
-  depends_on "libxml2" # need python3 bindings
+  depends_on "libxml2"
   depends_on "osinfo-db"
   depends_on "python"
   depends_on "spice-gtk"
@@ -69,14 +69,8 @@ def install
     venv.pip_install resources
 
     # virt-manager uses distutils, doesn't like --single-version-externally-managed
-    system "#{libexec}/bin/python", "setup.py",
-                     "configure",
-                     "--prefix=#{libexec}"
-    system "#{libexec}/bin/python", "setup.py",
-                     "--no-user-cfg",
-                     "--no-update-icon-cache",
-                     "--no-compile-schemas",
-                     "install"
+    system libexec/"bin/python", "setup.py", "configure", "--prefix=#{libexec}"
+    system libexec/"bin/python", "setup.py", "install", "--no-user-cfg", "--no-update-icon-cache", "--no-compile-schemas"
 
     # install virt-manager commands with PATH set to Python virtualenv environment
     bin.install Dir[libexec/"bin/virt-*"]
@@ -89,13 +83,13 @@ def install
 
   def post_install
     # manual schema compile step
-    system "#{Formula["glib"].opt_bin}/glib-compile-schemas", "#{HOMEBREW_PREFIX}/share/glib-2.0/schemas"
+    system Formula["glib"].opt_bin/"glib-compile-schemas", HOMEBREW_PREFIX/"share/glib-2.0/schemas"
     # manual icon cache update step
-    system "#{Formula["gtk+3"].opt_bin}/gtk3-update-icon-cache", "#{HOMEBREW_PREFIX}/share/icons/hicolor"
+    system Formula["gtk+3"].opt_bin/"gtk3-update-icon-cache", HOMEBREW_PREFIX/"share/icons/hicolor"
   end
 
   test do
-    system "#{bin}/virt-manager", "--version"
+    system bin/"virt-manager", "--version"
   end
 end
 __END__
diff --git a/virt-viewer.rb b/virt-viewer.rb
index a3fcbf3..4a743cb 100644
--- a/virt-viewer.rb
+++ b/virt-viewer.rb
@@ -3,7 +3,7 @@ class VirtViewer < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-10.0.tar.xz"
   sha256 "d23bc0a06e4027c37b8386cfd0286ef37bd738977153740ab1b6b331192389c5"
-  revision 1
+  revision 2
 
   depends_on "gettext" => :build
   depends_on "meson" => :build
@@ -23,12 +23,12 @@ def install
 
   def post_install
     # manual update of mime database
-    system "#{Formula["shared-mime-info"].opt_bin}/update-mime-database", "#{HOMEBREW_PREFIX}/share/mime"
+    system Formula["shared-mime-info"].opt_bin/"update-mime-database", HOMEBREW_PREFIX/"share/mime"
     # manual icon cache update step
-    system "#{Formula["gtk+3"].opt_bin}/gtk3-update-icon-cache", "#{HOMEBREW_PREFIX}/share/icons/hicolor"
+    system Formula["gtk+3"].opt_bin/"gtk3-update-icon-cache", HOMEBREW_PREFIX/"share/icons/hicolor"
   end
 
   test do
-    system "#{bin}/virt-viewer", "--version"
+    system bin/"virt-viewer", "--version"
   end
 end

From 7cffe92de762913c31685f76ec99fb2c0d2dd280 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Mon, 28 Jun 2021 20:02:29 +0200
Subject: [PATCH 09/18] setup.py opts order

---
 virt-manager.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index ca01de3..f6510b8 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -70,7 +70,7 @@ def install
 
     # virt-manager uses distutils, doesn't like --single-version-externally-managed
     system libexec/"bin/python", "setup.py", "configure", "--prefix=#{libexec}"
-    system libexec/"bin/python", "setup.py", "install", "--no-user-cfg", "--no-update-icon-cache", "--no-compile-schemas"
+    system libexec/"bin/python", "setup.py", "--no-user-cfg", "--no-update-icon-cache", "--no-compile-schemas", "install"
 
     # install virt-manager commands with PATH set to Python virtualenv environment
     bin.install Dir[libexec/"bin/virt-*"]
@@ -94,15 +94,17 @@ def post_install
 end
 __END__
 diff --git a/virtManager/virtmanager.py b/virtManager/virtmanager.py
-index f6d538b..3e78d3c 100755
+index f6d538b..1f01aa5 100755
 --- a/virtManager/virtmanager.py
 +++ b/virtManager/virtmanager.py
-@@ -136,7 +136,7 @@ def parse_commandline():
+@@ -136,8 +136,8 @@ def parse_commandline():
      parser.add_argument("--debug", action="store_true",
          help="Print debug output to stdout (implies --no-fork)",
          default=False)
 -    parser.add_argument("--no-fork", action="store_true",
+-        help="Don't fork into background on startup")
 +    parser.add_argument("--fork", dest='no_fork', action="store_false",
-         help="Don't fork into background on startup")
++        help="Fork into background on startup")
 
      parser.add_argument("--show-domain-creator", action="store_true",
+         help="Show 'New VM' wizard")

From 6b3fc9270d0a4c019add4d32b4c2944c591b4709 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Mon, 28 Jun 2021 20:03:40 +0200
Subject: [PATCH 10/18] bump minor

---
 virt-manager.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index f6510b8..253636b 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -5,7 +5,7 @@ class VirtManager < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
   sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
-  revision 2
+  revision 3
 
   depends_on "docutils" => :build
   depends_on "gettext" => :build

From c9dc00bc41fad90e8f011f4732c0fb3092265dc1 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Wed, 14 Jul 2021 14:03:34 +0200
Subject: [PATCH 11/18] fix meson install

---
 virt-viewer.rb | 47 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/virt-viewer.rb b/virt-viewer.rb
index 4a743cb..190547f 100644
--- a/virt-viewer.rb
+++ b/virt-viewer.rb
@@ -3,32 +3,71 @@ class VirtViewer < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-10.0.tar.xz"
   sha256 "d23bc0a06e4027c37b8386cfd0286ef37bd738977153740ab1b6b331192389c5"
-  revision 2
+  revision 3
 
   depends_on "gettext" => :build
   depends_on "meson" => :build
   depends_on "ninja" => :build
   depends_on "pkg-config" => :build
 
+  depends_on "desktop-file-utils"
   depends_on "glib"
-  depends_on "gtk+3"
   depends_on "gtk-vnc"
+  depends_on "gtk+3"
   depends_on "libvirt-glib"
+  depends_on "shared-mime-info"
   depends_on "spice-gtk"
 
+  patch :DATA
+
   def install
     system "meson", "setup", "builddir", *std_meson_args
     system "ninja", "-C", "builddir", "install", "-v"
   end
 
   def post_install
-    # manual update of mime database
     system Formula["shared-mime-info"].opt_bin/"update-mime-database", HOMEBREW_PREFIX/"share/mime"
-    # manual icon cache update step
     system Formula["gtk+3"].opt_bin/"gtk3-update-icon-cache", HOMEBREW_PREFIX/"share/icons/hicolor"
+    system Formula["desktop-file-utils"].opt_bin/"update-desktop-database", HOMEBREW_PREFIX/"share/applications"
   end
 
   test do
     system bin/"virt-viewer", "--version"
   end
 end
+__END__
+diff --git a/meson.build b/meson.build
+index e5ed47b..26f386f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -539,30 +539,6 @@ i18n = import('i18n')
+ i18n_itsdir = join_paths(meson.source_root(), 'data', 'gettext')
+ top_include_dir = [include_directories('.')]
+
+-update_mime_database = find_program('update-mime-database', required: false)
+-update_icon_cache = find_program('gtk-update-icon-cache', required: false)
+-update_desktop_database = find_program('update-desktop-database', required: false)
+-
+-update_mime_database_path = ''
+-if update_mime_database.found()
+-  update_mime_database_path = update_mime_database.path()
+-endif
+-
+-update_icon_cache_path = ''
+-if update_icon_cache.found()
+-  update_icon_cache_path = update_icon_cache.path()
+-endif
+-
+-update_desktop_database_path = ''
+-if update_desktop_database.found()
+-  update_desktop_database_path = update_desktop_database.path()
+-endif
+-
+-meson.add_install_script('build-aux/post_install.py',
+-                         update_mime_database_path,
+-                         update_icon_cache_path,
+-                         update_desktop_database_path)
+-
+ subdir('icons')
+ subdir('src')
+ subdir('po')

From 84adf5a7e690a3b6631eddf449ce85d1231cf5d3 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Wed, 14 Jul 2021 14:17:55 +0200
Subject: [PATCH 12/18] dep to adwaita-icon-theme

---
 virt-manager.rb | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index 253636b..656568d 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -5,11 +5,12 @@ class VirtManager < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
   sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
-  revision 3
+  revision 4
 
   depends_on "docutils" => :build
   depends_on "gettext" => :build
 
+  depends_on "adwaita-icon-theme"
   depends_on "gtk+3"
   depends_on "gtk-vnc"
   depends_on "gtksourceview4"
@@ -22,28 +23,28 @@ class VirtManager < Formula
   depends_on "vte3"
 
   resource "certifi" do
-    url "https://files.pythonhosted.org/packages/06/a9/cd1fd8ee13f73a4d4f491ee219deeeae20afefa914dfb4c130cfc9dc397a/certifi-2020.12.5.tar.gz"
-    sha256 "1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c"
+    url "https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9/certifi-2021.5.30.tar.gz"
+    sha256 "2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"
   end
 
-  resource "chardet" do
-    url "https://files.pythonhosted.org/packages/ee/2d/9cdc2b527e127b4c9db64b86647d567985940ac3698eeabc7ffaccb4ea61/chardet-4.0.0.tar.gz"
-    sha256 "0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"
+  resource "charset-normalizer" do
+    url "https://files.pythonhosted.org/packages/45/ab/74c77cf4590dfc846c101aee617f390ae679500630dd806b07f1a8e27b7b/charset-normalizer-2.0.1.tar.gz"
+    sha256 "ad0da505736fc7e716a8da15bf19a985db21ac6415c26b34d2fafd3beb3d927e"
   end
 
   resource "idna" do
-    url "https://files.pythonhosted.org/packages/ea/b7/e0e3c1c467636186c39925827be42f16fee389dc404ac29e930e9136be70/idna-2.10.tar.gz"
-    sha256 "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"
+    url "https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005/idna-3.2.tar.gz"
+    sha256 "467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"
   end
 
   resource "libvirt-python" do
-    url "https://files.pythonhosted.org/packages/55/1a/c3862f108a8591c18c54419fe5a0ee1a7ac8652029fa3c2ffc2352c5c9f8/libvirt-python-7.3.0.tar.gz"
-    sha256 "676c260ddb365120404e611a38c514045ef1af1a7fede15c1fc02d0f8241f696"
+    url "https://files.pythonhosted.org/packages/c5/39/cb8d3975cb285b08ad0fb0d7dc655b1da17f5d3ff53f294ef5b83381c394/libvirt-python-7.5.0.tar.gz"
+    sha256 "002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9"
   end
 
   resource "pycairo" do
-    url "https://files.pythonhosted.org/packages/9d/6e/499d6a6db416eb3cdf0e57762a269908e4ab6638a75a90972afc34885b91/pycairo-1.20.0.tar.gz"
-    sha256 "5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"
+    url "https://files.pythonhosted.org/packages/bc/3f/64e6e066d163fbcf13213f9eeda0fc83376243335ea46a66cefd70d62e8f/pycairo-1.20.1.tar.gz"
+    sha256 "1ee72b035b21a475e1ed648e26541b04e5d7e753d75ca79de8c583b25785531b"
   end
 
   resource "PyGObject" do
@@ -52,13 +53,13 @@ class VirtManager < Formula
   end
 
   resource "requests" do
-    url "https://files.pythonhosted.org/packages/6b/47/c14abc08432ab22dc18b9892252efaf005ab44066de871e72a38d6af464b/requests-2.25.1.tar.gz"
-    sha256 "27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"
+    url "https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670/requests-2.26.0.tar.gz"
+    sha256 "b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"
   end
 
   resource "urllib3" do
-    url "https://files.pythonhosted.org/packages/cb/cf/871177f1fc795c6c10787bc0e1f27bb6cf7b81dbde399fd35860472cecbc/urllib3-1.26.4.tar.gz"
-    sha256 "e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"
+    url "https://files.pythonhosted.org/packages/4f/5a/597ef5911cb8919efe4d86206aa8b2658616d676a7088f0825ca08bd7cb8/urllib3-1.26.6.tar.gz"
+    sha256 "f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"
   end
 
   # virt-manager doesn't prompt for password on macOS unless --no-fork flag is provided

From 900f07f7acb08a4b36c353639f38d66e808158e7 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Sun, 15 Aug 2021 20:29:38 +0200
Subject: [PATCH 13/18] bump

---
 virt-manager.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index 656568d..faf0512 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -28,8 +28,8 @@ class VirtManager < Formula
   end
 
   resource "charset-normalizer" do
-    url "https://files.pythonhosted.org/packages/45/ab/74c77cf4590dfc846c101aee617f390ae679500630dd806b07f1a8e27b7b/charset-normalizer-2.0.1.tar.gz"
-    sha256 "ad0da505736fc7e716a8da15bf19a985db21ac6415c26b34d2fafd3beb3d927e"
+    url "https://files.pythonhosted.org/packages/e7/4e/2af0238001648ded297fb54ceb425ca26faa15b341b4fac5371d3938666e/charset-normalizer-2.0.4.tar.gz"
+    sha256 "f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"
   end
 
   resource "idna" do
@@ -38,8 +38,8 @@ class VirtManager < Formula
   end
 
   resource "libvirt-python" do
-    url "https://files.pythonhosted.org/packages/c5/39/cb8d3975cb285b08ad0fb0d7dc655b1da17f5d3ff53f294ef5b83381c394/libvirt-python-7.5.0.tar.gz"
-    sha256 "002ff458a8eca1caf5d45dffe68b44a6d0ce115496373872355de0d589c578d9"
+    url "https://files.pythonhosted.org/packages/a0/24/a8eefb64e4c7baf5a0006dd3b2c5ce6aef334ff15c9c29066c6791a72fe1/libvirt-python-7.6.0.tar.gz"
+    sha256 "d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e"
   end
 
   resource "pycairo" do

From d979d0c7f49608a47e57c190330ca93350eddec7 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Sun, 15 Aug 2021 20:37:57 +0200
Subject: [PATCH 14/18] bump

---
 virt-manager.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index faf0512..8739237 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -5,7 +5,7 @@ class VirtManager < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
   sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
-  revision 4
+  revision 5
 
   depends_on "docutils" => :build
   depends_on "gettext" => :build

From 44b6ad96a44676102136cd7a0e43bc1992d02dbd Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Fri, 17 Sep 2021 14:11:40 +0200
Subject: [PATCH 15/18] bump

---
 virt-manager.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index 8739237..f96f871 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -5,7 +5,7 @@ class VirtManager < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
   sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
-  revision 5
+  revision 6
 
   depends_on "docutils" => :build
   depends_on "gettext" => :build
@@ -28,8 +28,8 @@ class VirtManager < Formula
   end
 
   resource "charset-normalizer" do
-    url "https://files.pythonhosted.org/packages/e7/4e/2af0238001648ded297fb54ceb425ca26faa15b341b4fac5371d3938666e/charset-normalizer-2.0.4.tar.gz"
-    sha256 "f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"
+    url "https://files.pythonhosted.org/packages/68/32/95ddb68b9abeb89efd461852cdff5791d42fc5e4c528536f541091ffded3/charset-normalizer-2.0.5.tar.gz"
+    sha256 "7098e7e862f6370a2a8d1a6398cd359815c45d12626267652c3f13dec58e2367"
   end
 
   resource "idna" do
@@ -38,8 +38,8 @@ class VirtManager < Formula
   end
 
   resource "libvirt-python" do
-    url "https://files.pythonhosted.org/packages/a0/24/a8eefb64e4c7baf5a0006dd3b2c5ce6aef334ff15c9c29066c6791a72fe1/libvirt-python-7.6.0.tar.gz"
-    sha256 "d8f9d4efdc79ad6b44bc43e49d6fa56d119895ba6c0bb000c6514ce84f19a13e"
+    url "https://files.pythonhosted.org/packages/a1/20/8d3d3a10d8d68ba82a68e70caf3c8baa782ee6cfa7cc431bc6a2bd50d04a/libvirt-python-7.7.0.tar.gz"
+    sha256 "cc8d6528cef7cf395c5d97566328f16faef6b5653a500b0e88c9c0fc36b72cdb"
   end
 
   resource "pycairo" do

From 63c64989ddb2a2a855e8f95eb8044503838dc491 Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Sat, 2 Oct 2021 21:05:42 +0200
Subject: [PATCH 16/18] bump py deps

---
 virt-manager.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index f96f871..a98e105 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -5,7 +5,7 @@ class VirtManager < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
   sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
-  revision 6
+  revision 7
 
   depends_on "docutils" => :build
   depends_on "gettext" => :build
@@ -28,8 +28,8 @@ class VirtManager < Formula
   end
 
   resource "charset-normalizer" do
-    url "https://files.pythonhosted.org/packages/68/32/95ddb68b9abeb89efd461852cdff5791d42fc5e4c528536f541091ffded3/charset-normalizer-2.0.5.tar.gz"
-    sha256 "7098e7e862f6370a2a8d1a6398cd359815c45d12626267652c3f13dec58e2367"
+    url "https://files.pythonhosted.org/packages/eb/7f/a6c278746ddbd7094b019b08d1b2187101b1f596f35f81dc27f57d8fcf7c/charset-normalizer-2.0.6.tar.gz"
+    sha256 "5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"
   end
 
   resource "idna" do
@@ -38,8 +38,8 @@ class VirtManager < Formula
   end
 
   resource "libvirt-python" do
-    url "https://files.pythonhosted.org/packages/a1/20/8d3d3a10d8d68ba82a68e70caf3c8baa782ee6cfa7cc431bc6a2bd50d04a/libvirt-python-7.7.0.tar.gz"
-    sha256 "cc8d6528cef7cf395c5d97566328f16faef6b5653a500b0e88c9c0fc36b72cdb"
+    url "https://files.pythonhosted.org/packages/20/fa/b8c7263b48dec918a5ce9c08ca457ef19836b87dd3f6ce91ff19e09c35fc/libvirt-python-7.8.0.tar.gz"
+    sha256 "9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5"
   end
 
   resource "pycairo" do
@@ -48,8 +48,8 @@ class VirtManager < Formula
   end
 
   resource "PyGObject" do
-    url "https://files.pythonhosted.org/packages/51/2f/4d5d5afb7000b9151e33952b59163c9389bd867ac6fe85d62f85831fa061/PyGObject-3.40.1.tar.gz"
-    sha256 "6fb599aa59ceb9dd05fafb0d72b3862943e7d5e85c8ef6c74856bc6d4321cbab"
+    url "https://files.pythonhosted.org/packages/cc/72/48cfdd7a0caf3c27f392d2657731ac6f7c3c1c0a60bfeba3e1ba9ffa7ba9/PyGObject-3.42.0.tar.gz"
+    sha256 "b9803991ec0b0b4175e81fee0ad46090fa7af438fe169348a9b18ae53447afcd"
   end
 
   resource "requests" do
@@ -58,8 +58,8 @@ class VirtManager < Formula
   end
 
   resource "urllib3" do
-    url "https://files.pythonhosted.org/packages/4f/5a/597ef5911cb8919efe4d86206aa8b2658616d676a7088f0825ca08bd7cb8/urllib3-1.26.6.tar.gz"
-    sha256 "f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"
+    url "https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73/urllib3-1.26.7.tar.gz"
+    sha256 "4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"
   end
 
   # virt-manager doesn't prompt for password on macOS unless --no-fork flag is provided

From 07e4134cfee35ca492531031407cee709213735a Mon Sep 17 00:00:00 2001
From: Cyril Jouve <jv.cyril@gmail.com>
Date: Sun, 23 Jan 2022 14:10:10 +0100
Subject: [PATCH 17/18] bump virt-viewer

---
 virt-manager.rb | 26 +++++++++++++-------------
 virt-viewer.rb  | 34 +++++++++++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/virt-manager.rb b/virt-manager.rb
index a98e105..158ff61 100644
--- a/virt-manager.rb
+++ b/virt-manager.rb
@@ -5,7 +5,7 @@ class VirtManager < Formula
   homepage "https://virt-manager.org/"
   url "https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
   sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
-  revision 7
+  revision 8
 
   depends_on "docutils" => :build
   depends_on "gettext" => :build
@@ -23,23 +23,23 @@ class VirtManager < Formula
   depends_on "vte3"
 
   resource "certifi" do
-    url "https://files.pythonhosted.org/packages/6d/78/f8db8d57f520a54f0b8a438319c342c61c22759d8f9a1cd2e2180b5e5ea9/certifi-2021.5.30.tar.gz"
-    sha256 "2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"
+    url "https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f/certifi-2021.10.8.tar.gz"
+    sha256 "78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"
   end
 
   resource "charset-normalizer" do
-    url "https://files.pythonhosted.org/packages/eb/7f/a6c278746ddbd7094b019b08d1b2187101b1f596f35f81dc27f57d8fcf7c/charset-normalizer-2.0.6.tar.gz"
-    sha256 "5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"
+    url "https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97/charset-normalizer-2.0.10.tar.gz"
+    sha256 "876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd"
   end
 
   resource "idna" do
-    url "https://files.pythonhosted.org/packages/cb/38/4c4d00ddfa48abe616d7e572e02a04273603db446975ab46bbcd36552005/idna-3.2.tar.gz"
-    sha256 "467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"
+    url "https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436/idna-3.3.tar.gz"
+    sha256 "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
   end
 
   resource "libvirt-python" do
-    url "https://files.pythonhosted.org/packages/20/fa/b8c7263b48dec918a5ce9c08ca457ef19836b87dd3f6ce91ff19e09c35fc/libvirt-python-7.8.0.tar.gz"
-    sha256 "9d07416d66805bf1a17f34491b3ced2ac6c42b6a012ddf9177e0e3ae1b103fd5"
+    url "https://files.pythonhosted.org/packages/9a/b5/0de1c04e45f082390d2adefde09fc851857a255a6e86ad7e9edf5e385bf7/libvirt-python-8.0.0.tar.gz"
+    sha256 "0245c226d7b83b32449299d0ca5f1f250dcc07edf9f2fcd87cb7462f09e4c026"
   end
 
   resource "pycairo" do
@@ -53,13 +53,13 @@ class VirtManager < Formula
   end
 
   resource "requests" do
-    url "https://files.pythonhosted.org/packages/e7/01/3569e0b535fb2e4a6c384bdbed00c55b9d78b5084e0fb7f4d0bf523d7670/requests-2.26.0.tar.gz"
-    sha256 "b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"
+    url "https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77/requests-2.27.1.tar.gz"
+    sha256 "68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"
   end
 
   resource "urllib3" do
-    url "https://files.pythonhosted.org/packages/80/be/3ee43b6c5757cabea19e75b8f46eaf05a2f5144107d7db48c7cf3a864f73/urllib3-1.26.7.tar.gz"
-    sha256 "4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"
+    url "https://files.pythonhosted.org/packages/b0/b1/7bbf5181f8e3258efae31702f5eab87d8a74a72a0aa78bc8c08c1466e243/urllib3-1.26.8.tar.gz"
+    sha256 "0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"
   end
 
   # virt-manager doesn't prompt for password on macOS unless --no-fork flag is provided
diff --git a/virt-viewer.rb b/virt-viewer.rb
index 190547f..e0cfbf7 100644
--- a/virt-viewer.rb
+++ b/virt-viewer.rb
@@ -1,9 +1,9 @@
 class VirtViewer < Formula
   desc "App for virtualized guest interaction"
   homepage "https://virt-manager.org/"
-  url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-10.0.tar.xz"
-  sha256 "d23bc0a06e4027c37b8386cfd0286ef37bd738977153740ab1b6b331192389c5"
-  revision 3
+  url "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-11.0.tar.xz"
+  sha256 "a43fa2325c4c1c77a5c8c98065ac30ef0511a21ac98e590f22340869bad9abd0"
+  revision 0
 
   depends_on "gettext" => :build
   depends_on "meson" => :build
@@ -71,3 +71,31 @@ def post_install
  subdir('icons')
  subdir('src')
  subdir('po')
+diff --git a/data/meson.build b/data/meson.build
+index d718491..4325108 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
+   desktop = 'remote-viewer.desktop'
+
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
+   mimetypes = 'virt-viewer-mime.xml'
+
+   i18n.merge_file (
+-    mimetypes,
+     type: 'xml',
+     input: mimetypes + '.in',
+     output: mimetypes,
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
+   metainfo = 'remote-viewer.appdata.xml'
+
+   i18n.merge_file (
+-    metainfo,
+     type: 'xml',
+     input: metainfo + '.in',
+     output: metainfo,

From 2d7e8230af2ecd1c58d276952dfd3f8c2d36682f Mon Sep 17 00:00:00 2001
From: Cyril Jouve <cjouve@lfdj.com>
Date: Mon, 9 May 2022 12:31:41 +0200
Subject: [PATCH 18/18] virt-manager is now part of homebrew-core

---
 virt-manager.rb | 111 ------------------------------------------------
 1 file changed, 111 deletions(-)
 delete mode 100644 virt-manager.rb

diff --git a/virt-manager.rb b/virt-manager.rb
deleted file mode 100644
index 158ff61..0000000
--- a/virt-manager.rb
+++ /dev/null
@@ -1,111 +0,0 @@
-class VirtManager < Formula
-  include Language::Python::Virtualenv
-
-  desc "App for managing virtual machines"
-  homepage "https://virt-manager.org/"
-  url "https://virt-manager.org/download/sources/virt-manager/virt-manager-3.2.0.tar.gz"
-  sha256 "2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86"
-  revision 8
-
-  depends_on "docutils" => :build
-  depends_on "gettext" => :build
-
-  depends_on "adwaita-icon-theme"
-  depends_on "gtk+3"
-  depends_on "gtk-vnc"
-  depends_on "gtksourceview4"
-  depends_on "libosinfo"
-  depends_on "libvirt-glib"
-  depends_on "libxml2"
-  depends_on "osinfo-db"
-  depends_on "python"
-  depends_on "spice-gtk"
-  depends_on "vte3"
-
-  resource "certifi" do
-    url "https://files.pythonhosted.org/packages/6c/ae/d26450834f0acc9e3d1f74508da6df1551ceab6c2ce0766a593362d6d57f/certifi-2021.10.8.tar.gz"
-    sha256 "78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"
-  end
-
-  resource "charset-normalizer" do
-    url "https://files.pythonhosted.org/packages/48/44/76b179e0d1afe6e6a91fd5661c284f60238987f3b42b676d141d01cd5b97/charset-normalizer-2.0.10.tar.gz"
-    sha256 "876d180e9d7432c5d1dfd4c5d26b72f099d503e8fcc0feb7532c9289be60fcbd"
-  end
-
-  resource "idna" do
-    url "https://files.pythonhosted.org/packages/62/08/e3fc7c8161090f742f504f40b1bccbfc544d4a4e09eb774bf40aafce5436/idna-3.3.tar.gz"
-    sha256 "9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
-  end
-
-  resource "libvirt-python" do
-    url "https://files.pythonhosted.org/packages/9a/b5/0de1c04e45f082390d2adefde09fc851857a255a6e86ad7e9edf5e385bf7/libvirt-python-8.0.0.tar.gz"
-    sha256 "0245c226d7b83b32449299d0ca5f1f250dcc07edf9f2fcd87cb7462f09e4c026"
-  end
-
-  resource "pycairo" do
-    url "https://files.pythonhosted.org/packages/bc/3f/64e6e066d163fbcf13213f9eeda0fc83376243335ea46a66cefd70d62e8f/pycairo-1.20.1.tar.gz"
-    sha256 "1ee72b035b21a475e1ed648e26541b04e5d7e753d75ca79de8c583b25785531b"
-  end
-
-  resource "PyGObject" do
-    url "https://files.pythonhosted.org/packages/cc/72/48cfdd7a0caf3c27f392d2657731ac6f7c3c1c0a60bfeba3e1ba9ffa7ba9/PyGObject-3.42.0.tar.gz"
-    sha256 "b9803991ec0b0b4175e81fee0ad46090fa7af438fe169348a9b18ae53447afcd"
-  end
-
-  resource "requests" do
-    url "https://files.pythonhosted.org/packages/60/f3/26ff3767f099b73e0efa138a9998da67890793bfa475d8278f84a30fec77/requests-2.27.1.tar.gz"
-    sha256 "68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"
-  end
-
-  resource "urllib3" do
-    url "https://files.pythonhosted.org/packages/b0/b1/7bbf5181f8e3258efae31702f5eab87d8a74a72a0aa78bc8c08c1466e243/urllib3-1.26.8.tar.gz"
-    sha256 "0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"
-  end
-
-  # virt-manager doesn't prompt for password on macOS unless --no-fork flag is provided
-  patch :DATA
-
-  def install
-    venv = virtualenv_create(libexec, "python3")
-    venv.pip_install resources
-
-    # virt-manager uses distutils, doesn't like --single-version-externally-managed
-    system libexec/"bin/python", "setup.py", "configure", "--prefix=#{libexec}"
-    system libexec/"bin/python", "setup.py", "--no-user-cfg", "--no-update-icon-cache", "--no-compile-schemas", "install"
-
-    # install virt-manager commands with PATH set to Python virtualenv environment
-    bin.install Dir[libexec/"bin/virt-*"]
-    bin.env_script_all_files(libexec/"bin", :PATH => "#{libexec}/bin:$PATH")
-
-    share.install Dir[libexec/"share/man"]
-    share.install Dir[libexec/"share/glib-2.0"]
-    share.install Dir[libexec/"share/icons"]
-  end
-
-  def post_install
-    # manual schema compile step
-    system Formula["glib"].opt_bin/"glib-compile-schemas", HOMEBREW_PREFIX/"share/glib-2.0/schemas"
-    # manual icon cache update step
-    system Formula["gtk+3"].opt_bin/"gtk3-update-icon-cache", HOMEBREW_PREFIX/"share/icons/hicolor"
-  end
-
-  test do
-    system bin/"virt-manager", "--version"
-  end
-end
-__END__
-diff --git a/virtManager/virtmanager.py b/virtManager/virtmanager.py
-index f6d538b..1f01aa5 100755
---- a/virtManager/virtmanager.py
-+++ b/virtManager/virtmanager.py
-@@ -136,8 +136,8 @@ def parse_commandline():
-     parser.add_argument("--debug", action="store_true",
-         help="Print debug output to stdout (implies --no-fork)",
-         default=False)
--    parser.add_argument("--no-fork", action="store_true",
--        help="Don't fork into background on startup")
-+    parser.add_argument("--fork", dest='no_fork', action="store_false",
-+        help="Fork into background on startup")
-
-     parser.add_argument("--show-domain-creator", action="store_true",
-         help="Show 'New VM' wizard")