28c44a15c7
* Use absolute paths to load gobject, pango and cairo. * Add xcb-cursor support (also with absolute path) * Avoid tainting child processes environment: Save PATH and PYTHONPATH in wrapper, and restore them in python code. * Alter restart process, using $0 saved in wrapper, which allow user to restart qtile after system rebuild to upgrade it.
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 00c5af939567429d40877845dc52b54fde2d8a50 Mon Sep 17 00:00:00 2001
|
|
From: "Alexander V. Nikolaev" <avn@avnik.info>
|
|
Date: Thu, 26 Nov 2015 10:53:12 +0200
|
|
Subject: [PATCH 1/3] Substitution vars for absolute paths
|
|
|
|
---
|
|
libqtile/pangocffi.py | 6 +++---
|
|
libqtile/xcursors.py | 2 +-
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py
|
|
index 27691d1..25f690d 100644
|
|
--- a/libqtile/pangocffi.py
|
|
+++ b/libqtile/pangocffi.py
|
|
@@ -58,9 +58,9 @@ except ImportError:
|
|
else:
|
|
raise ImportError("No module named libqtile._ffi_pango, be sure to run `python ./libqtile/ffi_build.py`")
|
|
|
|
-gobject = ffi.dlopen('libgobject-2.0.so.0')
|
|
-pango = ffi.dlopen('libpango-1.0.so.0')
|
|
-pangocairo = ffi.dlopen('libpangocairo-1.0.so.0')
|
|
+gobject = ffi.dlopen('@glib@/lib/libgobject-2.0.so.0')
|
|
+pango = ffi.dlopen('@pango@/lib/libpango-1.0.so.0')
|
|
+pangocairo = ffi.dlopen('@pango@/lib/libpangocairo-1.0.so.0')
|
|
|
|
|
|
def CairoContext(cairo_t):
|
|
diff --git a/libqtile/xcursors.py b/libqtile/xcursors.py
|
|
index e0e55e1..59b6428 100644
|
|
--- a/libqtile/xcursors.py
|
|
+++ b/libqtile/xcursors.py
|
|
@@ -114,7 +114,7 @@ class Cursors(dict):
|
|
|
|
def _setup_xcursor_binding(self):
|
|
try:
|
|
- xcursor = ffi.dlopen('libxcb-cursor.so')
|
|
+ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so')
|
|
except OSError:
|
|
self.log.warning("xcb-cursor not found, fallback to font pointer")
|
|
return False
|
|
--
|
|
2.6.3
|
|
|