alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xpra: 3.0.9 -> 4.0.2

Browse source
This commit is contained in:
Michael Lingelbach 2020-05-16 21:19:00 +02:00 committed by Jon
parent 482a82b062
commit e5b7f1325c
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/X11/xpra/default.nix
View file

@ -30,11 +30,11 @@ let
in buildPythonApplication rec {
pname = "xpra";
version = "3.0.9";
version = "4.0.2";
src = fetchurl {
url = "https://xpra.org/src/${pname}-${version}.tar.xz";
sha256 = "04qskz1x1pvbdfirpxk58d3dfnf1n6dc69q2rdkak0avzl1nlzi7";
sha256 = "1cs39jzi59hkl421xmhi549ndmdfzkg0ap45f4nlsn9zr9zwmp3x";
};
patches = [
@ -85,7 +85,6 @@ in buildPythonApplication rec {
"--with-Xdummy"
"--without-strict"
"--with-gtk3"
"--without-gtk2"
# Override these, setup.py checks for headers in /usr/* paths
"--with-pam"
"--with-vsock"

24
pkgs/tools/X11/xpra/fix-41106.patch
View file

@ -1,15 +1,15 @@
diff --git a/xpra/server/server_util.py b/xpra/server/server_util.py
index 2ff2c0c..513201a 100644
index dd7c7c1..066b9ff 100644
--- a/xpra/server/server_util.py
+++ b/xpra/server/server_util.py
@@ -17,6 +17,10 @@ if PYTHON3:
return b"'" + s.replace(b"'", b"'\\''") + b"'"
def xpra_runner_shell_script(xpra_file, starting_dir, socket_dir):
+ # Nixpkgs contortion:
+ # xpra_file points to a shell wrapper, not to the python script.
+ dirname, basename = os.path.split(xpra_file)
+ xpra_file = os.path.join(dirname, "."+basename+"-wrapped")
script = []
script.append(b"#!/bin/sh\n")
for var, value in os.environb.items():
@@ -37,6 +37,10 @@ def sh_quotemeta(s):
return b"'" + s.replace(b"'", b"'\\''") + b"'"
def xpra_runner_shell_script(xpra_file, starting_dir, socket_dir):
+ # Nixpkgs contortion:
+ # xpra_file points to a shell wrapper, not to the python script.
+ dirname, basename = os.path.split(xpra_file)
+ xpra_file = os.path.join(dirname, "."+basename+"-wrapped")
script = []
script.append(b"#!/bin/sh\n")
for var, value in os.environb.items():

16
pkgs/tools/X11/xpra/fix-paths.patch
View file

@ -1,13 +1,13 @@
gdiff --git a/setup.py b/setup.py
index 8d3df15..6156206 100755
diff --git a/setup.py b/setup.py
index f962330..b02b6dd 100755
--- a/setup.py
+++ b/setup.py
-2322,11 +2322,7 @@ if v4l2_ENABLED:
videodev2_h = "/usr/include/linux/videodev2.h"
constants_pxi = "xpra/codecs/v4l2/constants.pxi"
if not os.path.exists(videodev2_h) or should_rebuild(videodev2_h, constants_pxi):
- ENABLE_DEVICE_CAPS = 0
- if os.path.exists(videodev2_h):
@@ -2224,11 +2224,7 @@ if v4l2_ENABLED:
videodev2_h = "/usr/include/linux/videodev2.h"
constants_pxi = "xpra/codecs/v4l2/constants.pxi"
if not os.path.exists(videodev2_h) or should_rebuild(videodev2_h, constants_pxi):
- ENABLE_DEVICE_CAPS = 0
- if os.path.exists(videodev2_h):
- with open(videodev2_h) as f:
- hdata = f.read()
- ENABLE_DEVICE_CAPS = int(hdata.find("device_caps")>=0)