Attachment 121416 Details for Bug 164391 – file.diff

[patch] file.diff

file.diff (text/plain), 4.52 KB, created by Golyashov Sergey on 2012-01-23 02:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Golyashov Sergey

Created: 2012-01-23 02:20:11 UTC

Size: 4.52 KB

patch

obsolete

>diff -ruN pidgin-sipe.orig/Makefile pidgin-sipe/Makefile
>--- pidgin-sipe.orig/Makefile	2012-01-23 12:02:15.000000000 +1100
>+++ pidgin-sipe/Makefile	2012-01-23 12:04:15.000000000 +1100
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	pidgin-sipe
>-PORTVERSION=	1.11.2
>-PORTREVISION=	4
>+PORTVERSION=	1.12.0
> CATEGORIES=	net-im
> MASTER_SITES=	SF/sipe/sipe/${DISTNAME}
> 
>diff -ruN pidgin-sipe.orig/distinfo pidgin-sipe/distinfo
>--- pidgin-sipe.orig/distinfo	2012-01-23 12:02:15.000000000 +1100
>+++ pidgin-sipe/distinfo	2012-01-23 12:05:11.000000000 +1100
>@@ -1,2 +1,2 @@
>-SHA256 (pidgin-sipe-1.11.2.tar.bz2) = 90c424942cad50f271367acb0ddcf8e5c648d1aed1f395200e5d909515ce7ae9
>-SIZE (pidgin-sipe-1.11.2.tar.bz2) = 605656
>+SHA256 (pidgin-sipe-1.12.0.tar.bz2) = 302a495bbe37d45e6d8836cd29031295eef631211b0cc15067b2f687d2b25717
>+SIZE (pidgin-sipe-1.12.0.tar.bz2) = 673336
>diff -ruN pidgin-sipe.orig/files/patch-src__purple__purple-dnsquery.c pidgin-sipe/files/patch-src__purple__purple-dnsquery.c
>--- pidgin-sipe.orig/files/patch-src__purple__purple-dnsquery.c	2012-01-23 12:02:15.000000000 +1100
>+++ pidgin-sipe/files/patch-src__purple__purple-dnsquery.c	2012-01-23 12:25:04.000000000 +1100
>@@ -1,13 +1,15 @@
>---- ./src/purple/purple-dnsquery.c.orig	2010-11-03 05:13:51.000000000 +0100
>-+++ ./src/purple/purple-dnsquery.c	2011-06-21 11:23:35.000000000 +0200
>-@@ -22,6 +22,10 @@
>- 
>- #include "glib.h"
>+--- 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 <sys/socket.h>
>++
> +#include "version.h"
> +#if PURPLE_VERSION_CHECK(2,8,0)
> +#include "account.h"
> +#endif
>- #include "dnssrv.h"
>  
>- #include "sipe-backend.h"
>+ #include "dnsquery.h"
>+ #include "dnssrv.h"
>diff -ruN pidgin-sipe.orig/files/patch-src__purple__purple-plugin.c pidgin-sipe/files/patch-src__purple__purple-plugin.c
>--- pidgin-sipe.orig/files/patch-src__purple__purple-plugin.c	2012-01-23 12:02:15.000000000 +1100
>+++ pidgin-sipe/files/patch-src__purple__purple-plugin.c	1970-01-01 10:00:00.000000000 +1000
>@@ -1,13 +0,0 @@
>---- ./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
>diff -ruN pidgin-sipe.orig/files/patch-src__purple__purple-private.h pidgin-sipe/files/patch-src__purple__purple-private.h
>--- pidgin-sipe.orig/files/patch-src__purple__purple-private.h	2012-01-23 12:02:15.000000000 +1100
>+++ pidgin-sipe/files/patch-src__purple__purple-private.h	1970-01-01 10:00:00.000000000 +1000
>@@ -1,31 +0,0 @@
>---- ./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;
>- };
>- 
>diff -ruN pidgin-sipe.orig/pkg-plist pidgin-sipe/pkg-plist
>--- pidgin-sipe.orig/pkg-plist	2012-01-23 12:02:15.000000000 +1100
>+++ pidgin-sipe/pkg-plist	2012-01-23 12:31:22.000000000 +1100
>@@ -1,5 +1,15 @@
> lib/purple-2/libsipe.la
> lib/purple-2/libsipe.so
>+libdata/ldconfig/pidgin-sipe
>+share/doc/pidgin-sipe/AUTHORS
>+share/doc/pidgin-sipe/COPYING
>+share/doc/pidgin-sipe/ChangeLog
>+share/doc/pidgin-sipe/HACKING
>+share/doc/pidgin-sipe/INSTALL
>+share/doc/pidgin-sipe/NEWS
>+share/doc/pidgin-sipe/README
>+share/doc/pidgin-sipe/TODO
>+share/doc/pidgin-sipe/VERSION
> %%NLS%%share/locale/ar/LC_MESSAGES/pidgin-sipe.mo
> %%NLS%%share/locale/cs/LC_MESSAGES/pidgin-sipe.mo
> %%NLS%%share/locale/da/LC_MESSAGES/pidgin-sipe.mo
>@@ -25,3 +35,5 @@
> share/pixmaps/pidgin/protocols/22/sipe.png
> share/pixmaps/pidgin/protocols/48/sipe.png
> share/pixmaps/pidgin/protocols/scalable/sipe.svg
>+@dirrm share/doc/pidgin-sipe
>+@dirrmtry share/doc

Actions: View | Diff

Attachments on bug 164391: 121416