[xpra-codecs-freeworld] git add xpra-find_py3cairo.patch xpra-force_always_libexec.patch

commit 861d3a50cf717f902cb1a06919f3337474d35ce8 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Feb 20 22:28:46 2022 +0000 git add xpra-find_py3cairo.patch xpra-force_always_libexec.patch xpra-find_py3cairo.patch | 33 +++++++++++++++++++++++++++++++++ xpra-force_always_libexec.patch | 11 +++++++++++ 2 files changed, 44 insertions(+) --- diff --git a/xpra-find_py3cairo.patch b/xpra-find_py3cairo.patch new file mode 100644 index 0000000..d055d51 --- /dev/null +++ b/xpra-find_py3cairo.patch @@ -0,0 +1,33 @@ +--- a/setup.orig.py 2020-06-05 11:40:10.000000000 +0200 ++++ b/setup.py 2020-07-15 11:07:19.084531962 +0200 +@@ -1899,8 +1899,8 @@ + #cairo workaround: + add_cython_ext("xpra.client.gtk3.cairo_workaround", + ["xpra/client/gtk3/cairo_workaround.pyx"], +- **pkgconfig("py3cairo") +- ) ++ ["@@python3_sitearch@@"] ++ ) + + if client_ENABLED or server_ENABLED: + add_packages("xpra.codecs.argb") +--- a/xpra/client/gtk3/cairo_workaround.orig.pyx 2020-05-10 19:00:53.000000000 +0200 ++++ b/xpra/client/gtk3/cairo_workaround.pyx 2020-07-15 11:17:57.586807490 +0200 +@@ -35,7 +35,7 @@ + pass + void * PyCapsule_Import(const char *name, int no_block) + +-cdef extern from "cairo/cairo.h": ++cdef extern from "cairo/include/py3cairo.h": + ctypedef struct cairo_surface_t: + pass + +@@ -59,7 +59,7 @@ + void cairo_surface_flush (cairo_surface_t *surface) + void cairo_surface_mark_dirty (cairo_surface_t *surface) + +-cdef extern from "pycairo/py3cairo.h": ++cdef extern from "cairo/include/py3cairo.h": + ctypedef struct Pycairo_CAPI_t: + pass + ctypedef struct PycairoSurface: diff --git a/xpra-force_always_libexec.patch b/xpra-force_always_libexec.patch new file mode 100644 index 0000000..577570a --- /dev/null +++ b/xpra-force_always_libexec.patch @@ -0,0 +1,11 @@ +--- a/setup.orig.py 2020-07-15 17:54:25.805747151 +0200 ++++ b/setup.py 2020-07-15 17:53:15.841073182 +0200 +@@ -1510,7 +1510,7 @@ + if is_Fedora() or is_CentOS() or is_RedHat() or FREEBSD: + libexec = "libexec" + else: +- libexec = "lib" ++ libexec = "libexec" + if LINUX or FREEBSD: + if scripts_ENABLED: + scripts += ["fs/bin/xpra_udev_product_version", "fs/bin/xpra_signal_listener"]