rpms/arts/F-12 arts-1.5.10-cpu-overload-quiet.patch, NONE, 1.1 arts-acinclude.patch, NONE, 1.1 arts.spec, 1.100, 1.101

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/arts/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31121/F-12

Modified Files:
	arts.spec 
Added Files:
	arts-1.5.10-cpu-overload-quiet.patch arts-acinclude.patch 
Log Message:
Sync from devel:

* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-11
- don't pop up a dialog on CPU overload (#361891)

* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
- patch autoconfigury to build with autoconf >= 2.64

arts-1.5.10-cpu-overload-quiet.patch:
 cpuusage.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE arts-1.5.10-cpu-overload-quiet.patch ---
diff -ur arts-1.5.10/soundserver/cpuusage.cc arts-1.5.10-cpu-overload-quiet/soundserver/cpuusage.cc
--- arts-1.5.10/soundserver/cpuusage.cc	2005-09-10 10:13:31.000000000 +0200
+++ arts-1.5.10-cpu-overload-quiet/soundserver/cpuusage.cc	2009-12-16 09:28:14.000000000 +0100
@@ -24,6 +24,7 @@
 #include "dispatcher.h"
 #include "debug.h"
 
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
@@ -121,7 +122,7 @@
 
 		// ok, cancel synthesis due to cpu overload! brutal method
 		if(d->stalled > 15)
-			arts_fatal("cpu overload, aborting");
+			exit(1);
 	}
 
 	// prepare for next checkpoint

arts-acinclude.patch:
 acinclude.m4.in |   23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

--- NEW FILE arts-acinclude.patch ---
2009-12-10  Stepan Kasal  <skasal at redhat.com>

The change of implementation of AC_REQUIRE in 2.64 caused a regression
in the arts project.
This can be fixed by shuffling some macro calls.

I suppose that most of this patch will not be needed with a future
release of Autoconf.
But the last chunk of this patch is a real bug in this source and
should go upstream.

--- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
@@ -3081,8 +3081,18 @@
 fi
 ])
 
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
+[ 
+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
+  CFLAGS=" $CFLAGS"
+  AC_PROG_CC
+  CXXFLAGS=" $CXXFLAGS"
+  AC_PROG_CXX
+])
+
 AC_DEFUN([AC_CHECK_COMPILERS],
 [
+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
   AC_ARG_ENABLE(debug,
 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
   [
@@ -3141,11 +3151,6 @@
     [kde_use_profiling="no"]
   )
 
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
   AC_PROG_CPP
 
   if test "$GCC" = "yes"; then
@@ -3174,10 +3179,6 @@
      LDFLAGS=""
   fi
 
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
   KDE_CHECK_FOR_BAD_COMPILER
 
   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
@@ -3503,8 +3504,8 @@
 AC_REQUIRE([AC_LIBTOOL_DLOPEN])
 AC_REQUIRE([KDE_CHECK_LIB64])
 
-AC_OBJEXT
-AC_EXEEXT
+AC_REQUIRE([AC_OBJEXT])
+AC_REQUIRE([AC_EXEEXT])
 
 AM_PROG_LIBTOOL
 AC_LIBTOOL_CXX


Index: arts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/arts/F-12/arts.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- arts.spec	7 Dec 2009 14:50:51 -0000	1.100
+++ arts.spec	16 Dec 2009 09:28:25 -0000	1.101
@@ -10,7 +10,7 @@ Summary: aRts (analog realtime synthesiz
 Group:   System Environment/Daemons
 Epoch:   8
 Version: 1.5.10
-Release: 9%{?dist}
+Release: 11%{?dist}
 
 License: LGPLv2+
 Url: http://www.kde.org
@@ -24,6 +24,8 @@ Patch5: arts-1.3.1-alsa.patch
 Patch6: arts-1.5.8-glibc.patch
 Patch7: arts-1.5.0-check_tmp_dir.patch
 Patch8: arts-1.5.2-multilib.patch
+# don't pop up a dialog on CPU overload (#361891)
+Patch9: arts-1.5.10-cpu-overload-quiet.patch
 # kde#93359
 Patch50: arts-1.5.4-dlopenext.patch
 Patch51: kde-3.5-libtool-shlibext.patch
@@ -33,6 +35,9 @@ Patch51: kde-3.5-libtool-shlibext.patch
 # CVE-2009-3736 libtool: libltdl may load and execute code from a library in the current directory 
 Patch200: libltdl-CVE-2009-3736.patch
 
+# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
+Patch300: arts-acinclude.patch
+
 # used in artsdsp
 Requires: which
 
@@ -79,12 +84,17 @@ Install %{name}-devel if you intend to w
 %patch6 -p1 -b .glibc
 %patch7 -p1 -b .check_tmp_dir
 %patch8 -p1 -b .multilib
+%patch9 -p1 -b .cpu-overload-quiet
 
 %patch50 -p1 -b .dlopenext
 %patch51 -p1 -b .libtool-shlibext
 
 %patch200 -p1 -b .CVE-2009-3736
 
+%patch300 -p1 -b .acinclude
+
+%build
+
 %if %{make_cvs}
 # hack/fix for newer automake
   sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
@@ -92,7 +102,6 @@ Install %{name}-devel if you intend to w
 %endif
 
 
-%build
 unset QTDIR && . /etc/profile.d/qt.sh
 
 %configure \
@@ -187,6 +196,12 @@ rm -rf  %{buildroot}
 
 
 %changelog
+* Wed Dec 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.10-11
+- don't pop up a dialog on CPU overload (#361891)
+
+* Thu Dec 10 2009 Stepan Kasal <skasal at redhat.com> - 1.5.10-10
+- patch autoconfigury to build with autoconf >= 2.64
+
 * Sun Dec 06 2009 Than Ngo <than at redhat.com> - 1.5.10-9
 - fix url
 - fix security issues in libltdl (CVE-2009-3736)