jreznik pushed to arts (epel7). "- 1.5.8 (kde-3.5.8)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 15:10:32 UTC 2015
>From 2b3a72c49fd2ff0787dd4d60722a3a3ae473adad Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri, 12 Oct 2007 13:49:50 +0000
Subject: - 1.5.8 (kde-3.5.8)
diff --git a/.cvsignore b/.cvsignore
index 8968569..8085db2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -13,3 +13,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
+arts-1.5.8.tar.bz2
diff --git a/arts-1.5.5-kde#139445.patch b/arts-1.5.5-kde#139445.patch
deleted file mode 100644
index 5b3f0fe..0000000
--- a/arts-1.5.5-kde#139445.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- arts-1.5.5/mcop/Makefile.am.139445 2005-09-10 03:13:32.000000000 -0500
-+++ arts-1.5.5/mcop/Makefile.am 2007-01-12 08:11:10.000000000 -0600
-@@ -16,7 +16,9 @@
- trader_impl.cc dynamicrequest.cc anyref.cc loopback.cc \
- delayedreturn.cc thread.cc dynamicskeleton.cc
-
-+CXXFLAGS += -fexceptions
- libmcop_la_LIBADD = $(LIBSOCKET) $(GLIB_LIBADD) $(top_builddir)/libltdl/libltdlc.la
-+libmcop_la_LIBADD += -lboost_filesystem -lboost_regex
- libmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(GLIB_LDFLAGS) $(all_libraries)
-
- artsincludedir = $(includedir)/arts
---- arts-1.5.5/mcop/extensionloader.cc.139445 2005-09-10 03:13:32.000000000 -0500
-+++ arts-1.5.5/mcop/extensionloader.cc 2007-01-12 09:54:57.000000000 -0600
-@@ -28,26 +28,62 @@
- #include <unistd.h>
- #include <assert.h>
-
-+#include <boost/filesystem/exception.hpp>
-+#include <boost/filesystem/operations.hpp>
-+#include <boost/regex.hpp>
-+
- using namespace std;
- using namespace Arts;
-
-+static std::string makeLibraryName( std::string const& dir, std::string const& name )
-+{
-+ try
-+ {
-+ // std::string p = dir + "/" + name;
-+ boost::regex p_regex;
-+ p_regex.assign("(.+)\\.la$");
-+ std::string p = dir + "/" + boost::regex_replace( name, p_regex, "$1", boost::match_default);
-+
-+ if ( boost::filesystem::exists( p + ".so" ) )
-+ return ( p + ".so" );
-+ boost::regex re( p + ".*so\\..+", boost::regex::extended );
-+ for ( boost::filesystem::directory_iterator i( dir );
-+ i != boost::filesystem::directory_iterator(); ++i )
-+ {
-+ boost::smatch m;
-+ if ( boost::regex_match( i->string(), m, re ) )
-+ return m.str();
-+ }
-+ return ( p + ".la" );
-+ }
-+ catch ( boost::filesystem::filesystem_error const& )
-+ {
-+ }
-+ return std::string();
-+}
-+
- ExtensionLoader::ExtensionLoader(const string& filename) :handle(0)
- {
- string dlfilename;
--
- assert(filename.size());
-- if(filename[0] == '/')
-- dlfilename = filename;
-- else
-+ try
-+ {
-+ boost::filesystem::path p( filename );
-+ if ( p.has_root_directory() )
-+ dlfilename = makeLibraryName( p.branch_path().string(), p.leaf() );
-+ }
-+ catch ( boost::filesystem::filesystem_error const& )
-+ {
-+ }
-+ if ( dlfilename.empty() )
- {
- const vector<string> *path = MCOPUtils::extensionPath();
-
- vector<string>::const_iterator pi;
- for(pi = path->begin(); pi != path->end(); pi++)
- {
-- dlfilename = *pi + "/" + filename;
--
-- if(access(dlfilename.c_str(),F_OK) == 0)
-+ dlfilename = makeLibraryName( *pi, filename );
-+ if ( !dlfilename.empty() && ( access( dlfilename.c_str(), F_OK ) == 0 ) )
- break;
- }
- }
diff --git a/arts-1.5.7-qtmcop-notifications-on-demand.patch b/arts-1.5.7-qtmcop-notifications-on-demand.patch
deleted file mode 100644
index 9f409e4..0000000
--- a/arts-1.5.7-qtmcop-notifications-on-demand.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-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));
- }
-
diff --git a/arts.spec b/arts.spec
index cc4a22d..85131a0 100644
--- a/arts.spec
+++ b/arts.spec
@@ -1,3 +1,4 @@
+
%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
%define final 1
@@ -8,8 +9,8 @@ Name: arts
Summary: aRts (analog realtime synthesizer) - the KDE sound system
Group: System Environment/Daemons
Epoch: 8
-Version: 1.5.7
-Release: 7%{?dist}
+Version: 1.5.8
+Release: 1%{?dist}
License: LGPLv2+
Url: http://www.kde.org
@@ -27,13 +28,13 @@ Patch8: arts-1.5.2-multilib.patch
Patch50: arts-1.5.4-dlopenext.patch
Patch51: kde-3.5-libtool-shlibext.patch
# upstream patches
-Patch100: arts-1.5.7-qtmcop-notifications-on-demand.patch
+# used in artsdsp
Requires: which
-BuildRequires: qt-devel
+BuildRequires: qt-devel
## Shouldn't be necessary, but some folks won't upgrade, unless we stiff-arm them. (-;
-#global qt_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo 3.3)
+#global qt_ver %(pkg-config qt-mt --modversion 2>/dev/null || echo %{qt_version})
#Requires: qt >= 1:%{qt_ver}
BuildRequires: alsa-lib-devel
BuildRequires: glib2-devel
@@ -69,11 +70,13 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: qt-devel
Requires: pkgconfig
## those below can/should be omitted from future(f8?) builds -- Rex
+%if 0
Requires: esound-devel
Requires: glib2-devel
Requires: libvorbis-devel
Requires: audiofile-devel
Requires: alsa-lib-devel
+%endif
%description devel
Install arts-devel if you intend to write applications using arts (such as
@@ -92,8 +95,6 @@ KDE applications using sound).
%patch50 -p1 -b .dlopenext
%patch51 -p1 -b .libtool-shlibext
-%patch100 -p0 -b .qtmcop-notifications-on-demand
-
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
@@ -120,13 +121,13 @@ make %{?_smp_mflags}
rm -rf %{buildroot}
export PATH=`pwd`:$PATH
-make DESTDIR=%{buildroot} install
+make install DESTDIR=%{buildroot}
%ifarch %{multilib_arches}
# Ugly hack to allow parallel installation of 32-bit and 64-bit arts-devel
mv %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig.h \
%{buildroot}%{_includedir}/kde/arts/gsl/gslconfig-%{_arch}.h
- install -c -m644 %{SOURCE1} %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig.h
+ install -p -m644 %{SOURCE1} %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig.h
%endif
## remove references to optional external libraries in .la files (#178733)
@@ -192,6 +193,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Oct 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 8:1.5.8-1
+- 1.5.8 (kde-3.5.8)
+
* Mon Oct 01 2007 Than Ngo <than at redhat.com> - 8:1.5.7-7
- rh#312621, requires which
diff --git a/qtmcop-notifications-on-demand.patch b/qtmcop-notifications-on-demand.patch
deleted file mode 100644
index 7984738..0000000
--- a/qtmcop-notifications-on-demand.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Index: mcop/notification.h
-===================================================================
---- mcop/notification.h (revision 664999)
-+++ mcop/notification.h (working copy)
-@@ -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 664999)
-+++ mcop/iomanager.cc (working copy)
-@@ -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 664999)
-+++ mcop/notification.cc (working copy)
-@@ -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 664999)
-+++ qtmcop/qiomanager.cc (working copy)
-@@ -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));
- }
-
diff --git a/sources b/sources
index f8e33c9..94db958 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28ac10541e5d8daf9009f6af1f7857af arts-1.5.7.tar.bz2
+061ce49351d970a81f4c0a1b0339fb34 arts-1.5.8.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/arts.git/commit/?h=epel7&id=2b3a72c49fd2ff0787dd4d60722a3a3ae473adad
More information about the scm-commits
mailing list