Update to Pidgin 2.10.11.

ok jasper@
This commit is contained in:
brad 2015-01-05 08:29:37 +00:00
parent 545a3a4bc3
commit e1e11fbf21
7 changed files with 67 additions and 60 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.122 2014/10/28 01:14:23 brad Exp $ # $OpenBSD: Makefile,v 1.123 2015/01/05 08:29:37 brad Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant messaging client
COMMENT-finch= multi-protocol instant messaging client, console client COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library COMMENT-libpurple= multi-protocol instant messaging library
VERSION= 2.10.10 VERSION= 2.10.11
DISTNAME= pidgin-${VERSION} DISTNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION} PKGNAME-main= pidgin-${VERSION}
PKGNAME-finch= finch-${VERSION} PKGNAME-finch= finch-${VERSION}
@ -34,7 +34,7 @@ MAINTAINER= Brad Smith <brad@comstyle.com>
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c dbus-1 dbus-glib-1 ffi gadu gio-2.0 glib-2.0 gmodule-2.0 \ 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 m pcre pthread xml2 z gobject-2.0 gthread-2.0 idn lzma m pcre pthread xml2 z
WANTLIB-main= X11 ICE SM Xcomposite Xcursor Xdamage Xext Xfixes Xi \ WANTLIB-main= X11 ICE SM Xcomposite Xcursor Xdamage Xext Xfixes Xi \
Xinerama Xrandr Xrender Xss atk-1.0 cairo expat fontconfig \ Xinerama Xrandr Xrender Xss atk-1.0 cairo expat fontconfig \
freetype gdk-x11-2.0 gdk_pixbuf-2.0 graphite2 gtk-x11-2.0 \ freetype gdk-x11-2.0 gdk_pixbuf-2.0 graphite2 gtk-x11-2.0 \

View File

@ -1,2 +1,2 @@
SHA256 (pidgin-2.10.10.tar.bz2) = 3GuVUS6ux1rvFwqrzkcUkfxwWEkyWZ3+rSDx8cRcgi0= SHA256 (pidgin-2.10.11.tar.bz2) = 8q4hE0H8d++5lF1A6ZMqpTXN86bImT/nkZ/KjMHAQAc=
SIZE (pidgin-2.10.10.tar.bz2) = 9409485 SIZE (pidgin-2.10.11.tar.bz2) = 9458050

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_am,v 1.3 2008/12/27 20:48:00 steven Exp $ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_am,v 1.4 2015/01/05 08:29:37 brad Exp $
--- libpurple/plugins/ssl/Makefile.am.orig Sat Dec 20 19:38:16 2008 --- libpurple/plugins/ssl/Makefile.am.orig Sun Nov 23 11:41:25 2014
+++ libpurple/plugins/ssl/Makefile.am Mon Dec 22 00:09:09 2008 +++ libpurple/plugins/ssl/Makefile.am Wed Nov 26 04:19:11 2014
@@ -4,6 +4,7 @@ EXTRA_DIST = \ @@ -4,6 +4,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
@ -8,8 +8,8 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_am,v 1.3 2008/12/27 20:48:00 stev
+ssl_openssl_la_LDFLAGS = -module -avoid-version +ssl_openssl_la_LDFLAGS = -module -avoid-version
ssl_gnutls_la_LDFLAGS = -module -avoid-version ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version ssl_nss_la_LDFLAGS = -module -avoid-version
nss_prefs_la_LDFLAGS = -module -avoid-version
@@ -13,6 +14,11 @@ if PLUGINS @@ -14,6 +15,11 @@ if PLUGINS
# if USE_GNUTLS && USE_NSS # if USE_GNUTLS && USE_NSS
# but only support testing a single variable. Hence: # but only support testing a single variable. Hence:
@ -21,7 +21,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_am,v 1.3 2008/12/27 20:48:00 stev
if USE_GNUTLS if USE_GNUTLS
if USE_NSS if USE_NSS
plugin_LTLIBRARIES = \ plugin_LTLIBRARIES = \
@@ -34,12 +40,15 @@ plugin_LTLIBRARIES = \ @@ -37,13 +43,16 @@ plugin_LTLIBRARIES = \
ssl.la ssl.la
endif endif
endif endif
@ -31,16 +31,18 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_am,v 1.3 2008/12/27 20:48:00 stev
+ssl_openssl_la_SOURCES = ssl-openssl.c +ssl_openssl_la_SOURCES = ssl-openssl.c
ssl_gnutls_la_SOURCES = ssl-gnutls.c ssl_gnutls_la_SOURCES = ssl-gnutls.c
ssl_nss_la_SOURCES = ssl-nss.c ssl_nss_la_SOURCES = ssl-nss.c
nss_prefs_la_SOURCES = nss-prefs.c
ssl_la_LIBADD = $(GLIB_LIBS) ssl_la_LIBADD = $(GLIB_LIBS)
+ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS) +ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS) ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
nss_prefs_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
@@ -54,5 +63,6 @@ AM_CPPFLAGS = \ @@ -59,6 +68,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS) $(PLUGIN_CFLAGS)
+ssl_openssl_la_CFLAGS = $(AM_CPPFLAGS) $(OPENSSL_CFLAGS) +ssl_openssl_la_CFLAGS = $(AM_CPPFLAGS) $(OPENSSL_CFLAGS)
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS) ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS) ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
nss_prefs_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.30 2014/10/28 01:14:23 brad Exp $ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.31 2015/01/05 08:29:37 brad Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Thu Oct 16 20:20:19 2014 --- libpurple/plugins/ssl/Makefile.in.orig Sun Nov 23 11:41:58 2014
+++ libpurple/plugins/ssl/Makefile.in Sun Oct 26 16:44:07 2014 +++ libpurple/plugins/ssl/Makefile.in Wed Nov 26 23:35:38 2014
@@ -120,6 +120,20 @@ am__uninstall_files_from_dir = { \ @@ -120,6 +120,20 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(plugindir)" am__installdirs = "$(DESTDIR)$(plugindir)"
LTLIBRARIES = $(plugin_LTLIBRARIES) LTLIBRARIES = $(plugin_LTLIBRARIES)
@ -11,27 +11,28 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.30 2014/10/28 01:14:23 bra
+@PLUGINS_TRUE@am_ssl_openssl_la_OBJECTS = ssl_openssl_la-ssl-openssl.lo +@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_OBJECTS = $(am_ssl_openssl_la_OBJECTS)
+ssl_openssl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ +ssl_openssl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ssl_openssl_la_CFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ssl_openssl_la_CFLAGS) \
+ $(CFLAGS) $(ssl_openssl_la_LDFLAGS) $(LDFLAGS) -o $@ + $(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@am_ssl_openssl_la_rpath = \
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_FALSE@ -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_FALSE@ $(plugindir)
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@am_ssl_openssl_la_rpath = \ +@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@ -rpath \
+@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@ $(plugindir) +@PLUGINS_TRUE@@USE_OPENSSL_TRUE@@USE_NSS_TRUE@ $(plugindir)
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @PLUGINS_TRUE@nss_prefs_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@PLUGINS_TRUE@ $(am__DEPENDENCIES_1) @PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c am__nss_prefs_la_SOURCES_DIST = nss-prefs.c
@@ -206,7 +220,7 @@ am__v_CCLD_0 = @echo " CCLD " $@; @@ -222,7 +236,8 @@ SOURCES = $(nss_prefs_la_SOURCES) $(ssl_gnutls_la_SOUR
am__v_CCLD_1 = $(ssl_nss_la_SOURCES) $(ssl_la_SOURCES)
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \ DIST_SOURCES = $(am__nss_prefs_la_SOURCES_DIST) \
$(ssl_la_SOURCES) $(am__ssl_gnutls_la_SOURCES_DIST) \
-DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \ - $(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
+DIST_SOURCES = $(am__ssl_openssl_la_SOURCES_DIST) $(am__ssl_gnutls_la_SOURCES_DIST) \ + $(am__ssl_nss_la_SOURCES_DIST) \
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST) + $(am__ssl_openssl_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
am__can_run_installinfo = \ am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \ case $$AM_UPDATE_INFO_DIR in \
@@ -361,6 +375,8 @@ NSS_CFLAGS = @NSS_CFLAGS@ n|no|NO) false;; \
@@ -376,6 +391,8 @@ NSS_CFLAGS = @NSS_CFLAGS@
NSS_LIBS = @NSS_LIBS@ NSS_LIBS = @NSS_LIBS@
OBJDUMP = @OBJDUMP@ OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
@ -40,15 +41,15 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.30 2014/10/28 01:14:23 bra
OTOOL = @OTOOL@ OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@ OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
@@ -493,6 +509,7 @@ EXTRA_DIST = \ @@ -508,6 +525,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version ssl_la_LDFLAGS = -module -avoid-version
+ssl_openssl_la_LDFLAGS = -module -avoid-version +ssl_openssl_la_LDFLAGS = -module -avoid-version
ssl_gnutls_la_LDFLAGS = -module -avoid-version ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_FALSE@@USE_NSS_FALSE@plugin_LTLIBRARIES = \ nss_prefs_la_LDFLAGS = -module -avoid-version
@@ -506,19 +523,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version @@ -523,12 +541,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.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la
@ -63,28 +64,27 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.30 2014/10/28 01:14:23 bra
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl.la \ @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-openssl.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ ssl-gnutls.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@ ssl-nss.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_TRUE@ nss-prefs.la
@PLUGINS_TRUE@ssl_la_SOURCES = ssl.c @@ -538,6 +560,7 @@ nss_prefs_la_LDFLAGS = -module -avoid-version
+@PLUGINS_TRUE@ssl_openssl_la_SOURCES = ssl-openssl.c
@PLUGINS_TRUE@ssl_gnutls_la_SOURCES = ssl-gnutls.c
@PLUGINS_TRUE@ssl_nss_la_SOURCES = ssl-nss.c @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_la_LIBADD = $(GLIB_LIBS)
+@PLUGINS_TRUE@ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS) +@PLUGINS_TRUE@ssl_openssl_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS) @PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS) @PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \ @PLUGINS_TRUE@nss_prefs_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
@@ -530,6 +553,7 @@ AM_CPPFLAGS = \ @@ -550,6 +573,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS) $(PLUGIN_CFLAGS)
+ssl_openssl_la_CFLAGS = $(AM_CPPFLGS) $(OPENSSL_CFLAGS) +ssl_openssl_la_CFLAGS = $(AM_CPPFLGS) $(OPENSSL_CFLAGS)
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS) ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS) ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am nss_prefs_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
@@ -602,6 +626,9 @@ clean-pluginLTLIBRARIES: @@ -626,6 +650,9 @@ clean-pluginLTLIBRARIES:
rm -f $${locs}; \ 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) +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) + $(AM_V_CCLD)$(ssl_openssl_la_LINK) $(am_ssl_openssl_la_rpath) $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
@ -92,15 +92,15 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.30 2014/10/28 01:14:23 bra
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES) $(EXTRA_ssl_gnutls_la_DEPENDENCIES) 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) $(AM_V_CCLD)$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
@@ -618,6 +645,7 @@ distclean-compile: @@ -643,6 +670,7 @@ distclean-compile:
-rm -f *.tab.c
@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.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl-openssl.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_gnutls_la-ssl-gnutls.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_nss_la-ssl-nss.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl_nss_la-ssl-nss.Plo@am__quote@
@@ -641,6 +669,13 @@ distclean-compile: @@ -666,6 +694,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@ -112,5 +112,5 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.30 2014/10/28 01:14:23 bra
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @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 +@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
ssl_gnutls_la-ssl-gnutls.lo: ssl-gnutls.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) $(ssl_gnutls_la_CFLAGS) $(CFLAGS) -MT ssl_gnutls_la-ssl-gnutls.lo -MD -MP -MF $(DEPDIR)/ssl_gnutls_la-ssl-gnutls.Tpo -c -o ssl_gnutls_la-ssl-gnutls.lo `test -f 'ssl-gnutls.c' || echo '$(srcdir)/'`ssl-gnutls.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

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.17 2014/10/28 01:14:23 brad Exp $ $OpenBSD: patch-pidgin_Makefile_in,v 1.18 2015/01/05 08:29:37 brad Exp $
--- pidgin/Makefile.in.orig Thu Oct 16 20:20:20 2014 --- pidgin/Makefile.in.orig Sun Nov 23 11:41:59 2014
+++ pidgin/Makefile.in Thu Oct 23 04:38:23 2014 +++ pidgin/Makefile.in Wed Nov 26 04:17:18 2014
@@ -178,7 +178,7 @@ AM_V_CC = $(am__v_CC_@AM_V@) @@ -176,7 +176,7 @@ AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@; am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 = am__v_CC_1 =

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.29 2014/10/28 01:14:23 brad Exp $ $OpenBSD: patch-pidgin_gtkdialogs_c,v 1.30 2015/01/05 08:29:37 brad Exp $
--- pidgin/gtkdialogs.c.orig Thu Oct 16 20:19:33 2014 --- pidgin/gtkdialogs.c.orig Sun Nov 23 11:41:26 2014
+++ pidgin/gtkdialogs.c Thu Oct 23 04:31:11 2014 +++ pidgin/gtkdialogs.c Wed Nov 26 04:17:18 2014
@@ -645,6 +645,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br @@ -650,6 +650,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>"); g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif #endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.19 2014/10/28 01:14:23 brad Exp $ @comment $OpenBSD: PLIST-main,v 1.20 2015/01/05 08:29:37 brad Exp $
@conflict gaim-* @conflict gaim-*
@conflict pidgin-facebookchat-<1.68p0 @conflict pidgin-facebookchat-<1.68p0
@pkgpath net/pidgin @pkgpath net/pidgin
@ -76,6 +76,8 @@ lib/pidgin/xmppconsole.so
lib/pidgin/xmppdisco.so lib/pidgin/xmppdisco.so
lib/pkgconfig/pidgin.pc lib/pkgconfig/pidgin.pc
@man man/man1/pidgin.1 @man man/man1/pidgin.1
share/appdata/
share/appdata/pidgin.appdata.xml
share/applications/pidgin.desktop share/applications/pidgin.desktop
share/doc/pidgin/ share/doc/pidgin/
share/icons/hicolor/16x16/apps/pidgin.png share/icons/hicolor/16x16/apps/pidgin.png
@ -127,6 +129,9 @@ share/locale/km/LC_MESSAGES/pidgin.mo
share/locale/kn/LC_MESSAGES/pidgin.mo share/locale/kn/LC_MESSAGES/pidgin.mo
share/locale/ko/LC_MESSAGES/pidgin.mo share/locale/ko/LC_MESSAGES/pidgin.mo
share/locale/ku/LC_MESSAGES/pidgin.mo share/locale/ku/LC_MESSAGES/pidgin.mo
share/locale/ku_IQ/
share/locale/ku_IQ/LC_MESSAGES/
share/locale/ku_IQ/LC_MESSAGES/pidgin.mo
share/locale/lt/LC_MESSAGES/pidgin.mo share/locale/lt/LC_MESSAGES/pidgin.mo
share/locale/lv/LC_MESSAGES/pidgin.mo share/locale/lv/LC_MESSAGES/pidgin.mo
share/locale/mai/LC_MESSAGES/pidgin.mo share/locale/mai/LC_MESSAGES/pidgin.mo