rpms/ardour/devel ardour-2.1-glib215.patch,1.1,1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified 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:

Index: ardour-2.1-glib215.patch
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/ardour-2.1-glib215.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ardour-2.1-glib215.patch	22 Dec 2007 10:38:47 -0000	1.1
+++ ardour-2.1-glib215.patch	22 Dec 2007 11:25:48 -0000	1.2
@@ -20,17 +20,6 @@
  #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
@@ -42,17 +31,6 @@
  #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
@@ -64,14 +42,3 @@
  
  #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>
- 
-