!4 Upgrade to 3.38.2

From: @weijin-deng
Reviewed-by: 
Signed-off-by:
This commit is contained in:
openeuler-ci-bot 2021-07-07 06:50:42 +00:00 committed by Gitee
commit feeff81b14
5 changed files with 13 additions and 57 deletions

View File

@ -1,22 +0,0 @@
From ec9ce6f88de60ae74f21e26f960f2b0c077f8b78 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 18 Mar 2019 10:13:08 +0100
Subject: [PATCH] Constructors of abstract classes should not be public
---
src/machine.vala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/machine.vala b/src/machine.vala
index 77ec6c10..60b3def6 100644
--- a/src/machine.vala
+++ b/src/machine.vala
@@ -254,7 +254,7 @@ private abstract class Boxes.Machine: Boxes.CollectionItem, Boxes.IPropertiesPro
cr.fill ();
}
- public Machine (Boxes.CollectionSource source, string name, string? uuid = null) {
+ protected Machine (Boxes.CollectionSource source, string name, string? uuid = null) {
this.name = name;
this.source = source;
this.connecting_cancellable = new Cancellable ();

View File

@ -1,23 +0,0 @@
From a1522749a9651915132fc1171d31a1c22df423ab Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Mon, 28 Oct 2019 10:36:20 -0500
Subject: [PATCH] Fix build with vala master
See #431
---
src/app-window.vala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app-window.vala b/src/app-window.vala
index 8a1ebb6a..82a9f834 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -438,7 +438,7 @@ private class Boxes.AppWindow: Gtk.ApplicationWindow, Boxes.UI {
return true;
} else if (event.keyval == Gdk.Key.A &&
- (event.state & default_modifiers) == Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK) {
+ (event.state & default_modifiers) == (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)) {
foreach_view ((view) => { view.unselect_all (); });
return true;

Binary file not shown.

BIN
gnome-boxes-3.38.2.tar.xz Normal file

Binary file not shown.

View File

@ -1,27 +1,24 @@
ExclusiveArch: x86_64
%global distributor_name openEuler
%global distributor_version %{openEuler}
%global url_ver %%(echo %{version}|cut -d. -f1,2)
Name: gnome-boxes
Version: 3.30.3
Release: 5
Version: 3.38.2
Release: 1
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
Patch0000: constructors-of-abstract-classes-should-not-be-public.patch
Patch0001: fix-build-with-vala-master.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
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)
BuildRequires: pkgconfig(libosinfo-1.0) >= 1.1.0 pkgconfig(libsoup-2.4) >= 2.44
BuildRequires: pkgconfig(tracker-sparql-2.0) pkgconfig(webkit2gtk-4.0) spice-gtk3-vala libosinfo-vala
BuildRequires: desktop-file-utils pkgconfig(libusb-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-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
Requires: libvirt-daemon-kvm libvirt-daemon-config-network mtools genisoimage adwaita-icon-theme
%description
@ -45,7 +42,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
%exclude %{_includedir}/gnome-boxes/
%exclude %{_libdir}/gnome-boxes/{girepository-1.0,pkgconfig}
%exclude %{_datadir}/gnome-boxes/{gir-1.0,vapi}
%doc AUTHORS README NEWS TODO COPYING
%doc AUTHORS README.md NEWS COPYING
%{_bindir}/gnome-boxes
%{_libdir}/gnome-boxes
%{_libexecdir}/gnome-boxes-search-provider
@ -54,13 +51,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Boxes.deskt
%{_datadir}/gnome-boxes/
%dir %{_datadir}/gnome-shell
%dir %{_datadir}/gnome-shell/search-providers
%{_datadir}/gnome-shell/search-providers/gnome-boxes-search-provider.ini
%{_datadir}/icons/hicolor/*/apps/org.gnome.Boxes.png
%{_datadir}/gnome-shell/search-providers/org.gnome.Boxes.SearchProvider.ini
%{_datadir}/icons/hicolor/scalable/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
%{_datadir}/metainfo/org.gnome.Boxes.appdata.xml
%changelog
* Tue Jun 22 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.2-1
- Upgrade to 3.38.2
- Delete two patches whoes content existed in this version 3.38.2
* Mon Apr 27 2020 wangyue<wangyue92@huawei.com> - 3.30.3-5
- Package init and fix build error