adium-1.4 3495:446ad33f3ce0: Use a hack to make GLib detect endi...

commits at adium.im commits at adium.im
Sat May 21 23:24:46 UTC 2011


details:	http://hg.adium.im/adium-1.4/rev/446ad33f3ce0
revision:	3495:446ad33f3ce0
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Sun May 22 01:23:35 2011 +0200

Use a hack to make GLib detect endiannes properly. This was causing SHA1 and MD5 hasing to fail on PPC.

Fixes #15134

diffs (77 lines):

diff -r 9b3686f7a1c9 -r 446ad33f3ce0 Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig-ppc.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig-ppc.h	Sat May 21 14:26:07 2011 +0200
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig-ppc.h	Sun May 22 01:23:35 2011 +0200
@@ -181,18 +181,18 @@
 
 #define G_ATOMIC_OP_MEMORY_BARRIER_NEEDED 1
 
-#define GINT16_TO_LE(val)	((gint16) (val))
-#define GUINT16_TO_LE(val)	((guint16) (val))
-#define GINT16_TO_BE(val)	((gint16) GUINT16_SWAP_LE_BE (val))
-#define GUINT16_TO_BE(val)	(GUINT16_SWAP_LE_BE (val))
-#define GINT32_TO_LE(val)	((gint32) (val))
-#define GUINT32_TO_LE(val)	((guint32) (val))
-#define GINT32_TO_BE(val)	((gint32) GUINT32_SWAP_LE_BE (val))
-#define GUINT32_TO_BE(val)	(GUINT32_SWAP_LE_BE (val))
-#define GINT64_TO_LE(val)	((gint64) (val))
-#define GUINT64_TO_LE(val)	((guint64) (val))
-#define GINT64_TO_BE(val)	((gint64) GUINT64_SWAP_LE_BE (val))
-#define GUINT64_TO_BE(val)	(GUINT64_SWAP_LE_BE (val))
+#define GINT16_TO_BE(val)	((gint16) (val))
+#define GUINT16_TO_BE(val)	((guint16) (val))
+#define GINT16_TO_LE(val)	((gint16) GUINT16_SWAP_LE_BE (val))
+#define GUINT16_TO_LE(val)	(GUINT16_SWAP_LE_BE (val))
+#define GINT32_TO_BE(val)	((gint32) (val))
+#define GUINT32_TO_BE(val)	((guint32) (val))
+#define GINT32_TO_LE(val)	((gint32) GUINT32_SWAP_LE_BE (val))
+#define GUINT32_TO_LE(val)	(GUINT32_SWAP_LE_BE (val))
+#define GINT64_TO_BE(val)	((gint64) (val))
+#define GUINT64_TO_BE(val)	((guint64) (val))
+#define GINT64_TO_LE(val)	((gint64) GUINT64_SWAP_LE_BE (val))
+#define GUINT64_TO_LE(val)	(GUINT64_SWAP_LE_BE (val))
 #define GLONG_TO_LE(val)	((glong) GINT32_TO_LE (val))
 #define GULONG_TO_LE(val)	((gulong) GUINT32_TO_LE (val))
 #define GLONG_TO_BE(val)	((glong) GINT32_TO_BE (val))
@@ -201,7 +201,7 @@
 #define GUINT_TO_LE(val)	((guint) GUINT32_TO_LE (val))
 #define GINT_TO_BE(val)		((gint) GINT32_TO_BE (val))
 #define GUINT_TO_BE(val)	((guint) GUINT32_TO_BE (val))
-#define G_BYTE_ORDER G_LITTLE_ENDIAN
+#define G_BYTE_ORDER G_BIG_ENDIAN
 
 #define GLIB_SYSDEF_POLLIN =1
 #define GLIB_SYSDEF_POLLOUT =4
diff -r 9b3686f7a1c9 -r 446ad33f3ce0 Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 9b3686f7a1c9 -r 446ad33f3ce0 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 9b3686f7a1c9 -r 446ad33f3ce0 Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
diff -r 9b3686f7a1c9 -r 446ad33f3ce0 Plists/Info.plist
--- a/Plists/Info.plist	Sat May 21 14:26:07 2011 +0200
+++ b/Plists/Info.plist	Sun May 22 01:23:35 2011 +0200
@@ -475,7 +475,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5.8</string>
 	<key>LSRequiresNativeExecution</key>
-	<true/>
+	<false/>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
 	<key>NSMainNibFile</key>
diff -r 9b3686f7a1c9 -r 446ad33f3ce0 Utilities/dep-build-scripts/general_dependencies_make.sh
--- a/Utilities/dep-build-scripts/general_dependencies_make.sh	Sat May 21 14:26:07 2011 +0200
+++ b/Utilities/dep-build-scripts/general_dependencies_make.sh	Sun May 22 01:23:35 2011 +0200
@@ -86,8 +86,10 @@
 	export LDFLAGS="$LOCAL_FLAGS $BASE_LDFLAGS -arch $ARCH"
 	
 	case $ARCH in
-		ppc) HOST=powerpc-apple-darwin9;;
-		i386) HOST=i686-apple-darwin9;;
+		ppc) HOST=powerpc-apple-darwin9
+             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




More information about the commits mailing list