summaryrefslogtreecommitdiff
path: root/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
blob: 8475d47b8b3c9fe3d807a64c50e153439ee73ee1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
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