Here is an update to Pidgin 2.14.7.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.149
diff -u -p -u -p -r1.149 Makefile
--- Makefile 29 Apr 2021 18:27:02 -0000 1.149
+++ Makefile 26 Sep 2021 04:23:13 -0000
@@ -4,7 +4,7 @@ COMMENT-main= multi-protocol instant mes
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
-VERSION= 2.13.0
+VERSION= 2.14.7
DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION}
@@ -16,15 +16,10 @@ FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
EXTRACT_SUFX= .tar.bz2
-REVISION-main= 5
-REVISION-finch= 1
-REVISION-libpurple=0
SHARED_LIBS= jabber 0.0 \
- oscar 0.0 \
- purple 7.0 \
- purple-client 7.0 \
- gnt 7.0
+ purple 7.1 \
+ purple-client 7.1
HOMEPAGE= https://pidgin.im/
@@ -33,51 +28,50 @@ MAINTAINER= Brad Smith <b...@comstyle.co
# GPLv2+
PERMIT_PACKAGE= Yes
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc base-gcc
-WANTLIB= c dbus-1 dbus-glib-1 ffi gadu gio-2.0 glib-2.0 gmodule-2.0 \
- gobject-2.0 gthread-2.0 idn lzma m pcre pthread xml2 z \
- iconv intl
+WANTLIB= c dbus-1 dbus-glib-1 execinfo ffi gadu gio-2.0 glib-2.0 \
+ gmodule-2.0 gobject-2.0 gthread-2.0 iconv idn intl lzma m \
+ pcre pthread xml2 z
WANTLIB-main= X11 ICE SM Xcomposite Xcursor Xdamage Xext Xfixes Xi \
Xinerama Xrandr Xrender Xss atk-1.0 cairo expat fontconfig \
- freetype gdk-x11-2.0 gdk_pixbuf-2.0 graphite2 gtk-x11-2.0 \
- harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
- png purple ${COMPILER_LIBCXX} xcb-render xcb-shm xcb \
- fribidi ${WANTLIB}
+ freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 graphite2 \
+ gtk-x11-2.0 harfbuzz jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0
\
+ pixman-1 png purple ${COMPILER_LIBCXX} xcb-render xcb-shm \
+ xcb ${WANTLIB}
WANTLIB-libpurple= crypto meanwhile ssl silc silcclient ${WANTLIB}
-WANTLIB-finch= X11 curses panelw purple util xcb ${WANTLIB} \
- ${MODPY_WANTLIB}
+WANTLIB-finch= X11 curses gnt panel purple xcb ${WANTLIB}
MODULES= textproc/intltool \
lang/python \
devel/gconf2
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
-BUILD_DEPENDS= x11/dbus-python
+BUILD_DEPENDS= x11/dbus-python${MODPY_FLAVOR}
LIB_DEPENDS= devel/glib2
-RUN_DEPENDS-main= x11/dbus-python \
- x11/py-gtk2 \
+RUN_DEPENDS-main= x11/dbus-python${MODPY_FLAVOR} \
devel/desktop-file-utils \
x11/gtk+3,-guic
LIB_DEPENDS-main= ${LIB_DEPENDS} \
x11/gtk+2
RUN_DEPENDS-finch= # empty
LIB_DEPENDS-finch= ${LIB_DEPENDS} \
- ${MODPY_LIB_DEPENDS}
+ ${MODPY_LIB_DEPENDS} \
+ devel/libgnt
RUN_DEPENDS-libpurple= ${MODGCONF2_RUN_DEPENDS}
LIB_DEPENDS-libpurple= ${LIB_DEPENDS} \
devel/libidn \
devel/silc-toolkit \
net/meanwhile \
- net/libgadu>=1.12.1
+ net/libgadu
MODGCONF2_SCHEMAS_DIR= pidgin
MODGCONF2_LIBDEP= No
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.16
CONFIGURE_ARGS+= --disable-avahi \
--disable-cap \
--disable-doxygen \
@@ -87,10 +81,11 @@ CONFIGURE_ARGS+= --disable-avahi \
--disable-nm \
--disable-nss \
--disable-perl \
+ --disable-cyrus-sasl \
--disable-tcl \
--disable-tk \
--disable-vv \
- --with-python=${MODPY_BIN}
+ --with-python3=${MODPY_BIN}
# XXX prevent a fatal error at install phase
CONFIGURE_ARGS+= --disable-schemas-install
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
@@ -127,7 +122,7 @@ WANTLIB-main+= enchant gtkspell
CONFIGURE_ARGS+= --disable-gtkspell
.endif
-ARCHIVE_DIR_LIST= finch gnt pidgin purple-2
+ARCHIVE_DIR_LIST= finch pidgin purple-2
post-extract:
@cp ${FILESDIR}/ssl-openssl.c ${WRKSRC}/libpurple/plugins/ssl
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 distinfo
--- distinfo 28 Apr 2018 16:58:39 -0000 1.52
+++ distinfo 26 Sep 2021 04:23:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (pidgin-2.13.0.tar.bz2) = J0cVDG9xEUa93TM8SWhwv9VQWLqyL/t+TreEAY7EbY8=
-SIZE (pidgin-2.13.0.tar.bz2) = 8994457
+SHA256 (pidgin-2.14.7.tar.bz2) = /qarTwVy/iRkYEnCs/7L3KJ6vKbQbpW9ZV5E25m9af4=
+SIZE (pidgin-2.14.7.tar.bz2) = 8713379
Index: patches/patch-configure_ac
===================================================================
RCS file: /home/cvs/ports/net/pidgin/patches/patch-configure_ac,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 patch-configure_ac
--- patches/patch-configure_ac 1 Sep 2017 09:53:09 -0000 1.36
+++ patches/patch-configure_ac 5 Sep 2021 22:57:23 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-configure_ac,v 1.36 2017/09/01 09:53:09 ajacoutot Exp $
+
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -1378,7 +1378,6 @@ if test "x$GCC" = "xyes"; then
+@@ -1335,7 +1335,6 @@ if test "x$GCC" = "xyes"; then
fi
DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
@@ -10,7 +11,7 @@ Index: configure.ac
fi
if test "x$SUNCC" = "xyes"; then
-@@ -1766,6 +1765,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
+@@ -1706,6 +1705,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!
@@ -22,7 +23,7 @@ Index: configure.ac
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support
[default=yes]],
[enable_gnutls="$enableval"],
-@@ -1776,10 +1780,98 @@ AC_ARG_ENABLE(nss,
+@@ -1716,10 +1720,98 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
@@ -123,7 +124,7 @@ Index: configure.ac
dnl #
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
-@@ -2177,17 +2269,32 @@ fi
+@@ -2117,17 +2209,32 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
Index: patches/patch-libpurple_plugins_ssl_Makefile_am
===================================================================
RCS file:
/home/cvs/ports/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_am,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-libpurple_plugins_ssl_Makefile_am
--- patches/patch-libpurple_plugins_ssl_Makefile_am 5 Jan 2015 08:29:37
-0000 1.4
+++ patches/patch-libpurple_plugins_ssl_Makefile_am 18 Jun 2021 20:29:43
-0000
@@ -1,4 +1,5 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_am,v 1.4 2015/01/05 08:29:37
brad Exp $
+
--- libpurple/plugins/ssl/Makefile.am.orig Sun Nov 23 11:41:25 2014
+++ libpurple/plugins/ssl/Makefile.am Wed Nov 26 04:19:11 2014
@@ -4,6 +4,7 @@ EXTRA_DIST = \
Index: patches/patch-libpurple_plugins_ssl_Makefile_in
===================================================================
RCS file: patches/patch-libpurple_plugins_ssl_Makefile_in
diff -N patches/patch-libpurple_plugins_ssl_Makefile_in
--- patches/patch-libpurple_plugins_ssl_Makefile_in 28 Apr 2018 16:58:39
-0000 1.33
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,117 +0,0 @@
-$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.33 2018/04/28 16:58:39
ajacoutot Exp $
-Index: libpurple/plugins/ssl/Makefile.in
---- libpurple/plugins/ssl/Makefile.in.orig
-+++ libpurple/plugins/ssl/Makefile.in
-@@ -129,6 +129,20 @@ am__uninstall_files_from_dir = { \
- am__installdirs = "$(DESTDIR)$(plugindir)"
- LTLIBRARIES = $(plugin_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-+@PLUGINS_TRUE@ssl_openssl_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
-+am__ssl_openssl_la_SOURCES_DIST = ssl-openssl.c
-+@PLUGINS_TRUE@am_ssl_openssl_la_OBJECTS = ssl_openssl_la-ssl-openssl.lo
-+ssl_openssl_la_OBJECTS = $(am_ssl_openssl_la_OBJECTS)
-+ssl_openssl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ssl_openssl_la_CFLAGS) \
-+ $(CFLAGS) $(ssl_openssl_la_LDFLAGS) $(LDFLAGS) -o $@
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_FALSE@am_ssl_openssl_la_rpath = \
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_FALSE@ -rpath \
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_FALSE@ $(plugindir)
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@am_ssl_openssl_la_rpath = \
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@ -rpath \
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@ $(plugindir)
- @PLUGINS_TRUE@nss_prefs_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- @PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
- am__nss_prefs_la_SOURCES_DIST = nss-prefs.c
-@@ -231,7 +245,8 @@ SOURCES = $(nss_prefs_la_SOURCES) $(ssl_gnutls_la_SOUR
- $(ssl_nss_la_SOURCES) $(ssl_la_SOURCES)
- DIST_SOURCES = $(am__nss_prefs_la_SOURCES_DIST) \
- $(am__ssl_gnutls_la_SOURCES_DIST) \
-- $(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
-+ $(am__ssl_nss_la_SOURCES_DIST) \
-+ $(am__ssl_openssl_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
- am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
-@@ -393,6 +408,8 @@ NSS_CFLAGS = @NSS_CFLAGS@
- NSS_LIBS = @NSS_LIBS@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
-+OPENSSL_LIBS = @OPENSSL_LIBS@
- OTOOL = @OTOOL@
- OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
-@@ -526,6 +543,7 @@ EXTRA_DIST = \
-
- plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
- ssl_la_LDFLAGS = -module -avoid-version
-+ssl_openssl_la_LDFLAGS = -module -avoid-version
- ssl_gnutls_la_LDFLAGS = -module -avoid-version
- ssl_nss_la_LDFLAGS = -module -avoid-version
- nss_prefs_la_LDFLAGS = -module -avoid-version
-@@ -541,12 +559,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
-
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_GNUTLS_FALSE@plugin_LTLIBRARIES = \
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_GNUTLS_FALSE@ ssl.la \
-+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_GNUTLS_FALSE@ ssl-openssl.la
-
- # I'm sorry to report that Automake Conditionals don't support
- # if USE_GNUTLS && USE_NSS
- # but only support testing a single variable. Hence:
- @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@plugin_LTLIBRARIES = \
- @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl.la \
-+@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-openssl.la \
- @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
-@@ -556,6 +578,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)
-+@PLUGINS_TRUE@ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
- @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)
-@@ -568,6 +591,7 @@ AM_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(PLUGIN_CFLAGS)
-
-+ssl_openssl_la_CFLAGS = $(AM_CPPFLGS) $(OPENSSL_CFLAGS)
- ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
- ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
- nss_prefs_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
-@@ -643,6 +667,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)
-
-+ssl-openssl.la: $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_DEPENDENCIES)
$(EXTRA_ssl_openssl_la_DEPENDENCIES)
-+ $(AM_V_CCLD)$(ssl_openssl_la_LINK) $(am_ssl_openssl_la_rpath)
$(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
-+
- 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)
-
-@@ -660,6 +687,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@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl-openssl.Plo@am__quote@
- @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@
-
-@@ -683,6 +711,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 $@ $<
-+
-+ssl_openssl_la-ssl-openssl.lo: ssl-openssl.c
-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(ssl_openssl_la_CFLAGS) $(CFLAGS) -MT ssl_openssl_la-ssl-openssl.lo -MD -MP
-MF $(DEPDIR)/ssl_openssl_la-ssl-openssl.Tpo -c -o
ssl_openssl_la-ssl-openssl.lo `test -f 'ssl-openssl.c' || echo
'$(srcdir)/'`ssl-openssl.c
-+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv)
$(DEPDIR)/ssl_openssl_la-ssl-openssl.Tpo
$(DEPDIR)/ssl_openssl_la-ssl-openssl.Plo
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ssl-openssl.c'
object='ssl_openssl_la-ssl-openssl.lo' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(ssl_openssl_la_CFLAGS) $(CFLAGS) -c -o ssl_openssl_la-ssl-openssl.lo `test -f
'ssl-openssl.c' || echo '$(srcdir)/'`ssl-openssl.c
-
- nss_prefs_la-nss-prefs.lo: nss-prefs.c
- @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(nss_prefs_la_CFLAGS) $(CFLAGS) -MT nss_prefs_la-nss-prefs.lo -MD -MP -MF
$(DEPDIR)/nss_prefs_la-nss-prefs.Tpo -c -o nss_prefs_la-nss-prefs.lo `test -f
'nss-prefs.c' || echo '$(srcdir)/'`nss-prefs.c
Index: patches/patch-libpurple_protocols_jabber_Makefile_am
===================================================================
RCS file: patches/patch-libpurple_protocols_jabber_Makefile_am
diff -N patches/patch-libpurple_protocols_jabber_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libpurple_protocols_jabber_Makefile_am 5 Sep 2021
23:01:43 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: libpurple/protocols/jabber/Makefile.am
+--- libpurple/protocols/jabber/Makefile.am.orig
++++ libpurple/protocols/jabber/Makefile.am
+@@ -121,6 +121,8 @@ libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIB
+ libxmpp_la_SOURCES = libxmpp.c
+ libxmpp_la_LIBADD = libjabber.la
+
++am_libxmpp_la_rpath = -rpath $(pkgdir) -Wl,-rpath,$(pkgdir)
++
+ endif
+
+ AM_CPPFLAGS = \
Index: patches/patch-libpurple_protocols_jabber_Makefile_in
===================================================================
RCS file: patches/patch-libpurple_protocols_jabber_Makefile_in
diff -N patches/patch-libpurple_protocols_jabber_Makefile_in
--- patches/patch-libpurple_protocols_jabber_Makefile_in 28 Apr 2018
16:58:39 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-libpurple_protocols_jabber_Makefile_in,v 1.7 2018/04/28
16:58:39 ajacoutot Exp $
-Index: libpurple/protocols/jabber/Makefile.in
---- libpurple/protocols/jabber/Makefile.in.orig
-+++ libpurple/protocols/jabber/Makefile.in
-@@ -198,7 +198,7 @@ libxmpp_la_OBJECTS = $(am_libxmpp_la_OBJECTS)
- libxmpp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libxmpp_la_LDFLAGS) $(LDFLAGS) -o $@
--@STATIC_JABBER_FALSE@am_libxmpp_la_rpath = -rpath $(pkgdir)
-+@STATIC_JABBER_FALSE@am_libxmpp_la_rpath = -rpath $(pkgdir)
-Wl,-rpath,$(pkgdir)
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
Index: patches/patch-libpurple_protocols_oscar_Makefile_in
===================================================================
RCS file: patches/patch-libpurple_protocols_oscar_Makefile_in
diff -N patches/patch-libpurple_protocols_oscar_Makefile_in
--- patches/patch-libpurple_protocols_oscar_Makefile_in 28 Apr 2018 16:58:39
-0000 1.23
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.23 2018/04/28
16:58:39 ajacoutot Exp $
-Index: libpurple/protocols/oscar/Makefile.in
---- libpurple/protocols/oscar/Makefile.in.orig
-+++ libpurple/protocols/oscar/Makefile.in
-@@ -139,7 +139,7 @@ am__v_lt_1 =
- libaim_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libaim_la_LDFLAGS) $(LDFLAGS) -o $@
--@STATIC_OSCAR_FALSE@am_libaim_la_rpath = -rpath $(pkgdir)
-+@STATIC_OSCAR_FALSE@am_libaim_la_rpath = -rpath $(pkgdir) -Wl,-rpath,$(pkgdir)
- @STATIC_OSCAR_FALSE@libicq_la_DEPENDENCIES = liboscar.la
- am__libicq_la_SOURCES_DIST = libicq.c
- @STATIC_OSCAR_FALSE@am_libicq_la_OBJECTS = libicq.lo
-@@ -147,7 +147,7 @@ libicq_la_OBJECTS = $(am_libicq_la_OBJECTS)
- libicq_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libicq_la_LDFLAGS) $(LDFLAGS) -o $@
--@STATIC_OSCAR_FALSE@am_libicq_la_rpath = -rpath $(pkgdir)
-+@STATIC_OSCAR_FALSE@am_libicq_la_rpath = -rpath $(pkgdir) -Wl,-rpath,$(pkgdir)
- am__DEPENDENCIES_1 =
- @STATIC_OSCAR_FALSE@liboscar_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
- am__liboscar_la_SOURCES_DIST = authorization.c bstream.c clientlogin.c \
Index: patches/patch-libpurple_protocols_silc_silc_c
===================================================================
RCS file:
/home/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_silc_silc_c,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-libpurple_protocols_silc_silc_c
--- patches/patch-libpurple_protocols_silc_silc_c 6 Feb 2014 07:44:15
-0000 1.9
+++ patches/patch-libpurple_protocols_silc_silc_c 18 Jun 2021 20:38:25
-0000
@@ -1,6 +1,8 @@
$OpenBSD: patch-libpurple_protocols_silc_silc_c,v 1.9 2014/02/06 07:44:15 brad
Exp $
---- libpurple/protocols/silc/silc.c.orig Wed Jan 22 02:39:51 2014
-+++ libpurple/protocols/silc/silc.c Sat Feb 1 02:56:15 2014
+
+Index: libpurple/protocols/silc/silc.c
+--- libpurple/protocols/silc/silc.c.orig
++++ libpurple/protocols/silc/silc.c
@@ -674,30 +674,12 @@ silcpurple_close(PurpleConnection *gc)
SilcPurpleTask task;
#endif /* __SILC_TOOLKIT_VERSION */
Index: patches/patch-libpurple_purple-remote
===================================================================
RCS file: /home/cvs/ports/net/pidgin/patches/patch-libpurple_purple-remote,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-libpurple_purple-remote
--- patches/patch-libpurple_purple-remote 17 Jun 2020 11:30:03 -0000
1.8
+++ patches/patch-libpurple_purple-remote 18 Jun 2021 20:30:18 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-libpurple_purple-remote,v 1.8 2020/06/17 11:30:03 landry Exp $
+
Index: libpurple/purple-remote
--- libpurple/purple-remote.orig
+++ libpurple/purple-remote
@@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
+#!${MODPY_BIN}
from __future__ import absolute_import, division, print_function
Index: patches/patch-libpurple_purple-url-handler
===================================================================
RCS file:
/home/cvs/ports/net/pidgin/patches/patch-libpurple_purple-url-handler,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-libpurple_purple-url-handler
--- patches/patch-libpurple_purple-url-handler 28 Apr 2018 16:58:39 -0000
1.7
+++ patches/patch-libpurple_purple-url-handler 18 Jun 2021 20:30:27 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-libpurple_purple-url-handler,v 1.7 2018/04/28 16:58:39
ajacoutot Exp $
+
Index: libpurple/purple-url-handler
--- libpurple/purple-url-handler.orig
+++ libpurple/purple-url-handler
@@ -1,4 +1,4 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
+#!${MODPY_BIN}
from __future__ import absolute_import, division, print_function
Index: patches/patch-pidgin_Makefile_am
===================================================================
RCS file: patches/patch-pidgin_Makefile_am
diff -N patches/patch-pidgin_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pidgin_Makefile_am 5 Sep 2021 22:57:19 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: pidgin/Makefile.am
+--- pidgin/Makefile.am.orig
++++ pidgin/Makefile.am
+@@ -31,6 +31,8 @@ EXTRA_DIST = \
+ win32/nsis/create_nsis_translations.pl \
+ win32/nsis/nsis_translations.desktop.in
+
++CCLD = $(CXX)
++
+ if ENABLE_GTK
+
+ SUBDIRS = pixmaps plugins
Index: patches/patch-pidgin_Makefile_in
===================================================================
RCS file: patches/patch-pidgin_Makefile_in
diff -N patches/patch-pidgin_Makefile_in
--- patches/patch-pidgin_Makefile_in 28 Apr 2018 16:58:39 -0000 1.19
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-pidgin_Makefile_in,v 1.19 2018/04/28 16:58:39 ajacoutot Exp $
-Index: pidgin/Makefile.in
---- pidgin/Makefile.in.orig
-+++ pidgin/Makefile.in
-@@ -186,7 +186,7 @@ AM_V_CC = $(am__v_CC_@AM_V@)
- am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
- am__v_CC_0 = @echo " CC " $@;
- am__v_CC_1 =
--CCLD = $(CC)
-+CCLD = $(CXX)
- LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
Index: patches/patch-pidgin_gtkconv_c
===================================================================
RCS file: /home/cvs/ports/net/pidgin/patches/patch-pidgin_gtkconv_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-pidgin_gtkconv_c
--- patches/patch-pidgin_gtkconv_c 28 Apr 2018 16:58:39 -0000 1.3
+++ patches/patch-pidgin_gtkconv_c 5 Sep 2021 22:57:19 -0000
@@ -6,7 +6,7 @@ of the nick changes with each restart of
Index: pidgin/gtkconv.c
--- pidgin/gtkconv.c.orig
+++ pidgin/gtkconv.c
-@@ -10275,7 +10275,7 @@ generate_nick_colors(guint *color_count, GdkColor back
+@@ -10274,7 +10274,7 @@ generate_nick_colors(guint *color_count, GdkColor back
pidgin_style_adjust_contrast(NULL, &nick_highlight);
pidgin_style_adjust_contrast(NULL, &send_color);
Index: patches/patch-pidgin_gtkdialogs_c
===================================================================
RCS file: /home/cvs/ports/net/pidgin/patches/patch-pidgin_gtkdialogs_c,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 patch-pidgin_gtkdialogs_c
--- patches/patch-pidgin_gtkdialogs_c 5 Jul 2016 07:13:59 -0000 1.32
+++ patches/patch-pidgin_gtkdialogs_c 18 Jun 2021 20:36:39 -0000
@@ -1,6 +1,8 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.32 2016/07/05 07:13:59 ajacoutot Exp $
---- pidgin/gtkdialogs.c.orig Sun Jun 19 01:33:11 2016
-+++ pidgin/gtkdialogs.c Sat Jul 2 19:20:34 2016
+
+Index: pidgin/gtkdialogs.c
+--- pidgin/gtkdialogs.c.orig
++++ pidgin/gtkdialogs.c
@@ -654,6 +654,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif
Index: pkg/DESCR-main
===================================================================
RCS file: /home/cvs/ports/net/pidgin/pkg/DESCR-main,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 DESCR-main
--- pkg/DESCR-main 1 Sep 2017 09:53:09 -0000 1.2
+++ pkg/DESCR-main 7 Sep 2021 02:28:37 -0000
@@ -1,15 +1,14 @@
Pidgin is a GTK+-based multi-protocol instant messaging client. It is
-compatible with AIM, ICQ, IRC, Jabber, Gadu-Gadu, Novell GroupWise,
-and Zephyr networks.
+compatible with IRC, Jabber, Gadu-Gadu, Novell GroupWise, and Zephyr
+networks.
Pidgin supports many features of the various networks, such as file
-transfer, away messages, typing notification, and MSN window closing
-notification. It also goes beyond that and provides many unique
-features. A few popular features are Buddy Pounces, which give the
-ability to notify you, send a message, play a sound, or run a program
-when a specific buddy goes away, signs online, or returns from idle;
-and plugins, consisting of text replacement, a buddy ticker, extended
-message notification, iconify on away, and more.
+transfer, away messages, typing notification. It also goes beyond that
+and provides many unique features. A few popular features are Buddy
+Pounces, which give the ability to notify you, send a message, play a
+sound, or run a program when a specific buddy goes away, signs online,
+or returns from idle; and plugins, consisting of text replacement, a
+buddy ticker, extended message notification, iconify on away, and more.
Pidgin integrates well with GNOME and KDE's system trays. This allows
you to work with Pidgin without requiring the buddy list window to
Index: pkg/PLIST-finch
===================================================================
RCS file: /home/cvs/ports/net/pidgin/pkg/PLIST-finch,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST-finch
--- pkg/PLIST-finch 13 Dec 2011 14:42:55 -0000 1.7
+++ pkg/PLIST-finch 6 Sep 2021 00:17:21 -0000
@@ -23,47 +23,12 @@ include/finch/gntroomlist.h
include/finch/gntsound.h
include/finch/gntstatus.h
include/finch/gntui.h
-include/gnt/
-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/
-lib/finch/gntclipboard.so
-lib/finch/gntgf.so
-lib/finch/gnthistory.so
-lib/finch/gntlastlog.so
-lib/finch/gnttinyurl.so
-lib/finch/grouping.so
-lib/gnt/
-lib/gnt/irssi.so
-lib/gnt/s.so
-lib/libgnt.a
-lib/libgnt.la
-@lib lib/libgnt.so.${LIBgnt_VERSION}
+@so lib/finch/gntclipboard.so
+@so lib/finch/gntgf.so
+@so lib/finch/gnthistory.so
+@so lib/finch/gntlastlog.so
+@so lib/finch/gnttinyurl.so
+@so lib/finch/grouping.so
lib/pkgconfig/finch.pc
-lib/pkgconfig/gnt.pc
@man man/man1/finch.1
Index: pkg/PLIST-libpurple
===================================================================
RCS file: /home/cvs/ports/net/pidgin/pkg/PLIST-libpurple,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 PLIST-libpurple
--- pkg/PLIST-libpurple 1 Sep 2017 09:53:09 -0000 1.25
+++ pkg/PLIST-libpurple 6 Sep 2021 20:44:53 -0000
@@ -34,6 +34,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
@@ -81,38 +82,35 @@ include/libpurple/value.h
include/libpurple/version.h
include/libpurple/whiteboard.h
include/libpurple/xmlnode.h
-lib/libpurple-client.a
+@static-lib lib/libpurple-client.a
lib/libpurple-client.la
@lib lib/libpurple-client.so.${LIBpurple-client_VERSION}
-lib/libpurple.a
+@static-lib lib/libpurple.a
lib/libpurple.la
@lib lib/libpurple.so.${LIBpurple_VERSION}
lib/pkgconfig/purple.pc
lib/purple-2/
-lib/purple-2/autoaccept.so
-lib/purple-2/buddynote.so
-lib/purple-2/dbus-example.so
-lib/purple-2/idle.so
-lib/purple-2/joinpart.so
-lib/purple-2/libaim.so
-lib/purple-2/libgg.so
-lib/purple-2/libicq.so
-lib/purple-2/libirc.so
+@so lib/purple-2/autoaccept.so
+@so lib/purple-2/buddynote.so
+@so lib/purple-2/dbus-example.so
+@so lib/purple-2/idle.so
+@so lib/purple-2/joinpart.so
+@so lib/purple-2/libgg.so
+@so lib/purple-2/libirc.so
@lib lib/purple-2/libjabber.so.${LIBjabber_VERSION}
-lib/purple-2/libnovell.so
-@lib lib/purple-2/liboscar.so.${LIBoscar_VERSION}
-lib/purple-2/libsametime.so
-lib/purple-2/libsilcpurple.so
-lib/purple-2/libsimple.so
-lib/purple-2/libxmpp.so
-lib/purple-2/libzephyr.so
-lib/purple-2/log_reader.so
-lib/purple-2/newline.so
-lib/purple-2/offlinemsg.so
-lib/purple-2/psychic.so
-lib/purple-2/ssl-openssl.so
-lib/purple-2/ssl.so
-lib/purple-2/statenotify.so
+@so lib/purple-2/libnovell.so
+@so lib/purple-2/libsametime.so
+@so lib/purple-2/libsilcpurple.so
+@so lib/purple-2/libsimple.so
+@so lib/purple-2/libxmpp.so
+@so lib/purple-2/libzephyr.so
+@so lib/purple-2/log_reader.so
+@so lib/purple-2/newline.so
+@so lib/purple-2/offlinemsg.so
+@so lib/purple-2/psychic.so
+@so lib/purple-2/ssl-openssl.so
+@so lib/purple-2/ssl.so
+@so lib/purple-2/statenotify.so
share/aclocal/purple.m4
share/dbus-1/services/purple.service
share/purple/
@@ -120,10 +118,10 @@ share/purple/ca-certs/
share/purple/ca-certs/CAcert_Class3.pem
share/purple/ca-certs/CAcert_Root.pem
share/purple/ca-certs/mozilla.pem
-@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas
>/dev/null 2>&1
+@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool${MODPY_BIN_SUFFIX}
--get-default-source` %D/bin/gconftool${MODPY_BIN_SUFFIX}
--makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas >/dev/null 2>&1
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/purple.schemas
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas
>/dev/null 2>&1
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool${MODPY_BIN_SUFFIX}
--get-default-source` %D/bin/gconftool${MODPY_BIN_SUFFIX}
--makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas >/dev/null 2>&1
share/sounds/
share/sounds/purple/
share/sounds/purple/alert.wav
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/net/pidgin/pkg/PLIST-main,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 PLIST-main
--- pkg/PLIST-main 29 Jun 2018 22:16:19 -0000 1.26
+++ pkg/PLIST-main 8 Sep 2021 03:36:28 -0000
@@ -56,30 +56,28 @@ include/pidgin/pidgin.h
include/pidgin/pidginstock.h
include/pidgin/pidgintooltip.h
lib/pidgin/
-lib/pidgin/convcolors.so
-lib/pidgin/extplacement.so
-lib/pidgin/gestures.so
-lib/pidgin/gtkbuddynote.so
-lib/pidgin/history.so
-lib/pidgin/iconaway.so
-lib/pidgin/markerline.so
-lib/pidgin/musicmessaging.so
-lib/pidgin/notify.so
-lib/pidgin/pidginrc.so
-lib/pidgin/relnot.so
-lib/pidgin/sendbutton.so
-lib/pidgin/spellchk.so
-lib/pidgin/themeedit.so
-lib/pidgin/ticker.so
-lib/pidgin/timestamp.so
-lib/pidgin/timestamp_format.so
-lib/pidgin/transparency.so
-lib/pidgin/xmppconsole.so
-lib/pidgin/xmppdisco.so
+@so lib/pidgin/convcolors.so
+@so lib/pidgin/extplacement.so
+@so lib/pidgin/gestures.so
+@so lib/pidgin/gtkbuddynote.so
+@so lib/pidgin/history.so
+@so lib/pidgin/iconaway.so
+@so lib/pidgin/markerline.so
+@so lib/pidgin/musicmessaging.so
+@so lib/pidgin/notify.so
+@so lib/pidgin/pidginrc.so
+@so lib/pidgin/relnot.so
+@so lib/pidgin/sendbutton.so
+@so lib/pidgin/spellchk.so
+@so lib/pidgin/themeedit.so
+@so lib/pidgin/ticker.so
+@so lib/pidgin/timestamp.so
+@so lib/pidgin/timestamp_format.so
+@so lib/pidgin/transparency.so
+@so lib/pidgin/xmppconsole.so
+@so lib/pidgin/xmppdisco.so
lib/pkgconfig/pidgin.pc
@man man/man1/pidgin.1
-share/appdata/
-share/appdata/pidgin.appdata.xml
share/applications/pidgin.desktop
share/doc/pidgin/
share/icons/hicolor/16x16/apps/pidgin.png
@@ -91,6 +89,9 @@ share/icons/hicolor/scalable/apps/pidgin
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/
+share/locale/ar_SA/LC_MESSAGES/
+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
@@ -110,8 +111,6 @@ 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
@@ -150,8 +149,6 @@ share/locale/ku_IQ/LC_MESSAGES/pidgin.mo
share/locale/lt/LC_MESSAGES/pidgin.mo
share/locale/lv/LC_MESSAGES/pidgin.mo
share/locale/mai/LC_MESSAGES/pidgin.mo
-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
@@ -176,8 +173,6 @@ 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
@@ -186,8 +181,6 @@ share/locale/sq/LC_MESSAGES/pidgin.mo
share/locale/sr/LC_MESSAGES/pidgin.mo
share/locale/sr@latin/LC_MESSAGES/pidgin.mo
share/locale/sv/LC_MESSAGES/pidgin.mo
-share/locale/sw/
-share/locale/sw/LC_MESSAGES/
share/locale/sw/LC_MESSAGES/pidgin.mo
share/locale/ta/LC_MESSAGES/pidgin.mo
share/locale/te/LC_MESSAGES/pidgin.mo
@@ -202,6 +195,8 @@ share/locale/xh/LC_MESSAGES/pidgin.mo
share/locale/zh_CN/LC_MESSAGES/pidgin.mo
share/locale/zh_HK/LC_MESSAGES/pidgin.mo
share/locale/zh_TW/LC_MESSAGES/pidgin.mo
+share/metainfo/
+share/metainfo/pidgin.appdata.xml
share/pixmaps/
share/pixmaps/pidgin/
share/pixmaps/pidgin/animations/
@@ -599,12 +594,10 @@ share/pixmaps/pidgin/emotes/small/writin
share/pixmaps/pidgin/logo.png
share/pixmaps/pidgin/protocols/
share/pixmaps/pidgin/protocols/16/
-share/pixmaps/pidgin/protocols/16/aim.png
share/pixmaps/pidgin/protocols/16/bonjour.png
share/pixmaps/pidgin/protocols/16/facebook.png
share/pixmaps/pidgin/protocols/16/gadu-gadu.png
share/pixmaps/pidgin/protocols/16/google-talk.png
-share/pixmaps/pidgin/protocols/16/icq.png
share/pixmaps/pidgin/protocols/16/irc.png
share/pixmaps/pidgin/protocols/16/jabber.png
share/pixmaps/pidgin/protocols/16/meanwhile.png
@@ -613,12 +606,10 @@ share/pixmaps/pidgin/protocols/16/silc.p
share/pixmaps/pidgin/protocols/16/simple.png
share/pixmaps/pidgin/protocols/16/zephyr.png
share/pixmaps/pidgin/protocols/22/
-share/pixmaps/pidgin/protocols/22/aim.png
share/pixmaps/pidgin/protocols/22/bonjour.png
share/pixmaps/pidgin/protocols/22/facebook.png
share/pixmaps/pidgin/protocols/22/gadu-gadu.png
share/pixmaps/pidgin/protocols/22/google-talk.png
-share/pixmaps/pidgin/protocols/22/icq.png
share/pixmaps/pidgin/protocols/22/irc.png
share/pixmaps/pidgin/protocols/22/jabber.png
share/pixmaps/pidgin/protocols/22/meanwhile.png
@@ -627,11 +618,9 @@ share/pixmaps/pidgin/protocols/22/silc.p
share/pixmaps/pidgin/protocols/22/simple.png
share/pixmaps/pidgin/protocols/22/zephyr.png
share/pixmaps/pidgin/protocols/48/
-share/pixmaps/pidgin/protocols/48/aim.png
share/pixmaps/pidgin/protocols/48/bonjour.png
share/pixmaps/pidgin/protocols/48/facebook.png
share/pixmaps/pidgin/protocols/48/gadu-gadu.png
-share/pixmaps/pidgin/protocols/48/icq.png
share/pixmaps/pidgin/protocols/48/irc.png
share/pixmaps/pidgin/protocols/48/jabber.png
share/pixmaps/pidgin/protocols/48/meanwhile.png
@@ -640,11 +629,9 @@ share/pixmaps/pidgin/protocols/48/silc.p
share/pixmaps/pidgin/protocols/48/simple.png
share/pixmaps/pidgin/protocols/48/zephyr.png
share/pixmaps/pidgin/protocols/scalable/
-share/pixmaps/pidgin/protocols/scalable/aim.svg
share/pixmaps/pidgin/protocols/scalable/bonjour.svg
share/pixmaps/pidgin/protocols/scalable/gadu-gadu.svg
share/pixmaps/pidgin/protocols/scalable/google-talk.svg
-share/pixmaps/pidgin/protocols/scalable/icq.svg
share/pixmaps/pidgin/protocols/scalable/irc.svg
share/pixmaps/pidgin/protocols/scalable/jabber.svg
share/pixmaps/pidgin/protocols/scalable/meanwhile.svg
