Mon Jan 23 20:25:27 2023 UTC ()
libpurple: Update to 2.14.12

pkgsrc changes:
---------------
  * Remove useless PLIST.vv variable.
  * Disable vv when farstream or gstreamer options are not enabled.

upstream changes:
-----------------
version 2.14.12 (12/31/2022):
	* Remove a string from the Romanian translation that's breaks the creation
	  of the Windows installer. (RR 2157) (Gary Kramlich)

version 2.14.11 (12/31/2022):
	* Add Markus "ivanhoe" Fischer to the Crazy Patch Writers! Congrats Markus!
	  (RR 1952) (Gary Kramlich)
	* Fix a crash when closing a group chat with spellchk plugin enabled. (RR
	  1951) (Markus Fischer)
	* Fix network interface detection on Windows to fix broken file transfers.
	  (PIDGIN-17123, PIDGIN-17293, PIDGIN-17516, PIDGIN-17704) (RR 2018) (Gary
	  Kramlich)
	* Update the about box to point people to Discourse instead of the mailing
	  lists. (RR 2154) (Gary Kramlich)


(triaxx)
diff -r1.119 -r1.120 pkgsrc/chat/libpurple/Makefile
diff -r1.56 -r1.57 pkgsrc/chat/libpurple/Makefile.common
diff -r1.56 -r1.57 pkgsrc/chat/libpurple/distinfo
diff -r1.34 -r1.35 pkgsrc/chat/libpurple/options.mk
cvs diff -r1.119 -r1.120 pkgsrc/chat/libpurple/Makefile (switch to unified diff)

--- pkgsrc/chat/libpurple/Makefile 2022/11/23 16:18:33 1.119
+++ pkgsrc/chat/libpurple/Makefile 2023/01/23 20:25:27 1.120
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1# $NetBSD: Makefile,v 1.119 2022/11/23 16:18:33 adam Exp $ 1# $NetBSD: Makefile,v 1.120 2023/01/23 20:25:27 triaxx Exp $
2 2
3PKGNAME= libpurple-${PIDGIN_VERSION} 3PKGNAME= libpurple-${PIDGIN_VERSION}
4PKGREVISION= 2 
5 4
6COMMENT= Plugin-based multi-protocol instant messaging library 5COMMENT= Plugin-based multi-protocol instant messaging library
7 6
8.include "../../chat/libpurple/Makefile.common" 7.include "../../chat/libpurple/Makefile.common"
9 8
10USE_TOOLS+= intltool msgfmt msgmerge xgettext 9USE_TOOLS+= intltool msgfmt msgmerge xgettext
11 10
12CPPFLAGS.SunOS+= -D__SunOS 11CPPFLAGS.SunOS+= -D__SunOS
13 12
14.include "options.mk" 13.include "options.mk"
15 14
16BUILD_DIRS= m4macros libpurple po share/ca-certs share/sounds 15BUILD_DIRS= m4macros libpurple po share/ca-certs share/sounds
17 16
18.include "../../converters/libiconv/buildlink3.mk" 17.include "../../converters/libiconv/buildlink3.mk"
19.include "../../devel/gettext-lib/buildlink3.mk" 18.include "../../devel/gettext-lib/buildlink3.mk"
20.include "../../devel/glib2/buildlink3.mk" 19.include "../../devel/glib2/buildlink3.mk"
21.include "../../devel/libidn/buildlink3.mk" 20.include "../../devel/libidn/buildlink3.mk"
22.include "../../textproc/libxml2/buildlink3.mk" 21.include "../../textproc/libxml2/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.56 -r1.57 pkgsrc/chat/libpurple/Makefile.common (switch to unified diff)

--- pkgsrc/chat/libpurple/Makefile.common 2022/07/20 02:14:12 1.56
+++ pkgsrc/chat/libpurple/Makefile.common 2023/01/23 20:25:27 1.57
@@ -1,57 +1,57 @@ @@ -1,57 +1,57 @@
1# $NetBSD: Makefile.common,v 1.56 2022/07/20 02:14:12 khorben Exp $ 1# $NetBSD: Makefile.common,v 1.57 2023/01/23 20:25:27 triaxx Exp $
2# 2#
3# used by chat/finch/Makefile 3# used by chat/finch/Makefile
4# used by chat/libpurple/Makefile 4# used by chat/libpurple/Makefile
5# used by chat/pidgin/Makefile 5# used by chat/pidgin/Makefile
6# used by chat/pidgin-sametime/Makefile 6# used by chat/pidgin-sametime/Makefile
7# used by chat/pidgin-silc/Makefile 7# used by chat/pidgin-silc/Makefile
8 8
9PIDGIN_VERSION= 2.14.10 9PIDGIN_VERSION= 2.14.12
10DISTNAME= pidgin-${PIDGIN_VERSION} 10DISTNAME= pidgin-${PIDGIN_VERSION}
11CATEGORIES= chat 11CATEGORIES= chat
12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/} 12MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= https://www.pidgin.im/ 16HOMEPAGE= https://www.pidgin.im/
17LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
18 18
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
21USE_TOOLS+= pkg-config gmake 21USE_TOOLS+= pkg-config gmake
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23 23
24PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches 24PATCHDIR= ${.CURDIR}/../../chat/libpurple/patches
25DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo 25DISTINFO_FILE?= ${.CURDIR}/../../chat/libpurple/distinfo
26 26
27CONFIGURE_ARGS+= --disable-gtkui 27CONFIGURE_ARGS+= --disable-gtkui
28CONFIGURE_ARGS+= --disable-consoleui 28CONFIGURE_ARGS+= --disable-consoleui
29CONFIGURE_ARGS+= --disable-meanwhile 29CONFIGURE_ARGS+= --disable-meanwhile
30CONFIGURE_ARGS+= --disable-farstream 30CONFIGURE_ARGS+= --disable-farstream
31CONFIGURE_ARGS+= --disable-gstreamer 31CONFIGURE_ARGS+= --disable-gstreamer
32CONFIGURE_ARGS+= --disable-avahi 32CONFIGURE_ARGS+= --disable-avahi
33CONFIGURE_ARGS+= --disable-perl 33CONFIGURE_ARGS+= --disable-perl
34CONFIGURE_ARGS+= --disable-tcl 34CONFIGURE_ARGS+= --disable-tcl
35CONFIGURE_ARGS+= --disable-tk 35CONFIGURE_ARGS+= --disable-tk
36CONFIGURE_ARGS+= --disable-gnutls 36CONFIGURE_ARGS+= --disable-gnutls
37CONFIGURE_ARGS+= --disable-nss 37CONFIGURE_ARGS+= --disable-nss
38CONFIGURE_ARGS+= --disable-schemas-install 38CONFIGURE_ARGS+= --disable-schemas-install
39CONFIGURE_ARGS+= --disable-dbus 39CONFIGURE_ARGS+= --disable-dbus
40CONFIGURE_ARGS+= --disable-cyrus-sasl 40CONFIGURE_ARGS+= --disable-cyrus-sasl
41CONFIGURE_ARGS+= --disable-debug 41CONFIGURE_ARGS+= --disable-debug
42CONFIGURE_ARGS+= --disable-nm 42CONFIGURE_ARGS+= --disable-nm
43CONFIGURE_ARGS+= --disable-vv 43CONFIGURE_ARGS+= --disable-vv
44 44
45CONFIGURE_ENV+= ac_cv_path_GCONFTOOL="no" 45CONFIGURE_ENV+= ac_cv_path_GCONFTOOL="no"
46 46
47CPPFLAGS.SunOS+= -D__EXTENSIONS__ 47CPPFLAGS.SunOS+= -D__EXTENSIONS__
48CFLAGS.SunOS+= -Wno-error=implicit-function-declaration 48CFLAGS.SunOS+= -Wno-error=implicit-function-declaration
49LDFLAGS.SunOS+= -lnsl -lresolv 49LDFLAGS.SunOS+= -lnsl -lresolv
50 50
51PKGCONFIG_OVERRIDE+= finch/finch.pc.in 51PKGCONFIG_OVERRIDE+= finch/finch.pc.in
52PKGCONFIG_OVERRIDE+= finch/libgnt/gnt.pc.in 52PKGCONFIG_OVERRIDE+= finch/libgnt/gnt.pc.in
53PKGCONFIG_OVERRIDE+= gaim.pc.in 53PKGCONFIG_OVERRIDE+= gaim.pc.in
54PKGCONFIG_OVERRIDE+= libpurple/data/purple.pc.in 54PKGCONFIG_OVERRIDE+= libpurple/data/purple.pc.in
55PKGCONFIG_OVERRIDE+= libpurple/data/purple-2.pc.in 55PKGCONFIG_OVERRIDE+= libpurple/data/purple-2.pc.in
56PKGCONFIG_OVERRIDE+= pidgin/data/pidgin.pc.in 56PKGCONFIG_OVERRIDE+= pidgin/data/pidgin.pc.in
57PKGCONFIG_OVERRIDE+= pidgin/data/pidgin-2.pc.in 57PKGCONFIG_OVERRIDE+= pidgin/data/pidgin-2.pc.in
cvs diff -r1.56 -r1.57 pkgsrc/chat/libpurple/distinfo (switch to unified diff)

--- pkgsrc/chat/libpurple/distinfo 2022/07/20 02:14:12 1.56
+++ pkgsrc/chat/libpurple/distinfo 2023/01/23 20:25:27 1.57
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.56 2022/07/20 02:14:12 khorben Exp $ 1$NetBSD: distinfo,v 1.57 2023/01/23 20:25:27 triaxx Exp $
2 2
3BLAKE2s (pidgin-2.14.10.tar.bz2) = 32b2a307ed8ee05216688b0168a225921f4c1aec5369d5cebec8d91b25fdcb25 3BLAKE2s (pidgin-2.14.12.tar.bz2) = c064eeb66ea4d4dd9f9bdb9bee85f3cecc2ebd3649cfd82abefb8a27227777ec
4SHA512 (pidgin-2.14.10.tar.bz2) = 53241e9f62170fe7a8ea27ac03176d442f8aad4ed16da0033164b0949b00c3d476539b182e761950e7d6c385f22a891524c5f40a9cf8fe543b3003c37693314d 4SHA512 (pidgin-2.14.12.tar.bz2) = ce016ab4c48448653ae22eead1ddc16f1d10f446c601f8abd2c85b4ea83a4e80092e1ce8182834d998b6587f42a92a9a91105b4db976e170ec7043bb6af3c54c
5Size (pidgin-2.14.10.tar.bz2) = 8229328 bytes 5Size (pidgin-2.14.12.tar.bz2) = 8226145 bytes
6SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 4fc1c7cc2df8f4cf179d00fe3bcf5b2ab0c5adbd 6SHA1 (patch-libpurple_plugins_perl_common_Makefile.PL.in) = 4fc1c7cc2df8f4cf179d00fe3bcf5b2ab0c5adbd
cvs diff -r1.34 -r1.35 pkgsrc/chat/libpurple/options.mk (switch to unified diff)

--- pkgsrc/chat/libpurple/options.mk 2021/05/04 13:55:14 1.34
+++ pkgsrc/chat/libpurple/options.mk 2023/01/23 20:25:27 1.35
@@ -1,94 +1,95 @@ @@ -1,94 +1,95 @@
1# $NetBSD: options.mk,v 1.34 2021/05/04 13:55:14 nia Exp $ 1# $NetBSD: options.mk,v 1.35 2023/01/23 20:25:27 triaxx Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple 3PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple
4PKG_OPTIONS_REQUIRED_GROUPS= ssl 4PKG_OPTIONS_REQUIRED_GROUPS= ssl
5PKG_OPTIONS_GROUP.ssl= gnutls nss 5PKG_OPTIONS_GROUP.ssl= gnutls nss
6PKG_SUPPORTED_OPTIONS+= avahi dbus debug farstream 6PKG_SUPPORTED_OPTIONS+= avahi dbus debug farstream
7PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl 7PKG_SUPPORTED_OPTIONS+= gstreamer perl sasl tcl
8PKG_SUGGESTED_OPTIONS+= dbus farstream gstreamer gnutls 8PKG_SUGGESTED_OPTIONS+= dbus farstream gstreamer gnutls
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12PLIST_VARS+= avahi dbus gnutls nss perl tcl vv 12PLIST_VARS+= avahi dbus gnutls nss perl tcl
13 13
14.if !empty(PKG_OPTIONS:Mavahi) 14.if !empty(PKG_OPTIONS:Mavahi)
15PLIST.avahi= yes 15PLIST.avahi= yes
16CONFIGURE_ARGS+= --enable-avahi 16CONFIGURE_ARGS+= --enable-avahi
17. include "../../net/avahi/buildlink3.mk" 17. include "../../net/avahi/buildlink3.mk"
18.endif 18.endif
19 19
20.if !empty(PKG_OPTIONS:Mgnutls) 20.if !empty(PKG_OPTIONS:Mgnutls)
21PLIST.gnutls= yes 21PLIST.gnutls= yes
22CONFIGURE_ARGS+= --enable-gnutls 22CONFIGURE_ARGS+= --enable-gnutls
23CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include 23CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
24CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib 24CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
25. include "../../security/gnutls/buildlink3.mk" 25. include "../../security/gnutls/buildlink3.mk"
26.endif 26.endif
27 27
28.if !empty(PKG_OPTIONS:Mnss) 28.if !empty(PKG_OPTIONS:Mnss)
29PLIST.nss= yes 29PLIST.nss= yes
30CONFIGURE_ARGS+= --enable-nss 30CONFIGURE_ARGS+= --enable-nss
31CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr 31CONFIGURE_ARGS+= --with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
32CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr 32CONFIGURE_ARGS+= --with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib/nspr
33CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss 33CONFIGURE_ARGS+= --with-nss-includes=${BUILDLINK_PREFIX.nss}/include/nss
34CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss 34CONFIGURE_ARGS+= --with-nss-libs=${BUILDLINK_PREFIX.nss}/lib/nss
35. include "../../devel/nss/buildlink3.mk" 35. include "../../devel/nss/buildlink3.mk"
36.endif 36.endif
37 37
38.if !empty(PKG_OPTIONS:Mperl) 38.if !empty(PKG_OPTIONS:Mperl)
39PLIST.perl= yes 39PLIST.perl= yes
40CONFIGURE_ARGS+= --enable-perl 40CONFIGURE_ARGS+= --enable-perl
41USE_TOOLS+= perl:run 41USE_TOOLS+= perl:run
42PERL5_PACKLIST_DIR= ${PREFIX}/lib/purple-2/perl 42PERL5_PACKLIST_DIR= ${PREFIX}/lib/purple-2/perl
43PERL5_PACKLIST= auto/Purple/.packlist 43PERL5_PACKLIST= auto/Purple/.packlist
44. include "../../lang/perl5/packlist.mk" 44. include "../../lang/perl5/packlist.mk"
45. include "../../lang/perl5/buildlink3.mk" 45. include "../../lang/perl5/buildlink3.mk"
46.endif 46.endif
47 47
48.if !empty(PKG_OPTIONS:Mtcl) 48.if !empty(PKG_OPTIONS:Mtcl)
49PLIST.tcl= yes 49PLIST.tcl= yes
50CONFIGURE_ARGS+= --enable-tcl 50CONFIGURE_ARGS+= --enable-tcl
51CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib 51CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib
52. include "../../lang/tcl/buildlink3.mk" 52. include "../../lang/tcl/buildlink3.mk"
53.endif 53.endif
54 54
55.if !empty(PKG_OPTIONS:Mdbus) 55.if !empty(PKG_OPTIONS:Mdbus)
56CONFIGURE_ARGS+= --enable-dbus 56CONFIGURE_ARGS+= --enable-dbus
57CONFIGURE_ARGS+= --with-python3=${PYTHONBIN} 57CONFIGURE_ARGS+= --with-python3=${PYTHONBIN}
58PLIST.dbus= yes 58PLIST.dbus= yes
59REPLACE_SH+= libpurple/purple-send 59REPLACE_SH+= libpurple/purple-send
60REPLACE_SH+= libpurple/purple-send-async 60REPLACE_SH+= libpurple/purple-send-async
61REPLACE_PYTHON+= libpurple/purple-remote 61REPLACE_PYTHON+= libpurple/purple-remote
62REPLACE_PYTHON+= libpurple/purple-url-handler 62REPLACE_PYTHON+= libpurple/purple-url-handler
63PYTHON_VERSIONS_INCOMPATIBLE= 27 63PYTHON_VERSIONS_INCOMPATIBLE= 27
64. include "../../sysutils/py-dbus/buildlink3.mk" 64. include "../../sysutils/py-dbus/buildlink3.mk"
65. include "../../sysutils/dbus/buildlink3.mk" 65. include "../../sysutils/dbus/buildlink3.mk"
66. include "../../sysutils/dbus-glib/buildlink3.mk" 66. include "../../sysutils/dbus-glib/buildlink3.mk"
67. include "../../lang/python/application.mk" 67. include "../../lang/python/application.mk"
68.endif 68.endif
69 69
70.if !empty(PKG_OPTIONS:Mdebug) 70.if !empty(PKG_OPTIONS:Mdebug)
71CONFIGURE_ARGS+= --enable-debug 71CONFIGURE_ARGS+= --enable-debug
72.endif 72.endif
73 73
74.if !empty(PKG_OPTIONS:Msasl) 74.if !empty(PKG_OPTIONS:Msasl)
75CONFIGURE_ARGS+= --enable-cyrus-sasl 75CONFIGURE_ARGS+= --enable-cyrus-sasl
76. include "../../security/cyrus-sasl/buildlink3.mk" 76. include "../../security/cyrus-sasl/buildlink3.mk"
77.endif 77.endif
78 78
79# voice/video support requires both farstream and gstreamer 79# voice/video support requires both farstream and gstreamer
80.if !empty(PKG_OPTIONS:Mfarstream) && !empty(PKG_OPTIONS:Mgstreamer) 80.if !empty(PKG_OPTIONS:Mfarstream) && !empty(PKG_OPTIONS:Mgstreamer)
81CONFIGURE_ARGS+= --enable-vv 81CONFIGURE_ARGS+= --enable-vv
82PLIST.vv= yes 82.else
 83CONFIGURE_ARGS+= --disable-vv
83.endif 84.endif
84 85
85.if !empty(PKG_OPTIONS:Mfarstream) 86.if !empty(PKG_OPTIONS:Mfarstream)
86CONFIGURE_ARGS+= --enable-farstream 87CONFIGURE_ARGS+= --enable-farstream
87. include "../../chat/farstream/buildlink3.mk" 88. include "../../chat/farstream/buildlink3.mk"
88.endif 89.endif
89 90
90.if !empty(PKG_OPTIONS:Mgstreamer) 91.if !empty(PKG_OPTIONS:Mgstreamer)
91CONFIGURE_ARGS+= --enable-gstreamer 92CONFIGURE_ARGS+= --enable-gstreamer
92. include "../../multimedia/gstreamer1/buildlink3.mk" 93. include "../../multimedia/gstreamer1/buildlink3.mk"
93. include "../../multimedia/gst-plugins1-base/buildlink3.mk" 94. include "../../multimedia/gst-plugins1-base/buildlink3.mk"
94.endif 95.endif