Your message dated Wed, 20 Apr 2011 21:05:08 +0000
with message-id <e1qceac-0004rt...@franck.debian.org>
and subject line Bug#623333: fixed in kshutdown 2.0beta12-4
has caused the Debian Bug report #623333,
regarding kshutdown: FTBFS on kfreebsd and hurd
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
623333: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623333
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: kshutdown
Version: 2.0beta12-3
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the past)
Hi,
kshutdown 2.0beta12 fails to build on the Debian non-linux architectures
(kfreebsd and hurd); even the DefineForKfreebsd.patch does not help (and it is
not correct anyway).
The attached patch fixes the following issues:
- src/main.cpp: instead of restrict the gtk+ style on linux, make it valid on
any X11-based platform
- src/triggers/processmonitor.h: enable the process handling for kfreebsd
(note: it is not Q_OS_FREEBSD, which indicates proper freebsd) and hurd
- src/triggers/processmonitor.cpp: tweak the "ps" command invocation to work
on both linux (tested on current testing/wheezy) and hurd.
Note this patch replaces completely the current DefineForKfreebsd.patch.
Can you please review and report to upstream?
Thanks,
--
Pino
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,9 +18,9 @@
#ifdef KS_PURE_QT
#include <QApplication>
#include <QLocale>
- #ifdef Q_OS_LINUX
+ #ifdef Q_WS_X11
#include <QStyleFactory>
- #endif // Q_OS_LINUX
+ #endif // Q_WS_X11
#include <QTranslator>
#else
#include <KAboutData>
@@ -112,13 +112,13 @@
QApplication::setApplicationName("KShutdown");
KShutdownApplication program(argc, argv);
- #ifdef Q_OS_LINUX
+ #ifdef Q_WS_X11
if (Utils::isGNOME() || Utils::isXfce()) {
QStyle *gtkStyle = QStyleFactory::create("gtk+");
if (gtkStyle)
QApplication::setStyle(gtkStyle);
}
- #endif // Q_OS_LINUX
+ #endif //WS_X111
// init i18n
QString lang = QLocale::system().name();
--- a/src/triggers/processmonitor.cpp
+++ b/src/triggers/processmonitor.cpp
@@ -182,11 +182,9 @@
// show all processes
args << "-A";
// order: user pid command
- args << "-o" << "user=";
- args << "-o" << "pid=";
- args << "-o" << "comm=";
+ args << "-o" << "user=,pid=command=";
// sort by command
- args << "--sort" << "comm";
+ args << "--sort" << "command";
// start process
m_refreshProcess->start("ps", args);
--- a/src/triggers/processmonitor.h
+++ b/src/triggers/processmonitor.h
@@ -18,7 +18,7 @@
#ifndef KSHUTDOWN_PROCESSMONITOR_H
#define KSHUTDOWN_PROCESSMONITOR_H
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(__FreeBSD_kernel__) || defined(Q_OS_HURD)
#define KS_TRIGGER_PROCESS_MONITOR
#endif // Q_OS_LINUX
--- End Message ---
--- Begin Message ---
Source: kshutdown
Source-Version: 2.0beta12-4
We believe that the bug you reported is fixed in the latest version of
kshutdown, which is due to be installed in the Debian FTP archive:
kshutdown_2.0beta12-4.debian.tar.gz
to main/k/kshutdown/kshutdown_2.0beta12-4.debian.tar.gz
kshutdown_2.0beta12-4.dsc
to main/k/kshutdown/kshutdown_2.0beta12-4.dsc
kshutdown_2.0beta12-4_amd64.deb
to main/k/kshutdown/kshutdown_2.0beta12-4_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 623...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Eike Sauer <e...@debian.org> (supplier of updated kshutdown package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 19 Apr 2011 20:11:00 +0100
Source: kshutdown
Binary: kshutdown
Architecture: source amd64
Version: 2.0beta12-4
Distribution: unstable
Urgency: low
Maintainer: Romain Beauxis <to...@rastageeks.org>
Changed-By: Eike Sauer <e...@debian.org>
Description:
kshutdown - an advanced shut down utility for KDE
Closes: 623323 623333
Changes:
kshutdown (2.0beta12-4) unstable; urgency=low
.
* Many thanks to Pino Toscano who fixed the build problem
and also functionality for kfreebsd and hurd.
(Closes: #623333, 623323)
Checksums-Sha1:
f737c4bbfdc70be06007e1bef4661e6f9c5edf0b 1185 kshutdown_2.0beta12-4.dsc
d84bb3a2b2d267da04502cb68cbed0d21c20c71b 8679
kshutdown_2.0beta12-4.debian.tar.gz
4f0e1bc42ebd2d36261cc500faa75aa2405f4385 161476 kshutdown_2.0beta12-4_amd64.deb
Checksums-Sha256:
fc25ff0b5cd9f9fafcc2412bbdbe1024973e86da728c725bae92e40420e270e9 1185
kshutdown_2.0beta12-4.dsc
d1d235472875fa8ed4aee79524faab9df689cacd1b04bdedbb8afb86e382f5d6 8679
kshutdown_2.0beta12-4.debian.tar.gz
4a6cb071b0a9c7e6025da9fa9527cb62e392d24ca2481d4196c068350ad75fe5 161476
kshutdown_2.0beta12-4_amd64.deb
Files:
a13d38fd5869477d4ddc0e51423360c9 1185 kde optional kshutdown_2.0beta12-4.dsc
53b7b00785f99e94f17b4ab289a8f1bb 8679 kde optional
kshutdown_2.0beta12-4.debian.tar.gz
81fa66cf53f0bee2ceabe50cac54ba3e 161476 kde optional
kshutdown_2.0beta12-4_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAk2vN30ACgkQw/ijomqDM8anyQCfUr/hJhgtB/qA833YkLbdZFPC
t9IAn3waNtDPhcIGniSbIJh0Pkfi6jYp
=I1Qc
-----END PGP SIGNATURE-----
--- End Message ---
