--- net-im/libpurple/Makefile +++ net-im/libpurple/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= libpurple -PORTVERSION= 2.12.0 -PORTREVISION= 4 +PORTVERSION= 2.13.0 CATEGORIES?= net-im MASTER_SITES= SF/pidgin/Pidgin/${PORTVERSION} DISTNAME= pidgin-${PORTVERSION} --- net-im/libpurple/distinfo +++ net-im/libpurple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489472185 -SHA256 (pidgin-2.12.0.tar.bz2) = 8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8 -SIZE (pidgin-2.12.0.tar.bz2) = 9270704 +TIMESTAMP = 1520562328 +SHA256 (pidgin-2.13.0.tar.bz2) = 2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f +SIZE (pidgin-2.13.0.tar.bz2) = 8994457 --- net-im/libpurple/files/patch-finch_libgnt_gntmain.c +++ /dev/null @@ -1,74 +0,0 @@ ---- finch/libgnt/gntmain.c.orig 2015-07-10 05:07:01.325805007 -0400 -+++ finch/libgnt/gntmain.c 2015-07-10 13:05:46.746810688 -0400 -@@ -407,10 +407,11 @@ raise: - - #ifdef SIGWINCH - static void (*org_winch_handler)(int); -+static void (*org_winch_handler_sa)(int, siginfo_t *, void *); - #endif - - static void --sighandler(int sig) -+sighandler(int sig, siginfo_t *info, void *data) - { - switch (sig) { - #ifdef SIGWINCH -@@ -419,16 +420,15 @@ sighandler(int sig) - g_idle_add((GSourceFunc)refresh_screen, NULL); - if (org_winch_handler) - org_winch_handler(sig); -- signal(SIGWINCH, sighandler); -+ if (org_winch_handler_sa) -+ org_winch_handler_sa(sig, info, data); - break; - #endif - case SIGCHLD: - clean_pid(); -- signal(SIGCHLD, sighandler); - break; - case SIGINT: - ask_before_exit(); -- signal(SIGINT, sighandler); - break; - } - } -@@ -456,6 +456,10 @@ void gnt_init() - { - char *filename; - const char *locale; -+ struct sigaction act; -+#ifdef SIGWINCH -+ struct sigaction oact; -+#endif - - if (channel) - return; -@@ -501,11 +505,25 @@ void gnt_init() - werase(stdscr); - wrefresh(stdscr); - -+ act.sa_sigaction = sighandler; -+ sigemptyset(&act.sa_mask); -+ act.sa_flags = SA_SIGINFO; -+ - #ifdef SIGWINCH -- org_winch_handler = signal(SIGWINCH, sighandler); -+ org_winch_handler = NULL; -+ org_winch_handler_sa = NULL; -+ sigaction(SIGWINCH, &act, &oact); -+ if (oact.sa_flags & SA_SIGINFO) -+ { -+ org_winch_handler_sa = oact.sa_sigaction; -+ } -+ else if (oact.sa_handler != SIG_DFL && oact.sa_handler != SIG_IGN) -+ { -+ org_winch_handler = oact.sa_handler; -+ } - #endif -- signal(SIGCHLD, sighandler); -- signal(SIGINT, sighandler); -+ sigaction(SIGCHLD, &act, NULL); -+ sigaction(SIGINT, &act, NULL); - signal(SIGPIPE, SIG_IGN); - - #if !GLIB_CHECK_VERSION(2, 36, 0) --- net-im/libpurple/pkg-plist +++ net-im/libpurple/pkg-plist @@ -143,11 +143,11 @@ lib/purple-2/statenotify.so %%DBUS%%lib/libpurple-client.a %%DBUS%%lib/libpurple-client.so %%DBUS%%lib/libpurple-client.so.0 -%%DBUS%%lib/libpurple-client.so.0.12.0 +%%DBUS%%lib/libpurple-client.so.0.13.0 lib/libpurple.a lib/libpurple.so lib/libpurple.so.0 -lib/libpurple.so.0.12.0 +lib/libpurple.so.0.13.0 libdata/pkgconfig/purple.pc %%CONSOLEUI%%man/man1/finch.1.gz %%GTKUI%%man/man1/pidgin.1.gz --- net-im/pidgin/pkg-plist +++ net-im/pidgin/pkg-plist @@ -42,6 +42,7 @@ include/pidgin/gtksourceundomanager.h include/pidgin/gtksourceview-marshal.h include/pidgin/gtkstatus-icon-theme.h include/pidgin/gtkstatusbox.h +include/pidgin/gtkstyle.h include/pidgin/gtkthemes.h include/pidgin/gtkutils.h include/pidgin/gtkwhiteboard.h @@ -71,6 +72,7 @@ lib/pidgin/themeedit.so lib/pidgin/ticker.so lib/pidgin/timestamp.so lib/pidgin/timestamp_format.so +lib/pidgin/transparency.so %%VV%%lib/pidgin/vvconfig.so lib/pidgin/xmppconsole.so lib/pidgin/xmppdisco.so