summaryrefslogtreecommitdiff
path: root/x11/xpra/files/patch-setup.py
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2020-03-26 20:13:49 +0000
committerSteve Wills <swills@FreeBSD.org>2020-03-26 20:13:49 +0000
commit746dd3e3d07fab6c80db492223d4e1c64cf77c03 (patch)
treebd8920545f466aa83fbabf0f4e0fcbcc282689f1 /x11/xpra/files/patch-setup.py
parent- fix build with llvm10 (diff)
x11/xpra: restore port and update to 3.0.
While here, reformat and pass maintainership to submitter Submitted by: arrowd Differential Revision: https://reviews.freebsd.org/D23743
Notes
Notes: svn path=/head/; revision=529212
Diffstat (limited to 'x11/xpra/files/patch-setup.py')
-rw-r--r--x11/xpra/files/patch-setup.py60
1 files changed, 60 insertions, 0 deletions
diff --git a/x11/xpra/files/patch-setup.py b/x11/xpra/files/patch-setup.py
new file mode 100644
index 000000000000..e02663cddded
--- /dev/null
+++ b/x11/xpra/files/patch-setup.py
@@ -0,0 +1,60 @@
+--- setup.py.orig 2020-02-07 11:19:08 UTC
++++ setup.py
+@@ -165,7 +165,7 @@ html5_brotli_ENABLED = DEFAULT
+ minify_ENABLED = html5_ENABLED
+ pam_ENABLED = DEFAULT and (server_ENABLED or proxy_ENABLED) and POSIX and not OSX and (os.path.exists("/usr/include/pam/pam_misc.h") or os.path.exists("/usr/include/security/pam_misc.h"))
+
+-xdg_open_ENABLED = LINUX and DEFAULT
++xdg_open_ENABLED = (LINUX or FREEBSD) and DEFAULT
+ netdev_ENABLED = LINUX and DEFAULT
+ vsock_ENABLED = LINUX and os.path.exists("/usr/include/linux/vm_sockets.h")
+ bencode_ENABLED = DEFAULT
+@@ -1481,11 +1481,11 @@ if WIN32:
+ #*******************************************************************************
+ else:
+ #OSX and *nix:
+- if LINUX:
++ if LINUX or FREEBSD:
+ if scripts_ENABLED:
+ scripts += ["scripts/xpra_udev_product_version", "scripts/xpra_signal_listener"]
+ libexec_scripts = []
+- if is_Fedora() or is_CentOS() or is_RedHat():
++ if is_Fedora() or is_CentOS() or is_RedHat() or FREEBSD:
+ libexec = "libexec"
+ else:
+ libexec = "lib"
+@@ -1497,12 +1497,12 @@ else:
+ add_data_files("%s/xpra/" % libexec, libexec_scripts)
+ if data_ENABLED:
+ man_path = "share/man"
+- if OPENBSD:
++ if OPENBSD or FREEBSD:
+ man_path = "man"
+ 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"])
+
+ #here, we override build and install so we can
+@@ -1551,7 +1551,7 @@ else:
+
+ if printing_ENABLED and POSIX:
+ #install "/usr/lib/cups/backend" with 0700 permissions:
+- copytodir("cups/xpraforwarder", "lib/cups/backend", chmod=0o700)
++ copytodir("cups/xpraforwarder", "libexec/cups/backend", chmod=0o700)
+
+ if x11_ENABLED:
+ #install xpra_Xdummy if we need it:
+@@ -1624,8 +1624,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"])
+