Update to 0.40

Signed-off-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Victor Toso 2022-02-10 10:32:49 +01:00
parent 7c7291d9b0
commit feb2cd12e0
4 changed files with 9 additions and 44 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@
/spice-gtk-0.38.tar.xz.sig
/spice-gtk-0.39.tar.xz
/spice-gtk-0.39.tar.xz.sig
/spice-gtk-0.40.tar.xz
/spice-gtk-0.40.tar.xz.sig

View File

@ -1,38 +0,0 @@
From edba707b32d47977e14f576854f61a0c1a569eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Mon, 28 Jun 2021 12:12:21 +0400
Subject: [PATCH spice-gtk] Fix potential div0 crash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
gdk_monitor_get_geometry() may return 0-size, and leads to crash:
https://bugzilla.redhat.com/show_bug.cgi?id=1941627
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
src/spice-widget.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 7ee02a8..afcf45a 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -1379,9 +1379,11 @@ static void recalc_geometry(GtkWidget *widget)
width_mm = gdk_monitor_get_width_mm(monitor);
gdk_monitor_get_geometry(monitor, &geometry);
/* FIXME: gives wrong results atm: https://gitlab.gnome.org/GNOME/gtk/-/issues/3066 */
- width_mm = (width_mm * d->ww / geometry.width) / zoom * scale_factor;
- height_mm = (height_mm * d->wh / geometry.height) / zoom * scale_factor;
- has_display_mm = true;
+ if (geometry.width > 0 && geometry.height > 0) {
+ width_mm = (width_mm * d->ww / geometry.width) / zoom * scale_factor;
+ height_mm = (height_mm * d->wh / geometry.height) / zoom * scale_factor;
+ has_display_mm = true;
+ }
}
DISPLAY_DEBUG(display,
--
2.29.0

View File

@ -1,3 +1,3 @@
SHA512 (spice-gtk-0.39.tar.xz) = ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
SHA512 (spice-gtk-0.39.tar.xz.sig) = 4f2322c4490934943016c440736d9358fe68950f5681cee6afe977d63c7e11bb79818aa72f2618481e5deaefa64e73d01ae5adcd710d36410c962ff9d57a2c25
SHA512 (spice-gtk-0.40.tar.xz) = b6db8b56c5c36158d97b3f7690d18883c4d6076e4ed1de1763fc704f9a2397b60d6170b70882d7d0a977b32be334756b7a27d66849f53e4d3b82abb8a54a0892
SHA512 (spice-gtk-0.40.tar.xz.sig) = 5d452a974d62070695f201fa8d2c1176b8acfcd1469f1e936c11dc32bcb73df6d1ac52267144cc574e6e1c73890887bdd6d9cfba81e16b724bfa595f9847ad2c
SHA512 (victortoso-E37A484F.keyring) = 091755da8a358c8c8ebd3b5443b4b5eb3c260afed943454c085d48c973de6a42763547c321c64e4da5c1b2983ad0c5146aaeddeb1d54ef414f7e6a530a3bf14a

View File

@ -1,8 +1,8 @@
#define _version_suffix
Name: spice-gtk
Version: 0.39
Release: 7%{?dist}
Version: 0.40
Release: 1%{?dist}
Summary: A GTK+ widget for SPICE clients
License: LGPLv2+
@ -12,8 +12,6 @@ Source0: https://www.spice-space.org/download/gtk/%{name}-%{version}%{?_v
Source1: https://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.xz.sig
Source2: victortoso-E37A484F.keyring
Patch0001: 0001-Fix-potential-div0-crash.patch
BuildRequires: git-core
BuildRequires: meson
BuildRequires: intltool
@ -191,6 +189,9 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%{_bindir}/spicy-stats
%changelog
* Thu Feb 10 2022 Victor Toso <victortoso@redhat.com> - 0.40-1
- Update to v0.40
* Thu Jan 27 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.39-7
- Fix FTBFS. rhbz#2047026