/soc/2015/jgeboski/facebook: 3c5c8c63a686: Merge default into fa...
James Geboski <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 3c5c8c63a686c27621d89f48fcaf74506125293d Author: James Geboski <[email protected]> Date: 2015-10-17 20:41 -0400 Branch: facebook URL: https://hg.pidgin.im/soc/2015/jgeboski/facebook/rev/3c5c8c63a686 Description: Merge default into facebook diffstat: COPYRIGHT | 2 + ChangeLog | 2 + configure.ac | 432 +- finch/gntsound.c | 1 + libpurple/accounts.c | 35 - libpurple/buddyicon.c | 22 +- libpurple/conversation.h | 7 +- libpurple/data/purple-3.pc.in | 2 +- libpurple/http.c | 6 +- libpurple/log.c | 110 - libpurple/media.h | 6 +- libpurple/media/backend-fs2.c | 163 +- libpurple/media/backend-fs2.h | 8 +- libpurple/media/backend-iface.c | 2 + libpurple/mediamanager.c | 77 +- libpurple/mediamanager.h | 4 +- libpurple/plugins/log_reader.c | 151 - libpurple/plugins/ssl/ssl-gnutls.c | 16 - libpurple/protocols/jabber/gtalk.c | 5 +- libpurple/protocols/jabber/jabber.c | 8 +- libpurple/protocols/jabber/jabber.h | 1 - libpurple/protocols/jabber/presence.c | 2 +- libpurple/protocols/jabber/xmpp.c | 5 +- libpurple/protocols/novell/nmrtf.c | 4 +- libpurple/protocols/oscar/clientlogin.c | 4 +- libpurple/protocols/oscar/oscar.c | 1 + libpurple/protocols/yahoo/Makefile.am | 2 - libpurple/protocols/yahoo/Makefile.mingw | 1 - libpurple/protocols/yahoo/util.c | 27 +- libpurple/protocols/yahoo/yahoo.c | 12 - libpurple/protocols/yahoo/yahoo_aliases.c | 65 +- libpurple/protocols/yahoo/yahoo_filexfer.c | 17 +- libpurple/protocols/yahoo/yahoo_filexfer.h | 2 - libpurple/protocols/yahoo/yahoo_friend.c | 68 +- libpurple/protocols/yahoo/yahoo_friend.h | 1 - libpurple/protocols/yahoo/yahoo_packet.c | 7 +- libpurple/protocols/yahoo/yahoo_packet.h | 4 +- libpurple/protocols/yahoo/yahoo_picture.c | 5 +- libpurple/protocols/yahoo/yahoo_profile.c | 45 +- libpurple/protocols/yahoo/yahoochat.c | 22 +- libpurple/protocols/yahoo/ymsg.c | 529 +-- libpurple/protocols/yahoo/ymsg.h | 42 +- libpurple/protocols/zephyr/sysdep.h | 11 - libpurple/proxy.c | 3 + libpurple/smiley-custom.c | 20 +- libpurple/stun.c | 12 +- libpurple/xfer.c | 44 +- pidgin/gtkconv.c | 111 +- pidgin/gtkplugin.c | 2 + pidgin/gtksound.c | 1 + pidgin/gtkutils.c | 74 - pidgin/gtkwebview.c | 45 +- pidgin/gtkwebview.h | 27 + pidgin/pixmaps/emotes/default/24/default.theme.in | 92 - pidgin/pixmaps/emotes/small/16/small.theme.in | 36 - pidgin/plugins/Makefile.am | 4 - pidgin/plugins/Makefile.mingw | 7 - pidgin/plugins/crazychat/Makefile.am | 43 - pidgin/plugins/crazychat/QTUtilities.c | 306 - pidgin/plugins/crazychat/QTUtilities.h | 65 - pidgin/plugins/crazychat/Utilities.c | 283 - pidgin/plugins/crazychat/Utilities.h | 83 - pidgin/plugins/crazychat/camdata.c | 213 - pidgin/plugins/crazychat/camdata.h | 63 - pidgin/plugins/crazychat/camproc.c | 812 ---- pidgin/plugins/crazychat/camproc.h | 29 - pidgin/plugins/crazychat/cc_features.c | 504 -- pidgin/plugins/crazychat/cc_gtk_gl.c | 288 - pidgin/plugins/crazychat/cc_gtk_gl.h | 50 - pidgin/plugins/crazychat/cc_interface.h | 129 - pidgin/plugins/crazychat/cc_network.c | 540 -- pidgin/plugins/crazychat/cc_network.h | 78 - pidgin/plugins/crazychat/cc_output.c | 353 - pidgin/plugins/crazychat/cc_pidgin_plugin.c | 484 -- pidgin/plugins/crazychat/crazychat.c | 96 - pidgin/plugins/crazychat/crazychat.h | 46 - pidgin/plugins/crazychat/dog_lids.c | 48 - pidgin/plugins/crazychat/dog_lids.h | 3 - pidgin/plugins/crazychat/doggy.c | 227 - pidgin/plugins/crazychat/doggy.h | 10 - pidgin/plugins/crazychat/draw.c | 107 - pidgin/plugins/crazychat/eye.c | 812 ---- pidgin/plugins/crazychat/eye.h | 1 - pidgin/plugins/crazychat/eyes.c | 589 --- pidgin/plugins/crazychat/eyes.h | 3 - pidgin/plugins/crazychat/face.c | 38 - pidgin/plugins/crazychat/face.h | 44 - pidgin/plugins/crazychat/filter.c | 124 - pidgin/plugins/crazychat/filter.h | 19 - pidgin/plugins/crazychat/glm.c | 1964 ---------- pidgin/plugins/crazychat/glm.h | 269 - pidgin/plugins/crazychat/lids.c | 4080 --------------------- pidgin/plugins/crazychat/lids.h | 3 - pidgin/plugins/crazychat/main.c | 25 - pidgin/plugins/crazychat/mat_struct.h | 12 - pidgin/plugins/crazychat/models.c | 75 - pidgin/plugins/crazychat/models.h | 9 - pidgin/plugins/crazychat/sharky.c | 249 - pidgin/plugins/crazychat/sharky.h | 10 - pidgin/plugins/crazychat/test.h | 8 - pidgin/plugins/crazychat/util.h | 40 - pidgin/plugins/gtkbuddynote.c | 45 - pidgin/plugins/notify.c | 50 +- pidgin/plugins/themeedit-icon.c | 326 - pidgin/plugins/themeedit-icon.h | 28 - pidgin/plugins/themeedit.c | 338 - pidgin/win32/nsis/nsis_translations.desktop.in | 2 +- pidgin/win32/nsis/pidgin-installer.nsi | 1 - po/POTFILES.in | 3 - po/br.po | 35 - po/brx.po | 35 - po/es_AR.po | 35 - po/hy.po | 35 - po/kk.po | 35 - po/ks.po | 35 - po/lv.po | 35 - po/ms_MY.po | 35 - po/pl.po | 34 - po/sd.po | 35 - po/tt.po | 35 - po/uz.po | 35 - 121 files changed, 522 insertions(+), 16338 deletions(-) diffs (truncated from 20347 to 300 lines): diff --git a/COPYRIGHT b/COPYRIGHT --- a/COPYRIGHT +++ b/COPYRIGHT @@ -22,6 +22,7 @@ Saleem Abdulrasool Jakub Adam Dave Ahlswede Haval A. Ahmed +Sorokin Alexei Thijs Alkemade Manuel Amador Matt Amato @@ -487,6 +488,7 @@ Carsten Schaar Toby Schaffer Jonathan Schleifer <[email protected]> Luke Schierer +Sebastian Schmidt <[email protected]> Ralph Schmieder David Schmitt Heiko Schmitt diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ version 3.0.0 (??/??/????): plugins support. * Added dependency gobject-introspection, which is now required to enable non-native plugin support. + * Removed flags for manually configuring GnuTLS and NSS. They are now only + recognized through pkg-config. (Michael McConville) libpurple: * Specify a different set of encryption ciphers for TLS connections when diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1153,14 +1153,7 @@ if test "x$enable_farstream" != "xno"; t AC_SUBST(FARSTREAM_CFLAGS) AC_SUBST(FARSTREAM_LIBS) ], [ - # Try farsight. - PKG_CHECK_MODULES(FARSTREAM, [farsight2-0.10 >= 0.0.9], [ - AC_DEFINE(HAVE_FARSIGHT, 1, [Use Farsight instead of Farstream]) - AC_SUBST(FARSTREAM_CFLAGS) - AC_SUBST(FARSTREAM_LIBS) - ], [ - enable_farstream="no" - ]) + enable_farstream="no" ]) fi fi @@ -1193,14 +1186,12 @@ dnl #################################### dnl # Check for Raw data streams support in Farstream dnl ####################################################################### if test "x$enable_vv" != "xno" -a "x$with_gstreamer" == "x1.0"; then - AC_MSG_CHECKING(for raw data support in Farstream) PKG_CHECK_MODULES(GSTAPP, [gstreamer-app-1.0], [ AC_DEFINE(USE_GSTAPP, 1, [Use GStreamer Video Overlay support]) AC_SUBST(GSTAPP_CFLAGS) AC_SUBST(GSTAPP_LIBS) AC_DEFINE(HAVE_MEDIA_APPLICATION, 1, [Define if we have support for application media type.]) - AC_MSG_RESULT(yes) - ], [AC_MSG_RESULT(no)]) + ] , ) fi dnl ####################################################################### @@ -1404,6 +1395,7 @@ else AC_DEFINE_UNQUOTED(GG_CONFIG_GNUTLS_SYSTEM_TRUST_STORE, ["$gg_gnutls_sts"], [use the given file as GnuTLS default trust store]) fi + dnl # redundant - only here to stay compatible with libgadu upstream PKG_CHECK_MODULES([GNUTLS_2_10], [gnutls >= 2.10.0], [ AC_DEFINE([HAVE_GNUTLS_2_10], [], [Defined if GnuTLS >= 2.10.0 is available.]) ],:) @@ -1897,13 +1889,21 @@ dnl #################################### dnl # Check for GPlugin 0.0.17 dnl ####################################################################### if test "x$enable_plugins" = "xyes" ; then - PKG_CHECK_MODULES(GPLUGIN, [gplugin >= 0.0.17 gmodule-2.0], , [ + PKG_CHECK_MODULES(GPLUGIN, [gplugin >= 0.0.17 gmodule-2.0], [ + dnl # GPLUGIN_REQ sets pkg-config requirements in the .pc file + if test "x$with_gtk" != "xno" ; then + GPLUGIN_REQ=[", gplugin, gplugin-gtk"] + else + GPLUGIN_REQ=[", gplugin"] + fi + ], [ AC_MSG_RESULT(no) AC_MSG_ERROR([ GPlugin 0.0.17 development headers not found, which are required if you wish to enable plugins. Use --disable-plugins if you want to disable plugins. ])]) + AC_SUBST(GPLUGIN_REQ) AC_SUBST(GPLUGIN_CFLAGS) AC_SUBST(GPLUGIN_LIBS) else @@ -2086,403 +2086,69 @@ AC_ARG_ENABLE(nss, msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" looked_for_gnutls="no" dnl # -dnl # Check for GnuTLS if it's specified. +dnl # Check for GnuTLS if it isn't disabled dnl # if test "x$enable_gnutls" != "xno"; then - enable_gnutls="no" - prefix=`eval echo $prefix` looked_for_gnutls="yes" - AC_ARG_WITH(gnutls-includes, - [ --with-gnutls-includes=PREFIX location of GnuTLS includes.], - [ with_gnutls_includes="$withval" ], - [ with_gnutls_includes="$prefix/include" ]) - - have_gnutls_includes="no" - - if test "x$with_gnutls_includes" != "xno"; then - CPPFLAGS_save="$CPPFLAGS" - - AC_MSG_CHECKING(for GnuTLS includes) - AC_MSG_RESULT("") - - CPPFLAGS="$CPPFLAGS -I$with_gnutls_includes" - AC_CHECK_HEADERS(gnutls/gnutls.h, [ gnutls_includes="yes" ]) - CPPFLAGS="$CPPFLAGS_save" - - if test "x$gnutls_includes" != "xno" -a \ - "x$gnutls_includes" != "x"; then - have_gnutls_includes="yes" - - if test "x$with_gnutls_includes" != "xNONE/include"; then - GNUTLS_CFLAGS="-I$with_gnutls_includes" - fi - else - GNUTLS_CFLAGS="" - fi - else - AC_MSG_CHECKING(for GnuTLS includes) - AC_MSG_RESULT(no) + if `$PKG_CONFIG --exists gnutls`; then + dnl # minimum required version should almost certainly be higher + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.10], [ + have_gnutls="yes" + ], [ + AC_MSG_RESULT(no) + have_gnutls="no" + ]) fi - AC_ARG_WITH(gnutls-libs, - [AS_HELP_STRING([--with-gnutls-libs=PREFIX], [location of GnuTLS libraries.])], - [ with_gnutls_libs="$withval" ]) + if test "x$have_gnutls" = "xyes"; then - if test "x$with_gnutls_libs" != "xno" -a \ - "x$have_gnutls_includes" != "xno"; then + AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GnuTLS]) + AC_DEFINE(HAVE_SSL, 1, [Define if you have SSL]) - LIBS_save="$LIBS" - - case $with_gnutls_libs in - ""|-L*) ;; - *) with_gnutls_libs="-L$with_gnutls_libs" ;; - esac - - AC_CACHE_CHECK([for GnuTLS libraries], ac_cv_gnutls_libs, - [ - LIBS="$LIBS $with_gnutls_libs -lgnutls" - AC_LINK_IFELSE([AC_LANG_CALL([], [gnutls_init])], ac_cv_gnutls_libs="yes", ac_cv_gnutls_libs="no") - LIBS="$LIBS_save" - ]) - - if test "x$ac_cv_gnutls_libs" != "xno"; then - AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GnuTLS]) - AC_DEFINE(HAVE_SSL) - msg_gnutls="GnuTLS" - GNUTLS_LIBS="$with_gnutls_libs -lgnutls" - - enable_gnutls="yes" - else - GNUTLS_CFLAGS="" - GNUTLS_LIBS="" - fi - else - AC_MSG_CHECKING(for GnuTLS libraries) - AC_MSG_RESULT(no) + msg_gnutls="GnuTLS" fi -else - GNUTLS_CFLAGS="" - GNUTLS_LIBS="" fi -AC_SUBST(GNUTLS_CFLAGS) -AC_SUBST(GNUTLS_LIBS) - -if test "x$enable_gnutls" = "xyes"; then - AC_MSG_CHECKING(for gnutls_priority_set_direct and gnutls_priority_set) - LIBS_save="$LIBS" - LIBS="$LIBS $GNUTLS_LIBS" - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], - [[gnutls_session s; gnutls_priority_set_direct(s, NULL, NULL); gnutls_priority_set(s, NULL);]])], - [AC_DEFINE([HAVE_GNUTLS_PRIORITY_FUNCS], 1, - [Define if your gnutls has gnutls_priority_set_direct and friends]) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) - CPPFLAGS="$CPPFLAGS_save" - LIBS="$LIBS_save" -fi - -if test "x$enable_gnutls" = "xyes"; then - AC_MSG_CHECKING(for GNUTLS_CERT_INSECURE_ALGORITHM) - LIBS_save="$LIBS" - LIBS="$LIBS $GNUTLS_LIBS" - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], - [[unsigned int verify = GNUTLS_CERT_INSECURE_ALGORITHM;]])], - [AC_DEFINE([HAVE_GNUTLS_CERT_INSECURE_ALGORITHM], 1, - [Define if your gnutls has the GNUTLS_CERT_INSECURE_ALGORITHM flag]) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) - CPPFLAGS="$CPPFLAGS_save" - LIBS="$LIBS_save" -fi - - -AM_CONDITIONAL(USE_GNUTLS, test "x$enable_gnutls" = "xyes") +AM_CONDITIONAL(USE_GNUTLS, test "x$have_gnutls" = "xyes") dnl # -dnl # Check for NSS if it's specified, or if GnuTLS checks failed. +dnl # Check for NSS if it isn't disabled dnl # looked_for_nss="no" if test "x$enable_nss" != "xno"; then looked_for_nss="yes" - AC_ARG_WITH(nspr-includes, - [AS_HELP_STRING([--with-nspr-includes=PREFIX], [specify location of Mozilla nspr4 includes.])], - [with_nspr_includes="$withval"]) - - AC_ARG_WITH(nspr-libs, - [AS_HELP_STRING([--with-nspr-libs=PREFIX], [specify location of Mozilla nspr4 libs.])], - [with_nspr_libs="$withval"]) - - AC_ARG_WITH(nss-includes, - [AS_HELP_STRING([--with-nss-includes=PREFIX], [specify location of Mozilla nss3 includes.])], - [with_nss_includes="$withval"]) - - AC_ARG_WITH(nss-libs, - [AS_HELP_STRING([--with-nss-libs=PREFIX], [specify location of Mozilla nss3 libs.])], - [with_nss_libs="$withval"]) - - - if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \ - test -n "$with_nss_includes" || test -n "$with_nss_libs" || - test "x$enable_nss" = "xstatic"; then - - nss_manual_check="yes" - else - nss_manual_check="no" + if `$PKG_CONFIG --exists mozilla-nss`; then + dnl # TODO: set required minimum version + PKG_CHECK_MODULES(NSS, mozilla-nss, [ + have_nss="yes" + ], [ + AC_MSG_RESULT(no) + have_nss="no" + ]) + elif `$PKG_CONFIG --exists nss`; then + dnl # TODO: set required minimum version + PKG_CHECK_MODULES(NSS, nss, [ + have_nss="yes" + ], [ + AC_MSG_RESULT(no) + have_nss="no" + ]) fi - enable_nss="no" + if test "x$have_nss" = "xyes"; then - if test "x$nss_manual_check" = "xno"; then - if `$PKG_CONFIG --exists mozilla-nss`; then - PKG_CHECK_MODULES(NSS, mozilla-nss, [ - have_nss="yes" - ], [ - AC_MSG_RESULT(no) - have_nss="no" - ]) - mozilla_nspr="mozilla-nspr" - mozilla_nss="mozilla-nss" - elif `$PKG_CONFIG --exists nss`; then - PKG_CHECK_MODULES(NSS, nss, [ - have_nss="yes" _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits