Date: Mon, 20 Jun 2011 14:59:59 GMT From: Mark Atkinson <atkin901@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/158070: [PATCH] fix net-im/pidgin-sipe to compile with libpurple.8 Message-ID: <201106201459.p5KExxxq065558@red.freebsd.org> Resent-Message-ID: <201106201500.p5KF0Y9C020160@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158070 >Category: ports >Synopsis: [PATCH] fix net-im/pidgin-sipe to compile with libpurple.8 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jun 20 15:00:33 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Mark Atkinson >Release: FreeBSD 9.0-CURRENT #3 r220653 >Organization: >Environment: FreeBSD moby 9.0-CURRENT FreeBSD 9.0-CURRENT #3 r220653: Fri Apr 15 09:15:24 PDT 2011 >Description: With the current update to libpurple.8 net-im/pidgin-sipe will die during compilation with the following error: libtool: compile: cc -DHAVE_CONFIG_H -I. -I../.. -Werror -Wall -Wextra -Werror=declaration-after-statement -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/libpurple -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I./../api -DLOCALEDIR=\"/usr/local/share/locale\" -O2 -pipe -march=pentiumpro -I//usr/local/include -fno-strict-aliasing -MT libsipe_backend_la-purple-dnsquery.lo -MD -MP -MF .deps/libsipe_backend_la-purple-dnsquery.Tpo -c purple-dnsquery.c -fPIC -DPIC -o .libs/libsipe_backend_la-purple-dnsquery.o In file included from purple-dnsquery.c:25: /usr/local/include/libpurple/dnssrv.h:115: error: expected ')' before '*' token /usr/local/include/libpurple/dnssrv.h:150: error: expected ')' before '*' token cc1: warnings being treated as errors purple-dnsquery.c: In function 'sipe_backend_dns_query': purple-dnsquery.c:64: warning: assignment from incompatible pointer type gmake[3]: *** [libsipe_backend_la-purple-dnsquery.lo] Error 1 gmake[3]: Leaving directory `/usr/ports/net-im/pidgin-sipe/work/pidgin-sipe-1.11.2/src/purple' gmake[2]: *** [all-recursive] Error 1 gmake[2]: Leaving directory `/usr/ports/net-im/pidgin-sipe/work/pidgin-sipe-1.11.2/src' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/usr/ports/net-im/pidgin-sipe/work/pidgin-sipe-1.11.2' gmake: *** [all] Error 2 *** Error code 1 Stop in /usr/ports/net-im/pidgin-sipe. >How-To-Repeat: make in /usr/ports/net-im/pidgin-sipe after the libpurple.8 update (ports pr 157934) >Fix: Apply the attached patch to net-im/pidgin-sipe and rebuild. sources: http://permalink.gmane.org/gmane.linux.debian.devel.bugs.general/838995 http://aur.archlinux.org/packages.php?ID=16170 Patch attached with submission follows: diff -drupN /usr/ports/net-im/pidgin-sipe/files/patch-sipe-purple-2.8.0 ./pidgin-sipe/files/patch-sipe-purple-2.8.0 --- /usr/ports/net-im/pidgin-sipe/files/patch-sipe-purple-2.8.0 1969-12-31 16:00:00.000000000 -0800 +++ ./pidgin-sipe/files/patch-sipe-purple-2.8.0 2011-06-20 07:39:15.000000000 -0700 @@ -0,0 +1,60 @@ +diff -drupN src/purple/purple-dnsquery.c.orig src/purple/purple-dnsquery.c +--- src/purple/purple-dnsquery.c.orig 2010-11-03 05:13:51.000000000 +0100 ++++ src/purple/purple-dnsquery.c 2011-06-11 00:14:57.000000000 +0200 +@@ -22,6 +22,10 @@ + + #include "glib.h" + ++#include "version.h" ++#if PURPLE_VERSION_CHECK(2,8,0) ++#include "account.h" ++#endif + #include "dnssrv.h" + + #include "sipe-backend.h" +diff -drupN src/purple/purple-plugin.c.orig src/purple/purple-plugin.c +--- src/purple/purple-plugin.c.orig 2010-11-03 05:13:51.000000000 +0100 ++++ src/purple/purple-plugin.c 2011-06-10 23:58:20.000000000 +0200 +@@ -506,6 +506,10 @@ static PurplePluginProtocolInfo prpl_inf + NULL, /* get_moods */ + NULL, /* set_public_alias */ + NULL, /* get_public_alias */ ++#if PURPLE_VERSION_CHECK(2,8,0) ++ NULL, /* add_buddy_with_invite */ ++ NULL, /* add_buddies_with_invite */ ++#endif + #endif + #endif + #endif +diff -drupN src/purple/purple-private.h.orig src/purple/purple-private.h +--- src/purple/purple-private.h.orig 2010-11-03 05:13:51.000000000 +0100 ++++ src/purple/purple-private.h 2011-06-11 00:14:49.000000000 +0200 +@@ -20,18 +20,28 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include "version.h" ++ + /* Forward declarations */ + struct sipe_core_public; + struct _PurpleAccount; + struct _PurpleConnection; ++#if PURPLE_VERSION_CHECK(2,8,0) ++struct _PurpleSrvTxtQueryData; ++#else + struct _PurpleSrvQueryData; ++#endif + struct _PurpleXfer; + + struct sipe_backend_private { + struct sipe_core_public *public; + struct _PurpleConnection *gc; + struct _PurpleAccount *account; ++#if PURPLE_VERSION_CHECK(2,8,0) ++ struct _PurpleSrvTxtQueryData *dns_query; ++#else + struct _PurpleSrvQueryData *dns_query; ++#endif + time_t last_keepalive; + }; + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106201459.p5KExxxq065558>