forked from mirrors/nixpkgs
qtile: 0.10.4 -> 0.10.7
This commit is contained in:
Stefan Junker
parent
ac4f896fc6
commit
7c1e44f7b6
|
|
@ -1,15 +1,5 @@
|
|||
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
|
||||
index 1e8f5c04..e860d43a 100644
|
||||
--- a/libqtile/pangocffi.py
|
||||
+++ b/libqtile/pangocffi.py
|
||||
@@ -58,9 +58,9 @@ except ImportError:
|
||||
|
|
@ -26,18 +16,15 @@ index 27691d1..25f690d 100644
|
|||
|
||||
def CairoContext(cairo_t):
|
||||
diff --git a/libqtile/xcursors.py b/libqtile/xcursors.py
|
||||
index e0e55e1..59b6428 100644
|
||||
index f1133555..3e61204a 100644
|
||||
--- a/libqtile/xcursors.py
|
||||
+++ b/libqtile/xcursors.py
|
||||
@@ -114,7 +114,7 @@ class Cursors(dict):
|
||||
@@ -112,7 +112,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")
|
||||
logger.warning("xcb-cursor not found, fallback to font pointer")
|
||||
return False
|
||||
--
|
||||
2.6.3
|
||||
|
||||
|
|
|
|||
|
|
@ -1,57 +1,52 @@
|
|||
From f299a0aa0eefcf16bb4990f00ac3946727f43ef3 Mon Sep 17 00:00:00 2001
|
||||
From: "Alexander V. Nikolaev" <avn@avnik.info>
|
||||
Date: Fri, 27 Nov 2015 10:49:48 +0200
|
||||
Subject: [PATCH 2/3] Restore PATH and PYTHONPATH
|
||||
|
||||
---
|
||||
bin/qtile | 1 +
|
||||
bin/qtile-run | 1 +
|
||||
bin/qtile-session | 2 ++
|
||||
libqtile/utils.py | 7 +++++++
|
||||
4 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/bin/qshell b/bin/qshell
|
||||
index 2ba7e61c..0ac2a2ef 100755
|
||||
--- a/bin/qshell
|
||||
+++ b/bin/qshell
|
||||
@@ -28,5 +28,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
|
||||
sys.path.insert(0, base_dir)
|
||||
|
||||
if __name__ == '__main__':
|
||||
+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
|
||||
from libqtile.scripts import qshell
|
||||
qshell.main()
|
||||
diff --git a/bin/qtile b/bin/qtile
|
||||
index 66034fe..ce3fcd1 100755
|
||||
index 3e82814d..335b5cea 100755
|
||||
--- a/bin/qtile
|
||||
+++ b/bin/qtile
|
||||
@@ -131,6 +131,7 @@ def make_qtile():
|
||||
@@ -29,5 +29,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
|
||||
sys.path.insert(0, base_dir)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if __name__ == '__main__':
|
||||
+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
|
||||
rename_process()
|
||||
q = make_qtile()
|
||||
try:
|
||||
from libqtile.scripts import qtile
|
||||
qtile.main()
|
||||
diff --git a/bin/qtile-run b/bin/qtile-run
|
||||
index ccedb96..646a476 100755
|
||||
index e4b121be..1c203bc9 100755
|
||||
--- a/bin/qtile-run
|
||||
+++ b/bin/qtile-run
|
||||
@@ -50,6 +50,7 @@ def main():
|
||||
proc.wait()
|
||||
@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
|
||||
sys.path.insert(0, base_dir)
|
||||
|
||||
if __name__ == "__main__":
|
||||
if __name__ == '__main__':
|
||||
+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
|
||||
try:
|
||||
main()
|
||||
except KeyboardInterrupt:
|
||||
diff --git a/bin/qtile-session b/bin/qtile-session
|
||||
index 84f6a2d..da31b12 100755
|
||||
--- a/bin/qtile-session
|
||||
+++ b/bin/qtile-session
|
||||
@@ -25,6 +25,8 @@
|
||||
Qtile session manager.
|
||||
"""
|
||||
from libqtile.scripts import qtile_run
|
||||
qtile_run.main()
|
||||
diff --git a/bin/qtile-top b/bin/qtile-top
|
||||
index 5316e0e7..272c6430 100755
|
||||
--- a/bin/qtile-top
|
||||
+++ b/bin/qtile-top
|
||||
@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
|
||||
sys.path.insert(0, base_dir)
|
||||
|
||||
+__import__("importlib").import_module("libqtile.utils").restore_os_environment()
|
||||
+
|
||||
from libqtile.log_utils import init_log
|
||||
import logging
|
||||
import os
|
||||
if __name__ == '__main__':
|
||||
+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
|
||||
from libqtile.scripts import qtile_top
|
||||
qtile_top.main()
|
||||
diff --git a/libqtile/utils.py b/libqtile/utils.py
|
||||
index 284089b..ec3539e 100644
|
||||
index 36ed0a58..bca9eab3 100644
|
||||
--- a/libqtile/utils.py
|
||||
+++ b/libqtile/utils.py
|
||||
@@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None):
|
||||
@@ -240,3 +240,11 @@ def describe_attributes(obj, attrs, func=None):
|
||||
pairs.append('%s=%s' % (attr, value))
|
||||
|
||||
return ', '.join(pairs)
|
||||
|
|
|
|||
|
|
@ -1,17 +1,8 @@
|
|||
From b560c11078fecc35df2c62f34beda06c4e80a10d Mon Sep 17 00:00:00 2001
|
||||
From: "Alexander V. Nikolaev" <avn@avnik.info>
|
||||
Date: Fri, 27 Nov 2015 10:54:35 +0200
|
||||
Subject: [PATCH 3/3] Restart executable
|
||||
|
||||
---
|
||||
libqtile/manager.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libqtile/manager.py b/libqtile/manager.py
|
||||
index b1a38e2..110f7d8 100644
|
||||
index 36518a74..9b6bdd02 100644
|
||||
--- a/libqtile/manager.py
|
||||
+++ b/libqtile/manager.py
|
||||
@@ -1339,7 +1339,7 @@ class Qtile(command.CommandObject):
|
||||
@@ -1386,7 +1386,7 @@ class Qtile(command.CommandObject):
|
||||
argv = [s for s in argv if not s.startswith('--with-state')]
|
||||
argv.append('--with-state=' + buf.getvalue().decode())
|
||||
|
||||
|
|
@ -19,7 +10,4 @@ index b1a38e2..110f7d8 100644
|
|||
+ self.cmd_execute(os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:])
|
||||
|
||||
def cmd_spawn(self, cmd):
|
||||
"""
|
||||
--
|
||||
2.6.3
|
||||
|
||||
"""Run cmd in a shell.
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@ in
|
|||
|
||||
python27Packages.buildPythonApplication rec {
|
||||
name = "qtile-${version}";
|
||||
version = "0.10.4";
|
||||
version = "0.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qtile";
|
||||
repo = "qtile";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i";
|
||||
sha256 = "18szgplyym0b65vnaa8nqzadq6q0mhsiky9g5hqhn7xzf4kykmj8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
Loading…
Reference in a new issue