View Issue Details

Jump to NotesJump to History
IDProjectCategoryView StatusDate SubmittedLast Update
0002155ardourbugspublic2008-03-30 19:452020-04-19 20:13
Reporterkristian Assigned Topaul  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Summary0002155: compile against glib-2.16 fails because g_assert has moved to gtestutils.h
DescriptionIn glib-2.0 the definition of g_assert has moved from <glib/gmessages.h> to <glib/gtestutils.h>, unfortunately a completely new file.

This was fixed in the 2.0-ongoing branch in revision 2836:
 #include <glib/gmessages.h>
+#ifndef g_assert
+#include <glib/gtestutils.h>
+#endif


I would however propose to instead simply replace #include <glib/gmessages.h> with <glib.h>, since that seems cleaner, and is what gtestutils.h does anyway, as well as what glib devs recommend, ref. the discussion thread on bugzilla linked below; "You are supposed to include glib.h"
Additional InformationBug/discussion on glib-2.16: http://bugzilla.gnome.org/show_bug.cgi?id=511975
TagsNo tags attached.

Activities

2008-04-04 12:48

 

ardour-3.0_3212_replace_gmessages.h_with_glib.h.patch (4,140 bytes)    
Index: libs/glibmm2/glib/glibmm/convert.cc
===================================================================
--- libs/glibmm2/glib/glibmm/convert.cc	(revision 3212)
+++ libs/glibmm2/glib/glibmm/convert.cc	(working copy)
@@ -25,7 +25,7 @@
  */
 
 #include <glib/gconvert.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gunicode.h>
 #include <glibmm/utility.h>
 
Index: libs/glibmm2/glib/glibmm/main.cc
===================================================================
--- libs/glibmm2/glib/glibmm/main.cc	(revision 3212)
+++ libs/glibmm2/glib/glibmm/main.cc	(working copy)
@@ -24,7 +24,7 @@
 #include <glibmm/wrap.h>
 #include <glibmm/iochannel.h>
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <algorithm>
 
 GLIBMM_USING_STD(min)
Index: libs/glibmm2/glib/glibmm/debug.h
===================================================================
--- libs/glibmm2/glib/glibmm/debug.h	(revision 3212)
+++ libs/glibmm2/glib/glibmm/debug.h	(working copy)
@@ -28,7 +28,7 @@
 
 #ifdef GLIBMM_DEBUG_REFCOUNTING
 
-#include <glib/gmessages.h>
+#include <glib.h>
 
 /* We can't use G_GNUC_PRETTY_FUNCTION because it's always disabled in C++,
  * even though __PRETTY_FUNCTION__ works fine in C++ as well if you use it
Index: libs/glibmm2/glib/glibmm/timeval.cc
===================================================================
--- libs/glibmm2/glib/glibmm/timeval.cc	(revision 3212)
+++ libs/glibmm2/glib/glibmm/timeval.cc	(working copy)
@@ -21,7 +21,7 @@
  */
 
 #include <glib/gmain.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gtimer.h>
 
 #include <glibmm/timeval.h>
Index: libs/glibmm2/glib/glibmm/exception.cc
===================================================================
--- libs/glibmm2/glib/glibmm/exception.cc	(revision 3212)
+++ libs/glibmm2/glib/glibmm/exception.cc	(working copy)
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glibmm/exception.h>
 
 
Index: libs/glibmm2/glib/glibmm/error.cc
===================================================================
--- libs/glibmm2/glib/glibmm/error.cc	(revision 3212)
+++ libs/glibmm2/glib/glibmm/error.cc	(working copy)
@@ -21,7 +21,7 @@
  */
 
 #include <glib/gerror.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include <map>
 #include <glibmmconfig.h>
Index: libs/glibmm2/glib/glibmm/thread.cc
===================================================================
--- libs/glibmm2/glib/glibmm/thread.cc	(revision 3212)
+++ libs/glibmm2/glib/glibmm/thread.cc	(working copy)
@@ -25,7 +25,7 @@
  */
 
 #include <glibmm/exceptionhandler.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 
 namespace
Index: libs/glibmm2/glib/glibmm/date.cc
===================================================================
--- libs/glibmm2/glib/glibmm/date.cc	(revision 3212)
+++ libs/glibmm2/glib/glibmm/date.cc	(working copy)
@@ -25,7 +25,7 @@
  */
 
 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include <ctime>
 #include <algorithm>
Index: libs/glibmm2/glib/src/thread.ccg
===================================================================
--- libs/glibmm2/glib/src/thread.ccg	(revision 3212)
+++ libs/glibmm2/glib/src/thread.ccg	(working copy)
@@ -19,7 +19,7 @@
  */
 
 #include <glibmm/exceptionhandler.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 
 namespace
Index: libs/glibmm2/glib/src/date.ccg
===================================================================
--- libs/glibmm2/glib/src/date.ccg	(revision 3212)
+++ libs/glibmm2/glib/src/date.ccg	(working copy)
@@ -19,7 +19,7 @@
  */
 
 #include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include <ctime>
 #include <algorithm>
Index: libs/glibmm2/glib/src/convert.ccg
===================================================================
--- libs/glibmm2/glib/src/convert.ccg	(revision 3212)
+++ libs/glibmm2/glib/src/convert.ccg	(working copy)
@@ -19,7 +19,7 @@
  */
 
 #include <glib/gconvert.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <glib/gunicode.h>
 #include <glibmm/utility.h>
ardour-3.0_3212_replace_gmessages.h_with_glib.h.patch (4,140 bytes)   

kristian

2008-04-04 12:52

reporter   ~0004837

Not entirely sure how to deal with those auto-generated glib files, but attaching my patch anyway since ardour-3.0 does not compile on the soon-to-be-released Ubuntu/Hardy without.

The attached diff patches both the autogenerated .cc and corresponding .ccg files.

paul

2008-04-17 06:06

administrator   ~0004869

patched independently by hans baier and already in svn. thanks for your effort on this issue.

system

2020-04-19 20:13

developer   ~0021674

Issue has been closed automatically, by Trigger Close Plugin.
Feel free to re-open with additional information if you think the issue is not resolved.

Issue History

Date Modified Username Field Change
2008-03-30 19:45 kristian New Issue
2008-04-04 12:48 kristian File Added: ardour-3.0_3212_replace_gmessages.h_with_glib.h.patch
2008-04-04 12:52 kristian Note Added: 0004837
2008-04-17 06:06 paul Status new => resolved
2008-04-17 06:06 paul Resolution open => fixed
2008-04-17 06:06 paul Assigned To => paul
2008-04-17 06:06 paul Note Added: 0004869
2020-04-19 20:13 system Note Added: 0021674
2020-04-19 20:13 system Status resolved => closed