adium-1.4 2962:a5c1353f0e08: Remove external libgadu use; we sho...
commits at adium.im
commits at adium.im
Sat May 15 19:36:08 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/a5c1353f0e08
revision: 2962:a5c1353f0e08
author: Evan Schoenberg
date: Sat May 15 14:25:21 2010 -0500
Remove external libgadu use; we should depend on the one bundled with libpurple to ensure that it is modern and compatible. This may be a fix for #13976 - refs #13976
Subject: adium-1.4 2963:bbc268a9b7af: Remove further evidence of external libgadu
details: http://hg.adium.im/adium-1.4/rev/bbc268a9b7af
revision: 2963:bbc268a9b7af
author: Evan Schoenberg
date: Sat May 15 14:27:45 2010 -0500
Remove further evidence of external libgadu
Subject: adium-1.4 2964:a41b1be1e95a: im.pidgin.adium-1.4 @ fa7af7557f09b92cf55a6a813fd980e7c25e1a7b:
details: http://hg.adium.im/adium-1.4/rev/a41b1be1e95a
revision: 2964:a41b1be1e95a
author: Evan Schoenberg
date: Sat May 15 14:34:44 2010 -0500
im.pidgin.adium-1.4 @ fa7af7557f09b92cf55a6a813fd980e7c25e1a7b:
* Hopefully fixed issues connecting to jabber servers which provide a GSSAPI SASL mech and expect a fallback to jabber:iq:auth when it fails. This restores the behavior we had previously for such servers but avoids spurious disconnect messages on sane servers. Refs #13975
* Removed use of an external and outdated libgadu, instead depending on the internal one which libpurple provides. Hopefully this will be a fix for #13976, but I have no way to test at this time. Refs #13976
* Plucked changes to oscar from im.pidgin.pidgin which should fix issues with sending and receiving HTML over ICQ. It's a reduction in overall code complexity by telling the server we are prepared to handle HTML from all clients; the server then handling processing from misbehaving ICQ clients.
Subject: adium-1.4 2965:c350d9984ada: Don't need this file anymore
details: http://hg.adium.im/adium-1.4/rev/c350d9984ada
revision: 2965:c350d9984ada
author: Evan Schoenberg
date: Sat May 15 14:35:40 2010 -0500
Don't need this file anymore
diffs (135 lines):
diff -r 2c563dc02354 -r c350d9984ada Frameworks/libpurple.framework/Versions/0/Headers/oscar.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/oscar.h Fri May 14 23:02:09 2010 -0400
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/oscar.h Sat May 15 14:35:40 2010 -0500
@@ -742,6 +742,20 @@
#define AIM_IMPARAM_FLAG_SMS_SUPPORTED 0x00000010
#define AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED 0x00000100
+/**
+* This flag tells the server that we always send HTML in messages
+* sent from an ICQ account to an ICQ account. (If this flag is
+* not sent then plaintext is sent ICQ<-->ICQ (HTML is sent in all
+* other cases)).
+*
+* If we send an HTML message to an old client that doesn't support
+* HTML messages, then the oscar servers will merrily strip the HTML
+* for us.
+*
+* All incoming IMs are treated as HTML.
+*/
+#define AIM_IMPARAM_FLAG_USE_HTML_FOR_ICQ 0x00000400
+
/* This is what the server will give you if you don't set them yourself. */
/* This is probably out of date. */
#define AIM_IMPARAM_DEFAULTS { \
diff -r 2c563dc02354 -r c350d9984ada Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
diff -r 2c563dc02354 -r c350d9984ada Utilities/dep-build-scripts/libgadu.h
--- a/Utilities/dep-build-scripts/libgadu.h Fri May 14 23:02:09 2010 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-#ifdef __ppc__
-#include "libgadu-ppc.h"
-#elif defined(__i386__)
-#include "libgadu-i386.h"
-#else
-#error This isn't a recognized platform.
-#endif
diff -r 2c563dc02354 -r c350d9984ada Utilities/dep-build-scripts/purple_dependencies_make.sh
--- a/Utilities/dep-build-scripts/purple_dependencies_make.sh Fri May 14 23:02:09 2010 -0400
+++ b/Utilities/dep-build-scripts/purple_dependencies_make.sh Sat May 15 14:35:40 2010 -0500
@@ -67,39 +67,6 @@
done
popd > /dev/null 2>&1
-# Gadu-gadu
-for ARCH in ppc i386 ; do
- echo "Building Gadu-Gadu for $ARCH"
-
- export CFLAGS="$BASE_CFLAGS -arch $ARCH"
- export CXXFLAGS="$CFLAGS"
- export LDFLAGS="$BASE_LDFLAGS -arch $ARCH"
-
- case $ARCH in
- ppc) HOST=powerpc-apple-darwin9
- export PATH="$PATH_PPC"
- TARGET_DIR="$TARGET_DIR_PPC"
- export PKG_CONFIG_PATH="$TARGET_DIR_PPC/lib/pkgconfig";;
- i386) HOST=i686-apple-darwin9
- TARGET_DIR="$TARGET_DIR_I386"
- export PATH="$PATH_I386"
- export PKG_CONFIG_PATH="$TARGET_DIR_I386/lib/pkgconfig";;
- esac
-
- mkdir gadu-$ARCH || true
- cd gadu-$ARCH
-
- echo ' Configuring...'
- "$SOURCEDIR/$GADU/configure" \
- --prefix=$TARGET_DIR \
- --enable-shared \
- --host=$HOST >> $LOG_FILE 2>&1
-
- echo ' make && make install'
- make -j $NUMBER_OF_CORES >> $LOG_FILE 2>&1 && make install >> $LOG_FILE 2>&1
- cd ..
-done
-
# intltool so pidgin will configure
# need a native intltool in both ppc and i386
for ARCH in ppc i386 ; do
diff -r 2c563dc02354 -r c350d9984ada Utilities/dep-build-scripts/purple_make.sh
--- a/Utilities/dep-build-scripts/purple_make.sh Fri May 14 23:02:09 2010 -0400
+++ b/Utilities/dep-build-scripts/purple_make.sh Sat May 15 14:35:40 2010 -0500
@@ -107,8 +107,6 @@
# we don't need pkg-config for this
export LIBXML_CFLAGS='-I/usr/include/libxml2'
export LIBXML_LIBS='-lxml2'
- export GADU_CFLAGS="-I$TARGET_DIR/include"
- export GADU_LIBS="-lgadu"
export MEANWHILE_CFLAGS="-I$TARGET_DIR/include/meanwhile -I$TARGET_DIR/include/glib-2.0 -I$TARGET_DIR/lib/glib-2.0/include"
export MEANWHILE_LIBS="-lmeanwhile -lglib-2.0 -liconv"
diff -r 2c563dc02354 -r c350d9984ada Utilities/dep-build-scripts/universalize.sh
--- a/Utilities/dep-build-scripts/universalize.sh Fri May 14 23:02:09 2010 -0400
+++ b/Utilities/dep-build-scripts/universalize.sh Sat May 15 14:35:40 2010 -0500
@@ -14,7 +14,6 @@
# "purple" deps
MEANWHILE=libmeanwhile.1
-GADU=libgadu.3.7.0
SASL=libsasl2.2
JSONGLIB=libjson-glib-1.0.0
@@ -60,16 +59,12 @@
rm -rf $UNIVERSAL_DIR/include/$PURPLE_FOLDER
cp -R $TARGET_DIR_I386/include/libpurple $UNIVERSAL_DIR/include/$PURPLE_FOLDER
-# Another hack: we need libgadu.h
-cp $TARGET_DIR_I386/include/libgadu.h $UNIVERSAL_DIR/include/$PURPLE_FOLDER/libgadu-i386.h
-cp $TARGET_DIR_PPC/include/libgadu.h $UNIVERSAL_DIR/include/$PURPLE_FOLDER/libgadu-ppc.h
-cp $SCRIPT_DIR/libgadu.h $UNIVERSAL_DIR/include/$PURPLE_FOLDER/
cd ..
cd $UNIVERSAL_DIR
for lib in $LIBINTL $LIBGLIB $LIBGOBJECT $LIBGTHREAD $LIBGMODULE $MEANWHILE $JSONGLIB \
- $GADU $LIBPURPLE; do
+ $LIBPURPLE; do
echo "Making $lib universal..."
python $SCRIPT_DIR/framework_maker/universalize.py \
i386:$TARGET_DIR_I386/lib/$lib.dylib \
diff -r 2c563dc02354 -r c350d9984ada Utilities/dep-build-scripts/urls.txt
--- a/Utilities/dep-build-scripts/urls.txt Fri May 14 23:02:09 2010 -0400
+++ b/Utilities/dep-build-scripts/urls.txt Sat May 15 14:35:40 2010 -0500
@@ -18,10 +18,6 @@
# Meanwhile for Sametime support
#
http://softlayer.dl.sourceforge.net/project/meanwhile/meanwhile/1.0.2/meanwhile-1.0.2.tar.gz
-#
-# Gadu-Gadu
-#
-http://toxygen.net/libgadu/files/libgadu-1.7.1.tar.gz
####
#
# VV
More information about the commits
mailing list