diff --git a/.gitignore b/.gitignore index 6ce8127..03e5363 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /gnome-remote-desktop-40.rc.tar.xz /gnome-remote-desktop-40.0.tar.xz /gnome-remote-desktop-40.1.tar.xz +/gnome-remote-desktop-41.rc.tar.xz diff --git a/gnome-remote-desktop.spec b/gnome-remote-desktop.spec index 10bf168..aab9e46 100644 --- a/gnome-remote-desktop.spec +++ b/gnome-remote-desktop.spec @@ -3,8 +3,8 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-remote-desktop -Version: 40.1 -Release: 3%{?dist} +Version: 41~rc +Release: 1%{?dist} Summary: GNOME Remote Desktop screen share service License: GPLv2+ @@ -26,6 +26,7 @@ BuildRequires: pkgconfig(libvncserver) >= 0.9.11-7 BuildRequires: pkgconfig(freerdp2) BuildRequires: pkgconfig(winpr2) BuildRequires: pkgconfig(fuse3) +BuildRequires: pkgconfig(ffnvcodec) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libnotify) @@ -76,6 +77,9 @@ GNOME desktop environment. %changelog +* Tue Sep 07 2021 Jonas Ådahl - 41~rc-1 +- Bump to 41.rc + * Wed Aug 04 2021 Kalev Lember - 40.1-3 - Avoid systemd_requires as per updated packaging guidelines diff --git a/gnutls-anontls.patch b/gnutls-anontls.patch index bd05eac..1c5e384 100644 --- a/gnutls-anontls.patch +++ b/gnutls-anontls.patch @@ -1,4 +1,4 @@ -From 8676ef6c32557234d08acb13d7524df5fa1f4bb2 Mon Sep 17 00:00:00 2001 +From 06f99dc1aaef90275547d8c93ddf18e9d0c88257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 14 Jun 2018 12:21:37 +0200 Subject: [PATCH 1/7] vnc: Add anonymous TLS encryption support @@ -25,17 +25,17 @@ VNC connection. create mode 100644 src/grd-vnc-tls.h diff --git a/meson.build b/meson.build -index 5e9ad04..9bbd5fc 100644 +index c8c957c..536e94a 100644 --- a/meson.build +++ b/meson.build -@@ -40,6 +40,7 @@ endif +@@ -54,6 +54,7 @@ endif if have_vnc libvncserver_dep = dependency('libvncserver') libvncclient_dep = dependency('libvncclient') + gnutls_dep = dependency('gnutls') endif - cdata = configuration_data() + prefix = get_option('prefix') diff --git a/src/grd-enums.h b/src/grd-enums.h index ffab821..4333863 100644 --- a/src/grd-enums.h @@ -924,10 +924,10 @@ index 0000000..135ef8c + +#endif /* GRD_VNC_TLS_H */ diff --git a/src/meson.build b/src/meson.build -index 843746d..133cc60 100644 +index 2fe3923..bf8059f 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -72,10 +72,13 @@ if have_vnc +@@ -97,10 +97,13 @@ if have_vnc 'grd-vnc-pipewire-stream.h', 'grd-vnc-server.c', 'grd-vnc-server.h', @@ -942,7 +942,7 @@ index 843746d..133cc60 100644 endif diff --git a/src/org.gnome.desktop.remote-desktop.gschema.xml.in b/src/org.gnome.desktop.remote-desktop.gschema.xml.in -index 4b6e593..0086d99 100644 +index 7633e00..c2c543e 100644 --- a/src/org.gnome.desktop.remote-desktop.gschema.xml.in +++ b/src/org.gnome.desktop.remote-desktop.gschema.xml.in @@ -49,5 +49,15 @@ @@ -962,10 +962,10 @@ index 4b6e593..0086d99 100644 -- -2.29.2 +2.31.1 -From 552e9c9add722e953a8da22bd54ba0fef7a9d6af Mon Sep 17 00:00:00 2001 +From 9f289a90a167e29cf43e6d0d91c4f7605a131f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 11:02:09 +0100 Subject: [PATCH 2/7] session-vnc: Add paused/resumed signals @@ -1130,10 +1130,10 @@ index 0c189fd..596896d 100644 + G_TYPE_NONE, 0); } -- -2.29.2 +2.31.1 -From 3b33524046d299111cc150cc8d6d100f1e516485 Mon Sep 17 00:00:00 2001 +From 1d34839781948d8de331641863a589ae4eb46c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 11:03:46 +0100 Subject: [PATCH 3/7] session-vnc: Add grd_session_vnc_dispatch() helper @@ -1203,10 +1203,10 @@ index 4e7b33d..cf275af 100644 #endif /* GRD_SESSION_VNC_H */ -- -2.29.2 +2.31.1 -From 3945af78cea858033d954bb1b071269687bdea85 Mon Sep 17 00:00:00 2001 +From 9cdf72aa277782906a4b979773a7025a61994785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 11:05:13 +0100 Subject: [PATCH 4/7] vnc/tls: Add some logging @@ -1280,10 +1280,10 @@ index ec4758e..ac6c35f 100644 { g_warning ("TLS handshake failed: %s", error->message); -- -2.29.2 +2.31.1 -From f5330797678f4c4db4a3fa19cebd30dd4d6bbb8c Mon Sep 17 00:00:00 2001 +From 2c24c7ffa583c94d3cfd7eb105eb264a6430b128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 11:07:40 +0100 Subject: [PATCH 5/7] vnc/tls: Dispatch also when data is pending outside of @@ -1450,10 +1450,10 @@ index ac6c35f..312b6b9 100644 } -- -2.29.2 +2.31.1 -From fae9653965ddcc3d5684a056d9bdf46ef439d649 Mon Sep 17 00:00:00 2001 +From 28dcea05f8f42c3fe5d43d0dff0cdb1c9fc7f213 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 16:48:00 +0100 Subject: [PATCH 6/7] session-vnc: Set our own password handling function up @@ -1505,10 +1505,10 @@ index 06b2cf7..7a4c6b3 100644 rfbProcessEvents (rfb_screen, 0); } -- -2.29.2 +2.31.1 -From 1ae1286b2cc868045f93c02b7a990638ca94b26d Mon Sep 17 00:00:00 2001 +From 2327474d5fa0f6527b2f5f39d54f96f8ff9627db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 12 Oct 2020 17:34:30 +0200 Subject: [PATCH 7/7] vnc: Copy pixels using the right destination stride @@ -1540,5 +1540,5 @@ index efc0038..f3a6314 100644 gboolean grd_session_vnc_is_client_gone (GrdSessionVnc *session_vnc); -- -2.29.2 +2.31.1 diff --git a/sources b/sources index ce0da31..c0e9162 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-remote-desktop-40.1.tar.xz) = 39116afa16256820a69e020b71de5458fc5da8154bc8255d2157ff56fc679c39f4608f790d74eb4a0cb10cc61bd27d4172cfc547582100cab5b897644a700ee3 +SHA512 (gnome-remote-desktop-41.rc.tar.xz) = 30776b84d4753f280f5c67c29193e3aaec2b72630a95a2271927aef36d7f0368dc50b1173a176771bf960e811c55ec4e0da30217f8ee0d1325293dd0c2c7ec8f