Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'jouve/master' into jouve-master
* jouve/master: virt-manager is now part of homebrew-core bump virt-viewer bump py deps bump bump bump dep to adwaita-icon-theme fix meson install bump minor setup.py opts order osinfo-db now part of homebrew-core use virt-manager.org url simplify install step bump osinfo-db update virt-manager deps bump virt-viewer to 10.0 update libvirt-python to version 7.1.0 bump virt-manager/view-viewer and deps
- Loading branch information
Showing
1 changed file
with
80 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,48 +1,101 @@ | ||
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-11.0.tar.xz" | ||
sha256 "a43fa2325c4c1c77a5c8c98065ac30ef0511a21ac98e590f22340869bad9abd0" | ||
revision 0 | ||
|
||
depends_on "intltool" => :build | ||
depends_on "libtool" => :build | ||
depends_on "gettext" => :build | ||
depends_on "meson" => :build | ||
depends_on "ninja" => :build | ||
depends_on "pkg-config" => :build | ||
|
||
depends_on "atk" | ||
depends_on "cairo" | ||
depends_on "gdk-pixbuf" | ||
depends_on "gettext" | ||
depends_on "desktop-file-utils" | ||
depends_on "glib" | ||
depends_on "gtk+3" | ||
depends_on "gtk-vnc" | ||
depends_on "hicolor-icon-theme" | ||
depends_on "libvirt" | ||
depends_on "gtk+3" | ||
depends_on "libvirt-glib" | ||
depends_on "pango" | ||
depends_on "shared-mime-info" | ||
depends_on "spice-gtk" | ||
depends_on "spice-protocol" | ||
|
||
patch :DATA | ||
|
||
def install | ||
args = %W[ | ||
--disable-silent-rules | ||
--disable-update-mimedb | ||
--with-gtk-vnc | ||
--with-spice-gtk | ||
--prefix=#{prefix} | ||
] | ||
system "./configure", *args | ||
system "make", "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["shared-mime-info"].opt_bin/"update-mime-database", HOMEBREW_PREFIX/"share/mime" | ||
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" | ||
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') | ||
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, |