diff options
| author | Andy Tai <[email protected]> | 2023-09-27 09:36:13 -0700 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2023-09-28 11:44:09 +0200 |
| commit | be9b7e0f653e27030c402194c7020aea873f30a5 (patch) | |
| tree | 513e46abd8fac05a38297193c84596d57d4398fb /gnu/packages/patches/xpra-4.2-install_libs.patch | |
| parent | fe7b5df00ccecd46b6c06f5fef4fe42a5c8536be (diff) | |
gnu: xpra: Update to 5.0.2
* gnu/packages/patches/xpra-4.2-install_libs.patch: Move to ...
* gnu/packages/patches/xpra-5.0-install_libs.patch: ... this file.
* gnu/packages/patches/xpra-4.2-systemd-run.patch: Move to ...
* gnu/packages/patches/xpra-5.0-systemd-run.patch: ... this file.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
* gnu/packages/xorg.scm (xpra): Update to 5.0.2.
[source] <patches>: Rename per version changes
[inputs]: Add cups.
Signed-off-by: Ludovic Courtès <[email protected]>
Diffstat (limited to 'gnu/packages/patches/xpra-4.2-install_libs.patch')
| -rw-r--r-- | gnu/packages/patches/xpra-4.2-install_libs.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/gnu/packages/patches/xpra-4.2-install_libs.patch b/gnu/packages/patches/xpra-4.2-install_libs.patch deleted file mode 100644 index 65d489a3b8..0000000000 --- a/gnu/packages/patches/xpra-4.2-install_libs.patch +++ /dev/null @@ -1,29 +0,0 @@ -This workaround for Gentoo interferes with our use of --no-compile during -the 'install stage. - ---- a/setup.py 2022-01-04 10:10:05.039825000 +0100 -+++ b/setup.py 2022-01-06 15:10:31.952656039 +0100 -@@ -589,8 +589,6 @@ - }) - - def add_cython_ext(*args, **kwargs): -- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install" in sys.argv): -- return - assert cython_ENABLED, "cython compilation is disabled" - if cython_tracing_ENABLED: - kwargs["define_macros"] = [ -@@ -1703,14 +1701,6 @@ - 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): -- pkgconfig = no_pkgconfig -- - if OSX and "py2app" in sys.argv: - import py2app #@UnresolvedImport - assert py2app is not None |