Luigi Baldoni
172b599315
- 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
52 lines
2.5 KiB
Diff
52 lines
2.5 KiB
Diff
Index: xpra-4.1.2/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"))
|
|
add_data_files("share/mime/packages", ["fs/share/mime/packages/application-x-xpraconfig.xml"])
|
|
- add_data_files("share/icons", glob.glob("fs/share/icons/*.png"))
|
|
+ add_data_files("share/pixmaps", glob.glob("fs/share/icons/*.png"))
|
|
add_data_files("share/metainfo", ["fs/share/metainfo/xpra.appdata.xml"])
|
|
|
|
#here, we override build and install so we can
|
|
@@ -1617,7 +1617,7 @@ else:
|
|
if pam_ENABLED:
|
|
copytodir("fs/etc/pam.d/xpra", "/etc/pam.d")
|
|
|
|
- systemd_dir = "/lib/systemd/system"
|
|
+ systemd_dir = "__UNITDIR__"
|
|
if service_ENABLED:
|
|
#Linux init service:
|
|
subs = {}
|
|
@@ -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)
|
|
@@ -1761,7 +1761,6 @@ if scripts_ENABLED:
|
|
toggle_modules(WIN32, "xpra/scripts/win32_service")
|
|
|
|
if data_ENABLED:
|
|
- add_data_files(share_xpra, ["README.md", "COPYING"])
|
|
add_data_files(share_xpra, ["fs/share/xpra/bell.wav"])
|
|
ICONS = glob.glob("fs/share/xpra/icons/*.png")
|
|
if OSX:
|