Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 304687 Details for
Bug 401331
app-office/dia with >=dev-libs/glib-2.31 - /usr/include/glib-2.0/glib/gstrfuncs.h:28:2: error: #error "Only <glib.h> can be included directly."
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch
dia-0.97-glib_h-fix.patch (text/plain), 1.45 KB, created by
Göktürk Yüksek
on 2012-03-09 01:10:56 UTC
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Göktürk Yüksek
Created:
2012-03-09 01:10:56 UTC
Size:
1.45 KB
patch
obsolete
>--- tests/test-objects.c.orig 2012-03-08 19:12:28.630000003 -0500 >+++ tests/test-objects.c 2012-03-08 19:31:17.610000003 -0500 >@@ -26,11 +26,12 @@ > #define G_LOG_DOMAIN "Dia" > > #include <glib.h> >-#include <glib-object.h> >- >-#if GLIB_CHECK_VERSION(2,16,0) >-#include <glib/gtestutils.h> >-#endif >+#if !GLIB_CHECK_VERSION(2,31,0) >+ #include <glib-object.h> >+ #if GLIB_CHECK_VERSION(2,16,0) >+ #include <glib/gtestutils.h> >+ #endif /* GLIB_CHECK_VERSION(2,16,0) */ >+#endif /* !GLIB_CHECK_VERSION(2.31.0) */ > > #include "object.h" > #include "plug-ins.h" >--- objects/custom/shape_typeinfo.c.orig 2012-03-08 19:05:38.480000002 -0500 >+++ objects/custom/shape_typeinfo.c 2012-03-08 19:09:37.430000003 -0500 >@@ -27,8 +27,14 @@ > #include "custom_util.h" > #include <string.h> > #include <stdarg.h> >+ >+#if !GLIB_CHECK_VERSION(2, 31, 0) > #include <glib/gstrfuncs.h> > #include <glib/gstdio.h> >+#else >+#include <glib.h> >+#endif >+ > #include <libxml/parser.h> > > /* >--- tests/test-boundingbox.c.orig 2012-03-08 19:45:48.050000001 -0500 >+++ tests/test-boundingbox.c 2012-03-08 19:49:58.370000003 -0500 >@@ -26,11 +26,13 @@ > #define G_LOG_DOMAIN "Dia" > > #include <glib.h> >-#include <glib-object.h> >+#if !GLIB_CHECK_VERSION(2,31,0) >+ #include <glib-object.h> >+ #if GLIB_CHECK_VERSION(2,16,0) >+ #include <glib/gtestutils.h> >+ #endif /* GLIB_CHECK_VERSION(2,16,0) */ >+#endif /* !GLIB_CHECK_VERSION(2,31,0) */ > >-#if GLIB_CHECK_VERSION(2,16,0) >-#include <glib/gtestutils.h> >-#endif > #include "dialib.h" > > /*
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 401331
: 304687