rev 6392 - in trunk/packages/arts/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Tue May 29 12:54:26 UTC 2007
Author: fboudra-guest
Date: 2007-05-29 12:54:26 +0000 (Tue, 29 May 2007)
New Revision: 6392
Added:
trunk/packages/arts/debian/patches/12_qtmcop_notifications_on_demand.diff
Modified:
trunk/packages/arts/debian/changelog
trunk/packages/arts/debian/control
trunk/packages/arts/debian/patches/98_buildprep.diff
Log:
* Apply patch from Matthias Kretz to reduce power usage.
Modified: trunk/packages/arts/debian/changelog
===================================================================
--- trunk/packages/arts/debian/changelog 2007-05-29 11:25:22 UTC (rev 6391)
+++ trunk/packages/arts/debian/changelog 2007-05-29 12:54:26 UTC (rev 6392)
@@ -1,3 +1,12 @@
+arts (1.5.7-2) unstable; urgency=low
+
+ +++ Fathi Boudra:
+
+ * Apply patch from Matthias Kretz to reduce power usage.
+ * Add myself to uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 29 May 2007 14:27:42 +0200
+
arts (1.5.7-1) unstable; urgency=low
* New upstream release:
Modified: trunk/packages/arts/debian/control
===================================================================
--- trunk/packages/arts/debian/control 2007-05-29 11:25:22 UTC (rev 6391)
+++ trunk/packages/arts/debian/control 2007-05-29 12:54:26 UTC (rev 6392)
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Ana Beatriz Guerrero Lopez <ana at debian.org>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fboudra at free.fr>
Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, gawk, gettext, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libaudiofile-dev, libesd0-dev, libglib2.0-dev, libjack0.100.0-dev, libmad0-dev, libogg-dev, libqt3-mt-dev (>= 3:3.3.5), libvorbis-dev, sharutils, texinfo
Build-Conflicts: libmas-dev
Standards-Version: 3.7.2
Added: trunk/packages/arts/debian/patches/12_qtmcop_notifications_on_demand.diff
===================================================================
--- trunk/packages/arts/debian/patches/12_qtmcop_notifications_on_demand.diff (rev 0)
+++ trunk/packages/arts/debian/patches/12_qtmcop_notifications_on_demand.diff 2007-05-29 12:54:26 UTC (rev 6392)
@@ -0,0 +1,117 @@
+diff -Nur arts-1.5.7/mcop/iomanager.cc arts-1.5.7.new/mcop/iomanager.cc
+--- arts-1.5.7/mcop/iomanager.cc 2005-09-10 10:13:32.000000000 +0200
++++ arts-1.5.7.new/mcop/iomanager.cc 2007-05-29 14:32:34.000000000 +0200
+@@ -409,9 +409,15 @@
+
+ void StdIOManager::addTimer(int milliseconds, TimeNotify *notify)
+ {
+- timeList.push_back(new TimeWatcher(milliseconds,notify));
+- timeListChanged = true;
+- Dispatcher::wakeUp();
++ if (milliseconds == -1 && notify == 0) {
++ // HACK: in order to not add a virtual function to IOManager we're calling addTimer with
++ // magic values. This call tells the ioManager that notifications are pending and
++ // NotificationManager::run() should get called soon.
++ } else {
++ timeList.push_back(new TimeWatcher(milliseconds,notify));
++ timeListChanged = true;
++ Dispatcher::wakeUp();
++ }
+ }
+
+ void StdIOManager::removeTimer(TimeNotify *notify)
+diff -Nur arts-1.5.7/mcop/notification.cc arts-1.5.7.new/mcop/notification.cc
+--- arts-1.5.7/mcop/notification.cc 2005-09-10 10:13:32.000000000 +0200
++++ arts-1.5.7.new/mcop/notification.cc 2007-05-29 14:32:34.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #include "notification.h"
+ #include "debug.h"
++#include "dispatcher.h"
+
+ using namespace Arts;
+
+@@ -41,6 +42,17 @@
+ instance = 0;
+ }
+
++void NotificationManager::send(Notification wm)
++{
++ if (todo.empty()) {
++ // HACK: in order to not add a virtual function to IOManager we're calling addTimer with
++ // magic values. This call tells the ioManager that notifications are pending and
++ // NotificationManager::run() should get called soon.
++ Arts::Dispatcher::the()->ioManager()->addTimer(-1, 0);
++ }
++ todo.push(wm);
++}
++
+ bool NotificationManager::run()
+ {
+ if(todo.empty()) return false;
+diff -Nur arts-1.5.7/mcop/notification.h arts-1.5.7.new/mcop/notification.h
+--- arts-1.5.7/mcop/notification.h 2005-09-10 10:13:32.000000000 +0200
++++ arts-1.5.7.new/mcop/notification.h 2007-05-29 14:32:34.000000000 +0200
+@@ -72,10 +72,7 @@
+ {
+ return instance;
+ }
+- inline void send(Notification wm)
+- {
+- todo.push(wm);
+- }
++ void send(Notification wm);
+ inline bool pending()
+ {
+ return !todo.empty();
+diff -Nur arts-1.5.7/qtmcop/qiomanager.cc arts-1.5.7.new/qtmcop/qiomanager.cc
+--- arts-1.5.7/qtmcop/qiomanager.cc 2005-09-10 10:13:33.000000000 +0200
++++ arts-1.5.7.new/qtmcop/qiomanager.cc 2007-05-29 14:32:34.000000000 +0200
+@@ -102,30 +102,13 @@
+
+ class HandleNotifications : public TimeNotify {
+ public:
+- HandleNotifications()
+- {
+- Arts::Dispatcher::the()->ioManager()->addTimer(50, this);
+- }
+ void notifyTime()
+ {
+- NotificationManager::the()->run();
+- }
+- virtual ~HandleNotifications()
+- {
+ Arts::Dispatcher::the()->ioManager()->removeTimer(this);
++ NotificationManager::the()->run();
++ delete this;
+ }
+ };
+-
+-class HandleNotificationsStartup :public StartupClass
+-{
+-public:
+- void startup() { h = new HandleNotifications(); }
+- void shutdown() { delete h; }
+-private:
+- HandleNotifications *h;
+-};
+-static HandleNotificationsStartup handleNotifications;
+-
+ }
+
+ /*
+@@ -237,6 +220,14 @@
+
+ void QIOManager::addTimer(int milliseconds, TimeNotify *notify)
+ {
++ if (milliseconds == -1 && notify == 0)
++ {
++ // HACK: in order to not add a virtual function to IOManager we're calling addTimer with
++ // magic values. This call tells the ioManager that notifications are pending and
++ // NotificationManager::run() should get called soon.
++ notify = new HandleNotifications();
++ milliseconds = 0;
++ }
+ timeList.push_back(new QTimeWatch(milliseconds,notify));
+ }
+
Modified: trunk/packages/arts/debian/patches/98_buildprep.diff
===================================================================
More information about the pkg-kde-commits
mailing list