rpms/arts/F-7 arts-1.5.7-qtmcop-notifications-on-demand.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 arts.spec, 1.72, 1.73 sources, 1.31, 1.32 qtmcop-notifications-on-demand.patch, 1.1, NONE
Than Ngo (than)
fedora-extras-commits at redhat.com
Mon Jun 4 15:21:09 UTC 2007
Author: than
Update of /cvs/extras/rpms/arts/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21327
Modified Files:
.cvsignore arts.spec sources
Added Files:
arts-1.5.7-qtmcop-notifications-on-demand.patch
Removed Files:
qtmcop-notifications-on-demand.patch
Log Message:
1.5.7
arts-1.5.7-qtmcop-notifications-on-demand.patch:
--- NEW FILE arts-1.5.7-qtmcop-notifications-on-demand.patch ---
Index: mcop/notification.h
===================================================================
--- mcop/notification.h (Revision 667003)
+++ mcop/notification.h (Revision 667004)
@@ -72,10 +72,7 @@
{
return instance;
}
- inline void send(Notification wm)
- {
- todo.push(wm);
- }
+ void send(Notification wm);
inline bool pending()
{
return !todo.empty();
Index: mcop/iomanager.cc
===================================================================
--- mcop/iomanager.cc (Revision 667003)
+++ mcop/iomanager.cc (Revision 667004)
@@ -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)
Index: mcop/notification.cc
===================================================================
--- mcop/notification.cc (Revision 667003)
+++ mcop/notification.cc (Revision 667004)
@@ -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;
Index: qtmcop/qiomanager.cc
===================================================================
--- qtmcop/qiomanager.cc (Revision 667003)
+++ qtmcop/qiomanager.cc (Revision 667004)
@@ -102,30 +102,13 @@
class HandleNotifications : public TimeNotify {
public:
- HandleNotifications()
- {
- Arts::Dispatcher::the()->ioManager()->addTimer(50, this);
- }
void notifyTime()
{
+ Arts::Dispatcher::the()->ioManager()->removeTimer(this);
NotificationManager::the()->run();
+ delete this;
}
- virtual ~HandleNotifications()
- {
- Arts::Dispatcher::the()->ioManager()->removeTimer(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));
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/arts/F-7/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 24 Jan 2007 10:42:43 -0000 1.28
+++ .cvsignore 4 Jun 2007 15:20:26 -0000 1.29
@@ -12,3 +12,4 @@
arts-1.5.3.tar.bz2
arts-1.5.4.tar.bz2
arts-1.5.6.tar.bz2
+arts-1.5.7.tar.bz2
Index: arts.spec
===================================================================
RCS file: /cvs/extras/rpms/arts/F-7/arts.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- arts.spec 15 May 2007 17:27:17 -0000 1.72
+++ arts.spec 4 Jun 2007 15:20:26 -0000 1.73
@@ -1,15 +1,15 @@
%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
%define final 1
-%define qt_version 3.3.7
+%define qt_version 3.3.8
%define make_cvs 1
Name: arts
Summary: aRts (analog realtime synthesizer) - the KDE sound system
Group: System Environment/Daemons
Epoch: 8
-Version: 1.5.6
-Release: 4%{?dist}
+Version: 1.5.7
+Release: 1%{?dist}
License: LGPL
Url: http://www.kde.org
@@ -23,9 +23,9 @@
Patch6: arts-1.4.0-glibc.patch
Patch7: arts-1.5.0-check_tmp_dir.patch
Patch8: arts-1.5.2-multilib.patch
-## Consider for inclusion
-# http://vir.homelinux.org/blog/index.php?/archives/41-PowerTOP-and-aRts.html
-Patch9: http://vir.homelinux.org/qtmcop-notifications-on-demand.patch
+
+# upstream patches
+Patch100: arts-1.5.7-qtmcop-notifications-on-demand.patch
BuildRequires: qt-devel >= 1:%{qt_version}
## Shouldn't be necessary, but some folks won't upgrade, unless we stiff-arm them. (-;
@@ -84,6 +84,9 @@
%patch7 -p1 -b .check_tmp_dir
%patch8 -p1 -b .multilib
+# upstream patches
+%patch100 -p0 -b .qtmcop-notifications-on-demand
+
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
@@ -178,6 +181,9 @@
%changelog
+* Mon Jun 04 2007 Than Ngo <than at redhat.com> - 6:1.5.7-1.fc7
+- 1.5.7
+
* Tue May 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:1.5.6-4
- respin with higher release (for EVR upgrade paths)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/arts/F-7/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 24 Jan 2007 10:42:43 -0000 1.31
+++ sources 4 Jun 2007 15:20:26 -0000 1.32
@@ -1 +1 @@
-e986393a5827499bbad04a00b797add0 arts-1.5.6.tar.bz2
+28ac10541e5d8daf9009f6af1f7857af arts-1.5.7.tar.bz2
--- qtmcop-notifications-on-demand.patch DELETED ---
More information about the scm-commits
mailing list