adium 3786:b3ef94a6ec7f: Also changed all Dependencies to 10.6+.

commits at adium.im commits at adium.im
Mon Mar 28 20:05:32 UTC 2011


details:	http://hg.adium.im/adium/rev/b3ef94a6ec7f
revision:	3786:b3ef94a6ec7f
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Mar 28 22:03:03 2011 +0200

Also changed all Dependencies to 10.6+.

 * Changed SDK to 10.6
 * Removed XCode 3 compatibility stuff from build.sh
 * Removed PPC

Additionally, removed libjson-glib (as it shouldn't be necessary without the Facebook prpl)

diffs (truncated from 1844 to 1000 lines):

diff -r 974e73ff45bb -r b3ef94a6ec7f Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Mon Mar 28 03:28:39 2011 +0300
+++ b/Adium.xcodeproj/project.pbxproj	Mon Mar 28 22:03:03 2011 +0200
@@ -162,9 +162,6 @@
 		11879C0B0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 11879C0A0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m */; };
 		11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
 		11879E0A0F6FFC1000CACFB1 /* OAuthConsumer.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
-		118A44500FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
-		118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
-		118A44540FEEA82E008153C0 /* libjson-glib.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
 		1192E6D90FD3056F003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1192E6B10FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h */; };
 		1192E6DA0FD30578003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1192E6B20FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m */; };
 		1197F6710FCF8D180032F19B /* AITwitterStatusFollowup.m in Sources */ = {isa = PBXBuildFile; fileRef = 1197F6700FCF8D180032F19B /* AITwitterStatusFollowup.m */; };
@@ -1741,7 +1738,6 @@
 				34B89479102BCDB4000ABB8E /* libgstinterfaces.framework in Copy Frameworks */,
 				34B8947A102BCDB4000ABB8E /* libgstfarsight.framework in Copy Frameworks */,
 				34B8947B102BCDB4000ABB8E /* libgstbase.framework in Copy Frameworks */,
-				118A44540FEEA82E008153C0 /* libjson-glib.framework in Copy Frameworks */,
 				633404710F9C18EF003C77A9 /* AIUtilities.framework in Copy Frameworks */,
 				639DF9D80F97E678003C9A32 /* AdiumLibpurple.framework in Copy Frameworks */,
 				11879E0A0F6FFC1000CACFB1 /* OAuthConsumer.framework in Copy Frameworks */,
@@ -4888,7 +4884,6 @@
 				811035180CDE783800EC6038 /* SecurityInterface.framework in Frameworks */,
 				633405990F9C2C00003C77A9 /* AIUtilities.framework in Frameworks */,
 				3485D8EB09EB446900232CC4 /* Adium.framework in Frameworks */,
-				118A44500FEEA828008153C0 /* libjson-glib.framework in Frameworks */,
 				34B8936C102BCDAB000ABB8E /* libgstreamer.framework in Frameworks */,
 				34B8936D102BCDAB000ABB8E /* libgstinterfaces.framework in Frameworks */,
 				34B8936E102BCDAB000ABB8E /* libgstfarsight.framework in Frameworks */,
@@ -4951,7 +4946,6 @@
 				340C1ABF0BD58FAB00D09235 /* Security.framework in Frameworks */,
 				31E0CD810C5EEF5200271DB1 /* CoreAudio.framework in Frameworks */,
 				11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */,
-				118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */,
 				34C846AF101E515900140B4B /* QTKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff -r 974e73ff45bb -r b3ef94a6ec7f Dependencies/build.sh
--- a/Dependencies/build.sh	Mon Mar 28 03:28:39 2011 +0300
+++ b/Dependencies/build.sh	Mon Mar 28 22:03:03 2011 +0200
@@ -17,30 +17,15 @@
 TARGET_BASE="apple-darwin10"
 
 # Arrays for archs and host systems, sometimes an -arch just isnt enough!
-ARCHS=( "x86_64" "i386" "ppc" )
-HOSTS=( "x86_64-${TARGET_BASE}" "i686-${TARGET_BASE}" "powerpc-${TARGET_BASE}" )
+ARCHS=( "x86_64" "i386" )
+HOSTS=( "x86_64-${TARGET_BASE}" "i686-${TARGET_BASE}" )
 NUMBER_OF_CORES=`sysctl -n hw.activecpu`
 
 # Also try /Developer-old, just in case XCode 4 is installed
 DEVELOPER="/Developer"
-SDK_ROOT="${DEVELOPER}/SDKs/MacOSX10.5.sdk"
+SDK_ROOT="${DEVELOPER}/SDKs/MacOSX10.6.sdk"
 
-if ! [ -d $SDK_ROOT ];
-then
-	warning "10.5 SDK not found in /Developer. You probably have installed XCode4. Trying /Developer-old..."
-	DEVELOPER="/Developer-old"
-	SDK_ROOT="${DEVELOPER}/SDKs/MacOSX10.5.sdk"
-	
-	if ! [ -d $SDK_ROOT ];
-	then
-		error "10.5 SDK not found!"
-		exit 1
-	else
-		warning "found!"
-	fi
-fi
-
-MIN_OS_VERSION="10.5"
+MIN_OS_VERSION="10.6"
 BASE_CFLAGS="-fstack-protector -isysroot $SDK_ROOT \
 	-mmacosx-version-min=$MIN_OS_VERSION \
 	-I$ROOTDIR/build/include \
@@ -99,10 +84,6 @@
 			remove_arch "i386"
 			warning "i386 target removed! libpurple will not be universal!"
 			;;
-		--disable-ppc)
-			remove_arch "ppc"
-			warning "ppc target removed! Libpurple will not be universal!"
-			;;
 		--build-native) 
 			unset ARCHS; ARCHS=""
 			unset HOSTS; HOSTS=""
@@ -226,7 +207,6 @@
 	   build_meanwhile $@
 
     	build_intltool $@
-    	build_jsonglib $@
 
     	build_gstreamer $@
     	build_farsight $@
diff -r 974e73ff45bb -r b3ef94a6ec7f Dependencies/phases/build_dependencies.sh
--- a/Dependencies/phases/build_dependencies.sh	Mon Mar 28 03:28:39 2011 +0300
+++ b/Dependencies/phases/build_dependencies.sh	Mon Mar 28 22:03:03 2011 +0200
@@ -202,39 +202,4 @@
 	log make install
 	
 	quiet popd
-}
-
-##
-# json-glib
-#
-JSON_GLIB_VERSION=1.0
-build_jsonglib() {
-	prereq "json-glib-0.9.2" \
-		"http://ftp.gnome.org/pub/GNOME/sources/json-glib/0.9/json-glib-0.9.2.tar.gz"
-	
-	quiet pushd "$ROOTDIR/source/json-glib-0.9.2"
-	
-	if needsconfigure $@; then
-	(
-		status "Configuring json-glib"
-		export CFLAGS="$ARCH_CFLAGS"
-		export LDFLAGS="$ARCH_LDFLAGS"
-		export GLIB_LIBS="$ROOTDIR/build/lib"
-		export GLIB_CFLAGS="-I$ROOTDIR/build/include/glib-2.0 \
-			-I$ROOTDIR/build/lib/glib-2.0/include"
-		log ./configure \
-				--prefix="$ROOTDIR/build" \
-				--disable-dependency-tracking
-	)
-	fi
-	
-	status "Building and installing json-glib"
-	log make -j $NUMBER_OF_CORES
-	log make install
-	
-	# C'mon, why do you make me do this?
-	log ln -fs "$ROOTDIR/build/include/json-glib-1.0/json-glib" \
-		"$ROOTDIR/build/include/json-glib"
-	
-	quiet popd
-}
+}
\ No newline at end of file
diff -r 974e73ff45bb -r b3ef94a6ec7f Dependencies/phases/build_purple.sh
--- a/Dependencies/phases/build_purple.sh	Mon Mar 28 03:28:39 2011 +0300
+++ b/Dependencies/phases/build_purple.sh	Mon Mar 28 22:03:03 2011 +0200
@@ -123,7 +123,7 @@
 				$KERBEROS"
 		xconfigure "$BASE_CFLAGS -I/usr/include/kerberosIV -DHAVE_SSL \
 			        -DHAVE_OPENSSL -fno-common -DHAVE_ZLIB" \
-			"$BASE_LDFLAGS -lsasl2 -ljson-glib-1.0 -lz" \
+			"$BASE_LDFLAGS -lsasl2 -lz" \
 			"${CONFIG_CMD}" \
 			"${ROOTDIR}/source/im.pidgin.adium/libpurple/purple.h" \
 			"${ROOTDIR}/source/im.pidgin.adium/config.h"
diff -r 974e73ff45bb -r b3ef94a6ec7f Dependencies/phases/make_frameworks.sh
--- a/Dependencies/phases/make_frameworks.sh	Mon Mar 28 03:28:39 2011 +0300
+++ b/Dependencies/phases/make_frameworks.sh	Mon Mar 28 22:03:03 2011 +0200
@@ -55,13 +55,6 @@
 		quiet mkdir "${meanwhileDir}" || true
 		touch "${meanwhileDir}/no_headers_here.txt"
 		
-		#json-glib
-		status "Staging json-glib headers"
-		local jsonDir="${ROOTDIR}/build/lib/include/libjson-glib-${JSON_GLIB_VERSION}.0"
-		quiet rm -r "${jsonDir}" || true
-		quiet mkdir "${jsonDir}" || true
-		log cp -R "${ROOTDIR}/build/include/json-glib-${JSON_GLIB_VERSION}/json-glib" "${jsonDir}"
-		
 		## VV stuff
 		
 		#gstreamer
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig.h	Mon Mar 28 03:28:39 2011 +0300
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig.h	Mon Mar 28 22:03:03 2011 +0200
@@ -449,233 +449,6 @@
 G_END_DECLS
 
 #endif /* GLIBCONFIG_H */
-#elif defined (__ppc__)
-/* glibconfig.h
- *
- * This is a generated file.  Please modify 'configure.in'
- */
-
-#ifndef __G_LIBCONFIG_H__
-#define __G_LIBCONFIG_H__
-
-#include <glib/gmacros.h>
-
-#include <limits.h>
-#include <float.h>
-#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
-#define G_MAXFLOAT	FLT_MAX
-#define G_MINDOUBLE	DBL_MIN
-#define G_MAXDOUBLE	DBL_MAX
-#define G_MINSHORT	SHRT_MIN
-#define G_MAXSHORT	SHRT_MAX
-#define G_MAXUSHORT	USHRT_MAX
-#define G_MININT	INT_MIN
-#define G_MAXINT	INT_MAX
-#define G_MAXUINT	UINT_MAX
-#define G_MINLONG	LONG_MIN
-#define G_MAXLONG	LONG_MAX
-#define G_MAXULONG	ULONG_MAX
-
-typedef signed char gint8;
-typedef unsigned char guint8;
-typedef signed short gint16;
-typedef unsigned short guint16;
-#define G_GINT16_MODIFIER "h"
-#define G_GINT16_FORMAT "hi"
-#define G_GUINT16_FORMAT "hu"
-typedef signed int gint32;
-typedef unsigned int guint32;
-#define G_GINT32_MODIFIER ""
-#define G_GINT32_FORMAT "i"
-#define G_GUINT32_FORMAT "u"
-#define G_HAVE_GINT64 1          /* deprecated, always true */
-
-G_GNUC_EXTENSION typedef signed long long gint64;
-G_GNUC_EXTENSION typedef unsigned long long guint64;
-
-#define G_GINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##LL))
-#define G_GUINT64_CONSTANT(val)	(G_GNUC_EXTENSION (val##ULL))
-#define G_GINT64_MODIFIER "ll"
-#define G_GINT64_FORMAT "lli"
-#define G_GUINT64_FORMAT "llu"
-
-#define GLIB_SIZEOF_VOID_P 4
-#define GLIB_SIZEOF_LONG   4
-#define GLIB_SIZEOF_SIZE_T 4
-
-typedef signed long gssize;
-typedef unsigned long gsize;
-#define G_GSIZE_MODIFIER "l"
-#define G_GSSIZE_FORMAT "li"
-#define G_GSIZE_FORMAT "lu"
-
-#define G_MAXSIZE	G_MAXULONG
-#define G_MINSSIZE	G_MINLONG
-#define G_MAXSSIZE	G_MAXLONG
-
-typedef gint64 goffset;
-#define G_MINOFFSET	G_MININT64
-#define G_MAXOFFSET	G_MAXINT64
-
-#define G_GOFFSET_MODIFIER      G_GINT64_MODIFIER
-#define G_GOFFSET_FORMAT        G_GINT64_FORMAT
-#define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val)
-
-
-#define GPOINTER_TO_INT(p)	((gint)   (p))
-#define GPOINTER_TO_UINT(p)	((guint)  (p))
-
-#define GINT_TO_POINTER(i)	((gpointer)  (i))
-#define GUINT_TO_POINTER(u)	((gpointer)  (u))
-
-typedef signed int gintptr;
-typedef unsigned int guintptr;
-
-#ifdef NeXT /* @#%@! NeXTStep */
-# define g_ATEXIT(proc)	(!atexit (proc))
-#else
-# define g_ATEXIT(proc)	(atexit (proc))
-#endif
-
-#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END
-
-#define GLIB_MAJOR_VERSION 2
-#define GLIB_MINOR_VERSION 20
-#define GLIB_MICRO_VERSION 5
-
-#define G_OS_UNIX
-
-
-#define G_VA_COPY	va_copy
-
-#ifdef	__cplusplus
-#define	G_HAVE_INLINE	1
-#else	/* !__cplusplus */
-#define G_HAVE_INLINE 1
-#define G_HAVE___INLINE 1
-#define G_HAVE___INLINE__ 1
-#endif	/* !__cplusplus */
-
-#ifdef	__cplusplus
-#define G_CAN_INLINE	1
-#else	/* !__cplusplus */
-#define G_CAN_INLINE	1
-#endif
-
-#ifndef __cplusplus
-# define G_HAVE_ISO_VARARGS 1
-#endif
-#ifdef __cplusplus
-# define G_HAVE_ISO_VARARGS 1
-#endif
-
-/* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi
- * is passed ISO vararg support is turned off, and there is no work
- * around to turn it on, so we unconditionally turn it off.
- */
-#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
-#  undef G_HAVE_ISO_VARARGS
-#endif
-
-#define G_HAVE_GNUC_VARARGS 1
-#define G_HAVE_GROWING_STACK 0
-
-#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
-#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-#define G_GNUC_INTERNAL __hidden
-#elif defined (__GNUC__) && defined (G_HAVE_GNUC_VISIBILITY)
-#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
-#else
-#define G_GNUC_INTERNAL
-#endif
-
-#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)))
-/* 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
- * for some of our native implementations. */
-typedef union _GSystemThread GSystemThread;
-union _GSystemThread
-{
-  char   data[4];
-  double dummy_double;
-  void  *dummy_pointer;
-  long   dummy_long;
-};
-
-#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 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))
-#define GULONG_TO_BE(val)	((gulong) GUINT32_TO_BE (val))
-#define GINT_TO_LE(val)		((gint) GINT32_TO_LE (val))
-#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 GLIB_SYSDEF_POLLIN =1
-#define GLIB_SYSDEF_POLLOUT =4
-#define GLIB_SYSDEF_POLLPRI =2
-#define GLIB_SYSDEF_POLLHUP =16
-#define GLIB_SYSDEF_POLLERR =8
-#define GLIB_SYSDEF_POLLNVAL =32
-
-#define G_MODULE_SUFFIX "so"
-
-/* A GPid is an abstraction for a process "handle". It is *not* an
- * abstraction for a process identifier in general. GPid is used in
- * GLib only for descendant processes spawned with the g_spawn*
- * functions. On POSIX there is no "process handle" concept as such,
- * but on Windows a GPid is a handle to a process, a kind of pointer,
- * not a process identifier.
- */
-typedef int GPid;
-
-G_END_DECLS
-
-#endif /* GLIBCONFIG_H */
 #else
 #error This isn't a recognized platform.
 #endif
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstapp.framework/Versions/0.10.0/libgstapp
Binary file Frameworks/libgstapp.framework/Versions/0.10.0/libgstapp has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstaudio.framework/Versions/0.10.0/libgstaudio
Binary file Frameworks/libgstaudio.framework/Versions/0.10.0/libgstaudio has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstbase.framework/Versions/0.10.0/libgstbase
Binary file Frameworks/libgstbase.framework/Versions/0.10.0/libgstbase has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstcontroller.framework/Versions/0.10.0/libgstcontroller
Binary file Frameworks/libgstcontroller.framework/Versions/0.10.0/libgstcontroller has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstdataprotocol.framework/Versions/0.10.0/libgstdataprotocol
Binary file Frameworks/libgstdataprotocol.framework/Versions/0.10.0/libgstdataprotocol has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstfarsight.framework/Versions/0.10.0/libgstfarsight
Binary file Frameworks/libgstfarsight.framework/Versions/0.10.0/libgstfarsight has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstinterfaces.framework/Versions/0.10.0/libgstinterfaces
Binary file Frameworks/libgstinterfaces.framework/Versions/0.10.0/libgstinterfaces has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstnet.framework/Versions/0.10.0/libgstnet
Binary file Frameworks/libgstnet.framework/Versions/0.10.0/libgstnet has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstnetbuffer.framework/Versions/0.10.0/libgstnetbuffer
Binary file Frameworks/libgstnetbuffer.framework/Versions/0.10.0/libgstnetbuffer has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libfsfunnel.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsfunnel.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libfsmsnconference.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsmsnconference.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libfsrtcpfilter.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsrtcpfilter.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libfsrtpconference.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsrtpconference.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libfsselector.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsselector.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libfsvideoanyrate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsvideoanyrate.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstadder.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstadder.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstalaw.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstalaw.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstapp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstapp.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstaudiorate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudiorate.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstaudioresample.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudioresample.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstautodetect.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstautodetect.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstcoreelements.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstcoreelements.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstcoreindexers.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstcoreindexers.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstffmpegcolorspace.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstffmpegcolorspace.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstjrtp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstjrtp.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstlevel.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstlevel.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstmulaw.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstmulaw.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstnetsim.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstnetsim.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstnice.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstnice.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstosxaudio.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstosxaudio.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstosxvideosink.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstosxvideosink.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstrtpdemux.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpdemux.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstrtpjitterbuffer.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpjitterbuffer.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstrtpmanager.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpmanager.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstrtppayloads.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtppayloads.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstrtsp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtsp.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgsttcp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsttcp.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgsttypefindfunctions.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsttypefindfunctions.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstudp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstudp.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstvideobox.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideobox.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstvideocrop.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideocrop.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstvideomixer.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideomixer.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstvideorate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideorate.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstvideoscale.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideoscale.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/PlugIns/libgstvolume.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvolume.so has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/Versions/0.10.0/Headers/gst/gstconfig.h
--- a/Frameworks/libgstreamer.framework/Versions/0.10.0/Headers/gst/gstconfig.h	Mon Mar 28 03:28:39 2011 +0300
+++ b/Frameworks/libgstreamer.framework/Versions/0.10.0/Headers/gst/gstconfig.h	Mon Mar 28 22:03:03 2011 +0200
@@ -462,238 +462,6 @@
 #endif
 
 #endif /* __GST_CONFIG_H__ */
-#elif defined (__ppc__)
-/* GStreamer
- * Copyright (C) 1999,2000 Erik Walthinsen <omega at cse.ogi.edu>
- *               2004,2005 Wim Taymans <wim at fluendo.com>
- *
- * gstconfig.h: GST_DISABLE_* macros for build configuration
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library 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.
- */
-
-/**
- * SECTION:gstconfig
- * @short_description: Build configuration options
- *
- * This describes the configuration options for GStreamer. When building
- * GStreamer there are a lot of parts (known internally as "subsystems" ) that
- * can be disabled for various reasons. The most common reasons are speed and
- * size, which is important because GStreamer is designed to run on embedded
- * systems.
- *
- * If a subsystem is disabled, most of this changes are done in an API
- * compatible way, so you don't need to adapt your code in most cases. It is
- * never done in an ABI compatible way though. So if you want to disable a
- * suybsystem, you have to rebuild all programs depending on GStreamer, too.
- *
- * If a subsystem is disabled in GStreamer, a value is defined in
- * <gst/gst.h>. You can check this if you do subsystem-specific stuff.
- * <example id="example-gstconfig">
- * <title>Doing subsystem specific things</title>
- * <programlisting>
- * &hash;ifndef GST_DISABLE_GST_DEBUG
- * // do stuff specific to the debugging subsystem
- * &hash;endif // GST_DISABLE_GST_DEBUG
- * </programlisting>
- * </example>
- */
-
-#ifndef __GST_CONFIG_H__
-#define __GST_CONFIG_H__
-
-/* trick gtk-doc into believing these symbols are defined (yes, it's ugly) */
-
-#if 0
-#define GST_DISABLE_GST_DEBUG 1
-#define GST_DISABLE_LOADSAVE 1
-#define GST_DISABLE_PARSE 1
-#define GST_DISABLE_TRACE 1
-#define GST_DISABLE_ALLOC_TRACE 1
-#define GST_DISABLE_REGISTRY 1
-#define GST_DISABLE_PLUGIN 1
-#define GST_DISABLE_XML 1
-#define GST_DISABLE_LOADSAVE_REGISTRY 1
-#define GST_HAVE_GLIB_2_8 1
-#endif
-
-/***** default padding of structures *****/
-#define GST_PADDING		4
-#define GST_PADDING_INIT	{ NULL }
-
-/***** padding for very extensible base classes *****/
-#define GST_PADDING_LARGE	20
-
-/***** disabling of subsystems *****/
-
-/**
- * GST_DISABLE_GST_DEBUG:
- *
- * Configures the inclusion of the debugging subsystem
- */
-/* #undef GST_DISABLE_GST_DEBUG */
-
-/**
- * GST_DISABLE_LOADSAVE:
- *
- * Configures the inclusion of the plugin graph xml-serialisation
- * (was used in 0.8 by gst-editor)
- */
-/* #undef GST_DISABLE_LOADSAVE */
-
-/**
- * GST_DISABLE_PARSE:
- *
- * Configures the inclusion of the gst-lauch parser
- */
-/* #undef GST_DISABLE_PARSE */
-
-/**
- * GST_DISABLE_TRACE:
- *
- * Configures the inclusion of a resource tracing facillity
- * (seems to be unused)
- */
-/* #undef GST_DISABLE_TRACE */
-
-/**
- * GST_DISABLE_ALLOC_TRACE:
- *
- * Configures the use of a memory tracer based on the resource tracer
- * if TRACE is disabled, ALLOC_TRACE is disabled as well
- */
-/* #undef GST_DISABLE_ALLOC_TRACE */
-
-/**
- * GST_DISABLE_REGISTRY:
- *
- * Configures the use of the plugin registry.
- * If one disables this, required plugins need to be loaded and registered
- * manually
- */
-/* #undef GST_DISABLE_REGISTRY */
-
-/**
- * GST_DISABLE_XML:
- *
- * Configures the use libxml2. This setting is derived from the settings of
- * %GST_DISABLE_LOADSAVE and %GST_DISABLE_REGISTRY (in the xml registry case).
- */
-/* #undef GST_DISABLE_XML */
-
-/* FIXME: test and document these! */
-/* Configures the use of external plugins */
-/* #undef GST_DISABLE_PLUGIN */
-
-/* printf extension format */
-/**
- * GST_PTR_FORMAT:
- *
- * printf format type used to debug GStreamer types.
- * This can only be used on types whose size is >= sizeof(gpointer).
- */
-#define GST_PTR_FORMAT "p"
-/**
- * GST_SEGMENT_FORMAT:
- *
- * printf format type used to debug GStreamer segments.
- * This can only be used on pointers to GstSegment structures.
- *
- * Since: 0.10.10
- */
-#define GST_SEGMENT_FORMAT "p"
-
-/* whether or not GST_PTR_FORMAT or GST_SEGMENT_FORMAT are using
- * the printf extension mechanism. This is for internal use in our
- * header files so we know whether we can use G_GNUC_PRINTF or not */
-#undef GST_USING_PRINTF_EXTENSION
-
-/* GST_DISABLE_PRINTF_EXTENSION:
- *
- * Define this to debug your debug log messages and make gcc spew warnings
- * if printf format string and arguments don't match up (this is usually
- * not the case when libc and gcc are used because printf format warnings
- * have to be disabled when the printf extension mechanism is in use).
- *
- * Note that using this option disables 'pretty logging' of GStreamer objects
- * like caps, tags, structures, events, pads etc., so that only their address
- * will be printed in the log.
- *
- * This define only disables use of the special registered printf format
- * extensions in the code compiled with it defined. It does not stop
- * GStreamer from registering these extensions in the first place if it
- * was compiled against a libc that supports this.
- *
- * (not official API)
- */
-#ifdef GST_DISABLE_PRINTF_EXTENSION
-  #undef GST_PTR_FORMAT
-  #define GST_PTR_FORMAT "p"
-  #undef GST_SEGMENT_FORMAT
-  #define GST_SEGMENT_FORMAT "p"
-  #undef GST_USING_PRINTF_EXTENSION
-#endif
-
-/* whether or not the CPU supports unaligned access */
-#define GST_HAVE_UNALIGNED_ACCESS 1
-
-/* FIXME: 0.11 (remove)
- * whether or not we are using glib 2.8 api, e.g. atomic gobject
- * refcounting */
-#define GST_HAVE_GLIB_2_8 1
-
-/***** Deal with XML stuff, we have to handle both loadsave and registry *****/
-/* FIXME: move include to where we need it */
-/*#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )*/
-#ifndef GST_DISABLE_XML
-# include <libxml/parser.h>
-#else
-  /* FIXME: 0.11 (replace by GST_DISABLE_XML) */
-# define GST_DISABLE_LOADSAVE_REGISTRY
-#endif
-
-/**
- * GST_EXPORT:
- *
- * Export the given variable from the built shared object.
- *
- * On Windows, this exports the variable from the DLL.
- * On other platforms, this gets defined to "extern".
- */
-/**
- * GST_PLUGIN_EXPORT:
- *
- * Export the plugin's definition.
- *
- * On Windows, this exports the plugin definition from the DLL.
- * On other platforms, this gets defined as a no-op.
- */
-#ifdef _MSC_VER
-#define GST_PLUGIN_EXPORT __declspec(dllexport) extern
-#ifdef GST_EXPORTS
-#define GST_EXPORT __declspec(dllexport) extern
-#else
-#define GST_EXPORT __declspec(dllimport) extern
-#endif
-#else /* not _MSC_VER */
-#define GST_PLUGIN_EXPORT
-#define GST_EXPORT extern
-#endif
-
-#endif /* __GST_CONFIG_H__ */
 #else
 #error This isn't a recognized platform.
 #endif
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstreamer.framework/Versions/0.10.0/libgstreamer
Binary file Frameworks/libgstreamer.framework/Versions/0.10.0/libgstreamer has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstrtp.framework/Versions/0.10.0/libgstrtp
Binary file Frameworks/libgstrtp.framework/Versions/0.10.0/libgstrtp has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstrtsp.framework/Versions/0.10.0/libgstrtsp
Binary file Frameworks/libgstrtsp.framework/Versions/0.10.0/libgstrtsp has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstsdp.framework/Versions/0.10.0/libgstsdp
Binary file Frameworks/libgstsdp.framework/Versions/0.10.0/libgstsdp has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgsttag.framework/Versions/0.10.0/libgsttag
Binary file Frameworks/libgsttag.framework/Versions/0.10.0/libgsttag has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgstvideo.framework/Versions/0.10.0/libgstvideo
Binary file Frameworks/libgstvideo.framework/Versions/0.10.0/libgstvideo has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libjson-glib.framework/Headers
--- a/Frameworks/libjson-glib.framework/Headers	Mon Mar 28 03:28:39 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Versions/1.0.0/Headers
\ No newline at end of file
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libjson-glib.framework/Resources
--- a/Frameworks/libjson-glib.framework/Resources	Mon Mar 28 03:28:39 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Versions/1.0.0/Resources
\ No newline at end of file
diff -r 974e73ff45bb -r b3ef94a6ec7f 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 Mar 28 03:28:39 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
-#ifndef __JSON_ENUM_TYPES_H__
-#define __JSON_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "../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 "../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())
-
-G_END_DECLS
-
-#endif /* !__JSON_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-generator.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-generator.h	Mon Mar 28 03:28:39 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/* json-generator.h - JSON streams generator
- * 
- * This file is part of JSON-GLib
- * Copyright (C) 2007  OpenedHand Ltd.
- * Copyright (C) 2009  Intel Corp.
- *
- * 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.1 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Emmanuele Bassi  <ebassi at linux.intel.com>
- */
-
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
-#ifndef __JSON_GENERATOR_H__
-#define __JSON_GENERATOR_H__
-
-#include <json-glib/json-types.h>
-
-G_BEGIN_DECLS
-
-#define JSON_TYPE_GENERATOR             (json_generator_get_type ())
-#define JSON_GENERATOR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), JSON_TYPE_GENERATOR, JsonGenerator))
-#define JSON_IS_GENERATOR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), JSON_TYPE_GENERATOR))
-#define JSON_GENERATOR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), JSON_TYPE_GENERATOR, JsonGeneratorClass))
-#define JSON_IS_GENERATOR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), JSON_TYPE_GENERATOR))
-#define JSON_GENERATOR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), JSON_TYPE_GENERATOR, JsonGeneratorClass))
-
-typedef struct _JsonGenerator           JsonGenerator;
-typedef struct _JsonGeneratorPrivate    JsonGeneratorPrivate;
-typedef struct _JsonGeneratorClass      JsonGeneratorClass;
-
-/**
- * JsonGenerator:
- *
- * JSON data streams generator. The contents of the #JsonGenerator structure
- * are private and should only be accessed via the provided API.
- */
-struct _JsonGenerator
-{
-  /*< private >*/
-  GObject parent_instance;
-
-  JsonGeneratorPrivate *priv;
-};
-
-/**
- * JsonGeneratorClass:
- *
- * #JsonGenerator class
- */
-struct _JsonGeneratorClass
-{
-  /*< private >*/
-  GObjectClass parent_class;
-
-  /* padding, for future expansion */
-  void (* _json_reserved1) (void);
-  void (* _json_reserved2) (void);
-  void (* _json_reserved3) (void);
-  void (* _json_reserved4) (void);
-};
-
-GType json_generator_get_type (void) G_GNUC_CONST;
-
-JsonGenerator *json_generator_new (void);
-gchar *        json_generator_to_data  (JsonGenerator  *generator,
-                                        gsize          *length);
-gboolean       json_generator_to_file  (JsonGenerator  *generator,
-                                        const gchar    *filename,
-                                        GError        **error);
-void           json_generator_set_root (JsonGenerator  *generator,
-                                        JsonNode       *node);
-
-G_END_DECLS
-
-#endif /* __JSON_GENERATOR_H__ */
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib.h	Mon Mar 28 03:28:39 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/* json-glib.h: Main header
- *
- * This file is part of JSON-GLib
- * Copyright (C) 2007  OpenedHand Ltd.
- * Copyright (C) 2009  Intel Corp.
- *
- * 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.1 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Emmanuele Bassi  <ebassi at linux.intel.com>
- */
-
-#ifndef __JSON_GLIB_H__
-#define __JSON_GLIB_H__
-
-#define __JSON_GLIB_INSIDE__
-
-#include <json-glib/json-types.h>
-#include <json-glib/json-generator.h>
-#include <json-glib/json-parser.h>
-#include <json-glib/json-version.h>
-#include <json-glib/json-enum-types.h>
-
-#include <json-glib/json-gobject.h>
-
-#undef __JSON_GLIB_INSIDE__
-
-#endif /* __JSON_GLIB_H__ */
diff -r 974e73ff45bb -r b3ef94a6ec7f Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-gobject.h	Mon Mar 28 03:28:39 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,154 +0,0 @@
-/* json-gobject.h - JSON GObject integration
- * 
- * This file is part of JSON-GLib
- * Copyright (C) 2007  OpenedHand Ltd.
- * Copyright (C) 2009  Intel Corp.
- *
- * 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.1 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, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- *   Emmanuele Bassi  <ebassi at linux.intel.com>
- */
-
-#ifndef __JSON_GOBJECT_H__
-#define __JSON_GOBJECT_H__
-
-#include <json-glib/json-types.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define JSON_TYPE_SERIALIZABLE                  (json_serializable_get_type ())
-#define JSON_SERIALIZABLE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), JSON_TYPE_SERIALIZABLE, JsonSerializable))
-#define JSON_IS_SERIALIZABLE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), JSON_TYPE_SERIALIZABLE))
-#define JSON_SERIALIZABLE_GET_IFACE(obj)        (G_TYPE_INSTANCE_GET_INTERFACE ((obj), JSON_TYPE_SERIALIZABLE, JsonSerializableIface))
-
-typedef struct _JsonSerializable        JsonSerializable; /* dummy */
-typedef struct _JsonSerializableIface   JsonSerializableIface;
-
-/**
- * JsonSerializableIface:
- * @serialize_property: virtual function for serializing a #GObject property
- *   into a #JsonNode
- * @deserialize_property: virtual function for deserializing a #JsonNode
- *   into a #GObject property
- *
- * Interface that allows serializing and deserializing #GObject<!-- -->s
- * with properties storing complex data types. The json_serialize_gobject()
- * function will check if the passed #GObject implements this interface,
- * so it can also be used to override the default property serialization
- * sequence.
- */
-struct _JsonSerializableIface
-{




More information about the commits mailing list