adium 3764:2d0c99ebdab9: libpurple 2.7.11 [im.pidgin.adium @ ab0...
commits at adium.im
commits at adium.im
Fri Mar 18 11:22:16 UTC 2011
details: http://hg.adium.im/adium/rev/2d0c99ebdab9
revision: 3764:2d0c99ebdab9
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Fri Mar 18 12:21:25 2011 +0100
libpurple 2.7.11 [im.pidgin.adium @ ab088877a85248be87a95a3b3357c96f79865806]
Correct the merge with i.p.a.1-4 by removing X-FACEBOOK-PLATFORM, fixing a crash on startup.
Also, libpurple has i386 and ppc again.
diffs (332 lines):
diff -r eab533d47ea6 -r 2d0c99ebdab9 Dependencies/phases/build_purple.sh
--- a/Dependencies/phases/build_purple.sh Fri Mar 18 02:37:02 2011 +0100
+++ b/Dependencies/phases/build_purple.sh Fri Mar 18 12:21:25 2011 +0100
@@ -156,6 +156,7 @@
"$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/iq.h" \
"$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/namespaces.h" \
"$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/irc/irc.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/lib/libgadu.h" \
"$ROOTDIR/build/include/libpurple"
quiet popd
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstapp.framework/Versions/0.10.0/libgstapp
Binary file Frameworks/libgstapp.framework/Versions/0.10.0/libgstapp has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstaudio.framework/Versions/0.10.0/libgstaudio
Binary file Frameworks/libgstaudio.framework/Versions/0.10.0/libgstaudio has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstbase.framework/Versions/0.10.0/libgstbase
Binary file Frameworks/libgstbase.framework/Versions/0.10.0/libgstbase has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstcontroller.framework/Versions/0.10.0/libgstcontroller
Binary file Frameworks/libgstcontroller.framework/Versions/0.10.0/libgstcontroller has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstdataprotocol.framework/Versions/0.10.0/libgstdataprotocol
Binary file Frameworks/libgstdataprotocol.framework/Versions/0.10.0/libgstdataprotocol has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstfarsight.framework/Versions/0.10.0/libgstfarsight
Binary file Frameworks/libgstfarsight.framework/Versions/0.10.0/libgstfarsight has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstinterfaces.framework/Versions/0.10.0/libgstinterfaces
Binary file Frameworks/libgstinterfaces.framework/Versions/0.10.0/libgstinterfaces has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstnet.framework/Versions/0.10.0/libgstnet
Binary file Frameworks/libgstnet.framework/Versions/0.10.0/libgstnet has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstnetbuffer.framework/Versions/0.10.0/libgstnetbuffer
Binary file Frameworks/libgstnetbuffer.framework/Versions/0.10.0/libgstnetbuffer has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libfsfunnel.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsfunnel.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libfsmsnconference.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsmsnconference.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libfsrtcpfilter.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsrtcpfilter.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libfsrtpconference.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsrtpconference.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libfsvideoanyrate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsvideoanyrate.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstadder.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstadder.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstalaw.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstalaw.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstapp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstapp.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstaudiorate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudiorate.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstaudioresample.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudioresample.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstautodetect.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstautodetect.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstcoreelements.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstcoreelements.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstcoreindexers.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstcoreindexers.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstffmpegcolorspace.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstffmpegcolorspace.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstlevel.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstlevel.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstmulaw.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstmulaw.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstosxaudio.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstosxaudio.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstosxvideosink.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstosxvideosink.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstrtpmanager.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpmanager.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstrtsp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtsp.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgsttcp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsttcp.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgsttypefindfunctions.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsttypefindfunctions.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstudp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstudp.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstvideobox.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideobox.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstvideocrop.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideocrop.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstvideomixer.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideomixer.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstvideorate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideorate.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstvideoscale.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideoscale.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/PlugIns/libgstvolume.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvolume.so has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstreamer.framework/Versions/0.10.0/libgstreamer
Binary file Frameworks/libgstreamer.framework/Versions/0.10.0/libgstreamer has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstrtp.framework/Versions/0.10.0/libgstrtp
Binary file Frameworks/libgstrtp.framework/Versions/0.10.0/libgstrtp has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstrtsp.framework/Versions/0.10.0/libgstrtsp
Binary file Frameworks/libgstrtsp.framework/Versions/0.10.0/libgstrtsp has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstsdp.framework/Versions/0.10.0/libgstsdp
Binary file Frameworks/libgstsdp.framework/Versions/0.10.0/libgstsdp has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgsttag.framework/Versions/0.10.0/libgsttag
Binary file Frameworks/libgsttag.framework/Versions/0.10.0/libgsttag has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libgstvideo.framework/Versions/0.10.0/libgstvideo
Binary file Frameworks/libgstvideo.framework/Versions/0.10.0/libgstvideo has changed
diff -r eab533d47ea6 -r 2d0c99ebdab9 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 eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libpurple.framework/Versions/0.7.11/Headers/purple.h
--- a/Frameworks/libpurple.framework/Versions/0.7.11/Headers/purple.h Fri Mar 18 02:37:02 2011 +0100
+++ b/Frameworks/libpurple.framework/Versions/0.7.11/Headers/purple.h Fri Mar 18 12:21:25 2011 +0100
@@ -1,3 +1,4 @@
+#if defined (__x86_64__)
/**
* @file purple.h Header files and defines
* This file contains all the necessary preprocessor directives to include
@@ -103,3 +104,218 @@
#include <xmlnode.h>
#endif
+#elif defined (__i386__)
+/**
+ * @file purple.h Header files and defines
+ * This file contains all the necessary preprocessor directives to include
+ * libpurple's headers and other preprocessor directives required for plugins
+ * or UIs to build. Including this file eliminates the need to directly
+ * include any other libpurple files.
+ *
+ * @ingroup core libpurple
+ * @since 2.3.0
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+ */
+
+#ifndef _PURPLE_PURPLE_H_
+#define _PURPLE_PURPLE_H_
+
+#include <glib.h>
+
+#ifndef G_GNUC_NULL_TERMINATED
+# if __GNUC__ >= 4
+# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+# else
+# define G_GNUC_NULL_TERMINATED
+# endif
+#endif
+
+#undef PURPLE_PLUGINS
+
+#include <account.h>
+#include <accountopt.h>
+#include <blist.h>
+#include <buddyicon.h>
+#include <certificate.h>
+#include <cipher.h>
+#include <circbuffer.h>
+#include <cmds.h>
+#include <connection.h>
+#include <conversation.h>
+#include <core.h>
+#include <debug.h>
+#include <desktopitem.h>
+#include <dnsquery.h>
+#include <dnssrv.h>
+#include <eventloop.h>
+#include <ft.h>
+#include <idle.h>
+#include <imgstore.h>
+#include <log.h>
+#include <media.h>
+#include <mediamanager.h>
+#include <mime.h>
+#include <nat-pmp.h>
+#include <network.h>
+#include <notify.h>
+#include <ntlm.h>
+#include <plugin.h>
+#include <pluginpref.h>
+#include <pounce.h>
+#include <prefs.h>
+#include <privacy.h>
+#include <proxy.h>
+#include <prpl.h>
+#include <request.h>
+#include <roomlist.h>
+#include <savedstatuses.h>
+#include <server.h>
+#include <signals.h>
+#include <smiley.h>
+#include <sound.h>
+#include <sound-theme.h>
+#include <sound-theme-loader.h>
+#include <sslconn.h>
+#include <status.h>
+#include <stringref.h>
+#include <stun.h>
+#include <theme.h>
+#include <theme-loader.h>
+#include <theme-manager.h>
+#include <upnp.h>
+#include <util.h>
+#include <value.h>
+#include <version.h>
+#include <whiteboard.h>
+#include <xmlnode.h>
+
+#endif
+#elif defined (__ppc__)
+/**
+ * @file purple.h Header files and defines
+ * This file contains all the necessary preprocessor directives to include
+ * libpurple's headers and other preprocessor directives required for plugins
+ * or UIs to build. Including this file eliminates the need to directly
+ * include any other libpurple files.
+ *
+ * @ingroup core libpurple
+ * @since 2.3.0
+ */
+
+/* purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here. Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+ */
+
+#ifndef _PURPLE_PURPLE_H_
+#define _PURPLE_PURPLE_H_
+
+#include <glib.h>
+
+#ifndef G_GNUC_NULL_TERMINATED
+# if __GNUC__ >= 4
+# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__))
+# else
+# define G_GNUC_NULL_TERMINATED
+# endif
+#endif
+
+#undef PURPLE_PLUGINS
+
+#include <account.h>
+#include <accountopt.h>
+#include <blist.h>
+#include <buddyicon.h>
+#include <certificate.h>
+#include <cipher.h>
+#include <circbuffer.h>
+#include <cmds.h>
+#include <connection.h>
+#include <conversation.h>
+#include <core.h>
+#include <debug.h>
+#include <desktopitem.h>
+#include <dnsquery.h>
+#include <dnssrv.h>
+#include <eventloop.h>
+#include <ft.h>
+#include <idle.h>
+#include <imgstore.h>
+#include <log.h>
+#include <media.h>
+#include <mediamanager.h>
+#include <mime.h>
+#include <nat-pmp.h>
+#include <network.h>
+#include <notify.h>
+#include <ntlm.h>
+#include <plugin.h>
+#include <pluginpref.h>
+#include <pounce.h>
+#include <prefs.h>
+#include <privacy.h>
+#include <proxy.h>
+#include <prpl.h>
+#include <request.h>
+#include <roomlist.h>
+#include <savedstatuses.h>
+#include <server.h>
+#include <signals.h>
+#include <smiley.h>
+#include <sound.h>
+#include <sound-theme.h>
+#include <sound-theme-loader.h>
+#include <sslconn.h>
+#include <status.h>
+#include <stringref.h>
+#include <stun.h>
+#include <theme.h>
+#include <theme-loader.h>
+#include <theme-manager.h>
+#include <upnp.h>
+#include <util.h>
+#include <value.h>
+#include <version.h>
+#include <whiteboard.h>
+#include <xmlnode.h>
+
+#endif
+#else
+#error This isn't a recognized platform.
+#endif
diff -r eab533d47ea6 -r 2d0c99ebdab9 Frameworks/libpurple.framework/Versions/0.7.11/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.7.11/libpurple has changed
More information about the commits
mailing list