Skip to content

Commit 6a11437

Browse files
authored
Merge pull request #199185 from branchvincent/virt-manager
virt-manager 5.0.0
2 parents 627951e + 1a97fb6 commit 6a11437

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

Formula/v/virt-manager.rb

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
class VirtManager < Formula
22
include Language::Python::Virtualenv
3+
include Language::Python::Shebang
34

45
desc "App for managing virtual machines"
56
homepage "https://virt-manager.org/"
6-
url "https://releases.pagure.org/virt-manager/virt-manager-4.1.0.tar.gz"
7-
sha256 "950681d7b32dc61669278ad94ef31da33109bf6fcf0426ed82dfd7379aa590a2"
7+
url "https://releases.pagure.org/virt-manager/virt-manager-5.0.0.tar.xz"
8+
sha256 "bc89ae46e0c997bd754ed62a419ca39c6aadec27e3d8b850cea5282f0083f84a"
89
license "GPL-2.0-or-later"
9-
revision 8
1010
head "https://github.com/virt-manager/virt-manager.git", branch: "main"
1111

1212
bottle do
13-
rebuild 1
14-
sha256 cellar: :any_skip_relocation, all: "3490af322b74e2098969db9537ec991f141cb7efd330e3cbd2d794856dac5fe4"
13+
sha256 cellar: :any_skip_relocation, all: "83397ecb04b719a262ba0d0b06a0a7561598de290647b16fce11ed3e64a7fa9c"
1514
end
1615

1716
depends_on "docutils" => :build
1817
depends_on "intltool" => :build
18+
depends_on "meson" => :build
19+
depends_on "ninja" => :build
1920
depends_on "pkgconf" => :build
20-
depends_on "python-setuptools" => :build
2121
depends_on "adwaita-icon-theme"
2222
depends_on "certifi"
2323
depends_on "cpio"
@@ -36,13 +36,13 @@ class VirtManager < Formula
3636
depends_on "vte3"
3737

3838
resource "charset-normalizer" do
39-
url "https://files.pythonhosted.org/packages/63/09/c1bc53dab74b1816a00d8d030de5bf98f724c52c1635e07681d312f20be8/charset-normalizer-3.3.2.tar.gz"
40-
sha256 "f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"
39+
url "https://files.pythonhosted.org/packages/f2/4f/e1808dc01273379acc506d18f1504eb2d299bd4131743b9fc54d7be4df1e/charset_normalizer-3.4.0.tar.gz"
40+
sha256 "223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e"
4141
end
4242

4343
resource "idna" do
44-
url "https://files.pythonhosted.org/packages/21/ed/f86a79a07470cb07819390452f178b3bef1d375f2ec021ecfc709fc7cf07/idna-3.7.tar.gz"
45-
sha256 "028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"
44+
url "https://files.pythonhosted.org/packages/f1/70/7703c29685631f5a7590aa73f1f1d3fa9a380e654b86af429e0934a32f7d/idna-3.10.tar.gz"
45+
sha256 "12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"
4646
end
4747

4848
resource "requests" do
@@ -51,26 +51,24 @@ class VirtManager < Formula
5151
end
5252

5353
resource "urllib3" do
54-
url "https://files.pythonhosted.org/packages/43/6d/fa469ae21497ddc8bc93e5877702dca7cb8f911e337aca7452b5724f1bb6/urllib3-2.2.2.tar.gz"
55-
sha256 "dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
54+
url "https://files.pythonhosted.org/packages/ed/63/22ba4ebfe7430b76388e7cd448d5478814d3032121827c12a2cc287e2260/urllib3-2.2.3.tar.gz"
55+
sha256 "e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
5656
end
5757

5858
def install
59-
# Fix to use shlex instead of pipes, should be removed in next release
60-
# Commit ref: https://github.com/virt-manager/virt-manager/commit/bb1afaba29019605a240a57d6b3ca8eb36341d9b
61-
inreplace "virtManager/object/domain.py", "pipes", "shlex"
62-
6359
python3 = "python3.13"
6460
venv = virtualenv_create(libexec, python3)
6561
venv.pip_install resources
62+
ENV.prepend_path "PATH", venv.root/"bin"
6663

67-
# Restore disabled egg_info command
68-
inreplace "setup.py", "'install_egg_info': my_egg_info,", ""
69-
system libexec/"bin/python", "setup.py", "configure", "--prefix=#{prefix}"
70-
ENV["PIP_CONFIG_SETTINGS"] = "--global-option=--no-update-icon-cache --no-compile-schemas"
71-
venv.pip_install_and_link buildpath
64+
system "meson", "setup", "build", "-Dtests=disabled",
65+
"-Dupdate-icon-cache=false",
66+
"-Dcompile-schemas=false",
67+
*std_meson_args
68+
system "meson", "compile", "-C", "build", "--verbose"
69+
system "meson", "install", "-C", "build"
7270

73-
share.install Dir[libexec/"share/*"]
71+
rewrite_shebang python_shebang_rewrite_info(venv.root/"bin/python"), *bin.children
7472
end
7573

7674
def post_install

pypi_formula_mappings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,7 @@
866866
"exclude_packages": ["certifi"]
867867
},
868868
"virt-manager": {
869+
"package_name": "",
869870
"exclude_packages": ["certifi"],
870871
"extra_packages": ["requests"]
871872
},

0 commit comments

Comments
 (0)