patch-setup_py 872 B

123456789101112131415161718192021222324252627
  1. $OpenBSD: patch-setup_py,v 1.1 2015/01/15 01:28:06 daniel Exp $
  2. fs-uae-launcher includes its own py-six which breaks
  3. things like matplotlib when both are installed.
  4. Fix taken from arch linux:
  5. https://aur.archlinux.org/packages/fs-uae-launcher/
  6. --- setup.py.orig Tue Jan 13 10:21:23 2015
  7. +++ setup.py Tue Jan 13 10:21:44 2015
  8. @@ -22,7 +22,6 @@ package_map = {
  9. "fsui": "../python",
  10. "game_center": "../python",
  11. "lhafile": "../python-lhafile",
  12. - "six": "../python",
  13. }
  14. packages = sorted(package_map.keys())
  15. if sys.platform != "win32":
  16. @@ -139,7 +138,6 @@ if sys.platform == "win32":
  17. res_dirs.append('fsgs/res')
  18. res_dirs.append('fsui/res')
  19. res_dirs.append('lhafile/res')
  20. - res_dirs.append('six/res')
  21. for res_dir in res_dirs:
  22. full = os.path.join(self.collect_dir, res_dir)