adium 5117:24a33c054027: - Updated libglib to 2.32.4, to fix #16...
commits at adium.im
commits at adium.im
Tue Oct 16 21:40:49 UTC 2012
details: http://hg.adium.im/adium/rev/24a33c054027
revision: 5117:24a33c054027
branch: adium-1.5.4
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Tue Oct 16 23:34:24 2012 +0200
- Updated libglib to 2.32.4, to fix #16186.
- Patched libpurple to store the PurpleAccount on PurpleSSLConnections.
Fixes #16186, Refs #16081
diffs (truncated from 341446 to 1000 lines):
diff -r 778962cfca9d -r 24a33c054027 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Oct 14 23:00:54 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Tue Oct 16 23:34:24 2012 +0200
@@ -1389,6 +1389,8 @@
6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.nib */; };
+ 7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
+ 7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
@@ -1641,6 +1643,7 @@
11EE1CD00CDD01120097F246 /* libgmodule.framework in Copy Frameworks */,
11EE1CD10CDD01120097F246 /* libgobject.framework in Copy Frameworks */,
11EE1CD20CDD01120097F246 /* libgthread.framework in Copy Frameworks */,
+ 7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */,
11EE1CD30CDD01120097F246 /* libintl.framework in Copy Frameworks */,
11EE1CD40CDD01120097F246 /* libmeanwhile.framework in Copy Frameworks */,
11EE1CD50CDD01120097F246 /* libpurple.framework in Copy Frameworks */,
@@ -4528,6 +4531,7 @@
6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvIncomingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m; sourceTree = SOURCE_ROOT; };
6FB330A30C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EKEzvOutgoingFileTransfer.h; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.h; sourceTree = SOURCE_ROOT; };
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
+ 7664EAA4162E086A008CF995 /* libffi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libffi.framework; path = Frameworks/libffi.framework; sourceTree = "<group>"; };
766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIUnreadMessagesTooltip.m; path = Source/AIUnreadMessagesTooltip.m; sourceTree = "<group>"; };
76731DE015F90538007728C3 /* libgcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgcrypt.framework; path = Frameworks/libgcrypt.framework; sourceTree = "<group>"; };
@@ -4884,6 +4888,7 @@
9719C92E1530EE0C00217FBE /* ShortcutRecorder.framework in Frameworks */,
76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */,
76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */,
+ 7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -8241,6 +8246,7 @@
979AA6A914D59EF3008730DF /* Others */ = {
isa = PBXGroup;
children = (
+ 7664EAA4162E086A008CF995 /* libffi.framework */,
76731DE015F90538007728C3 /* libgcrypt.framework */,
76731DE115F90538007728C3 /* libgpgerror.framework */,
3496A8E707CE6CA30055BBAB /* AutoHyperlinks.framework.xcodeproj */,
diff -r 778962cfca9d -r 24a33c054027 Dependencies/patches/Meanwhile-glib_headers.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/Meanwhile-glib_headers.diff Tue Oct 16 23:34:24 2012 +0200
@@ -0,0 +1,257 @@
+diff -r -u meanwhile-1.0.2-orig/samples/logging_proxy.c meanwhile-1.0.2/samples/logging_proxy.c
+--- meanwhile-1.0.2-orig/samples/logging_proxy.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/samples/logging_proxy.c 2012-10-16 22:02:36.000000000 +0200
+@@ -25,7 +25,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+ #include <mw_cipher.h>
+ #include <mw_common.h>
+diff -r -u meanwhile-1.0.2-orig/samples/login_server.c meanwhile-1.0.2/samples/login_server.c
+--- meanwhile-1.0.2-orig/samples/login_server.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/samples/login_server.c 2012-10-16 22:02:23.000000000 +0200
+@@ -19,7 +19,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+ #include <mw_cipher.h>
+ #include <mw_common.h>
+diff -r -u meanwhile-1.0.2-orig/samples/nocipher_proxy.c meanwhile-1.0.2/samples/nocipher_proxy.c
+--- meanwhile-1.0.2-orig/samples/nocipher_proxy.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/samples/nocipher_proxy.c 2012-10-16 22:02:56.000000000 +0200
+@@ -29,7 +29,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+ #include <mw_common.h>
+ #include <mw_message.h>
+diff -r -u meanwhile-1.0.2-orig/samples/redirect_server.c meanwhile-1.0.2/samples/redirect_server.c
+--- meanwhile-1.0.2-orig/samples/redirect_server.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/samples/redirect_server.c 2012-10-16 22:02:48.000000000 +0200
+@@ -22,7 +22,6 @@
+ #include <unistd.h>
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+ #include <mw_common.h>
+ #include <mw_message.h>
+diff -r -u meanwhile-1.0.2-orig/src/channel.c meanwhile-1.0.2/src/channel.c
+--- meanwhile-1.0.2-orig/src/channel.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/channel.c 2012-10-16 22:03:01.000000000 +0200
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -r -u meanwhile-1.0.2-orig/src/mw_debug.c meanwhile-1.0.2/src/mw_debug.c
+--- meanwhile-1.0.2-orig/src/mw_debug.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/mw_debug.c 2012-10-16 22:03:06.000000000 +0200
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+
+diff -r -u meanwhile-1.0.2-orig/src/mw_message.h meanwhile-1.0.2/src/mw_message.h
+--- meanwhile-1.0.2-orig/src/mw_message.h 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/mw_message.h 2012-10-16 22:03:09.000000000 +0200
+@@ -22,7 +22,7 @@
+ #define _MW_MESSAGE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -r -u meanwhile-1.0.2-orig/src/mw_srvc_conf.h meanwhile-1.0.2/src/mw_srvc_conf.h
+--- meanwhile-1.0.2-orig/src/mw_srvc_conf.h 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/mw_srvc_conf.h 2012-10-16 22:03:17.000000000 +0200
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_CONF_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -r -u meanwhile-1.0.2-orig/src/mw_srvc_dir.h meanwhile-1.0.2/src/mw_srvc_dir.h
+--- meanwhile-1.0.2-orig/src/mw_srvc_dir.h 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/mw_srvc_dir.h 2012-10-16 22:03:35.000000000 +0200
+@@ -22,7 +22,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+
+ #ifdef __cplusplus
+diff -r -u meanwhile-1.0.2-orig/src/mw_srvc_place.h meanwhile-1.0.2/src/mw_srvc_place.h
+--- meanwhile-1.0.2-orig/src/mw_srvc_place.h 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/mw_srvc_place.h 2012-10-16 22:03:40.000000000 +0200
+@@ -22,7 +22,7 @@
+ #define _MW_SRVC_PLACE_H
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+ #include "mw_common.h"
+
+
+diff -r -u meanwhile-1.0.2-orig/src/mw_srvc_resolve.h meanwhile-1.0.2/src/mw_srvc_resolve.h
+--- meanwhile-1.0.2-orig/src/mw_srvc_resolve.h 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/mw_srvc_resolve.h 2012-10-16 22:03:44.000000000 +0200
+@@ -23,7 +23,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+
+
+ #ifdef __cplusplus
+diff -r -u meanwhile-1.0.2-orig/src/mw_st_list.h meanwhile-1.0.2/src/mw_st_list.h
+--- meanwhile-1.0.2-orig/src/mw_st_list.h 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/mw_st_list.h 2012-10-16 22:03:48.000000000 +0200
+@@ -30,7 +30,6 @@
+
+
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include "mw_common.h"
+
+
+diff -r -u meanwhile-1.0.2-orig/src/mw_util.h meanwhile-1.0.2/src/mw_util.h
+--- meanwhile-1.0.2-orig/src/mw_util.h 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/mw_util.h 2012-10-16 22:03:51.000000000 +0200
+@@ -23,8 +23,6 @@
+
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+
+ #define map_guint_new() \
+diff -r -u meanwhile-1.0.2-orig/src/srvc_aware.c meanwhile-1.0.2/src/srvc_aware.c
+--- meanwhile-1.0.2-orig/src/srvc_aware.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/srvc_aware.c 2012-10-16 22:03:58.000000000 +0200
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -r -u meanwhile-1.0.2-orig/src/srvc_conf.c meanwhile-1.0.2/src/srvc_conf.c
+--- meanwhile-1.0.2-orig/src/srvc_conf.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/srvc_conf.c 2012-10-16 22:04:01.000000000 +0200
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -r -u meanwhile-1.0.2-orig/src/srvc_dir.c meanwhile-1.0.2/src/srvc_dir.c
+--- meanwhile-1.0.2-orig/src/srvc_dir.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/srvc_dir.c 2012-10-16 22:04:07.000000000 +0200
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -r -u meanwhile-1.0.2-orig/src/srvc_ft.c meanwhile-1.0.2/src/srvc_ft.c
+--- meanwhile-1.0.2-orig/src/srvc_ft.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/srvc_ft.c 2012-10-16 22:04:12.000000000 +0200
+@@ -19,7 +19,7 @@
+ */
+
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -r -u meanwhile-1.0.2-orig/src/srvc_im.c meanwhile-1.0.2/src/srvc_im.c
+--- meanwhile-1.0.2-orig/src/srvc_im.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/srvc_im.c 2012-10-16 22:04:18.000000000 +0200
+@@ -19,7 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include <string.h>
+
+ #include "mw_channel.h"
+diff -r -u meanwhile-1.0.2-orig/src/srvc_place.c meanwhile-1.0.2/src/srvc_place.c
+--- meanwhile-1.0.2-orig/src/srvc_place.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/srvc_place.c 2012-10-16 22:04:23.000000000 +0200
+@@ -19,8 +19,6 @@
+ */
+
+ #include <glib.h>
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -r -u meanwhile-1.0.2-orig/src/srvc_resolve.c meanwhile-1.0.2/src/srvc_resolve.c
+--- meanwhile-1.0.2-orig/src/srvc_resolve.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/srvc_resolve.c 2012-10-16 22:04:27.000000000 +0200
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_common.h"
+diff -r -u meanwhile-1.0.2-orig/src/srvc_store.c meanwhile-1.0.2/src/srvc_store.c
+--- meanwhile-1.0.2-orig/src/srvc_store.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/srvc_store.c 2012-10-16 22:04:31.000000000 +0200
+@@ -18,7 +18,7 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-#include <glib/glist.h>
++#include <glib.h>
+
+ #include "mw_channel.h"
+ #include "mw_debug.h"
+diff -r -u meanwhile-1.0.2-orig/src/st_list.c meanwhile-1.0.2/src/st_list.c
+--- meanwhile-1.0.2-orig/src/st_list.c 2012-10-16 22:02:02.000000000 +0200
++++ meanwhile-1.0.2/src/st_list.c 2012-10-16 22:04:36.000000000 +0200
+@@ -20,7 +20,7 @@
+
+ #include <stdio.h>
+ #include <string.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+
+ #include "mw_debug.h"
+ #include "mw_util.h"
+
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/Headers
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libffi.framework/Headers Tue Oct 16 23:34:24 2012 +0200
@@ -0,0 +1,1 @@
+Versions/3.0.11/Headers
\ No newline at end of file
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/Resources
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libffi.framework/Resources Tue Oct 16 23:34:24 2012 +0200
@@ -0,0 +1,1 @@
+Versions/3.0.11/Resources
\ No newline at end of file
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/Versions/3.0.11/Headers/ffi.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libffi.framework/Versions/3.0.11/Headers/ffi.h Tue Oct 16 23:34:24 2012 +0200
@@ -0,0 +1,471 @@
+/* -----------------------------------------------------------------*-C-*-
+ libffi 3.0.11 - Copyright (c) 2011 Anthony Green
+ - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the ``Software''), to deal in the Software without
+ restriction, including without limitation the rights to use, copy,
+ modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+ ----------------------------------------------------------------------- */
+
+/* -------------------------------------------------------------------
+ The basic API is described in the README file.
+
+ The raw API is designed to bypass some of the argument packing
+ and unpacking on architectures for which it can be avoided.
+
+ The closure API allows interpreted functions to be packaged up
+ inside a C function pointer, so that they can be called as C functions,
+ with no understanding on the client side that they are interpreted.
+ It can also be used in other cases in which it is necessary to package
+ up a user specified parameter and a function pointer as a single
+ function pointer.
+
+ The closure API must be implemented in order to get its functionality,
+ e.g. for use by gij. Routines are provided to emulate the raw API
+ if the underlying platform doesn't allow faster implementation.
+
+ More details on the raw and cloure API can be found in:
+
+ http://gcc.gnu.org/ml/java/1999-q3/msg00138.html
+
+ and
+
+ http://gcc.gnu.org/ml/java/1999-q3/msg00174.html
+ -------------------------------------------------------------------- */
+
+#ifndef LIBFFI_H
+#define LIBFFI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Specify which architecture libffi is configured for. */
+#ifndef X86_DARWIN
+#define X86_DARWIN
+#endif
+
+/* ---- System configuration information --------------------------------- */
+
+#include <ffitarget.h>
+
+#ifndef LIBFFI_ASM
+
+#ifdef _MSC_VER
+#define __attribute__(X)
+#endif
+
+#include <stddef.h>
+#include <limits.h>
+
+/* LONG_LONG_MAX is not always defined (not if STRICT_ANSI, for example).
+ But we can find it either under the correct ANSI name, or under GNU
+ C's internal name. */
+
+#define FFI_64_BIT_MAX 9223372036854775807
+
+#ifdef LONG_LONG_MAX
+# define FFI_LONG_LONG_MAX LONG_LONG_MAX
+#else
+# ifdef LLONG_MAX
+# define FFI_LONG_LONG_MAX LLONG_MAX
+# ifdef _AIX52 /* or newer has C99 LLONG_MAX */
+# undef FFI_64_BIT_MAX
+# define FFI_64_BIT_MAX 9223372036854775807LL
+# endif /* _AIX52 or newer */
+# else
+# ifdef __GNUC__
+# define FFI_LONG_LONG_MAX __LONG_LONG_MAX__
+# endif
+# ifdef _AIX /* AIX 5.1 and earlier have LONGLONG_MAX */
+# ifndef __PPC64__
+# if defined (__IBMC__) || defined (__IBMCPP__)
+# define FFI_LONG_LONG_MAX LONGLONG_MAX
+# endif
+# endif /* __PPC64__ */
+# undef FFI_64_BIT_MAX
+# define FFI_64_BIT_MAX 9223372036854775807LL
+# endif
+# endif
+#endif
+
+/* The closure code assumes that this works on pointers, i.e. a size_t */
+/* can hold a pointer. */
+
+typedef struct _ffi_type
+{
+ size_t size;
+ unsigned short alignment;
+ unsigned short type;
+ struct _ffi_type **elements;
+} ffi_type;
+
+#ifndef LIBFFI_HIDE_BASIC_TYPES
+#if SCHAR_MAX == 127
+# define ffi_type_uchar ffi_type_uint8
+# define ffi_type_schar ffi_type_sint8
+#else
+ #error "char size not supported"
+#endif
+
+#if SHRT_MAX == 32767
+# define ffi_type_ushort ffi_type_uint16
+# define ffi_type_sshort ffi_type_sint16
+#elif SHRT_MAX == 2147483647
+# define ffi_type_ushort ffi_type_uint32
+# define ffi_type_sshort ffi_type_sint32
+#else
+ #error "short size not supported"
+#endif
+
+#if INT_MAX == 32767
+# define ffi_type_uint ffi_type_uint16
+# define ffi_type_sint ffi_type_sint16
+#elif INT_MAX == 2147483647
+# define ffi_type_uint ffi_type_uint32
+# define ffi_type_sint ffi_type_sint32
+#elif INT_MAX == 9223372036854775807
+# define ffi_type_uint ffi_type_uint64
+# define ffi_type_sint ffi_type_sint64
+#else
+ #error "int size not supported"
+#endif
+
+#if LONG_MAX == 2147483647
+# if FFI_LONG_LONG_MAX != FFI_64_BIT_MAX
+ #error "no 64-bit data type supported"
+# endif
+#elif LONG_MAX != FFI_64_BIT_MAX
+ #error "long size not supported"
+#endif
+
+#if LONG_MAX == 2147483647
+# define ffi_type_ulong ffi_type_uint32
+# define ffi_type_slong ffi_type_sint32
+#elif LONG_MAX == FFI_64_BIT_MAX
+# define ffi_type_ulong ffi_type_uint64
+# define ffi_type_slong ffi_type_sint64
+#else
+ #error "long size not supported"
+#endif
+
+/* Need minimal decorations for DLLs to works on Windows. */
+/* GCC has autoimport and autoexport. Rely on Libtool to */
+/* help MSVC export from a DLL, but always declare data */
+/* to be imported for MSVC clients. This costs an extra */
+/* indirection for MSVC clients using the static version */
+/* of the library, but don't worry about that. Besides, */
+/* as a workaround, they can define FFI_BUILDING if they */
+/* *know* they are going to link with the static library. */
+#if defined _MSC_VER && !defined FFI_BUILDING
+#define FFI_EXTERN extern __declspec(dllimport)
+#else
+#define FFI_EXTERN extern
+#endif
+
+/* These are defined in types.c */
+FFI_EXTERN ffi_type ffi_type_void;
+FFI_EXTERN ffi_type ffi_type_uint8;
+FFI_EXTERN ffi_type ffi_type_sint8;
+FFI_EXTERN ffi_type ffi_type_uint16;
+FFI_EXTERN ffi_type ffi_type_sint16;
+FFI_EXTERN ffi_type ffi_type_uint32;
+FFI_EXTERN ffi_type ffi_type_sint32;
+FFI_EXTERN ffi_type ffi_type_uint64;
+FFI_EXTERN ffi_type ffi_type_sint64;
+FFI_EXTERN ffi_type ffi_type_float;
+FFI_EXTERN ffi_type ffi_type_double;
+FFI_EXTERN ffi_type ffi_type_pointer;
+
+#if 1
+FFI_EXTERN ffi_type ffi_type_longdouble;
+#else
+#define ffi_type_longdouble ffi_type_double
+#endif
+#endif /* LIBFFI_HIDE_BASIC_TYPES */
+
+typedef enum {
+ FFI_OK = 0,
+ FFI_BAD_TYPEDEF,
+ FFI_BAD_ABI
+} ffi_status;
+
+typedef unsigned FFI_TYPE;
+
+typedef struct {
+ ffi_abi abi;
+ unsigned nargs;
+ ffi_type **arg_types;
+ ffi_type *rtype;
+ unsigned bytes;
+ unsigned flags;
+#ifdef FFI_EXTRA_CIF_FIELDS
+ FFI_EXTRA_CIF_FIELDS;
+#endif
+} ffi_cif;
+
+/* Used internally, but overridden by some architectures */
+ffi_status ffi_prep_cif_core(ffi_cif *cif,
+ ffi_abi abi,
+ unsigned int isvariadic,
+ unsigned int nfixedargs,
+ unsigned int ntotalargs,
+ ffi_type *rtype,
+ ffi_type **atypes);
+
+/* ---- Definitions for the raw API -------------------------------------- */
+
+#ifndef FFI_SIZEOF_ARG
+# if LONG_MAX == 2147483647
+# define FFI_SIZEOF_ARG 4
+# elif LONG_MAX == FFI_64_BIT_MAX
+# define FFI_SIZEOF_ARG 8
+# endif
+#endif
+
+#ifndef FFI_SIZEOF_JAVA_RAW
+# define FFI_SIZEOF_JAVA_RAW FFI_SIZEOF_ARG
+#endif
+
+typedef union {
+ ffi_sarg sint;
+ ffi_arg uint;
+ float flt;
+ char data[FFI_SIZEOF_ARG];
+ void* ptr;
+} ffi_raw;
+
+#if FFI_SIZEOF_JAVA_RAW == 4 && FFI_SIZEOF_ARG == 8
+/* This is a special case for mips64/n32 ABI (and perhaps others) where
+ sizeof(void *) is 4 and FFI_SIZEOF_ARG is 8. */
+typedef union {
+ signed int sint;
+ unsigned int uint;
+ float flt;
+ char data[FFI_SIZEOF_JAVA_RAW];
+ void* ptr;
+} ffi_java_raw;
+#else
+typedef ffi_raw ffi_java_raw;
+#endif
+
+
+void ffi_raw_call (ffi_cif *cif,
+ void (*fn)(void),
+ void *rvalue,
+ ffi_raw *avalue);
+
+void ffi_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw);
+void ffi_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args);
+size_t ffi_raw_size (ffi_cif *cif);
+
+/* This is analogous to the raw API, except it uses Java parameter */
+/* packing, even on 64-bit machines. I.e. on 64-bit machines */
+/* longs and doubles are followed by an empty 64-bit word. */
+
+void ffi_java_raw_call (ffi_cif *cif,
+ void (*fn)(void),
+ void *rvalue,
+ ffi_java_raw *avalue);
+
+void ffi_java_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_java_raw *raw);
+void ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_java_raw *raw, void **args);
+size_t ffi_java_raw_size (ffi_cif *cif);
+
+/* ---- Definitions for closures ----------------------------------------- */
+
+#if FFI_CLOSURES
+
+#ifdef _MSC_VER
+__declspec(align(8))
+#endif
+typedef struct {
+#if 0
+ void *trampoline_table;
+ void *trampoline_table_entry;
+#else
+ char tramp[FFI_TRAMPOLINE_SIZE];
+#endif
+ ffi_cif *cif;
+ void (*fun)(ffi_cif*,void*,void**,void*);
+ void *user_data;
+#ifdef __GNUC__
+} ffi_closure __attribute__((aligned (8)));
+#else
+} ffi_closure;
+# ifdef __sgi
+# pragma pack 0
+# endif
+#endif
+
+void *ffi_closure_alloc (size_t size, void **code);
+void ffi_closure_free (void *);
+
+ffi_status
+ffi_prep_closure (ffi_closure*,
+ ffi_cif *,
+ void (*fun)(ffi_cif*,void*,void**,void*),
+ void *user_data);
+
+ffi_status
+ffi_prep_closure_loc (ffi_closure*,
+ ffi_cif *,
+ void (*fun)(ffi_cif*,void*,void**,void*),
+ void *user_data,
+ void*codeloc);
+
+#ifdef __sgi
+# pragma pack 8
+#endif
+typedef struct {
+#if 0
+ void *trampoline_table;
+ void *trampoline_table_entry;
+#else
+ char tramp[FFI_TRAMPOLINE_SIZE];
+#endif
+ ffi_cif *cif;
+
+#if !FFI_NATIVE_RAW_API
+
+ /* if this is enabled, then a raw closure has the same layout
+ as a regular closure. We use this to install an intermediate
+ handler to do the transaltion, void** -> ffi_raw*. */
+
+ void (*translate_args)(ffi_cif*,void*,void**,void*);
+ void *this_closure;
+
+#endif
+
+ void (*fun)(ffi_cif*,void*,ffi_raw*,void*);
+ void *user_data;
+
+} ffi_raw_closure;
+
+typedef struct {
+#if 0
+ void *trampoline_table;
+ void *trampoline_table_entry;
+#else
+ char tramp[FFI_TRAMPOLINE_SIZE];
+#endif
+
+ ffi_cif *cif;
+
+#if !FFI_NATIVE_RAW_API
+
+ /* if this is enabled, then a raw closure has the same layout
+ as a regular closure. We use this to install an intermediate
+ handler to do the transaltion, void** -> ffi_raw*. */
+
+ void (*translate_args)(ffi_cif*,void*,void**,void*);
+ void *this_closure;
+
+#endif
+
+ void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*);
+ void *user_data;
+
+} ffi_java_raw_closure;
+
+ffi_status
+ffi_prep_raw_closure (ffi_raw_closure*,
+ ffi_cif *cif,
+ void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
+ void *user_data);
+
+ffi_status
+ffi_prep_raw_closure_loc (ffi_raw_closure*,
+ ffi_cif *cif,
+ void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
+ void *user_data,
+ void *codeloc);
+
+ffi_status
+ffi_prep_java_raw_closure (ffi_java_raw_closure*,
+ ffi_cif *cif,
+ void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*),
+ void *user_data);
+
+ffi_status
+ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
+ ffi_cif *cif,
+ void (*fun)(ffi_cif*,void*,ffi_java_raw*,void*),
+ void *user_data,
+ void *codeloc);
+
+#endif /* FFI_CLOSURES */
+
+/* ---- Public interface definition -------------------------------------- */
+
+ffi_status ffi_prep_cif(ffi_cif *cif,
+ ffi_abi abi,
+ unsigned int nargs,
+ ffi_type *rtype,
+ ffi_type **atypes);
+
+ffi_status ffi_prep_cif_var(ffi_cif *cif,
+ ffi_abi abi,
+ unsigned int nfixedargs,
+ unsigned int ntotalargs,
+ ffi_type *rtype,
+ ffi_type **atypes);
+
+void ffi_call(ffi_cif *cif,
+ void (*fn)(void),
+ void *rvalue,
+ void **avalue);
+
+/* Useful for eliminating compiler warnings */
+#define FFI_FN(f) ((void (*)(void))f)
+
+/* ---- Definitions shared with assembly code ---------------------------- */
+
+#endif
+
+/* If these change, update src/mips/ffitarget.h. */
+#define FFI_TYPE_VOID 0
+#define FFI_TYPE_INT 1
+#define FFI_TYPE_FLOAT 2
+#define FFI_TYPE_DOUBLE 3
+#if 1
+#define FFI_TYPE_LONGDOUBLE 4
+#else
+#define FFI_TYPE_LONGDOUBLE FFI_TYPE_DOUBLE
+#endif
+#define FFI_TYPE_UINT8 5
+#define FFI_TYPE_SINT8 6
+#define FFI_TYPE_UINT16 7
+#define FFI_TYPE_SINT16 8
+#define FFI_TYPE_UINT32 9
+#define FFI_TYPE_SINT32 10
+#define FFI_TYPE_UINT64 11
+#define FFI_TYPE_SINT64 12
+#define FFI_TYPE_STRUCT 13
+#define FFI_TYPE_POINTER 14
+
+/* This should always refer to the last type code (for sanity checks) */
+#define FFI_TYPE_LAST FFI_TYPE_POINTER
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/Versions/3.0.11/Headers/ffitarget.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libffi.framework/Versions/3.0.11/Headers/ffitarget.h Tue Oct 16 23:34:24 2012 +0200
@@ -0,0 +1,139 @@
+/* -----------------------------------------------------------------*-C-*-
+ ffitarget.h - Copyright (c) 2012 Anthony Green
+ Copyright (c) 1996-2003, 2010 Red Hat, Inc.
+ Copyright (C) 2008 Free Software Foundation, Inc.
+
+ Target configuration macros for x86 and x86-64.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ ``Software''), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+ ----------------------------------------------------------------------- */
+
+#ifndef LIBFFI_TARGET_H
+#define LIBFFI_TARGET_H
+
+#ifndef LIBFFI_H
+#error "Please do not include ffitarget.h directly into your source. Use ffi.h instead."
+#endif
+
+/* ---- System specific configurations ----------------------------------- */
+
+/* For code common to all platforms on x86 and x86_64. */
+#define X86_ANY
+
+#if defined (X86_64) && defined (__i386__)
+#undef X86_64
+#define X86
+#endif
+
+#ifdef X86_WIN64
+#define FFI_SIZEOF_ARG 8
+#define USE_BUILTIN_FFS 0 /* not yet implemented in mingw-64 */
+#endif
+
+/* ---- Generic type definitions ----------------------------------------- */
+
+#ifndef LIBFFI_ASM
+#ifdef X86_WIN64
+#ifdef _MSC_VER
+typedef unsigned __int64 ffi_arg;
+typedef __int64 ffi_sarg;
+#else
+typedef unsigned long long ffi_arg;
+typedef long long ffi_sarg;
+#endif
+#else
+#if defined __x86_64__ && !defined __LP64__
+#define FFI_SIZEOF_ARG 8
+typedef unsigned long long ffi_arg;
+typedef long long ffi_sarg;
+#else
+typedef unsigned long ffi_arg;
+typedef signed long ffi_sarg;
+#endif
+#endif
+
+typedef enum ffi_abi {
+ FFI_FIRST_ABI = 0,
+
+ /* ---- Intel x86 Win32 ---------- */
+#ifdef X86_WIN32
+ FFI_SYSV,
+ FFI_STDCALL,
+ FFI_THISCALL,
+ FFI_FASTCALL,
+ FFI_MS_CDECL,
+ FFI_LAST_ABI,
+#ifdef _MSC_VER
+ FFI_DEFAULT_ABI = FFI_MS_CDECL
+#else
+ FFI_DEFAULT_ABI = FFI_SYSV
+#endif
+
+#elif defined(X86_WIN64)
+ FFI_WIN64,
+ FFI_LAST_ABI,
+ FFI_DEFAULT_ABI = FFI_WIN64
+
+#else
+ /* ---- Intel x86 and AMD x86-64 - */
+ FFI_SYSV,
+ FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */
+ FFI_LAST_ABI,
+#if defined(__i386__) || defined(__i386)
+ FFI_DEFAULT_ABI = FFI_SYSV
+#else
+ FFI_DEFAULT_ABI = FFI_UNIX64
+#endif
+#endif
+} ffi_abi;
+#endif
+
+/* ---- Definitions for closures ----------------------------------------- */
+
+#define FFI_CLOSURES 1
+#define FFI_TYPE_SMALL_STRUCT_1B (FFI_TYPE_LAST + 1)
+#define FFI_TYPE_SMALL_STRUCT_2B (FFI_TYPE_LAST + 2)
+#define FFI_TYPE_SMALL_STRUCT_4B (FFI_TYPE_LAST + 3)
+#define FFI_TYPE_MS_STRUCT (FFI_TYPE_LAST + 4)
+
+#if defined (X86_64) || (defined (__x86_64__) && defined (X86_DARWIN))
+#define FFI_TRAMPOLINE_SIZE 24
+#define FFI_NATIVE_RAW_API 0
+#else
+#ifdef X86_WIN32
+#define FFI_TRAMPOLINE_SIZE 52
+#else
+#ifdef X86_WIN64
+#define FFI_TRAMPOLINE_SIZE 29
+#define FFI_NATIVE_RAW_API 0
+#define FFI_NO_RAW_API 1
+#else
+#define FFI_TRAMPOLINE_SIZE 10
+#endif
+#endif
+#ifndef X86_WIN64
+#define FFI_NATIVE_RAW_API 1 /* x86 has native raw api support */
+#endif
+#endif
+
+#endif
+
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/Versions/3.0.11/Resources/English.lproj/InfoPlist.strings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libffi.framework/Versions/3.0.11/Resources/English.lproj/InfoPlist.strings Tue Oct 16 23:34:24 2012 +0200
@@ -0,0 +1,3 @@
+/* Localized versions of Info.plist keys */
+
+CFBundleName = "libffi";
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/Versions/3.0.11/Resources/Info.plist
Binary file Frameworks/libffi.framework/Versions/3.0.11/Resources/Info.plist has changed
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/Versions/3.0.11/libffi
Binary file Frameworks/libffi.framework/Versions/3.0.11/libffi has changed
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/Versions/Current
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libffi.framework/Versions/Current Tue Oct 16 23:34:24 2012 +0200
@@ -0,0 +1,1 @@
+3.0.11
\ No newline at end of file
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libffi.framework/libffi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libffi.framework/libffi Tue Oct 16 23:34:24 2012 +0200
@@ -0,0 +1,1 @@
+Versions/3.0.11/libffi
\ No newline at end of file
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libglib.framework/Headers
--- a/Frameworks/libglib.framework/Headers Sun Oct 14 23:00:54 2012 +0200
+++ b/Frameworks/libglib.framework/Headers Tue Oct 16 23:34:24 2012 +0200
@@ -1,1 +1,1 @@
-Versions/2.20.5/Headers
\ No newline at end of file
+Versions/2.32.4/Headers
\ No newline at end of file
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libglib.framework/Resources
--- a/Frameworks/libglib.framework/Resources Sun Oct 14 23:00:54 2012 +0200
+++ b/Frameworks/libglib.framework/Resources Tue Oct 16 23:34:24 2012 +0200
@@ -1,1 +1,1 @@
-Versions/2.20.5/Resources
\ No newline at end of file
+Versions/2.32.4/Resources
\ No newline at end of file
diff -r 778962cfca9d -r 24a33c054027 Frameworks/libglib.framework/Versions/2.20.5/Headers/gio/gappinfo.h
--- a/Frameworks/libglib.framework/Versions/2.20.5/Headers/gio/gappinfo.h Sun Oct 14 23:00:54 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl at redhat.com>
- */
-
More information about the commits
mailing list