/pidgin/main: b2ad25dfbd57: Merge release-2.x.y
Tomasz Wasilczyk <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: b2ad25dfbd570ef79ed3dd6d1e174d8e9dbca30a Author: Tomasz Wasilczyk <[email protected]> Date: 2014-06-17 01:10 +0200 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/b2ad25dfbd57 Description: Merge release-2.x.y diffstat: COPYRIGHT | 4 + ChangeLog | 2 +- configure.ac | 165 +- libpurple/protocols/gg/Makefile.am | 36 +- libpurple/protocols/gg/lib/config.h | 6 +- libpurple/protocols/gg/lib/dcc7.c | 2 +- libpurple/protocols/gg/lib/handlers.c | 26 +- libpurple/protocols/gg/lib/internal.h | 28 +- libpurple/protocols/gg/lib/libgadu.c | 160 +- libpurple/protocols/gg/lib/libgadu.h | 2 +- libpurple/protocols/gg/lib/resolver.c | 6 +- libpurple/protocols/gg/lib/resolver.h | 1 + libpurple/protocols/jabber/Makefile.mingw | 1 + pidgin/gtkdialogs.c | 16 +- po/brx.po | 19799 ++++++++++++++++++++++++++++ po/es_AR.po | 19799 ++++++++++++++++++++++++++++ po/ks.po | 19799 ++++++++++++++++++++++++++++ po/sd.po | 19799 ++++++++++++++++++++++++++++ po/uz.po | 19770 +++++++++++++++++++++++++++ 19 files changed, 99207 insertions(+), 214 deletions(-) diffs (truncated from 99869 to 300 lines): diff --git a/COPYRIGHT b/COPYRIGHT --- a/COPYRIGHT +++ b/COPYRIGHT @@ -148,6 +148,7 @@ Marc Dequènes Philip Derrin Taso N. Devetzis Balwinder Singh Dheeman +Chandrakant Dhutadmal Andrew Dieffenbach Finlay Dobbie Mark Doliner @@ -275,9 +276,11 @@ Tomáš Kebert John Kelm Jochen Kemnade Yann Kerherve +Akmal Khushvakov Gordian Klein Marten Klencke Krzysztof Klinikowski +KNTRO Akuke Kok Kir Kolyshkin Ivan Komarov @@ -378,6 +381,7 @@ Richard Nelson Dennis Nezic Matthew A. Nicholson Andreas Nilsson +Allan Nordhøy Henning Norén Szilard Novaki Novell diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -81,7 +81,7 @@ version 2.10.10 (?/?/?): * Fix build against Python 3. (Ed Catmur) (#15969) Gadu-Gadu: - * Updated internal libgadu to version 1.12.0-rc2. + * Updated internal libgadu to version 1.12.0. IRC: * Fix a possible leak of unencrypted data when using /me command diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1336,147 +1336,36 @@ if test "x$silcclient" = "xyes"; then fi dnl ####################################################################### -dnl # Check for Gadu-Gadu client includes and libraries +dnl # Check for Gadu-Gadu protocol library (libgadu) dnl ####################################################################### -dnl TODO: we should get rid of manually entered dirs at some point -AC_ARG_WITH(gadu-includes, [AS_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) -AC_ARG_WITH(gadu-libs, [AS_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) -GADU_CFLAGS="" -GADU_LIBS="" -GADU_LIBGADU_MIN_VERSION=1.11.2 -if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then - gadu_manual_check="yes" -else - gadu_manual_check="no" + +PKG_CHECK_MODULES(LIBGADU, [libgadu >= 1.12.0], [have_libgadu=yes], [have_libgadu=no]) + +if test "x$have_libgadu" = "xyes"; then + AC_CHECK_LIB(gadu, gg_is_gpl_compliant, , [ + LIBGADU_LIBS="" + LIBGADU_CFLAGS="" + have_libgadu=no + AC_MSG_WARN([ +libgadu is not compatible with the GPL when compiled with OpenSSL support. + +To compile against system libgadu, please recompile libgadu using: +./configure --with-openssl=no +Then rerun this ./configure + +Falling back to using our own copy of libgadu. + ]) + ]) fi -if test "x$gadu_manual_check" = "xno"; then - PKG_CHECK_MODULES(GADU, [libgadu >= $GADU_LIBGADU_MIN_VERSION], [ - gadu_includes="yes" - gadu_libs="yes" - ], [ - gadu_includes="no" - ]) -else - if test "$ac_gadu_includes" != "no"; then - GADU_CFLAGS="-I$ac_gadu_includes" - fi - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" - AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes]) - CPPFLAGS="$CPPFLAGS_save" - - if test "$ac_gadu_libs" != "no"; then - GADU_LIBS="-L$ac_gadu_libs" - fi - GADU_LIBS="$GADU_LIBS -lgadu" - AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS) + +AM_CONDITIONAL(HAVE_LIBGADU, test "x$have_libgadu" = "xyes") +if test "x$have_libgadu" = "xyes"; then + AC_DEFINE(HAVE_LIBGADU, 1, [Linked with external libgadu]) fi -dnl TODO: it shouldn't be necessary with 1.12.0 and newer -GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'` - -if test "x$gadu_libs" = "xyes"; then - AC_MSG_CHECKING(for libgadu GPL compatibility) - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[ -#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL) -#error "libgadu is not compatible with the GPL when compiled with OpenSSL support." -#endif - ]])], [ - AC_MSG_RESULT(yes) - ], [ - AC_MSG_RESULT(no) - echo - echo - echo "libgadu is not compatible with the GPL when compiled with OpenSSL support." - echo "To compile against system libgadu, please recompile libgadu using:" - echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared" - echo "Then rerun this ./configure" - echo - echo "Falling back to using our own copy of libgadu" - echo - GADU_LIBS="" - GADU_CFLAGS="" - gadu_libs=no - ]) - CPPFLAGS="$CPPFLAGS_save" -fi - -dnl TODO: this one shouldn't be necessary too -if test "x$gadu_libs" = "xyes" -a "x$gadu_manual_check" = "xyes"; then - AC_MSG_CHECKING(for supplied libgadu compatibility) - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" - - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[ -#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e -#error "Your libgadu version is too old." -#endif - ]])], [ - AC_MSG_RESULT(yes) - ], [ - AC_MSG_RESULT(no) - echo - echo "Your supplied copy of libgadu is too old." - echo "Install version $GADU_LIBGADU_MIN_VERSION or newer." - echo "Then rerun this ./configure" - echo - echo "Falling back to using our own copy of libgadu" - echo - GADU_LIBS="" - GADU_CFLAGS="" - gadu_libs=no - ]) - - CPPFLAGS="$CPPFLAGS_save" -fi - -AM_CONDITIONAL(HAVE_LIBGADU, test "x$gadu_libs" = "xyes") -AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes") - -if test "x$gadu_libs" = "xyes"; then - AC_DEFINE(HAVE_LIBGADU, 1, [Linked with libgadu]) -fi - -if test "x$gadu_libs" != "xyes"; then - AC_DEFINE(USE_INTERNAL_LIBGADU, 1, [Using internal libgadu]) - - AC_CHECK_LIB(gnutls, gnutls_certificate_set_x509_system_trust, [gg_have_gnutls_csxst=yes], [gg_have_gnutls_csxst=no]) - - gg_gnutls_sts="" - if test "x$gg_have_gnutls_csxst" = "xno"; then - for i in /etc/ssl/ca-bundle.pem \ - /etc/ssl/certs/ca-certificates.crt \ - /etc/pki/tls/cert.pem \ - /usr/local/share/certs/ca-root-nss.crt \ - /etc/ssl/cert.pem - do - if test -e $i; then - gg_gnutls_sts="$i" - break - fi - done - fi - - if test "x$gg_have_gnutls_csxst" = "xyes"; then - AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_SET_X509_SYSTEM_TRUST, 1, [gnutls contains the gnutls_certificate_set_x509_system_trust function]) - fi - if test "x$gg_gnutls_sts" != "x"; then - AC_DEFINE_UNQUOTED(GG_CONFIG_GNUTLS_SYSTEM_TRUST_STORE, ["$gg_gnutls_sts"], [use the given file as GnuTLS default trust store]) - fi - - PKG_CHECK_MODULES([GNUTLS_2_10], [gnutls >= 2.10.0], [ - AC_DEFINE([HAVE_GNUTLS_2_10], [], [Defined if GnuTLS >= 2.10.0 is available.]) - ],:) -fi - -if test "x$gadu_libs" = "x"; then - gadu_libs=no -fi - -AC_SUBST(GADU_LIBS) -AC_SUBST(GADU_CFLAGS) +AC_SUBST(LIBGADU_LIBS) +AC_SUBST(LIBGADU_CFLAGS) + AC_ARG_ENABLE(distrib,,,enable_distrib=no) AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes") @@ -3210,7 +3099,7 @@ fi echo Build with Cyrus SASL support. : $enable_cyrus_sasl echo Use kerberos 4 with zephyr.... : $kerberos echo Use external libzephyr........ : $zephyr -echo Use external libgadu.......... : $gadu_libs +echo Use external libgadu.......... : $have_libgadu echo Install pixmaps............... : $enable_pixmaps echo Old tray icon compatibility... : $enable_traycompat echo Install translations.......... : $enable_i18n diff --git a/libpurple/protocols/gg/Makefile.am b/libpurple/protocols/gg/Makefile.am --- a/libpurple/protocols/gg/Makefile.am +++ b/libpurple/protocols/gg/Makefile.am @@ -1,8 +1,3 @@ -#V=0 -#CFLAGS = -g -O0 -GADU_EXTRA = -#GADU_EXTRA += -Werror - pkgdir = @PURPLE_PLUGINDIR@ EXTRA_DIST = \ @@ -11,8 +6,8 @@ EXTRA_DIST = \ Makefile.mingw \ lib/COPYING -if USE_INTERNAL_LIBGADU -INTGGSOURCES = \ +if ! HAVE_LIBGADU +INTGG_SOURCES = \ lib/common.c \ lib/config.h \ lib/dcc.c \ @@ -55,22 +50,21 @@ INTGGSOURCES = \ lib/tvbuilder.c \ lib/tvbuilder.h - -INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib \ +INTGG_LIBS = $(ZLIB_LIBS) +INTGG_CFLAGS = \ + -I$(top_srcdir)/libpurple/protocols/gg/lib \ $(ZLIB_CFLAGS) \ -DGG_IGNORE_DEPRECATED -GADU_LIBS += $(ZLIB_LIBS) + +if USE_GNUTLS + INTGG_LIBS += $(GNUTLS_LIBS) + INTGG_CFLAGS += $(GNUTLS_CFLAGS) endif -if USE_GNUTLS -GADU_LIBS += $(GNUTLS_LIBS) -GADU_CFLAGS += $(GNUTLS_CFLAGS) endif -GADU_LIBS += $(JSON_LIBS) - GGSOURCES = \ - $(INTGGSOURCES) \ + $(INTGG_SOURCES) \ avatar.c \ avatar.h \ blist.c \ @@ -130,26 +124,26 @@ libgg_la_LDFLAGS = -module @PLUGIN_LDFLA if STATIC_GG -st = -DPURPLE_STATIC_PRPL $(GADU_CFLAGS) +st = -DPURPLE_STATIC_PRPL noinst_LTLIBRARIES = libgg.la libgg_la_SOURCES = $(GGSOURCES) libgg_la_CFLAGS = $(AM_CFLAGS) else -st = $(GADU_CFLAGS) +st = pkg_LTLIBRARIES = libgg.la libgg_la_SOURCES = $(GGSOURCES)