mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 03:55:08 -06:00
8455dba243
* gnu/packages/xorg.scm (xpra): Update to 6.4.1. [source](origin): Update patch file name. * gnu/packages/patches/xpra-6.0-systemd-run.patch: Delete. * gnu/packages/patches/xpra-6.4-systemd-run.patch: New file. * gnu/packages/patches/xpra-6.1-install_libs.patch: Delete. * gnu/packages/patches/xpra-6.4-install_libs.patch: New file. * gnu/local.mk: Unregister deleted file and register new file. Change-Id: Ib026b49114f5afca39ee8ec1a8a209cd6c11c7d6
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
Distribution specific patch, not going upstream
|
|
|
|
This workaround for Gentoo interferes with our use of --no-compile during
|
|
the 'install stage.
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index bd65109379..a97a310ea3 100755
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -1081,8 +1081,6 @@ if verbose_ENABLED and not os.environ.get("DISTUTILS_DEBUG"):
|
|
|
|
|
|
def do_add_cython_ext(*args, **kwargs) -> None:
|
|
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv):
|
|
- return
|
|
if not cython_ENABLED:
|
|
raise ValueError(f"cannot build {args}: cython compilation is disabled")
|
|
if cython_tracing_ENABLED:
|
|
@@ -2301,11 +2299,6 @@ else:
|
|
|
|
def _get_root_prefix(self) -> str:
|
|
root_prefix = ""
|
|
- for x in sys.argv:
|
|
- if x.startswith("--root="):
|
|
- return x[len("--root="):]
|
|
- if x.startswith("--prefix="):
|
|
- root_prefix = x[len("--prefix="):]
|
|
if not root_prefix:
|
|
install_dir = self._get_install_dir()
|
|
root_prefix = install_dir.rstrip("/")
|
|
@@ -2466,13 +2459,6 @@ else:
|
|
if uinput_ENABLED:
|
|
add_data_files("lib/udev/rules.d/", ["fs/lib/udev/rules.d/71-xpra-virtual-pointer.rules"])
|
|
|
|
- # gentoo does weird things, calls --no-compile with build *and* install
|
|
- # then expects to find the cython modules!? ie:
|
|
- #> python2.7 setup.py build -b build-2.7 install --no-compile \
|
|
- # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7
|
|
- # otherwise we use the flags to skip pkgconfig
|
|
- if ("--no-compile" in sys.argv or "--skip-build" in sys.argv) and not ("build" in sys.argv and "install" in sys.argv): # noqa: E501
|
|
- pkgconfig = no_pkgconfig
|
|
|
|
if OSX and "py2app" in sys.argv:
|
|
import py2app #@UnresolvedImport
|