import gnome-boxes-3.28.5-7.el8

This commit is contained in:
CentOS Sources 2020-01-21 16:19:44 -05:00 committed by Stepan Oksanichenko
parent 738c8ea9f4
commit d1dfc626ea
2 changed files with 56 additions and 1 deletions

View File

@ -0,0 +1,43 @@
From 788d5bb418abe88727d33f2b21d56f4ed671b927 Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Thu, 15 Aug 2019 13:11:45 +0200
Subject: [PATCH] offer-only-supported-arches
---
src/installed-media.vala | 2 +-
src/media-manager.vala | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/installed-media.vala b/src/installed-media.vala
index 09ceffdf..e60f3508 100644
--- a/src/installed-media.vala
+++ b/src/installed-media.vala
@@ -12,7 +12,7 @@
".vpc", ".vpc.gz",
".cloop", ".cloop.gz" };
public const string[] supported_architectures = {
- "i686", "i586", "i486", "i386"
+ "i686", "i586", "i486", "i386", "x86_64", "amd64"
};
private static Regex date_regex = /20[0-9]{6,6}/;
diff --git a/src/media-manager.vala b/src/media-manager.vala
index 427ce874..dc7cc997 100644
--- a/src/media-manager.vala
+++ b/src/media-manager.vala
@@ -150,7 +150,11 @@ else if (VMConfigurator.is_libvirt_cloning_config (config))
continue;
}
- list.insert_sorted (media, compare_media_by_vendor);
+ var os = yield os_db.get_os_by_id (os_id);
+ var os_media = os_db.get_media_by_id (os, media_id);
+
+ if (os_media.architecture in InstalledMedia.supported_architectures)
+ list.insert_sorted (media, compare_media_by_vendor);
} catch (GLib.Error error) {
warning ("Failed to use ISO '%s': %s", path, error.message);
}
--
2.21.0

View File

@ -31,7 +31,7 @@ ExclusiveArch: x86_64
Name: gnome-boxes
Version: 3.28.5
Release: 6%{?dist}
Release: 7%{?dist}
Summary: A simple GNOME 3 application to access remote or virtual systems
License: LGPLv2+
@ -50,6 +50,9 @@ Patch2: gnome-boxes-hardcode-recommended-oses.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1713130
Patch3: gnome-boxes-update-rhel-logo.patch
# https://bugzilla.redhat.com/1739897
Patch4: gnome-boxes-offer-only-supported-arches.patch
BuildRequires: gettext >= 0.19.8
BuildRequires: meson
BuildRequires: vala >= 0.36.0
@ -121,6 +124,7 @@ gnome-boxes lets you easily create, setup, access, and use:
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%meson \
@ -158,6 +162,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
%{_datadir}/metainfo/org.gnome.Boxes.appdata.xml
%changelog
* Thu Aug 15 2019 Felipe Borges <feborges@redhat.com> - 3.28.5-7
- Bump the release to 3.28.5-7
- Related: #1739897
* Thu Aug 15 2019 Felipe Borges <feborges@redhat.com> - 3.28.5-7
- Filter off unsupported architectures
- Related: #1739897
* Mon Jun 17 2019 Fabiano Fidêncio <fidencio@redhat.com> - 3.28.5-6
- Revert "Add 3D acceleration option (powered by virgl)"
- Related: #1647004