aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bonetti <sid77@slackware.it>2011-08-11 14:47:59 -0300
committerNiels Horn <niels.horn@slackbuilds.org>2011-08-11 14:47:59 -0300
commit60ae8c614a2db7786cbb5cd8c87b3d0b5efb7861 (patch)
tree187f07d33657835cc0844fdf4d6560a916f91629
parentc90bb38f284acac2c483d53947b596df57b452bb (diff)
network/pidgin-sipe: Patched for pidgin >= 2.8.0
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
-rw-r--r--network/pidgin-sipe/pidgin-sipe.SlackBuild5
-rw-r--r--network/pidgin-sipe/pidgin-sipe.info2
-rw-r--r--network/pidgin-sipe/sipe-purple-2.8.0.patch60
-rw-r--r--network/pidgin-sipe/slack-desc2
4 files changed, 66 insertions, 3 deletions
diff --git a/network/pidgin-sipe/pidgin-sipe.SlackBuild b/network/pidgin-sipe/pidgin-sipe.SlackBuild
index e1865717a54f1..d0c55c35a5e1b 100644
--- a/network/pidgin-sipe/pidgin-sipe.SlackBuild
+++ b/network/pidgin-sipe/pidgin-sipe.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=pidgin-sipe
VERSION=${VERSION:-1.11.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,6 +71,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# ArchLinux patch: add support for pidgin >= 2.8.0
+patch -p1 < $CWD/sipe-purple-2.8.0.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/network/pidgin-sipe/pidgin-sipe.info b/network/pidgin-sipe/pidgin-sipe.info
index e23d275d5742f..52cbe8df1c9ca 100644
--- a/network/pidgin-sipe/pidgin-sipe.info
+++ b/network/pidgin-sipe/pidgin-sipe.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Marco Bonetti"
EMAIL="sid77@slackware.it"
-APPROVED="Erik Hanson"
+APPROVED="Niels Horn"
diff --git a/network/pidgin-sipe/sipe-purple-2.8.0.patch b/network/pidgin-sipe/sipe-purple-2.8.0.patch
new file mode 100644
index 0000000000000..f5f03215c5414
--- /dev/null
+++ b/network/pidgin-sipe/sipe-purple-2.8.0.patch
@@ -0,0 +1,60 @@
+diff -drupN pidgin-sipe-1.11.2/src/purple/purple-dnsquery.c pidgin-sipe-1.11.2-new/src/purple/purple-dnsquery.c
+--- pidgin-sipe-1.11.2/src/purple/purple-dnsquery.c 2010-11-03 05:13:51.000000000 +0100
++++ pidgin-sipe-1.11.2-new/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 pidgin-sipe-1.11.2/src/purple/purple-plugin.c pidgin-sipe-1.11.2-new/src/purple/purple-plugin.c
+--- pidgin-sipe-1.11.2/src/purple/purple-plugin.c 2010-11-03 05:13:51.000000000 +0100
++++ pidgin-sipe-1.11.2-new/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 pidgin-sipe-1.11.2/src/purple/purple-private.h pidgin-sipe-1.11.2-new/src/purple/purple-private.h
+--- pidgin-sipe-1.11.2/src/purple/purple-private.h 2010-11-03 05:13:51.000000000 +0100
++++ pidgin-sipe-1.11.2-new/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;
+ };
+
diff --git a/network/pidgin-sipe/slack-desc b/network/pidgin-sipe/slack-desc
index 63871322fce68..3ff880eab31c0 100644
--- a/network/pidgin-sipe/slack-desc
+++ b/network/pidgin-sipe/slack-desc
@@ -5,7 +5,7 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler----------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
pidgin-sipe: pidgin-sipe (pidgin plugin for Sip Exchange Protocol)
pidgin-sipe:
pidgin-sipe: With this plugin you should be able to replace your Microsoft