7887c684ad
are the latest stable releases. * Update vala to the newest stable release 0.18.1, also update a few ports in the gtk/gnome stack. * The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles. * Remove pkg-config run depends from glib20 and freetype2. This doesn't eliminate pkg-config run dependency completely, a second phase is needed and is planned. * Support for .:run. and .:build. for USE_GNOME components was added. Currently only libxml2 and libxslt support this mechanism. * Updates of the telepathy stack and empathy. * Trim makefile headers, convert ports to new options, trim off library versions for some ports. * Fix other ports so they build with the new glib version. Thanks to miwi and crees for helping out with some exp-runs. Approved by: portmgr (miwi & bapt) Obtained from: gnome team repo
20 lines
420 B
C
20 lines
420 B
C
--- src/state.c.orig 2008-01-09 16:35:12.000000000 +0000
|
|
+++ src/state.c 2013-03-06 13:32:20.000000000 +0000
|
|
@@ -36,7 +36,7 @@
|
|
#include <errno.h>
|
|
|
|
#include <glib/gi18n.h>
|
|
-#include <glib/gmessages.h>
|
|
+#include <glib.h>
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "configfile.h"
|
|
@@ -806,7 +806,7 @@
|
|
}
|
|
}
|
|
|
|
- if (n != NULL && v->type != 0) {
|
|
+ if (n != NULL && v!=NULL && v->type != 0) {
|
|
char *ep;
|
|
|
|
g_assert(v);
|