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 8b1bf6f303bf9420780a8288e8b4d16f22394706..0000000000000000000000000000000000000000 --- 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/spice-gtk-0.35.tar.bz2 b/spice-gtk-0.35.tar.bz2 deleted file mode 100644 index c1d7690bd01bfa572ba72d37547d7f194883d51c..0000000000000000000000000000000000000000 Binary files a/spice-gtk-0.35.tar.bz2 and /dev/null differ diff --git a/spice-gtk-0.38.tar.xz b/spice-gtk-0.38.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..2875b2ac9123c57667f2ca2a0cd30fcf828958d5 Binary files /dev/null and b/spice-gtk-0.38.tar.xz differ diff --git a/spice-gtk.spec b/spice-gtk.spec index 39eb221c0849706d60dfaa428c1e13b417093bfe..6877c32ffc23a8443fd15791b2a4418dfc8c209d 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -1,17 +1,15 @@ Name: spice-gtk -Version: 0.35 -Release: 4 +Version: 0.38 +Release: 1 Summary: A GIMP Toolkit (GTK+) widget for SPICE clients License: LGPLv2+ URL: https://www.spice-space.org/spice-gtk.html -Source0: https://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2 -Patch0001: 0001-display-Trigger-wheel-scrolling-after-one-click.patch - -BuildRequires: git-core intltool usbredir-devel >= 0.5.2 libusb1-devel >= 1.0.9 pixman-devel libjpeg-turbo-devel -BuildRequires: celt051-devel pulseaudio-libs-devel opus-devel zlib-devel cyrus-sasl-devel libcacard-devel -BuildRequires: gobject-introspection-devel libacl-devel polkit-devel gtk-doc vala-tools usbutils -BuildRequires: libsoup-devel >= 2.49.91 libphodav-devel lz4-devel gtk3-devel spice-protocol >= 0.12.14 -BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel libxslt openssl-devel +Source0: https://www.spice-space.org/download/gtk/%{name}-%{version}.tar.xz + +BuildRequires: git-core meson intltool usbredir-devel >= 0.7.1 libusb1-devel >= 1.0.21 pixman-devel libjpeg-turbo-devel +BuildRequires: opus-devel zlib-devel cyrus-sasl-devel libcacard-devel gobject-introspection-devel libacl-devel polkit-devel +BuildRequires: gtk-doc vala usbutils libsoup-devel >= 2.49.91 libphodav-devel lz4-devel gtk3-devel json-glib-devel +BuildRequires: spice-protocol >= 0.14.1 gstreamer1-devel >= 1.10 gstreamer1-plugins-base-devel >= 1.10 openssl-devel Requires: spice-gtk3-devel = %{version}-%{release} Provides: spice-glib = %{version}-%{release} spice-gtk3 = %{version}-%{release} Provides: spice-gtk3-vala = %{version}-%{release} spice-gtk-tools = %{version}-%{release} @@ -46,13 +44,23 @@ Files for help with spice-gtk. %autosetup -n %{name}-%{version} -p1 %build -%configure --disable-celt051 --enable-gtk-doc --enable-webdav --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/ \ - --enable-lz4 --enable-vala --disable-werror -%make_build V=1 +%global mjpegflag -Dbuiltin-mjpeg=false +%global celt051flag -Dcelt051=disabled +%global pulseflag -Dpulse=disabled + +%meson \ + %{mjpegflag} \ + %{celt051flag} \ + %{pulseflag} \ + -Dusb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/ + +%meson_build + +%check +%meson_test %install -%make_install -%delete_la_and_a +%meson_install %find_lang %{name} %post @@ -77,10 +85,13 @@ Files for help with spice-gtk. %{_datadir}/gir-1.0/* %files help -%doc AUTHORS README NEWS +%doc AUTHORS README.md CHANGELOG.md %doc %{_datadir}/gtk-doc/html/* %{_mandir}/man1/spice-client.1* %changelog +* Mon Aug 03 2020 lingsheng - 0.38-1 +- Update to 0.38 + * Mon Nov 25 2019 gulining - 0.35-4 - Pakcage init diff --git a/spice-gtk.yaml b/spice-gtk.yaml new file mode 100644 index 0000000000000000000000000000000000000000..dc9fafa4764dde6161d8d6448e1382e3b1dfe2af --- /dev/null +++ b/spice-gtk.yaml @@ -0,0 +1,4 @@ +version_control: git +src_repo: https://gitlab.freedesktop.org/spice/spice-gtk.git +tag_prefix: ^v +seperator: .