packages/gnome-boxes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:a07f7da7c88315265620cd2becc341fcbb5b64a0
Branches Tags
packages:main
..
compare: packages:79670c6ee25e203cad618ca393e4e88c33229009
Branches Tags
packages:main

No commits in common. "a07f7da7c88315265620cd2becc341fcbb5b64a0" and "79670c6ee25e203cad618ca393e4e88c33229009" have entirely different histories.
a07f7da7c8 ... 79670c6ee2

9 changed files with 182 additions and 24 deletions
Show Stats Expand all files Collapse all files

45
0001-make-gnome-boxes-correctly-select-virtualization-cpu-mode.patch Normal file
View File

@ -0,0 +1,45 @@
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index 6d817df..c75cd45 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -39,6 +39,13 @@
private const string LIBOSINFO_XML = "<libosinfo>%s</libosinfo>";
private const string LIBOSINFO_OS_ID_XML = "<os id=\"%s\"/>";
+ /* this var is used for passporting virt type information between function set_cpu_config and statement:
+ "var virt_type = guest_kvm_enabled (best_caps) ? DomainVirtType.KVM : DomainVirtType.QEMU;"
+ the concrete type of virt_type_p refers to /usr/share/vala/vapi/libvirt-gconfig-1.0.vapi:75: public GVirConfig.DomainVirtType get_virt_type ();
+ the virt_type_p must be static then member function create_domain_config and set_cpu_config can access it.
+ */
+ private static GVirConfig.DomainVirtType virt_type_p = DomainVirtType.QEMU;
+
private const bool SPICE_AVAILABLE =
#if HAS_SPICE
true;
@@ -54,9 +61,13 @@ public static Domain create_domain_config (InstallerMedia install_media, string
var best_caps = get_best_guest_caps (caps, install_media);
domain.memory = install_media.resources.ram / KIBIBYTES;
- set_cpu_config (domain, caps);
+ //set_cpu_config (domain, caps); //move this statement before statement:"domain.set_virt_type (virt_type);"
var virt_type = guest_kvm_enabled (best_caps) ? DomainVirtType.KVM : DomainVirtType.QEMU;
+ // passporting virt type information
+ virt_type_p = virt_type;
+ // new call position
+ set_cpu_config (domain, caps);
domain.set_virt_type (virt_type);
set_os_config (domain, install_media, best_caps, domain_caps);
@@ -233,7 +244,10 @@ private static void set_cpu_config (Domain domain, Capabilities caps) {
domain.vcpu = topology.get_sockets () * topology.get_cores () * topology.get_threads ();
var cpu = new DomainCpu ();
- cpu.set_mode (DomainCpuMode.HOST_PASSTHROUGH);
+ if(virt_type_p == DomainVirtType.QEMU)
+ cpu.set_mode (DomainCpuMode.HOST_MODEL);
+ else /* if virt_type_p == DomainVirtType.KVM or other */
+ cpu.set_mode (DomainCpuMode.HOST_PASSTHROUGH);
cpu.set_topology (topology);
domain.set_cpu (cpu);

19
0002-disable-domain-conf-video-model-qxl-because-qemu-not-open-this-support.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index c75cd45..521ab0c 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -461,11 +461,11 @@ private static void set_os_config (Domain domain, InstallerMedia install_media,
private static void set_video_config (Domain domain, InstallerMedia install_media) {
var video = new DomainVideo ();
- video.set_model (DomainVideoModel.QXL);
+ //video.set_model (DomainVideoModel.QXL);
- if (install_media.supports_virtio_gpu) {
+ //if (install_media.supports_virtio_gpu) {
video.set_model (DomainVideoModel.VIRTIO);
- }
+ //}
domain.add_device (video);
}

30
0003-disable-domain-conf-smartcard-because-qemu-not-open-this-support-now.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index 521ab0c..bef9f95 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -103,8 +103,10 @@ public static Domain create_domain_config (InstallerMedia install_media, string
add_usb_support (domain, install_media);
+/*
if (!App.is_running_in_flatpak ())
add_smartcard_support (domain);
+*/
set_video_config (domain, install_media);
set_sound_config (domain, install_media);
@@ -670,12 +672,14 @@ else if (install_media is InstalledMedia)
}
}
+/*
public static void add_smartcard_support (Domain domain) {
var smartcard = new DomainSmartcardPassthrough ();
var vmc = new DomainChardevSourceSpiceVmc ();
smartcard.set_source (vmc);
domain.add_device (smartcard);
}
+*/
public static void add_usb_support (Domain domain, InstallerMedia install_media) {

33
0004-disable-domain-conf-spice-graphics-because-qemu-not-open-this-support-now-and-add-vnc-instead.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/src/libvirt-machine.vala b/src/libvirt-machine.vala
index 054f722..fc90003 100644
--- a/src/libvirt-machine.vala
+++ b/src/libvirt-machine.vala
@@ -63,7 +63,7 @@
#if HAS_SPICE
GLib.List<GVirConfig.DomainDevice> devices = null;
foreach (var device in domain_config.get_devices ()) {
- if (device is GVirConfig.DomainGraphicsSpice) {
+ if (device is GVirConfig.DomainGraphicsVnc) {
var graphics_device = VMConfigurator.create_graphics_device (_acceleration_3d);
devices.prepend (graphics_device);
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index bef9f95..26a7199 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -742,12 +742,9 @@ private static DomainChannel create_spice_agent_channel () {
return channel;
}
- public static DomainGraphicsSpice create_graphics_device (bool accel3d = false) {
- var graphics = new DomainGraphicsSpice ();
- graphics.set_autoport (false);
- graphics.set_gl (accel3d);
- graphics.set_image_compression (DomainGraphicsSpiceImageCompression.OFF);
-
+ public static DomainGraphicsVnc create_graphics_device (bool accel3d = false) {
+ var graphics = new DomainGraphicsVnc ();
+ graphics.set_autoport (true);
return graphics;
}

43
0005-disable-domain-conf-USB-redirection--because-qemu-this-version-unsupport-now.patch Normal file
View File

@ -0,0 +1,43 @@
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index 26a7199..263f966 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -684,6 +684,7 @@ public static void add_smartcard_support (Domain domain) {
public static void add_usb_support (Domain domain, InstallerMedia install_media) {
// 4 USB redirection channels
+/*
for (int i = 0; i < 4; i++) {
var usb_redir = new DomainRedirdev ();
usb_redir.set_bus (DomainRedirdevBus.USB);
@@ -691,6 +692,7 @@ public static void add_usb_support (Domain domain, InstallerMedia install_media)
usb_redir.set_source (vmc);
domain.add_device (usb_redir);
}
+*/
var device = find_device_by_prop (install_media.supported_devices, DEVICE_PROP_NAME, "qemu-xhci");
if (device != null) {
@@ -736,8 +738,10 @@ private static DomainChannel create_spice_agent_channel () {
var channel = new DomainChannel ();
channel.set_target_type (DomainChannelTargetType.VIRTIO);
channel.set_target_name (SPICE_AGENT_CHANNEL);
+/*
var vmc = new DomainChardevSourceSpiceVmc ();
channel.set_source (vmc);
+*/
return channel;
}
@@ -753,9 +757,11 @@ public static DomainChannel create_spice_webdav_channel () {
channel_webdav.set_target_type (DomainChannelTargetType.VIRTIO);
channel_webdav.set_target_name (WEBDAV_CHANNEL_URI);
+/*
var spice_port = new DomainChardevSourceSpicePort ();
spice_port.set_channel (WEBDAV_CHANNEL_URI);
channel_webdav.set_source (spice_port);
+*/
return channel_webdav;
}

BIN
gnome-boxes-42.0.1.tar.xz Normal file
View File

Binary file not shown.

BIN
gnome-boxes-44.3.tar.xz
View File

Binary file not shown.

32
gnome-boxes.spec
View File

@ -1,17 +1,22 @@
%global distributor_name openEuler
%global distributor_version %{openEuler}
%global major_version %%(echo %%{version} | cut -d. -f1)
%global major_version %%(echo %%{tarball_version} | cut -d. -f1)
%global __provides_exclude_from ^%{_libdir}/gnome-boxes/
%global __requires_exclude ^(%%(find %{buildroot}%{_libdir}/gnome-boxes/ -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -))
Name: gnome-boxes
Version: 44.3
Release: 1
Name: gnome-boxes
Version: 42.0.1
Release: 1
Summary: An application of the GNOME Desktop Environment
License: LGPLv2+
URL: https://wiki.gnome.org/Apps/Boxes
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{version}.tar.xz
Patch0: 0001-make-gnome-boxes-correctly-select-virtualization-cpu-mode.patch
Patch1: 0002-disable-domain-conf-video-model-qxl-because-qemu-not-open-this-support.patch
Patch2: 0003-disable-domain-conf-smartcard-because-qemu-not-open-this-support-now.patch
Patch3: 0004-disable-domain-conf-spice-graphics-because-qemu-not-open-this-support-now-and-add-vnc-instead.patch
Patch4: 0005-disable-domain-conf-USB-redirection--because-qemu-this-version-unsupport-now.patch
BuildRequires: gettext >= 0.19.8 meson itstool vala >= 0.36.0 yelp-tools
BuildRequires: pkgconfig(clutter-gtk-1.0) pkgconfig(freerdp2) pkgconfig(glib-2.0) >= 2.52
@ -19,13 +24,12 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) pkgconfig(govirt-1.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.20 pkgconfig(gtk-vnc-2.0) pkgconfig(libarchive)
BuildRequires: pkgconfig(json-glib-1.0) pkgconfig(libsecret-1) pkgconfig(libvirt-gobject-1.0)
BuildRequires: pkgconfig(libvirt-gconfig-1.0) pkgconfig(libxml-2.0) pkgconfig(gudev-1.0) libosinfo-vala
BuildRequires: pkgconfig(libosinfo-1.0) >= 1.4.0 pkgconfig(libsoup-3.0) pkgconfig(vte-2.91)
BuildRequires: pkgconfig(tracker-sparql-3.0) pkgconfig(webkit2gtk-4.1) spice-gtk3-vala libosinfo-vala
BuildRequires: pkgconfig(libosinfo-1.0) >= 1.4.0 pkgconfig(libsoup-2.4) >= 2.44 pkgconfig(vte-2.91)
BuildRequires: pkgconfig(tracker-sparql-3.0) pkgconfig(webkit2gtk-4.0) spice-gtk3-vala libosinfo-vala
BuildRequires: desktop-file-utils pkgconfig(libusb-1.0) pkgconfig(gtksourceview-4) spice-gtk spice-gtk-devel chrpath
BuildRequires: pkgconfig(gvncpulse-1.0) pkgconfig(libhandy-1)
Requires: libvirt-daemon-kvm libvirt-daemon-config-network mtools genisoimage adwaita-icon-theme
Requires: /usr/bin/virsh
%description
An application of the GNOME Desktop Environment,used to access remote or virtual systems.
@ -80,18 +84,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
* Mon Nov 27 2023 lwg <liweiganga@uniontech.com> - 44.3-1
- update to version 44.3
* Mon Mar 27 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-2
- Require virsh for fix issue:I6QG6Z
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-1
- Update to 43.2
* Tue Jun 21 2022 weijin deng <weijin.deng@turbolinux.com.cn> - 42.1-1
- Update to 42.1
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.0.1-1
- Update to 42.0.1, Update four patches

4
gnome-boxes.yaml
View File

@ -1,4 +0,0 @@
version_control: gitlab.gnome
src_repo: gnome-boxes
tag_prefix: ^
separator: .