cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to pidgin-2.10.12.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2016-01-03 09:06:49 +00:00
parent 226bf268c0
commit 73fc45de9f
8 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/pidgin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.127 2015/04/04 09:21:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.128 2016/01/03 09:06:49 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant messaging client
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
VERSION= 2.10.11
VERSION= 2.10.12
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
@ -19,10 +19,6 @@ CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
EXTRACT_SUFX= .tar.bz2
REVISION-main= 2
REVISION-libpurple= 2
REVISION-finch= 1
SHARED_LIBS= jabber 0.0 \
oscar 0.0 \
purple 6.2 \
@ -70,7 +66,7 @@ LIB_DEPENDS-libpurple= ${LIB_DEPENDS} \
devel/libidn \
devel/silc-toolkit \
net/meanwhile \
net/libgadu>=1.12.0
net/libgadu>=1.12.1
MODGCONF2_SCHEMAS_DIR= pidgin
MODGCONF2_LIBDEP= No

4
net/pidgin/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (pidgin-2.10.11.tar.bz2) = 8q4hE0H8d++5lF1A6ZMqpTXN86bImT/nkZ/KjMHAQAc=
SIZE (pidgin-2.10.11.tar.bz2) = 9458050
SHA256 (pidgin-2.10.12.tar.bz2) = LHUj8P7+iXScA7K3OKufe9GG2kNb5HYvFIfu4x53/90=
SIZE (pidgin-2.10.12.tar.bz2) = 9837598

14
net/pidgin/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.34 2014/10/28 01:14:23 brad Exp $
--- configure.ac.orig Thu Oct 16 20:19:33 2014
+++ configure.ac Thu Oct 23 04:31:11 2014
@@ -1298,7 +1298,6 @@ if test "x$GCC" = "xyes"; then
$OpenBSD: patch-configure_ac,v 1.35 2016/01/03 09:06:49 ajacoutot Exp $
--- configure.ac.orig Thu Dec 31 18:19:40 2015
+++ configure.ac Sat Jan 2 19:53:32 2016
@@ -1396,7 +1396,6 @@ if test "x$GCC" = "xyes"; then
fi
DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.34 2014/10/28 01:14:23 brad Exp $
fi
if test "x$SUNCC" = "xyes"; then
@@ -1686,6 +1685,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
@@ -1784,6 +1783,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!
@ -21,7 +21,7 @@ $OpenBSD: patch-configure_ac,v 1.34 2014/10/28 01:14:23 brad Exp $
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]],
[enable_gnutls="$enableval"],
@@ -1696,10 +1700,98 @@ AC_ARG_ENABLE(nss,
@@ -1794,10 +1798,98 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
@ -122,7 +122,7 @@ $OpenBSD: patch-configure_ac,v 1.34 2014/10/28 01:14:23 brad Exp $
dnl #
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
@@ -2097,17 +2189,32 @@ fi
@@ -2195,17 +2287,32 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

22
net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 brad Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Sun Nov 23 11:41:58 2014
+++ libpurple/plugins/ssl/Makefile.in Wed Nov 26 23:35:38 2014
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.32 2016/01/03 09:06:49 ajacoutot Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Thu Dec 31 18:19:51 2015
+++ libpurple/plugins/ssl/Makefile.in Sat Jan 2 19:53:32 2016
@@ -120,6 +120,20 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(plugindir)"
LTLIBRARIES = $(plugin_LTLIBRARIES)
@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 bra
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -376,6 +391,8 @@ NSS_CFLAGS = @NSS_CFLAGS@
@@ -381,6 +396,8 @@ NSS_CFLAGS = @NSS_CFLAGS@
NSS_LIBS = @NSS_LIBS@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@ -41,7 +41,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 bra
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
@@ -508,6 +525,7 @@ EXTRA_DIST = \
@@ -513,6 +530,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@ -49,7 +49,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 bra
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
nss_prefs_la_LDFLAGS = -module -avoid-version
@@ -523,12 +541,16 @@ nss_prefs_la_LDFLAGS = -module -avoid-version
@@ -528,12 +546,16 @@ nss_prefs_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la
@ -66,7 +66,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 bra
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-gnutls.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-nss.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ nss-prefs.la
@@ -538,6 +560,7 @@ nss_prefs_la_LDFLAGS = -module -avoid-version
@@ -543,6 +565,7 @@ nss_prefs_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@ssl_nss_la_SOURCES = ssl-nss.c
@PLUGINS_TRUE@nss_prefs_la_SOURCES = nss-prefs.c
@PLUGINS_TRUE@ssl_la_LIBADD = $(GLIB_LIBS)
@ -74,7 +74,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 bra
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
@PLUGINS_TRUE@nss_prefs_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
@@ -550,6 +573,7 @@ AM_CPPFLAGS = \
@@ -555,6 +578,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@ -82,7 +82,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 bra
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
nss_prefs_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
@@ -626,6 +650,9 @@ clean-pluginLTLIBRARIES:
@@ -631,6 +655,9 @@ clean-pluginLTLIBRARIES:
nss-prefs.la: $(nss_prefs_la_OBJECTS) $(nss_prefs_la_DEPENDENCIES) $(EXTRA_nss_prefs_la_DEPENDENCIES)
$(AM_V_CCLD)$(nss_prefs_la_LINK) $(am_nss_prefs_la_rpath) $(nss_prefs_la_OBJECTS) $(nss_prefs_la_LIBADD) $(LIBS)
@ -92,7 +92,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 bra
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES) $(EXTRA_ssl_gnutls_la_DEPENDENCIES)
$(AM_V_CCLD)$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
@@ -643,6 +670,7 @@ distclean-compile:
@@ -648,6 +675,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nss_prefs_la-nss-prefs.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@
@ -100,7 +100,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 bra
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_gnutls_la-ssl-gnutls.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_nss_la-ssl-nss.Plo@am__quote@
@@ -666,6 +694,13 @@ distclean-compile:
@@ -671,6 +699,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

8
net/pidgin/patches/patch-libpurple_purple-url-handler
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libpurple_purple-url-handler,v 1.5 2009/05/14 06:51:07 ajacoutot Exp $
--- libpurple/purple-url-handler.orig Mon Aug 18 21:53:50 2008
+++ libpurple/purple-url-handler Wed Aug 20 01:56:15 2008
$OpenBSD: patch-libpurple_purple-url-handler,v 1.6 2016/01/03 09:06:49 ajacoutot Exp $
--- libpurple/purple-url-handler.orig Thu Dec 31 18:19:41 2015
+++ libpurple/purple-url-handler Sat Jan 2 19:53:30 2016
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!${MODPY_BIN}
from __future__ import print_function
import dbus
import re

8
net/pidgin/patches/patch-pidgin_gtkdialogs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.30 2015/01/05 08:29:37 brad Exp $
--- pidgin/gtkdialogs.c.orig Sun Nov 23 11:41:26 2014
+++ pidgin/gtkdialogs.c Wed Nov 26 04:17:18 2014
@@ -650,6 +650,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.31 2016/01/03 09:06:49 ajacoutot Exp $
--- pidgin/gtkdialogs.c.orig Thu Dec 31 18:19:41 2015
+++ pidgin/gtkdialogs.c Sat Jan 2 19:53:30 2016
@@ -653,6 +653,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

4
net/pidgin/pkg/PLIST-libpurple
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-libpurple,v 1.22 2014/10/28 01:14:23 brad Exp $
@comment $OpenBSD: PLIST-libpurple,v 1.23 2016/01/03 09:06:49 ajacoutot Exp $
@conflict pidgin-<2.5.6p3
@pkgpath net/pidgin
@pkgpath net/pidgin,-libpurple,gtkspell
@ -129,6 +129,8 @@ share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
share/purple/ca-certs/Baltimore_CyberTrust_Root.pem
share/purple/ca-certs/CAcert_Class3.pem
share/purple/ca-certs/CAcert_Root.pem
share/purple/ca-certs/Certum_Root_CA.pem
share/purple/ca-certs/Certum_Trusted_Network_CA.pem
share/purple/ca-certs/Deutsche_Telekom_Root_CA_2.pem
share/purple/ca-certs/DigiCertHighAssuranceCA-3.pem
share/purple/ca-certs/DigiCertHighAssuranceEVRootCA.pem

23
net/pidgin/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.20 2015/01/05 08:29:37 brad Exp $
@comment $OpenBSD: PLIST-main,v 1.21 2016/01/03 09:06:49 ajacoutot Exp $
@conflict gaim-*
@conflict pidgin-facebookchat-<1.68p0
@pkgpath net/pidgin
@ -89,12 +89,17 @@ share/icons/hicolor/scalable/apps/pidgin.svg
share/locale/af/LC_MESSAGES/pidgin.mo
share/locale/am/LC_MESSAGES/pidgin.mo
share/locale/ar/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
share/locale/be@latin/LC_MESSAGES/pidgin.mo
share/locale/bg/LC_MESSAGES/pidgin.mo
share/locale/bn/LC_MESSAGES/pidgin.mo
share/locale/bn_IN/LC_MESSAGES/pidgin.mo
share/locale/br/LC_MESSAGES/pidgin.mo
share/locale/brx/
share/locale/brx/LC_MESSAGES/
share/locale/brx/LC_MESSAGES/pidgin.mo
share/locale/bs/LC_MESSAGES/pidgin.mo
share/locale/ca/LC_MESSAGES/pidgin.mo
share/locale/ca@valencia/LC_MESSAGES/pidgin.mo
@ -103,11 +108,16 @@ share/locale/da/LC_MESSAGES/pidgin.mo
share/locale/de/LC_MESSAGES/pidgin.mo
share/locale/dz/LC_MESSAGES/pidgin.mo
share/locale/el/LC_MESSAGES/pidgin.mo
share/locale/en_AU/
share/locale/en_AU/LC_MESSAGES/
share/locale/en_AU/LC_MESSAGES/pidgin.mo
share/locale/en_CA/LC_MESSAGES/pidgin.mo
share/locale/en_GB/LC_MESSAGES/pidgin.mo
share/locale/eo/LC_MESSAGES/pidgin.mo
share/locale/es/LC_MESSAGES/pidgin.mo
share/locale/es_AR/
share/locale/es_AR/LC_MESSAGES/
share/locale/es_AR/LC_MESSAGES/pidgin.mo
share/locale/et/LC_MESSAGES/pidgin.mo
share/locale/eu/LC_MESSAGES/pidgin.mo
share/locale/fa/LC_MESSAGES/pidgin.mo
@ -128,6 +138,9 @@ share/locale/kk/LC_MESSAGES/pidgin.mo
share/locale/km/LC_MESSAGES/pidgin.mo
share/locale/kn/LC_MESSAGES/pidgin.mo
share/locale/ko/LC_MESSAGES/pidgin.mo
share/locale/ks/
share/locale/ks/LC_MESSAGES/
share/locale/ks/LC_MESSAGES/pidgin.mo
share/locale/ku/LC_MESSAGES/pidgin.mo
share/locale/ku_IQ/
share/locale/ku_IQ/LC_MESSAGES/
@ -139,8 +152,12 @@ share/locale/mhr/
share/locale/mhr/LC_MESSAGES/
share/locale/mhr/LC_MESSAGES/pidgin.mo
share/locale/mk/LC_MESSAGES/pidgin.mo
share/locale/ml/LC_MESSAGES/pidgin.mo
share/locale/mn/LC_MESSAGES/pidgin.mo
share/locale/mr/LC_MESSAGES/pidgin.mo
share/locale/ms_MY/
share/locale/ms_MY/LC_MESSAGES/
share/locale/ms_MY/LC_MESSAGES/pidgin.mo
share/locale/my_MM/
share/locale/my_MM/LC_MESSAGES/
share/locale/my_MM/LC_MESSAGES/pidgin.mo
@ -157,6 +174,9 @@ share/locale/pt/LC_MESSAGES/pidgin.mo
share/locale/pt_BR/LC_MESSAGES/pidgin.mo
share/locale/ro/LC_MESSAGES/pidgin.mo
share/locale/ru/LC_MESSAGES/pidgin.mo
share/locale/sd/
share/locale/sd/LC_MESSAGES/
share/locale/sd/LC_MESSAGES/pidgin.mo
share/locale/si/LC_MESSAGES/pidgin.mo
share/locale/sk/LC_MESSAGES/pidgin.mo
share/locale/sl/LC_MESSAGES/pidgin.mo
@ -174,6 +194,7 @@ share/locale/tr/LC_MESSAGES/pidgin.mo
share/locale/tt/LC_MESSAGES/pidgin.mo
share/locale/uk/LC_MESSAGES/pidgin.mo
share/locale/ur/LC_MESSAGES/pidgin.mo
share/locale/uz/LC_MESSAGES/pidgin.mo
share/locale/vi/LC_MESSAGES/pidgin.mo
share/locale/xh/LC_MESSAGES/pidgin.mo
share/locale/zh_CN/LC_MESSAGES/pidgin.mo