public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xpra: 2.3.4 -> 2.5, unbreak

Browse Source
This commit is contained in:
Will Dietz
2019-03-22 17:32:55 -05:00
parent db7be52988
commit d48e8f67a2
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/X11/xpra/fix-paths.patch
+15 -14
View File
@@ -9,25 +9,26 @@
cython_add(Extension("xpra.client.gtk3.cairo_workaround",
["xpra/client/gtk3/cairo_workaround.pyx"],
**pkgconfig(pycairo)
--- a/xpra/client/gtk3/cairo_workaround.pyx
+++ b/xpra/client/gtk3/cairo_workaround.pyx
@@ -65,7 +65,7 @@
void cairo_surface_flush (cairo_surface_t *surface)
void cairo_surface_mark_dirty (cairo_surface_t *surface)
-cdef extern from "pycairo/pycairo.h":
+cdef extern from "py3cairo.h":
ctypedef struct Pycairo_CAPI_t:
pass
ctypedef struct PycairoSurface:
@@ -2363,10 +2363,7 @@
v4l2_pkgconfig = pkgconfig()
#fuly warning: cython makes this difficult,
#we have to figure out if "device_caps" exists in the headers:
- ENABLE_DEVICE_CAPS = False
- if os.path.exists("/usr/include/linux/videodev2.h"):
- hdata = open("/usr/include/linux/videodev2.h").read()
- ENABLE_DEVICE_CAPS = hdata.find("device_caps")>=0
+ ENABLE_DEVICE_CAPS = True
kwargs = {"ENABLE_DEVICE_CAPS" : ENABLE_DEVICE_CAPS}
make_constants("xpra", "codecs", "v4l2", "constants", **kwargs)
cython_add(Extension("xpra.codecs.v4l2.pusher",
--- a/xpra/x11/bindings/keyboard_bindings.pyx
+++ b/xpra/x11/bindings/keyboard_bindings.pyx
@@ -19,7 +19,7 @@
DEF PATH_MAX = 1024
DEF DFLT_XKB_RULES_FILE = "base"
-DEF DFLT_XKB_CONFIG_ROOT = "/usr/share/X11/xkb"
+DEF DFLT_XKB_CONFIG_ROOT = "@xkeyboardconfig@/share/X11/xkb"
DEF DFLT_XKB_RULES_FILE = b"base"
-DEF DFLT_XKB_CONFIG_ROOT = b"/usr/share/X11/xkb"
+DEF DFLT_XKB_CONFIG_ROOT = b"@xkeyboardconfig@/share/X11/xkb"
###################################
# Headers, python magic