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 <brad@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;
No comments:
Post a Comment