Skip to content

Commit

Permalink
#2453 MacOS Catalina is being facetious, don't install man page or cu…
Browse files Browse the repository at this point in the history
…ps backend (meaning printer forwarding to MacOS is no longer supported..)

git-svn-id: https://xpra.org/svn/Xpra/trunk@24175 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 18, 2019
1 parent 73ea98c commit b20d617
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,9 @@ def add_service_exe(script, icon, base_name):
man_path = "share/man"
if OPENBSD:
man_path = "man"
add_data_files("%s/man1" % man_path, ["man/xpra.1", "man/xpra_launcher.1"])
if not OSX:
#breaks installation with MacOS Catalina (see ticket #2453)
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"])
Expand Down Expand Up @@ -1503,7 +1505,8 @@ def copytodir(src, dst_dir, dst_name=None, chmod=0o644):
if chmod:
os.chmod(dst_file, chmod)

if printing_ENABLED and POSIX:
if printing_ENABLED and POSIX and not OSX:
#breaks installation with MacOS Catalina (see ticket #2453)
#install "/usr/lib/cups/backend" with 0700 permissions:
copytodir("cups/xpraforwarder", "lib/cups/backend", chmod=0o700)

Expand Down

0 comments on commit b20d617

Please sign in to comment.