rpms/ardour/devel ardour-2.1-glib215.patch, NONE, 1.1 ardour.spec, 1.8, 1.9

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/ardour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24254

Modified Files:
	ardour.spec 
Added Files:
	ardour-2.1-glib215.patch 
Log Message:
* Fri Dec 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-4
- Fix building of ardour on alpha machines (bz 425987)
- Fix building with glib-2.15.0


ardour-2.1-glib215.patch:

--- NEW FILE ardour-2.1-glib215.patch ---
diff -up ardour-2.1/libs/glibmm2/glibmm/date.cc~ ardour-2.1/libs/glibmm2/glibmm/date.cc
--- ardour-2.1/libs/glibmm2/glibmm/date.cc~	2007-12-21 21:17:42.000000000 +0100
+++ ardour-2.1/libs/glibmm2/glibmm/date.cc	2007-12-21 21:17:42.000000000 +0100
@@ -25,6 +25,7 @@
 
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 
 #include <ctime>
 #include <algorithm>
diff -up ardour-2.1/libs/glibmm2/glibmm/exception.cc~ ardour-2.1/libs/glibmm2/glibmm/exception.cc
--- ardour-2.1/libs/glibmm2/glibmm/exception.cc~	2007-12-22 11:34:03.000000000 +0100
+++ ardour-2.1/libs/glibmm2/glibmm/exception.cc	2007-12-22 11:34:03.000000000 +0100
@@ -21,6 +21,7 @@
  */
 
 #include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glibmm/exception.h>
 
 
diff -up ardour-2.1/libs/glibmm2/glibmm/exception.cc~ ardour-2.1/libs/glibmm2/glibmm/exception.cc
--- ardour-2.1/libs/glibmm2/glibmm/exception.cc~	2007-12-22 11:34:03.000000000 +0100
+++ ardour-2.1/libs/glibmm2/glibmm/exception.cc	2007-12-22 11:34:03.000000000 +0100
@@ -21,6 +21,7 @@
  */
 
 #include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glibmm/exception.h>
 
 
diff -up ardour-2.1/libs/glibmm2/glibmm/convert.cc~ ardour-2.1/libs/glibmm2/glibmm/convert.cc
--- ardour-2.1/libs/glibmm2/glibmm/convert.cc~	2007-12-22 11:36:50.000000000 +0100
+++ ardour-2.1/libs/glibmm2/glibmm/convert.cc	2007-12-22 11:36:50.000000000 +0100
@@ -26,6 +26,7 @@
 #include <glib/gconvert.h>
 #include <glib/gmessages.h>
 #include <glib/gunicode.h>
+#include <glib/gtestutils.h>
 #include <glibmm/utility.h>
 
 
diff -up ardour-2.1/libs/glibmm2/glibmm/exception.cc~ ardour-2.1/libs/glibmm2/glibmm/exception.cc
--- ardour-2.1/libs/glibmm2/glibmm/exception.cc~	2007-12-22 11:34:03.000000000 +0100
+++ ardour-2.1/libs/glibmm2/glibmm/exception.cc	2007-12-22 11:34:03.000000000 +0100
@@ -21,6 +21,7 @@
  */
 
 #include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 #include <glibmm/exception.h>
 
 
diff -up ardour-2.1/libs/glibmm2/glibmm/error.cc~ ardour-2.1/libs/glibmm2/glibmm/error.cc
--- ardour-2.1/libs/glibmm2/glibmm/error.cc~	2007-12-22 11:38:09.000000000 +0100
+++ ardour-2.1/libs/glibmm2/glibmm/error.cc	2007-12-22 11:38:09.000000000 +0100
@@ -22,6 +22,7 @@
 
 #include <glib/gerror.h>
 #include <glib/gmessages.h>
+#include <glib/gtestutils.h>
 
 #include <map>
 #include <glibmmconfig.h>
diff -up ardour-2.1/libs/glibmm2/glibmm/convert.cc~ ardour-2.1/libs/glibmm2/glibmm/convert.cc
--- ardour-2.1/libs/glibmm2/glibmm/convert.cc~	2007-12-22 11:36:50.000000000 +0100
+++ ardour-2.1/libs/glibmm2/glibmm/convert.cc	2007-12-22 11:36:50.000000000 +0100
@@ -26,6 +26,7 @@
 #include <glib/gconvert.h>
 #include <glib/gmessages.h>
 #include <glib/gunicode.h>
+#include <glib/gtestutils.h>
 #include <glibmm/utility.h>
 
 


Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ardour.spec	21 Dec 2007 18:28:08 -0000	1.8
+++ ardour.spec	22 Dec 2007 10:38:47 -0000	1.9
@@ -7,6 +7,7 @@
 Patch0:        ardour-2.1-SConstruct.patch
 Patch1:        ardour-session.cc-no_stomp.patch
 Patch2:        ardour-session.cc-_total_free_4k_blocks.patch
+Patch3:        ardour-2.1-glib215.patch
 URL:           http://ardour.org
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -49,6 +50,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 for i in README.fr README.it TRANSLATORS; do
   iconv -f ISO-8859-1 -t UTF8 DOCUMENTATION/$i > DOCUMENTATION/$i.tmp
   mv DOCUMENTATION/$i.tmp DOCUMENTATION/$i
@@ -145,8 +147,9 @@
 %{_datadir}/applications/fedora-ardour2.desktop
 
 %changelog
-* Mon Dec 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-4
+* Fri Dec 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-4
 - Fix building of ardour on alpha machines (bz 425987)
+- Fix building with glib-2.15.0
 
 * Wed Oct 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.1-3
 - Fix finding of translations (bz 238552)