summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-06-12 11:40:18 +0000
committernia <nia@pkgsrc.org>2020-06-12 11:40:18 +0000
commit21dbb2ee8d0f4ca64a60f8463a347fdcff5db04b (patch)
tree1accf1c83e496c6ccc5c492c74a5ab6a75d6e6fd
parente056a7072183500ef7d37911376003f964b1c75f (diff)
downloadpkgsrc-21dbb2ee8d0f4ca64a60f8463a347fdcff5db04b.tar.gz
pidgin: Update to 2.14.1
version 2.14.1 (11/06/2020): * Fixed issues with Windows installer that always thought Pidgin was running. (Eion Robb) * Fixed an issue where the Windows installer was not using Unicode while doing checksums which made it fail. (Eion Robb) * Fixed an issue in the released source code that caused the Mercurial revision in the About box to be "unknown". (Gary Kramlich) version 2.14.0 (10/06/2020): General: * Fixed a memory leak in search results. (#17292 PR #320 David Woodhouse) * Support SNI with GNUTLS. (#17300 tiagosalem) (PR #659 Mihai Moldovan) * Add additional error handling to NSS and GNUTLS. (PR #679 Samuel Thibault) libpurple: * Add invisible buddy support to support presence/name/photos for non buddies. (#17295 PR 321 David Woodhouse) * Make purple-remote compatible with both Python 2 and Python 3. (Jan Synacek of RedHat) * Fixed some leaky deprecation warnings. (PR #586 Gary Kramlich) * Fixed HTML logs which were writing invalid HTML. (#17280 stars PR #312 Daniel Kamil Kozar) * Fixed a use after free in purple_smiley_set_data_impl. (PR #694 Gary Kramlich) * Added the chat_send_file ability to protocol plugins. (PR #701 David Woodhouse) Pidgin: * Treat <p> tags as line breaks when pasting. (PR #678 Colin Xu) * Reverted Ticket #17232/PR #695. It caused more harm than good and a new solution needs to be found. (PR #695 Gary Kramlich) Bonjour: * Always use port fallback for IPv4 addresses. (PR #382 Michael Osborne) XMPP: * Support for XEP-0198 Stream Management (PR #309 defanor) * Decrease delay for file transfer using streamhosts (PR #464 #627 Evert Mouw) Voice & Video: * Improve webcam failure handling. (PR #322 David Woodhouse) * Show error when creating media pipeline fails. (#17290 PR 322 David Woodhouse) * Clip audio level reporting. (#14426 PR #322 David Woodhouse) * Keep track of devices managed by GstDeviceMonitor. (PR #322 David Woodhouse) * Ignore PulseAudio monitors. (PR #322 David Woodhouse) * Backport native Voice & Video prefs from 3.0. (PR #322 David Woodhouse) * Fixed building against GStreamer 0.10 (PR #325 David Woodhouse) * Fixed initial delay on incoming audio (PR #379 David Woodhouse) * Properly cleanup timeouts. (PR #383 Jakub Adam) * Added an audio mixer so mixed sources don't cause a pipe failure. (PR #522 Fabrice Bellet) * Added screen share support for Wayland via XDP Portal. (PR #337 David Woodhouse) * Handle unplug and replug events of selected media device. (PR #699 David Woodhouse)
-rw-r--r--chat/finch/Makefile4
-rw-r--r--chat/finch/PLIST33
-rw-r--r--chat/libpurple/Makefile5
-rw-r--r--chat/libpurple/Makefile.common8
-rw-r--r--chat/libpurple/PLIST5
-rw-r--r--chat/libpurple/buildlink3.mk8
-rw-r--r--chat/libpurple/distinfo12
-rw-r--r--chat/libpurple/options.mk24
-rw-r--r--chat/libpurple/patches/patch-libpurple_plugins_perl_common_Makefile.PL.in3
-rw-r--r--chat/pidgin-sametime/Makefile3
-rw-r--r--chat/pidgin-silc/Makefile3
-rw-r--r--chat/pidgin/Makefile3
12 files changed, 37 insertions, 74 deletions
diff --git a/chat/finch/Makefile b/chat/finch/Makefile
index 1bf6bf84dff..64375200140 100644
--- a/chat/finch/Makefile
+++ b/chat/finch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2020/06/02 08:23:17 adam Exp $
+# $NetBSD: Makefile,v 1.74 2020/06/12 11:40:18 nia Exp $
PKGNAME= finch-${PIDGIN_VERSION}
-PKGREVISION= 5
COMMENT= Multi-protocol Instant Messaging client console frontend
@@ -45,6 +44,7 @@ BUILDLINK_API_DEPENDS.libpurple+= libpurple-${PIDGIN_VERSION}{,nb*}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
+.include "../../devel/libgnt/buildlink3.mk"
.include "../../devel/ncursesw/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/finch/PLIST b/chat/finch/PLIST
index 7b8d871dc42..a793671a089 100644
--- a/chat/finch/PLIST
+++ b/chat/finch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/09/06 21:06:44 abs Exp $
+@comment $NetBSD: PLIST,v 1.9 2020/06/12 11:40:18 nia Exp $
bin/finch
include/finch/finch.h
include/finch/gntaccount.h
@@ -20,42 +20,11 @@ include/finch/gntroomlist.h
include/finch/gntsound.h
include/finch/gntstatus.h
include/finch/gntui.h
-include/gnt/gnt.h
-include/gnt/gntbindable.h
-include/gnt/gntbox.h
-include/gnt/gntbutton.h
-include/gnt/gntcheckbox.h
-include/gnt/gntclipboard.h
-include/gnt/gntcolors.h
-include/gnt/gntcombobox.h
-include/gnt/gntentry.h
-include/gnt/gntfilesel.h
-include/gnt/gntkeys.h
-include/gnt/gntlabel.h
-include/gnt/gntline.h
-include/gnt/gntmarshal.h
-include/gnt/gntmenu.h
-include/gnt/gntmenuitem.h
-include/gnt/gntmenuitemcheck.h
-include/gnt/gntprogressbar.h
-include/gnt/gntslider.h
-include/gnt/gntstyle.h
-include/gnt/gnttextview.h
-include/gnt/gnttree.h
-include/gnt/gntutils.h
-include/gnt/gntwidget.h
-include/gnt/gntwindow.h
-include/gnt/gntwm.h
-include/gnt/gntws.h
lib/finch/gntclipboard.la
lib/finch/gntgf.la
lib/finch/gnthistory.la
lib/finch/gntlastlog.la
lib/finch/gnttinyurl.la
lib/finch/grouping.la
-lib/gnt/irssi.la
-lib/gnt/s.la
-lib/libgnt.la
lib/pkgconfig/finch.pc
-lib/pkgconfig/gnt.pc
man/man1/finch.1
diff --git a/chat/libpurple/Makefile b/chat/libpurple/Makefile
index 0fb4a2776fc..b5786aa4fdb 100644
--- a/chat/libpurple/Makefile
+++ b/chat/libpurple/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.99 2020/06/02 08:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.100 2020/06/12 11:40:19 nia Exp $
PKGNAME= libpurple-${PIDGIN_VERSION}
-PKGREVISION= 13
COMMENT= Multi-protocol Instant Messaging client backend
.include "../../chat/libpurple/Makefile.common"
-USE_TOOLS+= msgfmt intltool
+USE_TOOLS+= intltool msgfmt msgmerge xgettext
CPPFLAGS.SunOS+= -D__SunOS
diff --git a/chat/libpurple/Makefile.common b/chat/libpurple/Makefile.common
index c6dc014ce15..ad565e3947a 100644
--- a/chat/libpurple/Makefile.common
+++ b/chat/libpurple/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.52 2020/01/26 17:30:48 rillig Exp $
+# $NetBSD: Makefile.common,v 1.53 2020/06/12 11:40:19 nia Exp $
#
# used by chat/finch/Makefile
# used by chat/libpurple/Makefile
@@ -6,7 +6,7 @@
# used by chat/pidgin-sametime/Makefile
# used by chat/pidgin-silc/Makefile
-PIDGIN_VERSION= 2.13.0
+PIDGIN_VERSION= 2.14.1
DISTNAME= pidgin-${PIDGIN_VERSION}
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
@@ -24,7 +24,6 @@ GNU_CONFIGURE= yes
PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches
DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo
-CONFIGURE_ARGS+= --disable-gevolution
CONFIGURE_ARGS+= --disable-gtkui
CONFIGURE_ARGS+= --disable-consoleui
CONFIGURE_ARGS+= --disable-meanwhile
@@ -36,12 +35,15 @@ CONFIGURE_ARGS+= --disable-tcl
CONFIGURE_ARGS+= --disable-tk
CONFIGURE_ARGS+= --disable-gnutls
CONFIGURE_ARGS+= --disable-nss
+CONFIGURE_ARGS+= --disable-schemas-install
CONFIGURE_ARGS+= --disable-dbus
CONFIGURE_ARGS+= --disable-cyrus-sasl
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --disable-nm
CONFIGURE_ARGS+= --disable-vv
+CONFIGURE_ENV+= ac_cv_path_GCONFTOOL="no"
+
CPPFLAGS.SunOS+= -D__EXTENSIONS__
CFLAGS.SunOS+= -Wno-error=implicit-function-declaration
LDFLAGS.SunOS+= -lnsl -lresolv
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 3fbfea35795..87cba4450e8 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2018/01/01 22:29:20 rillig Exp $
+@comment $NetBSD: PLIST,v 1.35 2020/06/12 11:40:19 nia Exp $
${PLIST.dbus}bin/purple-client-example
${PLIST.dbus}bin/purple-remote
${PLIST.dbus}bin/purple-send
@@ -29,6 +29,7 @@ include/libpurple/dnssrv.h
include/libpurple/eventloop.h
include/libpurple/ft.h
include/libpurple/gaim-compat.h
+include/libpurple/glibcompat.h
include/libpurple/idle.h
include/libpurple/imgstore.h
include/libpurple/log.h
@@ -106,10 +107,10 @@ lib/purple-2/ssl.la
lib/purple-2/statenotify.la
${PLIST.tcl}lib/purple-2/tcl.la
share/aclocal/purple.m4
-${PLIST.gnome}share/gconf/schemas/purple.schemas
share/locale/af/LC_MESSAGES/pidgin.mo
share/locale/am/LC_MESSAGES/pidgin.mo
share/locale/ar/LC_MESSAGES/pidgin.mo
+share/locale/ar_SA/LC_MESSAGES/pidgin.mo
share/locale/as/LC_MESSAGES/pidgin.mo
share/locale/ast/LC_MESSAGES/pidgin.mo
share/locale/az/LC_MESSAGES/pidgin.mo
diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk
index b557d32ed56..e81775a524b 100644
--- a/chat/libpurple/buildlink3.mk
+++ b/chat/libpurple/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.48 2020/06/02 08:22:32 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.49 2020/06/12 11:40:19 nia Exp $
BUILDLINK_TREE+= libpurple
@@ -12,14 +12,14 @@ BUILDLINK_PKGSRCDIR.libpurple?= ../../chat/libpurple
pkgbase := libpurple
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.libpurple:Mdbus)
+.if ${PKG_BUILD_OPTIONS.libpurple:Mdbus}
. include "../../sysutils/dbus/buildlink3.mk"
. include "../../sysutils/dbus-glib/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.libpurple:Mfarstream)
+.if ${PKG_BUILD_OPTIONS.libpurple:Mfarstream}
. include "../../chat/farstream/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.libpurple:Mgstreamer)
+.if ${PKG_BUILD_OPTIONS.libpurple:Mgstreamer}
. include "../../multimedia/gstreamer1/buildlink3.mk"
. include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.endif
diff --git a/chat/libpurple/distinfo b/chat/libpurple/distinfo
index 6b597d433ec..9a14df25a31 100644
--- a/chat/libpurple/distinfo
+++ b/chat/libpurple/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.50 2018/04/16 21:13:28 wiz Exp $
+$NetBSD: distinfo,v 1.51 2020/06/12 11:40:19 nia Exp $
-SHA1 (pidgin-2.13.0.tar.bz2) = 122f0a48ba63cd7f2bc2962c497df045ce29ef71
-RMD160 (pidgin-2.13.0.tar.bz2) = 48f1c281fb018257b2757c4c93ad1501f9f5a356
-SHA512 (pidgin-2.13.0.tar.bz2) = 68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047
-Size (pidgin-2.13.0.tar.bz2) = 8994457 bytes
-SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 40326826000ed42e7570486f89f3196b58093d48
+SHA1 (pidgin-2.14.1.tar.bz2) = a77c0745e7b60665e293b52dfb24ce191d1f81a6
+RMD160 (pidgin-2.14.1.tar.bz2) = 818f33917a5e0cd2a78f20f2cf7fb6263841ba4b
+SHA512 (pidgin-2.14.1.tar.bz2) = 6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
+Size (pidgin-2.14.1.tar.bz2) = 8849275 bytes
+SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 4fc1c7cc2df8f4cf179d00fe3bcf5b2ab0c5adbd
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 3f716c1aebe..f540f25aba8 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,13 +1,15 @@
-# $NetBSD: options.mk,v 1.30 2016/01/13 22:25:38 wiz Exp $
+# $NetBSD: options.mk,v 1.31 2020/06/12 11:40:19 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
-PKG_SUPPORTED_OPTIONS+= avahi dbus debug farstream gnome gnutls
+PKG_OPTIONS_REQUIRED_GROUPS= ssl
+PKG_OPTIONS_GROUP.ssl= gnutls nss
+PKG_SUPPORTED_OPTIONS+= avahi dbus debug farstream
PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl
-PKG_SUGGESTED_OPTIONS+= dbus farstream gnome gstreamer
+PKG_SUGGESTED_OPTIONS+= dbus farstream gstreamer gnutls
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= avahi dbus gnome gnutls nss perl tcl
+PLIST_VARS+= avahi dbus gnutls nss perl tcl vv
.if !empty(PKG_OPTIONS:Mavahi)
PLIST.avahi= yes
@@ -15,23 +17,15 @@ CONFIGURE_ARGS+= --enable-avahi
. include "../../net/avahi/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS:Mgnome)
-PLIST.gnome= yes
-. include "../../devel/GConf/schemas.mk"
-GCONF_SCHEMAS+= purple.schemas
-.else
-CONFIGURE_ARGS+= --disable-schemas-install
-CONFIGURE_ENV+= ac_cv_path_GCONFTOOL="no"
-.endif
-
.if !empty(PKG_OPTIONS:Mgnutls)
PLIST.gnutls= yes
CONFIGURE_ARGS+= --enable-gnutls
CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
. include "../../security/gnutls/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gnutls
+.endif
+
+.if !empty(PKG_OPTIONS:Mnss)
PLIST.nss= yes
CONFIGURE_ARGS+= --enable-nss
CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
diff --git a/chat/libpurple/patches/patch-libpurple_plugins_perl_common_Makefile.PL.in b/chat/libpurple/patches/patch-libpurple_plugins_perl_common_Makefile.PL.in
index 2be4d3351e3..f4d5ab698c8 100644
--- a/chat/libpurple/patches/patch-libpurple_plugins_perl_common_Makefile.PL.in
+++ b/chat/libpurple/patches/patch-libpurple_plugins_perl_common_Makefile.PL.in
@@ -1,6 +1,7 @@
-$NetBSD: patch-libpurple_plugins_perl_common_Makefile.PL.in,v 1.1 2013/07/17 09:41:06 fhajny Exp $
+$NetBSD: patch-libpurple_plugins_perl_common_Makefile.PL.in,v 1.2 2020/06/12 11:40:19 nia Exp $
Unset INSTALL_BASE so that MakeMaker installs perllocal.pod with proper path.
+
--- libpurple/plugins/perl/common/Makefile.PL.in.orig Wed Jul 17 08:18:42 2013
+++ libpurple/plugins/perl/common/Makefile.PL.in Wed Jul 17 08:18:58 2013
@@ -15,7 +15,6 @@
diff --git a/chat/pidgin-sametime/Makefile b/chat/pidgin-sametime/Makefile
index d441f3cade9..e59726b93eb 100644
--- a/chat/pidgin-sametime/Makefile
+++ b/chat/pidgin-sametime/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2020/06/02 08:23:20 adam Exp $
+# $NetBSD: Makefile,v 1.54 2020/06/12 11:40:19 nia Exp $
PKGNAME= pidgin-sametime-${PIDGIN_VERSION}
-PKGREVISION= 5
COMMENT= Lotus Sametime plugin for the Pidgin instant messenger
diff --git a/chat/pidgin-silc/Makefile b/chat/pidgin-silc/Makefile
index a3eced26b5d..c84d06ee61e 100644
--- a/chat/pidgin-silc/Makefile
+++ b/chat/pidgin-silc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2020/06/02 08:23:20 adam Exp $
+# $NetBSD: Makefile,v 1.57 2020/06/12 11:40:19 nia Exp $
PKGNAME= pidgin-silc-${PIDGIN_VERSION}
-PKGREVISION= 5
COMMENT= SILC plugin for the Pidgin instant messenger
diff --git a/chat/pidgin/Makefile b/chat/pidgin/Makefile
index 8487fbe0a96..5ab230a7f19 100644
--- a/chat/pidgin/Makefile
+++ b/chat/pidgin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2020/06/02 08:22:32 adam Exp $
+# $NetBSD: Makefile,v 1.85 2020/06/12 11:40:19 nia Exp $
COMMENT= Multi-protocol Instant Messaging client GTK frontend
-PKGREVISION= 10
.include "../../chat/libpurple/Makefile.common"