adium-1.4 2931:991fe1347654: Changes for building from current i...

commits at adium.im commits at adium.im
Mon May 3 20:36:07 UTC 2010


details:	http://hg.adium.im/adium-1.4/rev/991fe1347654
revision:	2931:991fe1347654
author:		Evan Schoenberg
date:		Mon May 03 15:35:58 2010 -0500

Changes for building from current im.pidgin.adium.1-4

diffs (434 lines):

diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h	Mon May 03 15:10:34 2010 -0500
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h	Mon May 03 15:35:58 2010 -0500
@@ -3,7 +3,7 @@
 
 G_BEGIN_DECLS
 
-/* VOID:VOID (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
+/* VOID:VOID (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
 extern void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -11,7 +11,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:BOOLEAN (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
+/* VOID:BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
 extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -19,7 +19,7 @@
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
-/* VOID:CHAR (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
+/* VOID:CHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
 extern void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -27,7 +27,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:UCHAR (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
+/* VOID:UCHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
 extern void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -35,7 +35,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:INT (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
+/* VOID:INT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
 extern void g_cclosure_marshal_VOID__INT (GClosure     *closure,
                                           GValue       *return_value,
                                           guint         n_param_values,
@@ -43,7 +43,7 @@
                                           gpointer      invocation_hint,
                                           gpointer      marshal_data);
 
-/* VOID:UINT (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
+/* VOID:UINT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
 extern void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -51,7 +51,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:LONG (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
+/* VOID:LONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
 extern void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -59,7 +59,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:ULONG (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
+/* VOID:ULONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
 extern void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -67,7 +67,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:ENUM (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
+/* VOID:ENUM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
 extern void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -75,7 +75,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:FLAGS (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
+/* VOID:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
 extern void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -83,7 +83,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:FLOAT (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
+/* VOID:FLOAT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
 extern void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -91,7 +91,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:DOUBLE (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
+/* VOID:DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
 extern void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -99,7 +99,7 @@
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:STRING (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
+/* VOID:STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
 extern void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -107,7 +107,7 @@
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:PARAM (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
+/* VOID:PARAM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
 extern void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -115,7 +115,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:BOXED (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
+/* VOID:BOXED (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
 extern void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -123,7 +123,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:POINTER (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
+/* VOID:POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
 extern void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -131,7 +131,7 @@
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
-/* VOID:OBJECT (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
+/* VOID:OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
 extern void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -139,7 +139,7 @@
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:UINT,POINTER (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
+/* VOID:UINT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
 extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
                                                    GValue       *return_value,
                                                    guint         n_param_values,
@@ -147,7 +147,7 @@
                                                    gpointer      invocation_hint,
                                                    gpointer      marshal_data);
 
-/* BOOL:FLAGS (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
+/* BOOL:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
 extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
                                                GValue       *return_value,
                                                guint         n_param_values,
@@ -156,7 +156,7 @@
                                                gpointer      marshal_data);
 #define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
 
-/* STRING:OBJECT,POINTER (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
+/* STRING:OBJECT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
 extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
                                                        GValue       *return_value,
                                                        guint         n_param_values,
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libglib.framework/Versions/2.0.0/Resources/Info.plist
Binary file Frameworks/libglib.framework/Versions/2.0.0/Resources/Info.plist has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libgmodule.framework/Versions/2.0.0/Resources/Info.plist
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/Resources/Info.plist has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h
--- a/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h	Mon May 03 15:10:34 2010 -0500
+++ b/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h	Mon May 03 15:35:58 2010 -0500
@@ -3,7 +3,7 @@
 
 G_BEGIN_DECLS
 
-/* VOID:VOID (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
+/* VOID:VOID (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
 extern void g_cclosure_marshal_VOID__VOID (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -11,7 +11,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:BOOLEAN (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
+/* VOID:BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
 extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -19,7 +19,7 @@
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
-/* VOID:CHAR (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
+/* VOID:CHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
 extern void g_cclosure_marshal_VOID__CHAR (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -27,7 +27,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:UCHAR (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
+/* VOID:UCHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
 extern void g_cclosure_marshal_VOID__UCHAR (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -35,7 +35,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:INT (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
+/* VOID:INT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
 extern void g_cclosure_marshal_VOID__INT (GClosure     *closure,
                                           GValue       *return_value,
                                           guint         n_param_values,
@@ -43,7 +43,7 @@
                                           gpointer      invocation_hint,
                                           gpointer      marshal_data);
 
-/* VOID:UINT (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
+/* VOID:UINT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
 extern void g_cclosure_marshal_VOID__UINT (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -51,7 +51,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:LONG (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
+/* VOID:LONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
 extern void g_cclosure_marshal_VOID__LONG (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -59,7 +59,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:ULONG (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
+/* VOID:ULONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
 extern void g_cclosure_marshal_VOID__ULONG (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -67,7 +67,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:ENUM (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
+/* VOID:ENUM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
 extern void g_cclosure_marshal_VOID__ENUM (GClosure     *closure,
                                            GValue       *return_value,
                                            guint         n_param_values,
@@ -75,7 +75,7 @@
                                            gpointer      invocation_hint,
                                            gpointer      marshal_data);
 
-/* VOID:FLAGS (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
+/* VOID:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
 extern void g_cclosure_marshal_VOID__FLAGS (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -83,7 +83,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:FLOAT (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
+/* VOID:FLOAT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
 extern void g_cclosure_marshal_VOID__FLOAT (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -91,7 +91,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:DOUBLE (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
+/* VOID:DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
 extern void g_cclosure_marshal_VOID__DOUBLE (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -99,7 +99,7 @@
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:STRING (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
+/* VOID:STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
 extern void g_cclosure_marshal_VOID__STRING (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -107,7 +107,7 @@
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:PARAM (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
+/* VOID:PARAM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
 extern void g_cclosure_marshal_VOID__PARAM (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -115,7 +115,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:BOXED (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
+/* VOID:BOXED (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
 extern void g_cclosure_marshal_VOID__BOXED (GClosure     *closure,
                                             GValue       *return_value,
                                             guint         n_param_values,
@@ -123,7 +123,7 @@
                                             gpointer      invocation_hint,
                                             gpointer      marshal_data);
 
-/* VOID:POINTER (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
+/* VOID:POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
 extern void g_cclosure_marshal_VOID__POINTER (GClosure     *closure,
                                               GValue       *return_value,
                                               guint         n_param_values,
@@ -131,7 +131,7 @@
                                               gpointer      invocation_hint,
                                               gpointer      marshal_data);
 
-/* VOID:OBJECT (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
+/* VOID:OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
 extern void g_cclosure_marshal_VOID__OBJECT (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,
@@ -139,7 +139,7 @@
                                              gpointer      invocation_hint,
                                              gpointer      marshal_data);
 
-/* VOID:UINT,POINTER (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
+/* VOID:UINT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
 extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure     *closure,
                                                    GValue       *return_value,
                                                    guint         n_param_values,
@@ -147,7 +147,7 @@
                                                    gpointer      invocation_hint,
                                                    gpointer      marshal_data);
 
-/* BOOL:FLAGS (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
+/* BOOL:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
 extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure     *closure,
                                                GValue       *return_value,
                                                guint         n_param_values,
@@ -156,7 +156,7 @@
                                                gpointer      marshal_data);
 #define g_cclosure_marshal_BOOL__FLAGS	g_cclosure_marshal_BOOLEAN__FLAGS
 
-/* STRING:OBJECT,POINTER (/Users/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
+/* STRING:OBJECT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
 extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure     *closure,
                                                        GValue       *return_value,
                                                        guint         n_param_values,
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libgobject.framework/Versions/2.0.0/Resources/Info.plist
Binary file Frameworks/libgobject.framework/Versions/2.0.0/Resources/Info.plist has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libgthread.framework/Versions/2.0.0/Resources/Info.plist
Binary file Frameworks/libgthread.framework/Versions/2.0.0/Resources/Info.plist has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libintl.framework/Versions/8/Resources/Info.plist
Binary file Frameworks/libintl.framework/Versions/8/Resources/Info.plist has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r dfc4f5ffc89c -r 991fe1347654 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	Mon May 03 15:10:34 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h	Mon May 03 15:35:58 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/evands/adium-1.4/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/evands/adium-1.4/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 dfc4f5ffc89c -r 991fe1347654 Frameworks/libjson-glib.framework/Versions/1.0.0/Resources/Info.plist
Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/Resources/Info.plist has changed
diff -r dfc4f5ffc89c -r 991fe1347654 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 dfc4f5ffc89c -r 991fe1347654 Frameworks/libmeanwhile.framework/Versions/1/Resources/Info.plist
Binary file Frameworks/libmeanwhile.framework/Versions/1/Resources/Info.plist has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile
Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed
diff -r dfc4f5ffc89c -r 991fe1347654 Utilities/dep-build-scripts/purple_make.sh
--- a/Utilities/dep-build-scripts/purple_make.sh	Mon May 03 15:10:34 2010 -0500
+++ b/Utilities/dep-build-scripts/purple_make.sh	Mon May 03 15:35:58 2010 -0500
@@ -198,6 +198,7 @@
 		$PIDGIN_SOURCE/libpurple/protocols/gg/buddylist.h \
 		$PIDGIN_SOURCE/libpurple/protocols/gg/gg.h \
 		$PIDGIN_SOURCE/libpurple/protocols/gg/search.h \
+		$PIDGIN_SOURCE/libpurple/protocols/jabber/auth.h \
 		$PIDGIN_SOURCE/libpurple/protocols/jabber/bosh.h \
 		$PIDGIN_SOURCE/libpurple/protocols/jabber/buddy.h \
 		$PIDGIN_SOURCE/libpurple/protocols/jabber/caps.h \
diff -r dfc4f5ffc89c -r 991fe1347654 Utilities/dep-build-scripts/universalize.sh
--- a/Utilities/dep-build-scripts/universalize.sh	Mon May 03 15:10:34 2010 -0500
+++ b/Utilities/dep-build-scripts/universalize.sh	Mon May 03 15:35:58 2010 -0500
@@ -21,7 +21,7 @@
 # vv
 # I'm not sure what to do to universalize the vv libs, especially the gst-plugins
 
-PURPLE_VERSION=0.6.5
+PURPLE_VERSION=0
 
 LIBPURPLE=libpurple.$PURPLE_VERSION
 PURPLE_FOLDER=libpurple-$PURPLE_VERSION




More information about the commits mailing list