| 1 |
commit: 91677b075dc3191b847eb9af194cc40c3b66e750 |
| 2 |
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 19:01:05 2016 +0000 |
| 4 |
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 19:01:20 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91677b07 |
| 7 |
|
| 8 |
net-analyzer/nagstamon: Revbump, fixes https://github.com/HenriWahl/Nagstamon/issues/296 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
.../nagstamon/files/nagstamon-2.0-EWMH.patch | 38 ++++++++++++++++++++++ |
| 13 |
...agstamon-2.0.ebuild => nagstamon-2.0-r1.ebuild} | 15 ++------- |
| 14 |
2 files changed, 40 insertions(+), 13 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch b/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..f7e62bc |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch |
| 21 |
@@ -0,0 +1,38 @@ |
| 22 |
+From 8ea1a9336b6239ead43ea7c4b767052e10745fe8 Mon Sep 17 00:00:00 2001 |
| 23 |
+From: Christian Ruppert <idl0r@g.o> |
| 24 |
+Date: Wed, 31 Aug 2016 20:19:20 +0200 |
| 25 |
+Subject: [PATCH] Initialize EWMH as soon as possible, #296 |
| 26 |
+ |
| 27 |
+Signed-off-by: Christian Ruppert <idl0r@g.o> |
| 28 |
+--- |
| 29 |
+ Nagstamon/QUI/__init__.py | 8 ++++---- |
| 30 |
+ 1 file changed, 4 insertions(+), 4 deletions(-) |
| 31 |
+ |
| 32 |
+diff --git a/Nagstamon/QUI/__init__.py b/Nagstamon/QUI/__init__.py |
| 33 |
+index 930cb68..d41b786 100644 |
| 34 |
+--- a/Nagstamon/QUI/__init__.py |
| 35 |
++++ b/Nagstamon/QUI/__init__.py |
| 36 |
+@@ -898,6 +898,10 @@ class StatusWindow(QWidget): |
| 37 |
+ # immediately hide to avoid flicker on Windows and OSX |
| 38 |
+ self.hide() |
| 39 |
+ |
| 40 |
++ # ewmh.py in thirdparty directory needed to keep floating statusbar on all desktops in Linux |
| 41 |
++ if not platform.system() in NON_LINUX: |
| 42 |
++ self.ewmh = EWMH() |
| 43 |
++ |
| 44 |
+ # avoid quitting when using Qt.Tool flag and closing settings dialog |
| 45 |
+ APP.setQuitOnLastWindowClosed(False) |
| 46 |
+ |
| 47 |
+@@ -1080,10 +1084,6 @@ class StatusWindow(QWidget): |
| 48 |
+ # start with priority 0 = lowest |
| 49 |
+ self.worker_thread.start(0) |
| 50 |
+ |
| 51 |
+- # ewmh.py in thirdparty directory needed to keep floating statusbar on all desktops in Linux |
| 52 |
+- if not platform.system() in NON_LINUX: |
| 53 |
+- self.ewmh = EWMH() |
| 54 |
+- |
| 55 |
+ # finally show up |
| 56 |
+ self.set_mode() |
| 57 |
+ |
| 58 |
+-- |
| 59 |
+2.7.3 |
| 60 |
|
| 61 |
diff --git a/net-analyzer/nagstamon/nagstamon-2.0.ebuild b/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild |
| 62 |
similarity index 74% |
| 63 |
rename from net-analyzer/nagstamon/nagstamon-2.0.ebuild |
| 64 |
rename to net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild |
| 65 |
index 851bca1..7337ca2 100644 |
| 66 |
--- a/net-analyzer/nagstamon/nagstamon-2.0.ebuild |
| 67 |
+++ b/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild |
| 68 |
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}" |
| 69 |
|
| 70 |
S="${WORKDIR}/${MY_PN}" |
| 71 |
|
| 72 |
-PATCHES="${FILESDIR}/${P}-setup.patch" |
| 73 |
+PATCHES="${FILESDIR}/${P}-setup.patch |
| 74 |
+ ${FILESDIR}/${P}-EWMH.patch" |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
default_src_prepare |
| 78 |
@@ -43,15 +44,3 @@ src_prepare() { |
| 79 |
# rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die |
| 80 |
rm -rf "${S}/Nagstamon/thirdparty/keyring/" || die |
| 81 |
} |
| 82 |
- |
| 83 |
-pkg_preinst() { |
| 84 |
- if has_version "<net-analyzer/nagstamon-2.0"; then |
| 85 |
- OLD_NAGSTAMON_VERSION=yup |
| 86 |
- fi |
| 87 |
-} |
| 88 |
- |
| 89 |
-pkg_postinst() { |
| 90 |
- if [ -n "${OLD_NAGSTAMON_VERSION}" ]; then |
| 91 |
- ewarn "WARNING: It is recommend to move your old Nagstamon 1.x ~/.nagstamon/ away and start from scratch!" |
| 92 |
- fi |
| 93 |
-} |
Archives