From cfde704338e1d03774c7e56754e5906bc355fc5c Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Thu, 16 Apr 2020 18:03:43 +1000 Subject: [PATCH 1/6] Bump the release number for rebuild against Xorg 1.20.8. --- xorgxrdp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xorgxrdp.spec b/xorgxrdp.spec index d698acd..de17f46 100644 --- a/xorgxrdp.spec +++ b/xorgxrdp.spec @@ -2,7 +2,7 @@ Name: xorgxrdp Version: 0.2.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Implementation of xrdp backend as Xorg modules License: MIT @@ -56,6 +56,9 @@ for screen resizing and multiple monitors. %changelog +* Thu Apr 16 2020 Bojan Smojver - 0.2.13-2 +- Rebuild against Xorg 1.20.8 + * Wed Mar 11 2020 Bojan Smojver - 0.2.13-1 - Bump up to 0.2.13 From cc3bf7b5fab3a12dc10d3352b6ba8a1d02fb21ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:00:57 +0000 Subject: [PATCH 2/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xorgxrdp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xorgxrdp.spec b/xorgxrdp.spec index de17f46..9f7214c 100644 --- a/xorgxrdp.spec +++ b/xorgxrdp.spec @@ -2,7 +2,7 @@ Name: xorgxrdp Version: 0.2.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Implementation of xrdp backend as Xorg modules License: MIT @@ -56,6 +56,9 @@ for screen resizing and multiple monitors. %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.2.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Apr 16 2020 Bojan Smojver - 0.2.13-2 - Rebuild against Xorg 1.20.8 From cd618b1bd7e69bf694675e5acd54e47efae1f60b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:47:21 +0000 Subject: [PATCH 3/6] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xorgxrdp.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xorgxrdp.spec b/xorgxrdp.spec index 9f7214c..ba66b83 100644 --- a/xorgxrdp.spec +++ b/xorgxrdp.spec @@ -2,7 +2,7 @@ Name: xorgxrdp Version: 0.2.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Implementation of xrdp backend as Xorg modules License: MIT @@ -56,6 +56,10 @@ for screen resizing and multiple monitors. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.2.13-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.2.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e46a8c6c9747df631ab3299f4239d2f0f359e843 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 1 Sep 2020 17:21:45 +1000 Subject: [PATCH 4/6] Bump up to 0.2.14. Exclude s390x for now, xrdp will not build on it. --- .gitignore | 1 + sources | 2 +- xorgxrdp.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4766548..d0be86b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /xorgxrdp-0.2.11.tar.gz /xorgxrdp-0.2.12.tar.gz /xorgxrdp-0.2.13.tar.gz +/xorgxrdp-0.2.14.tar.gz diff --git a/sources b/sources index df9ebfc..05d25ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xorgxrdp-0.2.13.tar.gz) = 1f0f6982917b4cd18660ab950a0f04ba962643a71fc2a7d7caeb3c30a6cd37ecb6e757efce3571c6c12f928eddb4e3311080a65f9074c7719980d3d7a6201185 +SHA512 (xorgxrdp-0.2.14.tar.gz) = 9abe7e831215f8922e244da8fdc8b61a2ac1c45ea454419b9176b333d8fc1def866ff5f7121c5d73c0581d3d42bc2225ffeef6f779959e277419ddf9beb5704f diff --git a/xorgxrdp.spec b/xorgxrdp.spec index ba66b83..a0ed09c 100644 --- a/xorgxrdp.spec +++ b/xorgxrdp.spec @@ -1,8 +1,8 @@ %global xorg_server_version %(pkg-config --silence-errors --modversion xorg-server 2>/dev/null || echo 65536) Name: xorgxrdp -Version: 0.2.13 -Release: 4%{?dist} +Version: 0.2.14 +Release: 1%{?dist} Summary: Implementation of xrdp backend as Xorg modules License: MIT @@ -10,6 +10,8 @@ URL: https://github.com/neutrinolabs/xorgxrdp Source0: https://github.com/neutrinolabs/xorgxrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz Patch0: xorgxrdp-0.2.12-xrandr-resize-revert.patch +ExcludeArch: s390x + BuildRequires: nasm BuildRequires: xorg-x11-server-devel BuildRequires: xrdp-devel >= 1:0.9.13 @@ -56,6 +58,9 @@ for screen resizing and multiple monitors. %changelog +* Tue Sep 1 2020 Bojan Smojver - 0.2.14-1 +- Bump up to 0.2.14 + * Sat Aug 01 2020 Fedora Release Engineering - 0.2.13-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From aee9db087342af6691e12b95b06b9b94d65a65fc Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 1 Sep 2020 17:39:12 +1000 Subject: [PATCH 5/6] Remove patch for bug #1787612 - fixed upstream. --- xorgxrdp.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xorgxrdp.spec b/xorgxrdp.spec index a0ed09c..cd5f6cc 100644 --- a/xorgxrdp.spec +++ b/xorgxrdp.spec @@ -8,7 +8,6 @@ Summary: Implementation of xrdp backend as Xorg modules License: MIT URL: https://github.com/neutrinolabs/xorgxrdp Source0: https://github.com/neutrinolabs/xorgxrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz -Patch0: xorgxrdp-0.2.12-xrandr-resize-revert.patch ExcludeArch: s390x From d646db81bc9242653a3219e0f45e18aeb65fe533 Mon Sep 17 00:00:00 2001 From: Bojan Smojver Date: Tue, 1 Sep 2020 17:44:02 +1000 Subject: [PATCH 6/6] Remove unused patch. --- xorgxrdp-0.2.12-xrandr-resize-revert.patch | 48 ---------------------- 1 file changed, 48 deletions(-) delete mode 100644 xorgxrdp-0.2.12-xrandr-resize-revert.patch diff --git a/xorgxrdp-0.2.12-xrandr-resize-revert.patch b/xorgxrdp-0.2.12-xrandr-resize-revert.patch deleted file mode 100644 index 08b34eb..0000000 --- a/xorgxrdp-0.2.12-xrandr-resize-revert.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- b/module/rdp.h -+++ a/module/rdp.h -@@ -270,7 +270,6 @@ - RROutputGetPropertyProcPtr rrOutputGetProperty; - RRGetPanningProcPtr rrGetPanning; - RRSetPanningProcPtr rrSetPanning; -- int allow_screen_resize; - - int listen_sck; - char uds_data[256]; ---- b/module/rdpClientCon.c -+++ a/module/rdpClientCon.c -@@ -746,9 +746,7 @@ - - if ((dev->width != width) || (dev->height != height)) - { -- dev->allow_screen_resize = 1; - ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight); -- dev->allow_screen_resize = 0; - LLOGLN(0, ("rdpClientConProcessScreenSizeMsg: RRScreenSizeSet ok=[%d]", ok)); - RRTellChanged(dev->pScreen); - } ---- b/module/rdpRandR.c -+++ a/module/rdpRandR.c -@@ -127,11 +127,6 @@ - LLOGLN(0, ("rdpRRScreenSetSize: width %d height %d mmWidth %d mmHeight %d", - width, height, (int)mmWidth, (int)mmHeight)); - dev = rdpGetDevFromScreen(pScreen); -- if (dev->allow_screen_resize == 0) -- { -- LLOGLN(0, ("rdpRRScreenSetSize: not allowing resize")); -- return FALSE; -- } - root = rdpGetRootWindowPtr(pScreen); - if ((width < 1) || (height < 1)) - { ---- b/xrdpdev/xrdpdev.c -+++ a/xrdpdev/xrdpdev.c -@@ -359,9 +359,7 @@ - if ((dev->width != width) || (dev->height != height)) - { - LLOGLN(0, (" calling RRScreenSizeSet")); -- dev->allow_screen_resize = 1; - ok = RRScreenSizeSet(dev->pScreen, width, height, mmwidth, mmheight); -- dev->allow_screen_resize = 0; - LLOGLN(0, (" RRScreenSizeSet ok %d", ok)); - } - return ok;