From 172b599315c5928a5d41296eee25f2da57823e6bea94dc84bf15a61b24aa1340 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Mon, 19 Apr 2021 08:24:03 +0000 Subject: [PATCH] Accepting request 886602 from home:alois:branches:X11:Utilities - Update to version 4.1.2 * fix unnecessary screen update delays * fix screen refresh rate detection * increase the default screen update refresh rate * fix missing encodings with 'upgrade' and 'upgrade-desktop' subcommands * fix client failures due to missing socket directories * more correct API usage of 'notify2' backend * fix `run_scaled` script handling of multiple arguments * fix ioctl error with nested SSH connections * fix video region detection error * fix sessions GUI not updating on process exit * fix compatibility with newer versions of python-zeroconf * fix directory listing with the builtin http server (still disabled by default) * fix the server's GetAll dbus property handler * fix display-name validation check * the 'exec-wrapper' option no longer needs to use an absolute path * ignore bell audio devices * show the correct list of pressed keys, unkown modifiers * prevent the splash screen process from consuming too much CPU * better service configuration file location detection * packaging script fixes, library and documentation updates - Update xpra-html5 to 4.1.2 and uglify-js to 3.13.3 - Refresh xpra-paths.patch OBS-URL: https://build.opensuse.org/request/show/886602 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=74 --- uglify-js-3.13.1.tgz | 3 --- uglify-js-3.13.3.tgz | 3 +++ xpra-4.1.1.tar.xz | 3 --- xpra-4.1.2.tar.xz | 3 +++ xpra-html5-4.0.6.tar.xz | 3 --- xpra-html5-4.1.2.tar.xz | 3 +++ xpra-paths.patch | 34 +++++++++++++++++++++------------- xpra.changes | 30 ++++++++++++++++++++++++++++++ xpra.spec | 10 +++++----- 9 files changed, 65 insertions(+), 27 deletions(-) delete mode 100644 uglify-js-3.13.1.tgz create mode 100644 uglify-js-3.13.3.tgz delete mode 100644 xpra-4.1.1.tar.xz create mode 100644 xpra-4.1.2.tar.xz delete mode 100644 xpra-html5-4.0.6.tar.xz create mode 100644 xpra-html5-4.1.2.tar.xz diff --git a/uglify-js-3.13.1.tgz b/uglify-js-3.13.1.tgz deleted file mode 100644 index 28732ab..0000000 --- a/uglify-js-3.13.1.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ca5a8b1945335fa9c04f19261b5b484eaba98cd288a2e942fc9a4b1e17d87a5 -size 207535 diff --git a/uglify-js-3.13.3.tgz b/uglify-js-3.13.3.tgz new file mode 100644 index 0000000..572b8e8 --- /dev/null +++ b/uglify-js-3.13.3.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b6688dbdf700490b016b823e1dbee865631263cd7e21a1456b8a43405f1302f +size 208830 diff --git a/xpra-4.1.1.tar.xz b/xpra-4.1.1.tar.xz deleted file mode 100644 index 93340f8..0000000 --- a/xpra-4.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58dc9feefef5e149acad8bb8d3aef59b5f6b48d875265fba1f097f8d264d41db -size 2674236 diff --git a/xpra-4.1.2.tar.xz b/xpra-4.1.2.tar.xz new file mode 100644 index 0000000..c66ce79 --- /dev/null +++ b/xpra-4.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32dd754038a2a8d4bf808a63495321ec5ec359c047d37ff8ab6287e1780052d4 +size 2676588 diff --git a/xpra-html5-4.0.6.tar.xz b/xpra-html5-4.0.6.tar.xz deleted file mode 100644 index bb32bbf..0000000 --- a/xpra-html5-4.0.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6f0d24158ababe2a94fc9d31747af7d4d5f65eb9953bae1adb8c2caf2eb5a47 -size 1132024 diff --git a/xpra-html5-4.1.2.tar.xz b/xpra-html5-4.1.2.tar.xz new file mode 100644 index 0000000..b764ee0 --- /dev/null +++ b/xpra-html5-4.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba34bd9aa9f6b5f47ca61ead5550b0a2913fc7df5e6ac5fee3f31fe3858f4a0a +size 1178976 diff --git a/xpra-paths.patch b/xpra-paths.patch index e1f1ddd..622fa88 100644 --- a/xpra-paths.patch +++ b/xpra-paths.patch @@ -1,7 +1,7 @@ -Index: xpra-4.1/setup.py +Index: xpra-4.1.2/setup.py =================================================================== ---- xpra-4.1.orig/setup.py -+++ xpra-4.1/setup.py +--- xpra-4.1.2.orig/setup.py ++++ xpra-4.1.2/setup.py @@ -1531,7 +1531,7 @@ else: add_data_files("%s/man1" % man_path, man_pages) add_data_files("share/applications", glob.glob("fs/share/applications/*.desktop")) @@ -11,7 +11,7 @@ Index: xpra-4.1/setup.py add_data_files("share/metainfo", ["fs/share/metainfo/xpra.appdata.xml"]) #here, we override build and install so we can -@@ -1617,16 +1617,18 @@ else: +@@ -1617,7 +1617,7 @@ else: if pam_ENABLED: copytodir("fs/etc/pam.d/xpra", "/etc/pam.d") @@ -20,20 +20,28 @@ Index: xpra-4.1/setup.py if service_ENABLED: #Linux init service: subs = {} - if os.path.exists("/etc/sysconfig"): -- copytodir("fs/etc/sysconfig/xpra", "/etc/sysconfig") -+ shutil.copy("fs/etc/sysconfig/xpra", "fs/etc/sysconfig/sysconfig.xpra") -+ os.chmod("fs/etc/sysconfig/sysconfig.xpra", 0o644) -+ copytodir("fs/etc/sysconfig/sysconfig.xpra", "__FILLUPDIR__") - elif os.path.exists("/etc/default"): - copytodir("fs/etc/sysconfig/xpra", "/etc/default") - subs[b"/etc/sysconfig"] = b"/etc/default" +@@ -1625,15 +1625,15 @@ else: + cdir = "/etc/sysconfig" + elif is_Debian() or is_Ubuntu(): + cdir = "/etc/default" +- elif os.path.exists("/etc/sysconfig"): +- cdir = "/etc/sysconfig" + else: +- cdir = "/etc/default" +- copytodir("fs/etc/sysconfig/xpra", cdir) ++ cdir = "__FILLUPDIR__" ++ shutil.copy("fs/etc/sysconfig/xpra", "fs/etc/sysconfig/sysconfig.xpra") ++ os.chmod("fs/etc/sysconfig/sysconfig.xpra", 0o644) ++ copytodir("fs/etc/sysconfig/sysconfig.xpra", cdir) + if cdir!="/etc/sysconfig": + #also replace the reference to it in the service file below + subs[b"/etc/sysconfig"] = cdir.encode() - if os.path.exists("/bin/systemctl"): + if os.path.exists("/usr/bin/systemctl"): if sd_listen_ENABLED: copytodir("fs/lib/systemd/system/xpra.service", systemd_dir, subs=subs) -@@ -1754,7 +1756,6 @@ if scripts_ENABLED: +@@ -1761,7 +1761,6 @@ if scripts_ENABLED: toggle_modules(WIN32, "xpra/scripts/win32_service") if data_ENABLED: diff --git a/xpra.changes b/xpra.changes index 36b8664..184a50d 100644 --- a/xpra.changes +++ b/xpra.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Apr 6 14:18:51 UTC 2021 - Luigi Baldoni + +- Update to version 4.1.2 + * fix unnecessary screen update delays + * fix screen refresh rate detection + * increase the default screen update refresh rate + * fix missing encodings with 'upgrade' and 'upgrade-desktop' + subcommands + * fix client failures due to missing socket directories + * more correct API usage of 'notify2' backend + * fix `run_scaled` script handling of multiple arguments + * fix ioctl error with nested SSH connections + * fix video region detection error + * fix sessions GUI not updating on process exit + * fix compatibility with newer versions of python-zeroconf + * fix directory listing with the builtin http server (still + disabled by default) + * fix the server's GetAll dbus property handler + * fix display-name validation check + * the 'exec-wrapper' option no longer needs to use an absolute + path + * ignore bell audio devices + * show the correct list of pressed keys, unkown modifiers + * prevent the splash screen process from consuming too much CPU + * better service configuration file location detection + * packaging script fixes, library and documentation updates +- Update xpra-html5 to 4.1.2 and uglify-js to 3.13.3 +- Refresh xpra-paths.patch + ------------------------------------------------------------------- Wed Mar 17 12:15:55 UTC 2021 - Luigi Baldoni diff --git a/xpra.spec b/xpra.spec index ac86dd2..28c6482 100644 --- a/xpra.spec +++ b/xpra.spec @@ -17,9 +17,9 @@ # -%define xpra_ver 4.1.1 -%define html5_ver 4.0.6 -%define uglifyjs_ver 3.13.1 +%define xpra_ver 4.1.2 +%define html5_ver 4.1.2 +%define uglifyjs_ver 3.13.3 %global __requires_exclude ^typelib\\(GtkosxApplication\\)|typelib\\(GdkGLExt\\)|typelib\\(GtkGLExt\\).*$ Name: xpra Version: %{xpra_ver} @@ -139,7 +139,7 @@ sed -e 's|__FILLUPDIR__|%{_fillupdir}|' \ -e 's|share/doc/xpra|share/doc/packages/xpra|' \ -i setup.py -sed -i '/install_html5/s/verbose=False/verbose=True/' %{name}-html5-%{html5_ver}/setup_html5.py +sed -i '/install_html5/s/verbose=False/verbose=True/' %{name}-html5-%{html5_ver}/setup.py %build python3 setup.py clean @@ -170,7 +170,7 @@ python3 setup.py install \ --verbose pushd %{name}-html5-%{html5_ver} -PATH=$PATH:../package/bin python3 setup_html5.py %{buildroot}%{_datadir}/%{name}/www +PATH=$PATH:../package/bin python3 setup.py install %{buildroot}%{_datadir}/%{name}/www popd rm -rf %{buildroot}%{_datadir}/xpra/cuda