diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-29 16:46:44 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-29 16:46:44 +0100 |
commit | ae838334efa4ecfd172331e8f5ae4eea8c5dd876 (patch) | |
tree | 4ca49a7102c3db20c7b54b7c9af988b0bc68e2ff /x11-wm/xpra/files | |
parent | d3fc35858ba4bc0c8038a8c536246b00fe648358 (diff) |
gentoo auto-resync : 29:08:2022 - 16:46:43
Diffstat (limited to 'x11-wm/xpra/files')
-rw-r--r-- | x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch | 33 | ||||
-rw-r--r-- | x11-wm/xpra/files/xpra-4.2-no-service.patch | 19 |
2 files changed, 0 insertions, 52 deletions
diff --git a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch deleted file mode 100644 index 8475d47b8b3c..000000000000 --- a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN xpra-3.0.2.orig/xpra/x11/fakeXinerama.py xpra-3.0.2/xpra/x11/fakeXinerama.py ---- xpra-3.0.2.orig/xpra/x11/fakeXinerama.py 2019-09-24 15:54:02.000000000 +0200 -+++ xpra-3.0.2/xpra/x11/fakeXinerama.py 2020-01-16 12:20:22.620519078 +0100 -@@ -23,29 +23,6 @@ - - def find_libfakeXinerama(): - libname = "fakeXinerama" -- try: -- from ctypes.util import find_library -- flibname = find_library("fakeXinerama") -- if flibname: -- libname = flibname -- except Exception: -- pass -- if POSIX: -- for lib_dir in os.environ.get("LD_LIBRARY_PATH", "/usr/lib").split(os.pathsep): -- lib_path = os.path.join(lib_dir, libname) -- if not os.path.exists(lib_dir): -- continue -- if os.path.exists(lib_path) and os.path.isfile(lib_path): -- return lib_path -- if LINUX: -- try: -- libpath = find_lib_ldconfig("fakeXinerama") -- if libpath: -- return libpath -- except Exception as e: -- log("find_libfakeXinerama()", exc_info=True) -- log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:") -- log.error(" %s", e) - return find_lib(libname) - - current_xinerama_config = None diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch b/x11-wm/xpra/files/xpra-4.2-no-service.patch deleted file mode 100644 index dd85370968ba..000000000000 --- a/x11-wm/xpra/files/xpra-4.2-no-service.patch +++ /dev/null @@ -1,19 +0,0 @@ -Don't install the service files. Auto-detection is used to determine what files -to install, and where, which can be unpredictable on Gentoo. The init.d script -is also not suitable for Gentoo. - -diff --git a/setup.py b/setup.py -index 1718b06a9..b24a5bd1e 100755 ---- a/setup.py -+++ b/setup.py -@@ -139,8 +139,8 @@ from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED - shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT - server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT - rfb_ENABLED = server_ENABLED --service_ENABLED = LINUX and server_ENABLED --sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd") -+service_ENABLED = False -+sd_listen_ENABLED = False - proxy_ENABLED = DEFAULT - client_ENABLED = DEFAULT - scripts_ENABLED = not WIN32 |