Skip to content

Commit

Permalink
pidgin: upgrade to 2.14.2
Browse files Browse the repository at this point in the history
* drop --with-python=python3 as it was renamed to --with-python3 and it defaults to
  python3 now anyway
  https://reviews.imfreedom.org/r/550/

* add PACKAGECONFIG for cyrus-sasl, it's enabled by default since:
  commit 8d6c390002378664dea48e8766a0e4f063b12f78
  Author: Gary Kramlich <grim@reaperworld.com>
  Date:   Mon Jul 13 03:34:57 2020 -0500

    Enable cyrus-sasl support by default
  but cyrus-sasl is in meta-networking layer, so we want to keep it disabled by default

* drop patches for autoconf-2.71, it was resolved upstream in:
  commit aedf4a502e3b5875966e3f8277d7d43a0d9497a2
  Author: Gary Kramlich <grim@reaperworld.com>
  Date:   Mon Mar 29 22:56:22 2021 -0500

    Fix a bug where autoconf 2.71 complains about AC_PROG_INTLTOOL not being used.

* 2.14.1 was sometimes failing with
  cat ../../pidgin-2.14.1/libpurple/account.h ../../pidgin-2.14.1/libpurple/accountopt.h ../../pidgin-2.14.1/libpurple/blist.h ../../pidgin-2.14.1/libpurple/buddyicon.h ../../pidgin-2.14.1/libpurple/certificate.h ../../pidgin-2.14.1/libpurple/cipher.h ../../pidgin-2.14.1/libpurple/circbuffer.h ../../pidgin-2.14.1/libpurple/cmds.h ../../pidgin-2.14.1/libpurple/connection.h ../../pidgin-2.14.1/libpurple/conversation.h ../../pidgin-2.14.1/libpurple/core.h ../../pidgin-2.14.1/libpurple/dbus-maybe.h ../../pidgin-2.14.1/libpurple/debug.h ../../pidgin-2.14.1/libpurple/desktopitem.h ../../pidgin-2.14.1/libpurple/eventloop.h ../../pidgin-2.14.1/libpurple/ft.h ../../pidgin-2.14.1/libpurple/gaim-compat.h ../../pidgin-2.14.1/libpurple/glibcompat.h ../../pidgin-2.14.1/libpurple/idle.h ../../pidgin-2.14.1/libpurple/imgstore.h ../../pidgin-2.14.1/libpurple/log.h ../../pidgin-2.14.1/libpurple/media.h ../../pidgin-2.14.1/libpurple/media-gst.h ../../pidgin-2.14.1/libpurple/mediamanager.h ../../pidgin-2.14.1/libpurple/mime.h ../../pidgin-2.14.1/libpurple/nat-pmp.h ../../pidgin-2.14.1/libpurple/network.h ../../pidgin-2.14.1/libpurple/notify.h ../../pidgin-2.14.1/libpurple/ntlm.h ../../pidgin-2.14.1/libpurple/plugin.h ../../pidgin-2.14.1/libpurple/pluginpref.h ../../pidgin-2.14.1/libpurple/pounce.h ../../pidgin-2.14.1/libpurple/prefs.h ../../pidgin-2.14.1/libpurple/privacy.h ../../pidgin-2.14.1/libpurple/proxy.h ../../pidgin-2.14.1/libpurple/prpl.h ../../pidgin-2.14.1/libpurple/request.h ../../pidgin-2.14.1/libpurple/roomlist.h ../../pidgin-2.14.1/libpurple/savedstatuses.h ../../pidgin-2.14.1/libpurple/server.h ../../pidgin-2.14.1/libpurple/signals.h ../../pidgin-2.14.1/libpurple/smiley.h ../../pidgin-2.14.1/libpurple/dnsquery.h ../../pidgin-2.14.1/libpurple/dnssrv.h ../../pidgin-2.14.1/libpurple/status.h ../../pidgin-2.14.1/libpurple/stringref.h ../../pidgin-2.14.1/libpurple/stun.h ../../pidgin-2.14.1/libpurple/sound.h ../../pidgin-2.14.1/libpurple/sound-theme.h ../../pidgin-2.14.1/libpurple/sound-theme-loader.h ../../pidgin-2.14.1/libpurple/sslconn.h ../../pidgin-2.14.1/libpurple/theme.h ../../pidgin-2.14.1/libpurple/theme-loader.h ../../pidgin-2.14.1/libpurple/theme-manager.h ../../pidgin-2.14.1/libpurple/upnp.h ../../pidgin-2.14.1/libpurple/util.h ../../pidgin-2.14.1/libpurple/value.h ../../pidgin-2.14.1/libpurple/xmlnode.h ../../pidgin-2.14.1/libpurple/whiteboard.h ../../pidgin-2.14.1/libpurple/media/backend-iface.h ../../pidgin-2.14.1/libpurple/media/candidate.h ../../pidgin-2.14.1/libpurple/media/codec.h ../../pidgin-2.14.1/libpurple/media/enum-types.h purple.h version.h marshallers.h | python3 ../../pidgin-2.14.1/libpurple/dbus-analyze-types.py --keyword=enum --verbatim > purple-client-bindings.h
  cat: marshallers.h: No such file or directory
  cat: marshallers.h: No such file or directory
  cat: marshallers.h: No such file or directory

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
  • Loading branch information
shr-project authored and kraj committed Apr 8, 2021
1 parent 0f32057 commit 92926a3
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 282 deletions.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ SRC_URI = "\
${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
file://sanitize-configure.ac.patch \
file://purple-OE-branding-25.patch \
file://0001-configure.ac-fix-build-with-autoconf-2.71.patch \
file://0002-configure.ac-disable-few-languages-not-compatible-wi.patch \
"

SRC_URI[sha256sum] = "f132e18d551117d9e46acce29ba4f40892a86746c366999166a3862b51060780"
SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603"

PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \
Expand All @@ -39,9 +37,9 @@ PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib"
PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss"
PACKAGECONFIG[cyrus-sasl] = "--enable-cyrus-sasl,--disable-cyrus-sasl,cyrus-sasl"

EXTRA_OECONF = " \
--with-python=python3 \
--disable-perl \
--disable-tcl \
--disable-gevolution \
Expand Down

0 comments on commit 92926a3

Please sign in to comment.