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 34 35 36 37
|
From: Moritz Schlarb <schlarbm@uni-mainz.de>
Date: Wed, 8 Sep 2021 09:38:11 +0200
Subject: Don't use the bundled ewmh and Xlib modules
Forwarded: not-needed
---
Nagstamon/QUI/__init__.py | 2 +-
setup.py | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
--- a/Nagstamon/QUI/__init__.py
+++ b/Nagstamon/QUI/__init__.py
@@ -76,7 +76,7 @@
if not os.path.exists(os.path.expanduser('~') + os.sep + '.Xauthority'):
open(os.path.expanduser('~') + os.sep + '.Xauthority', 'a').close()
- from Nagstamon.thirdparty.ewmh import EWMH
+ from ewmh import EWMH
# DBus only interesting for Linux too
if OS not in OS_NON_LINUX:
--- a/setup.py
+++ b/setup.py
@@ -142,12 +142,7 @@
'Nagstamon.Servers',
'Nagstamon.Servers.Alertmanager',
'Nagstamon.Servers.Centreon',
- 'Nagstamon.thirdparty',
- 'Nagstamon.thirdparty.Xlib',
- 'Nagstamon.thirdparty.Xlib.ext',
- 'Nagstamon.thirdparty.Xlib.protocol',
- 'Nagstamon.thirdparty.Xlib.support',
- 'Nagstamon.thirdparty.Xlib.xobject'],
+ 'Nagstamon.thirdparty'],
package_dir={'Nagstamon': 'Nagstamon'},
package_data={'Nagstamon': ['resources/*.*',
'resources/qui/*',
|