adium-1.4 3492:6f27a7d2fdc5: im.pidgin.adium.1-4 @ 79b15a2f60ca8...

commits at adium.im commits at adium.im
Sat May 21 10:50:38 UTC 2011


details:	http://hg.adium.im/adium-1.4/rev/6f27a7d2fdc5
revision:	3492:6f27a7d2fdc5
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Sat May 21 12:49:49 2011 +0200

im.pidgin.adium.1-4 @ 79b15a2f60ca8445998f5c26ed7d0e2449d87f66 which is libpurple 2.7.11 with a fix connecting to MSN on PPC

Also, fix the build scripts to use /Developer-old (so they work with Xcode 4 installed)

diffs (115 lines):

diff -r bf24c2bb868b -r 6f27a7d2fdc5 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 bf24c2bb868b -r 6f27a7d2fdc5 Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h	Fri May 20 02:37:10 2011 +0200
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h	Sat May 21 12:49:49 2011 +0200
@@ -6,7 +6,7 @@
 
 G_BEGIN_DECLS
 
-/* VOID:POINTER,POINTER,OBJECT (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:1) */
+/* VOID:POINTER,POINTER,OBJECT (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:1) */
 extern void purple_smarshal_VOID__POINTER_POINTER_OBJECT (GClosure     *closure,
                                                           GValue       *return_value,
                                                           guint         n_param_values,
@@ -14,7 +14,7 @@
                                                           gpointer      invocation_hint,
                                                           gpointer      marshal_data);
 
-/* BOOLEAN:OBJECT,POINTER,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:2) */
+/* BOOLEAN:OBJECT,POINTER,STRING (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:2) */
 extern void purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure     *closure,
                                                             GValue       *return_value,
                                                             guint         n_param_values,
@@ -22,7 +22,7 @@
                                                             gpointer      invocation_hint,
                                                             gpointer      marshal_data);
 
-/* VOID:STRING,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:3) */
+/* VOID:STRING,STRING (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:3) */
 extern void purple_smarshal_VOID__STRING_STRING (GClosure     *closure,
                                                  GValue       *return_value,
                                                  guint         n_param_values,
@@ -30,7 +30,7 @@
                                                  gpointer      invocation_hint,
                                                  gpointer      marshal_data);
 
-/* VOID:STRING,STRING,DOUBLE (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:4) */
+/* VOID:STRING,STRING,DOUBLE (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:4) */
 extern void purple_smarshal_VOID__STRING_STRING_DOUBLE (GClosure     *closure,
                                                         GValue       *return_value,
                                                         guint         n_param_values,
@@ -38,7 +38,7 @@
                                                         gpointer      invocation_hint,
                                                         gpointer      marshal_data);
 
-/* VOID:ENUM,STRING,STRING (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:5) */
+/* VOID:ENUM,STRING,STRING (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:5) */
 extern void purple_smarshal_VOID__ENUM_STRING_STRING (GClosure     *closure,
                                                       GValue       *return_value,
                                                       guint         n_param_values,
@@ -46,7 +46,7 @@
                                                       gpointer      invocation_hint,
                                                       gpointer      marshal_data);
 
-/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:6) */
+/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:6) */
 extern void purple_smarshal_VOID__ENUM_STRING_STRING_BOOLEAN (GClosure     *closure,
                                                               GValue       *return_value,
                                                               guint         n_param_values,
@@ -54,7 +54,7 @@
                                                               gpointer      invocation_hint,
                                                               gpointer      marshal_data);
 
-/* VOID:FLAGS,FLAGS (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:7) */
+/* VOID:FLAGS,FLAGS (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:7) */
 extern void purple_smarshal_VOID__FLAGS_FLAGS (GClosure     *closure,
                                                GValue       *return_value,
                                                guint         n_param_values,
@@ -62,7 +62,7 @@
                                                gpointer      invocation_hint,
                                                gpointer      marshal_data);
 
-/* VOID:STRING,STRING,OBJECT,OBJECT (/Users/evands/coding/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:8) */
+/* VOID:STRING,STRING,OBJECT,OBJECT (/Users/thijs/Projects/Checkouts/Adium/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:8) */
 extern void purple_smarshal_VOID__STRING_STRING_OBJECT_OBJECT (GClosure     *closure,
                                                                GValue       *return_value,
                                                                guint         n_param_values,
diff -r bf24c2bb868b -r 6f27a7d2fdc5 Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
diff -r bf24c2bb868b -r 6f27a7d2fdc5 Utilities/dep-build-scripts/common.sh
--- a/Utilities/dep-build-scripts/common.sh	Fri May 20 02:37:10 2011 +0200
+++ b/Utilities/dep-build-scripts/common.sh	Sat May 21 12:49:49 2011 +0200
@@ -43,7 +43,10 @@
 fi
 
 # Compiler options
-export CC=/usr/bin/gcc-4.2
+export CC="/Developer-old/usr/bin/gcc"
+export CPP="/Developer-old/usr/bin/gcc -E"
+export CXX="/Developer-old/usr/bin/g++"
+
 TARGET_DIR_PPC="$BUILDDIR/root-ppc"
 TARGET_DIR_I386="$BUILDDIR/root-i386"
 TARGET_DIR_ARMV6="$BUILDDIR/root-armv6"
@@ -61,7 +64,7 @@
     BASE_LDFLAGS="-miphoneos-version-min=2.2 -headerpad_max_install_names -Wl,-syslibroot,$SDK_ROOT"
 
 else
-    SDK_ROOT="/Developer/SDKs/MacOSX10.5.sdk"
+    SDK_ROOT="/Developer-old/SDKs/MacOSX10.5.sdk"
     BASE_CFLAGS="-mmacosx-version-min=10.5 -isysroot $SDK_ROOT"
     BASE_LDFLAGS="-mmacosx-version-min=10.5 -headerpad_max_install_names -Wl,-syslibroot,$SDK_ROOT"
 fi
diff -r bf24c2bb868b -r 6f27a7d2fdc5 Utilities/dep-build-scripts/urls.txt
--- a/Utilities/dep-build-scripts/urls.txt	Fri May 20 02:37:10 2011 +0200
+++ b/Utilities/dep-build-scripts/urls.txt	Sat May 21 12:49:49 2011 +0200
@@ -40,7 +40,7 @@
 http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.22.tar.gz
 http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.14.tar.gz
 http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.11.tar.gz
-http://farsight.freedesktop.org/releases/gst-plugins-farsight/gst-plugins-farsight-0.12.11.tar.gz
+http://farsight.freedesktop.org/releases/obsolete/gst-plugins-farsight/gst-plugins-farsight-0.12.11.tar.gz
 ####
 # Farsight
 ####



More information about the commits mailing list