adium-1.4 3588:39fd952ecc03: Fix the building of the Dependencie...
commits at adium.im
commits at adium.im
Wed Aug 10 12:40:53 UTC 2011
details: http://hg.adium.im/adium-1.4/rev/39fd952ecc03
revision: 3588:39fd952ecc03
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Wed Aug 10 14:26:00 2011 +0200
Fix the building of the Dependencies on Lion. Had to copy a number of configuration variables that could no longer be detected automatically from a build on a machine which still has Rosetta.
Rebuild everything, to hopefully fix the logging in to MSN again on PPC machines. Refs #15295
Subject: adium-1.4 3589:ecd704750752: Hardcode all architectures when building for Release, as apparently ARCHS_STANDARD_32_BIT in 3.2.6 dropped PPC.
details: http://hg.adium.im/adium-1.4/rev/ecd704750752
revision: 3589:ecd704750752
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Wed Aug 10 14:38:47 2011 +0200
Hardcode all architectures when building for Release, as apparently ARCHS_STANDARD_32_BIT in 3.2.6 dropped PPC.
Subject: adium-1.4 3590:6fcbf5fad457: Merged.
details: http://hg.adium.im/adium-1.4/rev/6fcbf5fad457
revision: 3590:6fcbf5fad457
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Wed Aug 10 14:39:26 2011 +0200
Merged.
diffs (610 lines):
diff -r f2617cde9403 -r 6fcbf5fad457 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Fri Aug 05 02:10:01 2011 +0200
+++ b/Adium.xcodeproj/project.pbxproj Wed Aug 10 14:39:26 2011 +0200
@@ -9594,7 +9594,6 @@
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
compatibilityVersion = "Xcode 3.1";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
@@ -12669,6 +12668,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12698,6 +12701,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E11A0FAFA35E00B310AC /* AdiumApplescriptRunner.xcconfig */;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
};
name = Release;
};
@@ -12705,6 +12712,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E11A0FAFA35E00B310AC /* AdiumApplescriptRunner.xcconfig */;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
};
name = "Release-Debug";
};
@@ -12740,6 +12751,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
};
name = Release;
};
@@ -12792,6 +12807,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
};
name = Release;
};
@@ -12817,6 +12836,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Fri Aug 05 02:10:01 2011 +0200
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Wed Aug 10 14:39:26 2011 +0200
@@ -385,7 +385,6 @@
};
buildConfigurationList = DA8A8087085549EE00F24BB3 /* Build configuration list for PBXProject "AutoHyperlinks.framework" */;
compatibilityVersion = "Xcode 3.1";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@@ -543,6 +542,10 @@
31C4603C0DE1D17100C4265B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -572,6 +575,10 @@
31C4603D0DE1D17100C4265B /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -599,6 +606,10 @@
34C57363093E5E6E00829508 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
COPY_PHASE_STRIP = NO;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -672,7 +683,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = (
+ i386,
+ ppc,
+ );
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
@@ -700,7 +714,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = (
+ i386,
+ ppc,
+ );
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -749,6 +766,10 @@
7EB550150DDC80DB000DC0D6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
COPY_PHASE_STRIP = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -771,6 +792,10 @@
7EB550160DDC80DB000DC0D6 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
@@ -822,6 +847,10 @@
7ED4FDCD0E002652004C5F4B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -851,6 +880,10 @@
7ED4FDCE0E002652004C5F4B /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -904,6 +937,10 @@
DA8A8085085549EE00F24BB3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
COPY_PHASE_STRIP = YES;
DEPLOYMENT_POSTPROCESSING = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/AutoHyperlinks Framework/Source/AHMarkedHyperlink.m
--- a/Frameworks/AutoHyperlinks Framework/Source/AHMarkedHyperlink.m Fri Aug 05 02:10:01 2011 +0200
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHMarkedHyperlink.m Wed Aug 10 14:39:26 2011 +0200
@@ -102,7 +102,7 @@
- (void)setURLFromString:(NSString *)inString
{
NSString *linkString, *preString;
-
+
preString = (NSString *)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,
(CFStringRef)inString,
CFSTR(""),
@@ -112,11 +112,33 @@
preString? (CFStringRef)preString : (CFStringRef)inString,
(CFStringRef)@"#[]",
NULL,
- kCFStringEncodingUTF8); // kCFStringEncodingISOLatin1 );
-
+ kCFStringEncodingUTF8);
[linkURL release];
linkURL = [[NSURL alloc] initWithString:linkString];
-
+ // Because -[NSURL URLWithString:(NSString*)inString] fails creating a link with 2 fragment hashes, but we don't want to escape the first one, we esape all '#' to "%23" then unescape the first back to '#'. rdar://9927055
+ if(!self.URL) {
+ [preString release]; preString = nil;
+ preString = (NSString *)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,
+ (CFStringRef)preString,
+ CFSTR(""),
+ kCFStringEncodingUTF8);
+ [linkString release]; linkString = nil;
+ linkString = (NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault,
+ preString? (CFStringRef)preString : (CFStringRef)inString,
+ (CFStringRef)@"[]",
+ NULL,
+ kCFStringEncodingUTF8);
+ NSRange fragmentRange = [linkString rangeOfString:@"%23"];
+ NSMutableString *mutaLinkString = nil;
+ if (fragmentRange.location != NSNotFound) {
+ mutaLinkString = [linkString mutableCopy];
+ [mutaLinkString replaceOccurrencesOfString:@"%23" withString:@"#" options:0 range:fragmentRange];
+ }
+ [linkURL release];
+ linkURL = [[NSURL alloc] initWithString:linkString];
+ [mutaLinkString release];
+ }
+
[linkString release];
if(preString) [preString release];
}
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/AutoHyperlinks Framework/UnitTests/HyperlinkContextTest.m
--- a/Frameworks/AutoHyperlinks Framework/UnitTests/HyperlinkContextTest.m Fri Aug 05 02:10:01 2011 +0200
+++ b/Frameworks/AutoHyperlinks Framework/UnitTests/HyperlinkContextTest.m Wed Aug 10 14:39:26 2011 +0200
@@ -13,7 +13,7 @@
AHHyperlinkScanner *scanner = [AHHyperlinkScanner hyperlinkScannerWithString:testString];
AHMarkedHyperlink *link = [scanner nextURI];
- STAssertNotNil(link, @"-[SHHyperlinkScanner nextURL] found no URI in \"%@\"", testString);
+ STAssertNotNil([link URL], @"-[SHHyperlinkScanner nextURL] found no URI in \"%@\"", testString);
STAssertEqualObjects([[link parentString] substringWithRange:[link range]], URIString, @"in context: '%@'", testString);
}
@@ -230,6 +230,8 @@
[self testLaxContext:@"%@" withURI:[NSString stringWithFormat:@"%@",@"http://example.com/hi%uthere"]]; //#11160
[self testURIEscaping:[NSString stringWithFormat:@"%@",@"http://www.google.com/search?q=foo%20bar"]]; //#12850
+
+ [self testLaxContext:@"%@ doesn't link." withURI:@"http://developer.apple.com/library/iOS/#documentation/Cocoa/Conceptual/CocoaFundamentals/CocoaObjects/CocoaObjects.html#//apple_ref/doc/uid/TP40002974-CH4-SW3"];
}
- (void)testCompositeContext {
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj
--- a/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Fri Aug 05 02:10:01 2011 +0200
+++ b/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Wed Aug 10 14:39:26 2011 +0200
@@ -375,6 +375,10 @@
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
@@ -438,6 +442,10 @@
346637AE0D415806006C9034 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj
--- a/Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj Fri Aug 05 02:10:01 2011 +0200
+++ b/Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj Wed Aug 10 14:39:26 2011 +0200
@@ -617,6 +617,10 @@
34D1AB700D693E2E00470520 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
INFOPLIST_FILE = "Palette/Palette-Info.plist";
LIBRARY_STYLE = BUNDLE;
WRAPPER_EXTENSION = palette;
@@ -626,6 +630,10 @@
34D1AB710D693E2E00470520 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
@@ -638,6 +646,10 @@
34D1AB720D693E2E00470520 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
LIBRARY_STYLE = STATIC;
};
name = "Release-Debug";
@@ -645,6 +657,10 @@
34D1AB730D693E2E00470520 /* Release-Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
INFOPLIST_FILE = "Sample App/SampleApp-Info.plist";
PRODUCT_NAME = SampleApp;
};
@@ -660,6 +676,10 @@
D50F205D08A01A630073A261 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
LIBRARY_STYLE = STATIC;
};
name = Release;
@@ -676,6 +696,10 @@
D50F206108A01A630073A261 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
INFOPLIST_FILE = "Palette/Palette-Info.plist";
LIBRARY_STYLE = BUNDLE;
WRAPPER_EXTENSION = palette;
@@ -697,6 +721,10 @@
D50F206508A01A630073A261 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
@@ -717,6 +745,10 @@
D50F206908A01A630073A261 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = (
+ i386,
+ ppc,
+ );
INFOPLIST_FILE = "Sample App/SampleApp-Info.plist";
PRODUCT_NAME = SampleApp;
};
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig-ppc.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig-ppc.h Fri Aug 05 02:10:01 2011 +0200
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig-ppc.h Wed Aug 10 14:39:26 2011 +0200
@@ -13,12 +13,6 @@
#define GLIB_HAVE_ALLOCA_H
#define GLIB_HAVE_SYS_POLL_H
-/* Specifies that GLib's g_print*() functions wrap the
- * system printf functions. This is useful to know, for example,
- * when using glibc's register_printf_function().
- */
-#define GLIB_USING_SYSTEM_PRINTF
-
G_BEGIN_DECLS
#define G_MINFLOAT FLT_MIN
@@ -151,21 +145,10 @@
#define G_THREADS_ENABLED
#define G_THREADS_IMPL_POSIX
-typedef struct _GStaticMutex GStaticMutex;
-struct _GStaticMutex
-{
- struct _GMutex *runtime_mutex;
- union {
- char pad[44];
- double dummy_double;
- void *dummy_pointer;
- long dummy_long;
- } static_mutex;
-};
-#define G_STATIC_MUTEX_INIT { NULL, { { 50,-86,-85,-89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#define g_static_mutex_get_mutex(mutex) \
- (g_thread_use_default_impl ? ((GMutex*)(gpointer) ((mutex)->static_mutex.pad)) : \
- g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
+typedef struct _GMutex* GStaticMutex;
+#define G_STATIC_MUTEX_INIT NULL
+#define g_static_mutex_get_mutex(mutex) \
+ (g_static_mutex_get_mutex_impl_shortcut (mutex))
/* This represents a system thread as used by the implementation. An
* alien implementaion, as loaded by g_thread_init can only count on
* "sizeof (gpointer)" bytes to store their info. We however need more
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r f2617cde9403 -r 6fcbf5fad457 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 f2617cde9403 -r 6fcbf5fad457 Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile
Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed
diff -r f2617cde9403 -r 6fcbf5fad457 Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h Fri Aug 05 02:10:01 2011 +0200
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h Wed Aug 10 14:39:26 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 f2617cde9403 -r 6fcbf5fad457 Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
diff -r f2617cde9403 -r 6fcbf5fad457 Utilities/dep-build-scripts/general_dependencies_make.sh
--- a/Utilities/dep-build-scripts/general_dependencies_make.sh Fri Aug 05 02:10:01 2011 +0200
+++ b/Utilities/dep-build-scripts/general_dependencies_make.sh Wed Aug 10 14:39:26 2011 +0200
@@ -86,10 +86,18 @@
export LDFLAGS="$LOCAL_FLAGS $BASE_LDFLAGS -arch $ARCH"
case $ARCH in
- ppc) HOST=powerpc-apple-darwin9
- export ac_cv_c_bigendian=yes;;
- i386) HOST=i686-apple-darwin9
- export ac_cv_c_bigendian=no;;
+ ppc) HOST=powerpc-apple-darwin9
+ export glib_cv_uscore=no
+ export glib_cv_stack_grows=no
+ export ac_cv_func_posix_getpwuid_r=yes
+ export ac_cv_func_posix_getgrgid_r=yes
+ export ac_cv_func_printf_unix98=yes
+ export ac_cv_func_snprintf_c99=yes
+ export ac_cv_func_vsnprintf_c99=yes
+ export glib_cv_have_strlcpy=yes
+ export ac_cv_c_bigendian=yes;;
+ i386) HOST=i686-apple-darwin9
+ export ac_cv_c_bigendian=no;;
esac
mkdir glib-$ARCH >/dev/null 2>&1 || true
diff -r f2617cde9403 -r 6fcbf5fad457 Utilities/dep-build-scripts/purple_dependencies_make.sh
--- a/Utilities/dep-build-scripts/purple_dependencies_make.sh Fri Aug 05 02:10:01 2011 +0200
+++ b/Utilities/dep-build-scripts/purple_dependencies_make.sh Wed Aug 10 14:39:26 2011 +0200
@@ -31,9 +31,11 @@
case $ARCH in
ppc) TARGET_DIR="$TARGET_DIR_PPC"
+ HOST=powerpc-apple-darwin9
export PATH="$PATH_PPC"
export PKG_CONFIG_PATH="$TARGET_DIR_PPC/lib/pkgconfig";;
i386) TARGET_DIR="$TARGET_DIR_I386"
+ HOST=i686-apple-darwin9
export PATH="$PATH_I386"
export PKG_CONFIG_PATH="$TARGET_DIR_I386/lib/pkgconfig";;
esac
@@ -46,7 +48,8 @@
--prefix=$TARGET_DIR \
--enable-static --enable-shared \
--disable-doxygen \
- --disable-mailme >> $LOG_FILE 2>&1
+ --disable-mailme \
+ --host=$HOST >> $LOG_FILE 2>&1
# We edit libtool before we run make. This is evil and makes me sad.
echo ' Editing libtool...'
@@ -95,21 +98,24 @@
export CFLAGS="$BASE_CFLAGS -arch $ARCH"
export CXXFLAGS="$CFLAGS"
export LDFLAGS="$BASE_LDFLAGS -arch $ARCH"
+ export NM="nm"
mkdir json-glib-$ARCH || true
cd json-glib-$ARCH
case $ARCH in
ppc) TARGET_DIR="$TARGET_DIR_PPC"
- export PATH="$PATH_PPC"
- export PKG_CONFIG_PATH="$TARGET_DIR_PPC/lib/pkgconfig";;
+ HOST=powerpc-apple-darwin9
+ export PATH="$PATH_PPC"
+ export PKG_CONFIG_PATH="$TARGET_DIR_PPC/lib/pkgconfig";;
i386) TARGET_DIR="$TARGET_DIR_I386"
- export PATH="$PATH_I386"
- export PKG_CONFIG_PATH="$TARGET_DIR_I386/lib/pkgconfig";;
+ HOST=i686-apple-darwin9
+ export PATH="$PATH_I386"
+ export PKG_CONFIG_PATH="$TARGET_DIR_I386/lib/pkgconfig";;
esac
echo ' Configuring...'
- "$SOURCEDIR/$JSONLIB/configure" --prefix=$TARGET_DIR #>> $LOG_FILE 2>&1
+ "$SOURCEDIR/$JSONLIB/configure" --prefix=$TARGET_DIR --host=$HOST #>> $LOG_FILE 2>&1
echo ' make && make install'
make -j $NUMBER_OF_CORES && make install #>> $LOG_FILE 2>&1
diff -r f2617cde9403 -r 6fcbf5fad457 xcconfigs/Release.xcconfig
--- a/xcconfigs/Release.xcconfig Fri Aug 05 02:10:01 2011 +0200
+++ b/xcconfigs/Release.xcconfig Wed Aug 10 14:39:26 2011 +0200
@@ -1,5 +1,5 @@
#include "Base.xcconfig"
-ARCHS = $(ARCHS_STANDARD_32_BIT) ppc
+ARCHS = i386 ppc
DEPLOYMENT_POSTPROCESSING = YES
APPLY_RULES_IN_COPY_FILES = YES
GCC_DEBUGGING_SYMBOLS = used
More information about the commits
mailing list