!20 Modify invalid source0

From: @caodongxia 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek

0002-disable-domain-conf-video-model-qxl-because-qemu-not-open-this-support.patch

@@ -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);
+     }

0003-disable-domain-conf-smartcard-because-qemu-not-open-this-support-now.patch

@@ -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) {
+ 

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

@@ -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;
+     }
+ 

0005-disable-domain-conf-USB-redirection--because-qemu-this-version-unsupport-now.patch

@@ -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;
+     }

gnome-boxes.spec

@@ -1,14 +1,21 @@
-%global distributor_name openEuler
-%global distributor_version %{openEuler}
-%global url_ver %%(echo %{version}|cut -d. -f1,2)
+%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
+%global distributor_name %{vendor}
+%global distributor_version %{%{vendor}}
 
-Name:           gnome-boxes
-Version:        3.38.2
-Release:        2
+%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:	42.1
+Release:	3
 Summary:        An application of the GNOME Desktop Environment
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Apps/Boxes
-Source0:        http://download.gnome.org/sources/%{name}/%{url_ver}/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz
+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,6 +26,8 @@ BuildRequires:  pkgconfig(libvirt-gconfig-1.0) pkgconfig(libxml-2.0) pkgconfig(g
 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
 
 %description
@@ -28,7 +37,7 @@ An application of the GNOME Desktop Environment,used to access remote or virtual
 %autosetup -n %{name}-%{version} -p1
 
 %build
-%meson -D distributor_name=%{distributor_name} -D distributor_version=%{distributor_version} \
+%meson -D distributor_name=%{distributor_name} -D distributor_version=%{distributor_version}
 %meson_build
 
 %install
@@ -39,6 +48,12 @@ chrpath -d %{buildroot}%{_bindir}/gnome-boxes
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
 echo "%{_libdir}/gnome-boxes" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
+rm -rf %{buildroot}%{_includedir}/gnome-boxes/
+rm -rf %{buildroot}%{_libdir}/gnome-boxes/girepository-1.0/
+rm -rf %{buildroot}%{_libdir}/gnome-boxes/pkgconfig/
+rm -rf %{buildroot}%{_datadir}/gnome-boxes/gir-1.0/
+rm -rf %{buildroot}%{_datadir}/gnome-boxes/vapi/
+
 %post
 /sbin/ldconfig
 
@@ -49,10 +64,8 @@ echo "%{_libdir}/gnome-boxes" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.desktop
 
 %files -f %{name}.lang
-%exclude %{_includedir}/gnome-boxes/
-%exclude %{_libdir}/gnome-boxes/{girepository-1.0,pkgconfig}
-%exclude %{_datadir}/gnome-boxes/{gir-1.0,vapi}
-%doc AUTHORS README.md NEWS COPYING
+%license COPYING copyright
+%doc README.md NEWS
 %{_bindir}/gnome-boxes
 %{_libdir}/gnome-boxes
 %{_libexecdir}/gnome-boxes-search-provider
@@ -62,7 +75,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
 %dir %{_datadir}/gnome-shell
 %dir %{_datadir}/gnome-shell/search-providers
 %{_datadir}/gnome-shell/search-providers/org.gnome.Boxes.SearchProvider.ini
-%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Boxes.svg
+%{_datadir}/icons/hicolor/*/apps/org.gnome.Boxes.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Boxes-symbolic.svg
 %{_datadir}/dbus-1/services/org.gnome.Boxes.SearchProvider.service
 %{_datadir}/dbus-1/services/org.gnome.Boxes.service
@@ -70,6 +83,22 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
 %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %changelog
+* Mon Nov 21 2022 caodongxia <caodongxia@h-partners.com> - 42.1-3
+- Modify invalid source0
+
+* Fri Nov 18 2022 yaoxin <yaoxin30@h-partners.com> - 42.1-2
+- Replace openEuler with vendor
+
+* Mon Oct 31 2022 yaoxin <yaoxin30@h-partners.com> - 42.1-1
+- Update to 42.1
+
+* Tue Mar 15 2022 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.2-4
+- Add four patches to make gome-boxes avoid setting qemu unsupported modules
+  add vnc instead of spice
+
+* Mon Oct 11 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.2-3
+- Add 0001-make-gnome-boxes-correctly-select-virtualization-cpu-mode.patch
+
 * Fri Sep 10 2021 lingsheng <lingsheng@huawei.com> - 3.38.2-2
 - Delete rpath setting
 

gnome-boxes.yaml

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