Attachment 30981 Details for Bug 23061 – patch for libpurple headers

[patch] patch for libpurple headers

telepathy-haze-0.3.2.patch (text/plain), 5.57 KB, created by Chris Vine on 2009-11-05 05:35:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Vine

Created: 2009-11-05 05:35:41 UTC

Size: 5.57 KB

patch

obsolete

>--- telepathy-haze-0.3.2/src/connection-avatars.c.orig	2009-11-05 13:06:31.000000000 +0000
>+++ telepathy-haze-0.3.2/src/connection-avatars.c	2009-11-05 13:07:12.000000000 +0000
>@@ -27,7 +27,8 @@
> #include <telepathy-glib/interfaces.h>
> #include <telepathy-glib/svc-connection.h>
> 
>-#include <libpurple/cipher.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/cipher.h>
> 
> #include "connection.h"
> #include "debug.h"
>--- telepathy-haze-0.3.2/src/connection.c.orig	2009-11-05 13:07:46.000000000 +0000
>+++ telepathy-haze-0.3.2/src/connection.c	2009-11-05 13:08:16.000000000 +0000
>@@ -29,8 +29,9 @@
> #include <telepathy-glib/interfaces.h>
> #include <telepathy-glib/svc-generic.h>
> 
>-#include <libpurple/accountopt.h>
>-#include <libpurple/version.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/accountopt.h>
>+#include <../libpurple/version.h>
> 
> #include "debug.h"
> #include "defines.h"
>--- telepathy-haze-0.3.2/src/connection.h.orig	2009-11-05 12:56:51.000000000 +0000
>+++ telepathy-haze-0.3.2/src/connection.h	2009-11-05 12:57:12.000000000 +0000
>@@ -26,8 +26,9 @@
> #include <telepathy-glib/contacts-mixin.h>
> #include <telepathy-glib/presence-mixin.h>
> 
>-#include <libpurple/account.h>
>-#include <libpurple/prpl.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/account.h>
>+#include <../libpurple/prpl.h>
> 
> #include "contact-list.h"
> #include "im-channel-factory.h"
>--- telepathy-haze-0.3.2/src/connection-manager.c.orig	2009-11-05 13:05:21.000000000 +0000
>+++ telepathy-haze-0.3.2/src/connection-manager.c	2009-11-05 13:05:42.000000000 +0000
>@@ -24,8 +24,9 @@
> #include <glib.h>
> #include <dbus/dbus-protocol.h>
> 
>-#include <libpurple/prpl.h>
>-#include <libpurple/accountopt.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/prpl.h>
>+#include <../libpurple/accountopt.h>
> 
> #include "connection-manager.h"
> #include "debug.h"
>--- telepathy-haze-0.3.2/src/contact-list-channel.h.orig	2009-11-05 13:00:31.000000000 +0000
>+++ telepathy-haze-0.3.2/src/contact-list-channel.h	2009-11-05 13:01:06.000000000 +0000
>@@ -25,7 +25,8 @@
> #include <telepathy-glib/group-mixin.h>
> #include <telepathy-glib/dbus-properties-mixin.h>
> 
>-#include <libpurple/account.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/account.h>
> 
> G_BEGIN_DECLS
> 
>--- telepathy-haze-0.3.2/src/debug.c.orig	2009-11-05 13:04:00.000000000 +0000
>+++ telepathy-haze-0.3.2/src/debug.c	2009-11-05 13:04:47.000000000 +0000
>@@ -23,7 +23,8 @@
> #include <string.h>
> #include <stdarg.h>
> 
>-#include <libpurple/debug.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/debug.h>
> #include <telepathy-glib/debug.h>
> 
> 
>--- telepathy-haze-0.3.2/src/im-channel-factory.h.orig	2009-11-05 13:02:40.000000000 +0000
>+++ telepathy-haze-0.3.2/src/im-channel-factory.h	2009-11-05 13:02:59.000000000 +0000
>@@ -23,7 +23,8 @@
> 
> #include <glib-object.h>
> 
>-#include <libpurple/conversation.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/conversation.h>
> 
> G_BEGIN_DECLS
> 
>--- telepathy-haze-0.3.2/src/im-channel.h.orig	2009-11-05 13:08:51.000000000 +0000
>+++ telepathy-haze-0.3.2/src/im-channel.h	2009-11-05 13:09:05.000000000 +0000
>@@ -25,7 +25,8 @@
> 
> #include <telepathy-glib/message-mixin.h>
> 
>-#include <libpurple/conversation.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/conversation.h>
> 
> G_BEGIN_DECLS
> 
>--- telepathy-haze-0.3.2/src/main.c.orig	2009-11-05 12:53:31.000000000 +0000
>+++ telepathy-haze-0.3.2/src/main.c	2009-11-05 12:58:00.000000000 +0000
>@@ -31,16 +31,17 @@
> #include <glib.h>
> #include <glib/gstdio.h>
> 
>-#include <libpurple/account.h>
>-#include <libpurple/core.h>
>-#include <libpurple/blist.h>
>-#include <libpurple/version.h>
>-#include <libpurple/eventloop.h>
>-#include <libpurple/prefs.h>
>-#include <libpurple/util.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/account.h>
>+#include <../libpurple/core.h>
>+#include <../libpurple/blist.h>
>+#include <../libpurple/version.h>
>+#include <../libpurple/eventloop.h>
>+#include <../libpurple/prefs.h>
>+#include <../libpurple/util.h>
> 
> #ifdef HAVE_PURPLE_DBUS_UNINIT
>-#include <libpurple/dbus-server.h>
>+#include <../libpurple/dbus-server.h>
> #endif
> 
> #if !PURPLE_VERSION_CHECK (2, 4, 0)
>--- telepathy-haze-0.3.2/src/notify.h.orig	2009-11-05 13:01:30.000000000 +0000
>+++ telepathy-haze-0.3.2/src/notify.h	2009-11-05 13:02:09.000000000 +0000
>@@ -18,6 +18,7 @@
>  *
>  */
> 
>-#include <libpurple/notify.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/notify.h>
> 
> PurpleNotifyUiOps *haze_notify_get_ui_ops (void);
>--- telepathy-haze-0.3.2/src/request.h.orig	2009-11-05 13:03:20.000000000 +0000
>+++ telepathy-haze-0.3.2/src/request.h	2009-11-05 13:03:36.000000000 +0000
>@@ -18,6 +18,7 @@
>  *
>  */
> 
>-#include <libpurple/request.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/request.h>
> 
> PurpleRequestUiOps *haze_request_get_ui_ops (void);
>--- telepathy-haze-0.3.2/src/request.c.orig	2009-11-05 13:19:49.000000000 +0000
>+++ telepathy-haze-0.3.2/src/request.c	2009-11-05 13:20:17.000000000 +0000
>@@ -20,8 +20,9 @@
> 
> #include <glib-object.h>
> 
>-#include <libpurple/account.h>
>-#include <libpurple/conversation.h>
>+/* Cflags in purple.pc is specified as ${includedir}/libpurple */
>+#include <../libpurple/account.h>
>+#include <../libpurple/conversation.h>
> 
> #include "debug.h"
> #include "request.h"

Actions: View | Splinter Review

Attachments on bug 23061: 30981

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.