adium-1.3 408:f2ae0aba65bb: Updated json build stuff
commits at adium.im
commits at adium.im
Wed Jan 13 03:36:32 UTC 2010
details: http://hg.adium.im/adium-1.3/rev/f2ae0aba65bb
revision: 408:f2ae0aba65bb
author: Smew
date: Tue Jan 12 22:36:11 2010 -0500
Updated json build stuff
Subject: adium-1.3 409:bc497f0fb2d5: libjson and libpurple that agree with each other
details: http://hg.adium.im/adium-1.3/rev/bc497f0fb2d5
revision: 409:bc497f0fb2d5
author: Smew
date: Tue Jan 12 22:36:25 2010 -0500
libjson and libpurple that agree with each other
diffs (274 lines):
diff -r c89fff01a172 -r bc497f0fb2d5 Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Tue Jan 12 22:25:33 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Tue Jan 12 22:36:25 2010 -0500
@@ -12,11 +12,11 @@
G_BEGIN_DECLS
-/* enumerations from "/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-parser.h" */
+/* enumerations from "/Users/adium/adium-1.3/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-parser.h" */
GType json_parser_error_get_type (void) G_GNUC_CONST;
#define JSON_TYPE_PARSER_ERROR (json_parser_error_get_type())
-/* enumerations from "/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-types.h" */
+/* enumerations from "/Users/adium/adium-1.3/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-types.h" */
GType json_node_type_get_type (void) G_GNUC_CONST;
#define JSON_TYPE_NODE_TYPE (json_node_type_get_type())
diff -r c89fff01a172 -r bc497f0fb2d5 Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h Tue Jan 12 22:25:33 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h Tue Jan 12 22:36:25 2010 -0500
@@ -69,85 +69,23 @@
GType json_serializable_get_type (void) G_GNUC_CONST;
-JsonNode *json_serializable_serialize_property (JsonSerializable *serializable,
- const gchar *property_name,
- const GValue *value,
- GParamSpec *pspec);
-gboolean json_serializable_deserialize_property (JsonSerializable *serializable,
- const gchar *property_name,
- GValue *value,
- GParamSpec *pspec,
- JsonNode *property_node);
+JsonNode *json_serializable_serialize_property (JsonSerializable *serializable,
+ const gchar *property_name,
+ const GValue *value,
+ GParamSpec *pspec);
+gboolean json_serializable_deserialize_property (JsonSerializable *serializable,
+ const gchar *property_name,
+ GValue *value,
+ GParamSpec *pspec,
+ JsonNode *property_node);
-JsonNode *json_serializable_default_serialize_property (JsonSerializable *serializable,
- const gchar *property_name,
- const GValue *value,
- GParamSpec *pspec);
-gboolean json_serializable_default_deserialize_property (JsonSerializable *serializable,
- const gchar *property_name,
- GValue *value,
- GParamSpec *pspec,
- JsonNode *property_node);
-/**
- * JsonBoxedSerializeFunc:
- * @boxed: a #GBoxed
- *
- * Serializes the passed #GBoxed and stores it inside a #JsonNode
- *
- * Return value: the newly created #JsonNode
- *
- * Since: 0.10
- */
-typedef JsonNode *(* JsonBoxedSerializeFunc) (gconstpointer boxed);
-
-/**
- * JsonBoxedDeserializeFunc:
- * @node: a #JsonNode
- *
- * Deserializes the contents of the passed #JsonNode into a #GBoxed
- *
- * Return value: the newly created boxed type
- *
- * Since: 0.10
- */
-typedef gpointer (* JsonBoxedDeserializeFunc) (JsonNode *node);
-
-void json_boxed_register_serialize_func (GType gboxed_type,
- JsonNodeType node_type,
- JsonBoxedSerializeFunc serialize_func);
-void json_boxed_register_deserialize_func (GType gboxed_type,
- JsonNodeType node_type,
- JsonBoxedDeserializeFunc deserialize_func);
-gboolean json_boxed_can_serialize (GType gboxed_type,
- JsonNodeType *node_type);
-gboolean json_boxed_can_deserialize (GType gboxed_type,
- JsonNodeType node_type);
-JsonNode *json_boxed_serialize (GType gboxed_type,
- gconstpointer boxed);
-gpointer json_boxed_deserialize (GType gboxed_type,
- JsonNode *node);
-
-JsonNode *json_gobject_serialize (GObject *gobject);
-GObject * json_gobject_deserialize (GType gtype,
- JsonNode *node);
-
-GObject * json_gobject_from_data (GType gtype,
- const gchar *data,
- gssize length,
- GError **error);
-gchar * json_gobject_to_data (GObject *gobject,
- gsize *length);
-
-#ifndef JSON_DISABLE_DEPRECATED
-GObject * json_construct_gobject (GType gtype,
- const gchar *data,
- gsize length,
- GError **error) G_GNUC_DEPRECATED;
-gchar * json_serialize_gobject (GObject *gobject,
- gsize *length) G_GNUC_MALLOC G_GNUC_DEPRECATED;
-#endif /* JSON_DISABLE_DEPRECATED */
-
+GObject *json_construct_gobject (GType gtype,
+ const gchar *data,
+ gsize length,
+ GError **error);
+gchar * json_serialize_gobject (GObject *gobject,
+ gsize *length) G_GNUC_MALLOC;
G_END_DECLS
diff -r c89fff01a172 -r bc497f0fb2d5 Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-types.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-types.h Tue Jan 12 22:25:33 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-types.h Tue Jan 12 22:36:25 2010 -0500
@@ -40,57 +40,6 @@
*/
#define JSON_NODE_TYPE(node) (json_node_get_node_type ((node)))
-/**
- * JSON_NODE_HOLDS:
- * @node: a #JsonNode
- * @t: a #JsonNodeType
- *
- * Evaluates to %TRUE if the @node holds type @t
- *
- * Since: 0.10
- */
-#define JSON_NODE_HOLDS(node,t) (json_node_get_node_type ((node)) == (t))
-
-/**
- * JSON_NODE_HOLDS_VALUE:
- * @node: a #JsonNode
- *
- * Evaluates to %TRUE if @node holds a %JSON_NODE_VALUE
- *
- * Since: 0.10
- */
-#define JSON_NODE_HOLDS_VALUE(node) (JSON_NODE_HOLDS ((node), JSON_NODE_VALUE))
-
-/**
- * JSON_NODE_HOLDS_OBJECT:
- * @node: a #JsonNode
- *
- * Evaluates to %TRUE if @node holds a %JSON_NODE_OBJECT
- *
- * Since: 0.10
- */
-#define JSON_NODE_HOLDS_OBJECT(node) (JSON_NODE_HOLDS ((node), JSON_NODE_OBJECT))
-
-/**
- * JSON_NODE_HOLDS_ARRAY:
- * @node: a #JsonNode
- *
- * Evaluates to %TRUE if @node holds a %JSON_NODE_ARRAY
- *
- * Since: 0.10
- */
-#define JSON_NODE_HOLDS_ARRAY(node) (JSON_NODE_HOLDS ((node), JSON_NODE_ARRAY))
-
-/**
- * JSON_NODE_HOLDS_NULL:
- * @node: a #JsonNode
- *
- * Evaluates to %TRUE if @node holds a %JSON_NODE_NULL
- *
- * Since: 0.10
- */
-#define JSON_NODE_HOLDS_NULL(node) (JSON_NODE_HOLDS ((node), JSON_NODE_NULL))
-
#define JSON_TYPE_NODE (json_node_get_type ())
#define JSON_TYPE_OBJECT (json_object_get_type ())
#define JSON_TYPE_ARRAY (json_array_get_type ())
@@ -182,8 +131,6 @@
void json_node_free (JsonNode *node);
JsonNodeType json_node_get_node_type (JsonNode *node);
GType json_node_get_value_type (JsonNode *node);
-void json_node_set_parent (JsonNode *node,
- JsonNode *parent);
JsonNode * json_node_get_parent (JsonNode *node);
G_CONST_RETURN gchar *json_node_type_name (JsonNode *node);
diff -r c89fff01a172 -r bc497f0fb2d5 Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-version.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-version.h Tue Jan 12 22:25:33 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-version.h Tue Jan 12 22:36:25 2010 -0500
@@ -48,21 +48,21 @@
*
* Json minor version component (e.g. 2 if %JSON_VERSION is 1.2.3)
*/
-#define JSON_MINOR_VERSION (9)
+#define JSON_MINOR_VERSION (7)
/**
* JSON_MICRO_VERSION:
*
* Json micro version component (e.g. 3 if %JSON_VERSION is 1.2.3)
*/
-#define JSON_MICRO_VERSION (2)
+#define JSON_MICRO_VERSION (6)
/**
* JSON_VERSION
*
* Json version.
*/
-#define JSON_VERSION (0.9.2)
+#define JSON_VERSION (0.7.6)
/**
* JSON_VERSION_S:
@@ -70,7 +70,7 @@
* Json version, encoded as a string, useful for printing and
* concatenation.
*/
-#define JSON_VERSION_S "0.9.2"
+#define JSON_VERSION_S "0.7.6"
/**
* JSON_VERSION_HEX:
diff -r c89fff01a172 -r bc497f0fb2d5 Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib
Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib has changed
diff -r c89fff01a172 -r bc497f0fb2d5 Frameworks/libpurple.framework/Versions/0.5.9/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.5.9/libpurple has changed
diff -r c89fff01a172 -r bc497f0fb2d5 Utilities/dep-build-scripts/common.sh
--- a/Utilities/dep-build-scripts/common.sh Tue Jan 12 22:25:33 2010 -0500
+++ b/Utilities/dep-build-scripts/common.sh Tue Jan 12 22:36:25 2010 -0500
@@ -12,7 +12,7 @@
MEANWHILE=meanwhile-1.0.2
GADU=libgadu-1.7.1
INTLTOOL=intltool-0.36.2
-JSONLIB=json-glib-0.7.6
+JSONLIB=json-glib-0.9.2
# Directories
BASEDIR="$PWD"
diff -r c89fff01a172 -r bc497f0fb2d5 Utilities/dep-build-scripts/universalize.sh
--- a/Utilities/dep-build-scripts/universalize.sh Tue Jan 12 22:25:33 2010 -0500
+++ b/Utilities/dep-build-scripts/universalize.sh Tue Jan 12 22:36:25 2010 -0500
@@ -16,7 +16,7 @@
MEANWHILE=libmeanwhile.1
GADU=libgadu.3.7.0
SASL=libsasl2.2
-JSONGLIB=libjson-glib-1.0
+JSONGLIB=libjson-glib-1.0.0
PURPLE_VERSION=0.5.9
@@ -54,7 +54,7 @@
# no headers to copy, make an empty file so that rtool isn't sad
touch libgthread-2.0.0/no_headers_here.txt
-mkdir libjson || true
+mkdir libjson-glib-1.0.0 || true
cp -R $TARGET_DIR_I386/include/json-glib-1.0/json-glib $UNIVERSAL_DIR/include/libjson-glib-1.0.0
rm -rf $UNIVERSAL_DIR/include/$PURPLE_FOLDER
diff -r c89fff01a172 -r bc497f0fb2d5 Utilities/dep-build-scripts/urls.txt
--- a/Utilities/dep-build-scripts/urls.txt Tue Jan 12 22:25:33 2010 -0500
+++ b/Utilities/dep-build-scripts/urls.txt Tue Jan 12 22:36:25 2010 -0500
@@ -15,4 +15,4 @@
http://softlayer.dl.sourceforge.net/project/meanwhile/meanwhile/1.0.2/meanwhile-1.0.2.tar.gz
http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.gz
http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz
-http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.7/json-glib-0.7.6.tar.gz
+http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.9/json-glib-0.9.2.tar.gz
More information about the commits
mailing list