From d6dcff7dc751f77bac62f9d5383edf6fb633c140 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: May 16 2019 12:59:36 +0000 Subject: Update to v0.37 (cherry picked from commit 14956ce6cca73cea67d63394ea840b0c59f3c43b) --- diff --git a/0001-display-Trigger-wheel-scrolling-after-one-click.patch b/0001-display-Trigger-wheel-scrolling-after-one-click.patch deleted file mode 100644 index 8b1bf6f..0000000 --- a/0001-display-Trigger-wheel-scrolling-after-one-click.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Christophe Fergeau -Date: Mon, 17 Sep 2018 18:41:05 +0200 -Subject: [spice-gtk] display: Trigger wheel scrolling after one 'click' -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The scroll wheel on the mouse will trigger a smooth scroll event with a -delta of +/-1.0. The code added in 2212f05 triggers a scroll when the -delta is strictly greater than 1.0. This means that right after -connecting a client, we won't be triggering a scroll with the first -mouse wheel 'click'. -This commit adjusts the check so that we try to scroll when the delta is -equal or greater than 1.0. - -https://bugzilla.redhat.com/show_bug.cgi?id=1627823 - -Signed-off-by: Christophe Fergeau -Acked-by: Marc-André Lureau ---- - src/spice-widget.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/spice-widget.c b/src/spice-widget.c -index 853c9df6..312c640a 100644 ---- a/src/spice-widget.c -+++ b/src/spice-widget.c -@@ -1979,7 +1979,7 @@ static gboolean scroll_event(GtkWidget *widget, GdkEventScroll *scroll) - break; - case GDK_SCROLL_SMOOTH: - d->scroll_delta_y += scroll->delta_y; -- while (ABS(d->scroll_delta_y) > 1) { -+ while (ABS(d->scroll_delta_y) >= 1) { - if (d->scroll_delta_y < 0) { - press_and_release(display, SPICE_MOUSE_BUTTON_UP, button_state); - d->scroll_delta_y += 1; diff --git a/sources b/sources index a829bf8..2546436 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (spice-gtk-0.35.tar.bz2) = f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729 +SHA512 (spice-gtk-0.37.tar.bz2) = a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029 diff --git a/spice-gtk.spec b/spice-gtk.spec index 8a7e111..add357f 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -1,8 +1,8 @@ #define _version_suffix Name: spice-gtk -Version: 0.35 -Release: 3%{?dist} +Version: 0.37 +Release: 1%{?dist} Summary: A GTK+ widget for SPICE clients Group: System Environment/Libraries @@ -10,12 +10,11 @@ License: LGPLv2+ URL: https://www.spice-space.org/spice-gtk.html #VCS: git:git://anongit.freedesktop.org/spice/spice-gtk Source0: https://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2 -Patch1: 0001-display-Trigger-wheel-scrolling-after-one-click.patch BuildRequires: git-core BuildRequires: intltool -BuildRequires: usbredir-devel >= 0.5.2 -BuildRequires: libusb1-devel >= 1.0.9 +BuildRequires: usbredir-devel >= 0.7.1 +BuildRequires: libusb1-devel >= 1.0.16 BuildRequires: pixman-devel libjpeg-turbo-devel BuildRequires: celt051-devel pulseaudio-libs-devel opus-devel BuildRequires: zlib-devel @@ -31,8 +30,13 @@ BuildRequires: libsoup-devel >= 2.49.91 BuildRequires: libphodav-devel BuildRequires: lz4-devel BuildRequires: gtk3-devel -BuildRequires: spice-protocol >= 0.12.14 -BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel +BuildRequires: json-glib-devel +BuildRequires: spice-protocol >= 0.12.15 +BuildRequires: gstreamer1-devel >= 1.10 gstreamer1-plugins-base-devel >= 1.10 +BuildRequires: python3-six +BuildRequires: python3-pyparsing +BuildRequires: openssl-devel + Obsoletes: spice-gtk-python < 0.32 Requires: spice-glib%{?_isa} = %{version}-%{release} @@ -136,8 +140,8 @@ rm -f %{buildroot}%{_libdir}/*.la %files %doc AUTHORS %doc COPYING -%doc README -%doc NEWS +%doc README.md +%doc CHANGELOG.md %{_mandir}/man1/spice-client.1* %files -n spice-glib -f %{name}.lang @@ -176,6 +180,9 @@ rm -f %{buildroot}%{_libdir}/*.la %{_bindir}/spicy-stats %changelog +* Thu May 16 2019 Victor Toso - 0.37-1 +- Update to v0.37 + * Wed Sep 19 2018 Christophe Fergeau - 0.35-3 - Fix scrolling with mousewheel https://bugzilla.redhat.com/show_bug.cgi?id=1627823