summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
diff options
context:
space:
mode:
authorAlexander V. Nikolaev <avn@avnik.info>2015-12-01 13:46:18 +0200
committerAlexander V. Nikolaev <avn@avnik.info>2015-12-01 13:46:18 +0200
commit28c44a15c76bb92d56a69e621e83b377ad9d3688 (patch)
tree102279da880fa063ef422f44bf93678c0e22d257 /pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
parent9b166f0db22a1cecabc88013c66dd6e0691e9a06 (diff)
qtile: rework package
* 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.
Diffstat (limited to 'pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch')
-rw-r--r--pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
new file mode 100644
index 000000000000..e3c88a5fa551
--- /dev/null
+++ b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
@@ -0,0 +1,43 @@
+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
+