Attachment #121416 for bug #164391

View | Details | Raw Unified | Return to bug 164391
Collapse All | Expand All

Lines 6-13 Link Here

(-)pidgin-sipe/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= pidgin-sipe	8	PORTNAME= pidgin-sipe
9	PORTVERSION= 1.11.2	9	PORTVERSION= 1.12.0
10	PORTREVISION= 4
11	CATEGORIES= net-im	10	CATEGORIES= net-im
12	MASTER_SITES= SF/sipe/sipe/${DISTNAME}	11	MASTER_SITES= SF/sipe/sipe/${DISTNAME}
13		12

Lines 1-2 Link Here

(-)pidgin-sipe/distinfo (-2 / +2 lines)
1	SHA256 (pidgin-sipe-1.11.2.tar.bz2) = 90c424942cad50f271367acb0ddcf8e5c648d1aed1f395200e5d909515ce7ae9	1	SHA256 (pidgin-sipe-1.12.0.tar.bz2) = 302a495bbe37d45e6d8836cd29031295eef631211b0cc15067b2f687d2b25717
2	SIZE (pidgin-sipe-1.11.2.tar.bz2) = 605656	2	SIZE (pidgin-sipe-1.12.0.tar.bz2) = 673336




--- src/purple/purple-dnsquery.c.orig	2011-08-29 17:05:26.000000000 +1100
+++ src/purple/purple-dnsquery.c	2012-01-23 12:24:33.000000000 +1100
@@ -29,6 +29,12 @@
 #endif
 #include "glib.h"
 
 #include <glib.h>
+#include <sys/socket.h>
+
+#include "version.h"
+#if PURPLE_VERSION_CHECK(2,8,0)
+#include "account.h"
+#endif
 #include "dnssrv.h"
 
 #include "dnsquery.h"
 #include "dnssrv.h"




--- ./src/purple/purple-plugin.c.orig	2010-11-03 05:13:51.000000000 +0100
+++ ./src/purple/purple-plugin.c	2011-06-21 11:23:35.000000000 +0200
@@ -506,6 +506,10 @@
 	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




--- ./src/purple/purple-private.h.orig	2010-11-03 05:13:51.000000000 +0100
+++ ./src/purple/purple-private.h	2011-06-21 11:23:35.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;
 };
 

Lines 1-5 Link Here

(-)pidgin-sipe/pkg-plist (+12 lines)
1	lib/purple-2/libsipe.la	1	lib/purple-2/libsipe.la
2	lib/purple-2/libsipe.so	2	lib/purple-2/libsipe.so
		3	libdata/ldconfig/pidgin-sipe
		4	share/doc/pidgin-sipe/AUTHORS
		5	share/doc/pidgin-sipe/COPYING
		6	share/doc/pidgin-sipe/ChangeLog
		7	share/doc/pidgin-sipe/HACKING
		8	share/doc/pidgin-sipe/INSTALL
		9	share/doc/pidgin-sipe/NEWS
		10	share/doc/pidgin-sipe/README
		11	share/doc/pidgin-sipe/TODO
		12	share/doc/pidgin-sipe/VERSION
3	%%NLS%%share/locale/ar/LC_MESSAGES/pidgin-sipe.mo	13	%%NLS%%share/locale/ar/LC_MESSAGES/pidgin-sipe.mo
4	%%NLS%%share/locale/cs/LC_MESSAGES/pidgin-sipe.mo	14	%%NLS%%share/locale/cs/LC_MESSAGES/pidgin-sipe.mo
5	%%NLS%%share/locale/da/LC_MESSAGES/pidgin-sipe.mo	15	%%NLS%%share/locale/da/LC_MESSAGES/pidgin-sipe.mo
Lines 25-27 Link Here
25	share/pixmaps/pidgin/protocols/22/sipe.png	35	share/pixmaps/pidgin/protocols/22/sipe.png
26	share/pixmaps/pidgin/protocols/48/sipe.png	36	share/pixmaps/pidgin/protocols/48/sipe.png
27	share/pixmaps/pidgin/protocols/scalable/sipe.svg	37	share/pixmaps/pidgin/protocols/scalable/sipe.svg
		38	@dirrm share/doc/pidgin-sipe
		39	@dirrmtry share/doc

Return to bug 164391

Lines 1-13 Link Here

(-)pidgin-sipe/files/patch-src__purple__purple-dnsquery.c (-7 / +9 lines)
1	--- ./src/purple/purple-dnsquery.c.orig 2010-11-03 05:13:51.000000000 +0100	1	--- src/purple/purple-dnsquery.c.orig 2011-08-29 17:05:26.000000000 +1100
2	+++ ./src/purple/purple-dnsquery.c 2011-06-21 11:23:35.000000000 +0200	2	+++ src/purple/purple-dnsquery.c 2012-01-23 12:24:33.000000000 +1100
3	@@ -22,6 +22,10 @@	3	@@ -29,6 +29,12 @@
4		4	#endif
5	#include "glib.h"
6		5
		6	#include <glib.h>
		7	+#include <sys/socket.h>
		8	+
7	+#include "version.h"	9	+#include "version.h"
8	+#if PURPLE_VERSION_CHECK(2,8,0)	10	+#if PURPLE_VERSION_CHECK(2,8,0)
9	+#include "account.h"	11	+#include "account.h"
10	+#endif	12	+#endif
11	#include "dnssrv.h"
12		13
13	#include "sipe-backend.h"	14	#include "dnsquery.h"
		15	#include "dnssrv.h"

Lines 1-13 Link Here

(-)pidgin-sipe/files/patch-src__purple__purple-plugin.c (-13 lines)
1	--- ./src/purple/purple-plugin.c.orig 2010-11-03 05:13:51.000000000 +0100
2	+++ ./src/purple/purple-plugin.c 2011-06-21 11:23:35.000000000 +0200
3	@@ -506,6 +506,10 @@
4	NULL, /* get_moods */
5	NULL, /* set_public_alias */
6	NULL, /* get_public_alias */
7	+#if PURPLE_VERSION_CHECK(2,8,0)
8	+ NULL, /* add_buddy_with_invite */
9	+ NULL, /* add_buddies_with_invite */
10	+#endif
11	#endif
12	#endif
13	#endif

Lines 1-31 Link Here

(-)pidgin-sipe/files/patch-src__purple__purple-private.h (-31 lines)
1	--- ./src/purple/purple-private.h.orig 2010-11-03 05:13:51.000000000 +0100
2	+++ ./src/purple/purple-private.h 2011-06-21 11:23:35.000000000 +0200
3	@@ -20,18 +20,28 @@
4	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
5	*/
6
7	+#include "version.h"
8	+
9	/* Forward declarations */
10	struct sipe_core_public;
11	struct _PurpleAccount;
12	struct _PurpleConnection;
13	+#if PURPLE_VERSION_CHECK(2,8,0)
14	+struct _PurpleSrvTxtQueryData;
15	+#else
16	struct _PurpleSrvQueryData;
17	+#endif
18	struct _PurpleXfer;
19
20	struct sipe_backend_private {
21	struct sipe_core_public *public;
22	struct _PurpleConnection *gc;
23	struct _PurpleAccount *account;
24	+#if PURPLE_VERSION_CHECK(2,8,0)
25	+ struct _PurpleSrvTxtQueryData *dns_query;
26	+#else
27	struct _PurpleSrvQueryData *dns_query;
28	+#endif
29	time_t last_keepalive;
30	};
31