From 5354e60c11953ac068a244cc7d1904cdffb137af Mon Sep 17 00:00:00 2001 From: Evan Schoenberg Date: Fri, 28 Dec 2007 16:32:18 +0000 Subject: [PATCH] Just talking about a patch in comments doesn't actually make use of it... our PLAIN on 10.4 fix wasn't applied for 1.2b6 because I shuffled things around and then forgot to put libpurple_jabber_avoid_sasl_option_hack in the patches list. git-svn-id: svn://svn.adiumx.com/adium/trunk@22050 1c916fce-81e2-0310-a464-8ca513f45935 --- Utilities/dep-build-scripts/current_step.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Utilities/dep-build-scripts/current_step.sh b/Utilities/dep-build-scripts/current_step.sh index 87914cda7..b8edfdf3e 100755 --- a/Utilities/dep-build-scripts/current_step.sh +++ b/Utilities/dep-build-scripts/current_step.sh @@ -65,7 +65,8 @@ for patch in "$PATCHDIR/libpurple_makefile_linkage_hacks.diff" \ "$PATCHDIR/libpurple-restrict-potfiles-to-libpurple.diff" \ "$PATCHDIR/libpurple_jabber_use_builtin_digestmd5.diff" \ "$PATCHDIR/libpurple_jabber_fallback_on_old_auth.diff" \ - "$PATCHDIR/libpurple_jabber_parser_error_handler.diff" ; do + "$PATCHDIR/libpurple_jabber_parser_error_handler.diff" \ + "$PATCHDIR/libpurple_jabber_avoid_sasl_option_hack.diff" ; do echo "Applying $patch" cat $patch | patch --forward -p0 done @@ -146,7 +147,8 @@ for ARCH in ppc i386 ; do done pushd $PIDGIN_SOURCE -for patch in "$PATCHDIR/libpurple_jabber_parser_error_handler.diff" \ +for patch in "$PATCHDIR/libpurple_jabber_avoid_sasl_option_hack.diff" \ + "$PATCHDIR/libpurple_jabber_parser_error_handler.diff" \ "$PATCHDIR/libpurple_jabber_fallback_on_old_auth.diff" \ "$PATCHDIR/libpurple_jabber_use_builtin_digestmd5.diff" \ "$PATCHDIR/libpurple-restrict-potfiles-to-libpurple.diff" \ -- 2.11.4.GIT