diff options
Diffstat (limited to 'x11/xpra/files/patch-setup.py')
| -rw-r--r-- | x11/xpra/files/patch-setup.py | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py index 39bd641ec0a9..e3e3583f98b8 100644 --- a/x11/xpra/files/patch-setup.py +++ b/x11/xpra/files/patch-setup.py @@ -1,31 +1,20 @@ ---- setup.py.orig 2020-03-13 16:51:18 UTC +--- setup.py.orig 2021-03-07 14:32:43 UTC +++ setup.py -@@ -1491,7 +1491,7 @@ else: - libexec = "libexec" - else: - libexec = "lib" -- if LINUX: -+ if LINUX or FREEBSD: - if scripts_ENABLED: - scripts += ["scripts/xpra_udev_product_version", "scripts/xpra_signal_listener"] - libexec_scripts = [] -@@ -1508,7 +1508,7 @@ else: - add_data_files("%s/man1" % man_path, ["man/xpra.1", "man/xpra_launcher.1"]) - add_data_files("share/applications", glob.glob("xdg/*.desktop")) - add_data_files("share/mime/packages", ["xdg/application-x-xpraconfig.xml"]) -- add_data_files("share/icons", ["xdg/xpra.png", "xdg/xpra-mdns.png", "xdg/xpra-shadow.png"]) -+ add_data_files("share/pixmaps", ["xdg/xpra.png", "xdg/xpra-mdns.png", "xdg/xpra-shadow.png"]) - add_data_files("share/metainfo", ["xdg/xpra.appdata.xml"]) +@@ -1012,7 +1012,7 @@ if 'clean' in sys.argv or 'sdist' in sys.argv: + clean() - #here, we override build and install so we can -@@ -1633,8 +1633,8 @@ else: - remove_packages("xpra.platform.win32", "xpra.platform.darwin") - if data_ENABLED: - #not supported by all distros, but doesn't hurt to install them anyway: -- for x in ("tmpfiles.d", "sysusers.d"): -- add_data_files("lib/%s" % x, ["%s/xpra.conf" % x]) -+# for x in ("tmpfiles.d", "sysusers.d"): -+# add_data_files("lib/%s" % x, ["%s/xpra.conf" % x]) - if uinput_ENABLED: - add_data_files("lib/udev/rules.d/", ["udev/rules.d/71-xpra-virtual-pointer.rules"]) + def add_build_info(*args): +- cmd = ["python3", "./fs/bin/add_build_info.py"]+list(args) ++ cmd = [sys.executable, "./fs/bin/add_build_info.py"]+list(args) + r = subprocess.Popen(cmd).wait(30) + assert r==0, "'%s' returned %s" % (" ".join(cmd), r) + +@@ -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 |