SF.net SVN: gar:[24203] csw/mgar/pkg/pidgin/trunk

[lblume at users.sourceforge.net]

Revision: 24203
          http://sourceforge.net/p/gar/code/24203
Author:   lblume
Date:     2014-10-23 20:38:38 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
pidgin/trunk: Bump to 2.10.10; add fixes so it builds

Modified Paths:
--------------
    csw/mgar/pkg/pidgin/trunk/Makefile
    csw/mgar/pkg/pidgin/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/pidgin/trunk/files/0005_AF_UNIX_not_LOCAL.patch

Modified: csw/mgar/pkg/pidgin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pidgin/trunk/Makefile	2014-10-20 20:04:22 UTC (rev 24202)
+++ csw/mgar/pkg/pidgin/trunk/Makefile	2014-10-23 20:38:38 UTC (rev 24203)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME    = pidgin
-VERSION = 2.10.9
+VERSION = 2.10.10
 GARTYPE = v2
 
 DESCRIPTION = Multi-protocol IM client
@@ -40,8 +40,8 @@
 # For msgfmt, msgmerge, xgettext and gettext to be used from GNU
 CONFIGURE_ENV_PATH = $(prefix)/gnu:$(PATH)
 
-EXTRA_CFLAGS  = -xc99 -D_XPG6 -D__EXTENSIONS__
-EXTRA_LD_OPTIONS = -z nolazyload
+EXTRA_CFLAGS  = -xc99 -D_XPG6 -D__EXTENSIONS__ -D__unix__
+#EXTRA_LD_OPTIONS = -z nolazyload
 
 NCURSES_HEADERS = /opt/csw/include/ncursesw
 EXTRA_CONFIGURE_EXPORTS += CFLAGS NCURSES_HEADERS
@@ -128,6 +128,7 @@
 PATCHFILES += patch-pidgin-plugins-perl-common-Makefile.PL.in
 PATCHFILES += patch-libpurple-plugins-perl-common-Makefile.PL.in
 PATCHFILES += 0004-irc-with-sasl.patch
+PATCHFILES += 0005_AF_UNIX_not_LOCAL.patch
 
 CHECKPKG_OVERRIDES_CSWpidgin += file-with-bad-content|/usr/local|root/opt/csw/lib/pidgin/musicmessaging.so 
 CHECKPKG_OVERRIDES_CSWpidgin += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libgnt.so

Modified: csw/mgar/pkg/pidgin/trunk/checksums
===================================================================
--- csw/mgar/pkg/pidgin/trunk/checksums	2014-10-20 20:04:22 UTC (rev 24202)
+++ csw/mgar/pkg/pidgin/trunk/checksums	2014-10-23 20:38:38 UTC (rev 24203)
@@ -1 +1 @@
-10a4a69d077893f6dd3438cd8af94e81  pidgin-2.10.9.tar.bz2
+5030d4750c73b211c7e82bb67ea3d016  pidgin-2.10.10.tar.bz2

Added: csw/mgar/pkg/pidgin/trunk/files/0005_AF_UNIX_not_LOCAL.patch
===================================================================
--- csw/mgar/pkg/pidgin/trunk/files/0005_AF_UNIX_not_LOCAL.patch	                        (rev 0)
+++ csw/mgar/pkg/pidgin/trunk/files/0005_AF_UNIX_not_LOCAL.patch	2014-10-23 20:38:38 UTC (rev 24203)
@@ -0,0 +1,51 @@
+index 0e362b2..04db360 100644
+--- a/libpurple/protocols/gg/lib/libgadu.c
++++ b/libpurple/protocols/gg/lib/libgadu.c
+@@ -197,7 +197,7 @@ int gg_get_dummy_fd(struct gg_session *sess)
+ 	if (p->dummyfds_created)
+ 		return p->dummyfds[0];
+ 
+-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, p->dummyfds) == -1) {
++	if (socketpair(AF_UNIX, SOCK_STREAM, 0, p->dummyfds) == -1) {
+ 		gg_debug(GG_DEBUG_MISC | GG_DEBUG_ERROR, "// gg_get_dummy_fd() "
+ 			"unable to create pipes (errno=%d, %s)\n",
+ 			errno, strerror(errno));
+@@ -2868,7 +2868,7 @@ static void gg_socket_manager_error(struct gg_session *sess, enum gg_failure_t f
+ 
+ 	p->socket_failure = failure;
+ 
+-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pipes) == -1) {
++	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipes) == -1) {
+ 		gg_debug(GG_DEBUG_MISC, "// gg_socket_manager_error() unable to"
+ 			" create pipes (errno=%d, %s)\n", errno,
+ 			strerror(errno));
+index d07dab0..67b3360 100644
+--- a/libpurple/protocols/gg/lib/resolver.c
++++ b/libpurple/protocols/gg/lib/resolver.c
+@@ -407,7 +407,7 @@ static int gg_resolver_fork_start(int *fd, void **priv_data, const char *hostnam
+ 		return -1;
+ 	}
+ 
+-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pipes) == -1) {
++	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipes) == -1) {
+ 		gg_debug(GG_DEBUG_MISC, "// gg_resolver_fork_start() unable "
+ 			"to create pipes (errno=%d, %s)\n",
+ 			errno, strerror(errno));
+@@ -578,7 +578,7 @@ static int gg_resolver_pthread_start(int *fd, void **priv_data, const char *host
+ 		return -1;
+ 	}
+ 
+-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pipes) == -1) {
++	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipes) == -1) {
+ 		gg_debug(GG_DEBUG_MISC, "// gg_resolver_pthread_start() unable "
+ 			"to create pipes (errno=%d, %s)\n",
+ 			errno, strerror(errno));
+@@ -706,7 +706,7 @@ static int gg_resolver_win32_start(int *fd, void **priv_data, const char *hostna
+ 	data->orphan = 0;
+ 	data->finished = 0;
+ 
+-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pipes) == -1) {
++	if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipes) == -1) {
+ 		gg_debug(GG_DEBUG_MISC, "// gg_resolver_win32_start() unable to "
+ 			"create pipes (errno=%d, %s)\n",
+ 			errno, strerror(errno));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.