diff --git a/ChangeLog b/ChangeLog index e3389ce5..11137d60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +purple-facebook-1852eb9052a0 (2015-12-25): + - Fixed broken contact counting with non-friends + - Trivial documentation fixes + purple-facebook-078fbf8d1a4e (2015-12-21): - Fixed missing link to libgio-2.0 with Windows diff --git a/VERSION b/VERSION index 7ab418f0..995316dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -078fbf8d1a4e +1852eb9052a0 diff --git a/patches/02-glibcompat.patch b/patches/02-glibcompat.patch new file mode 100644 index 00000000..4669b77c --- /dev/null +++ b/patches/02-glibcompat.patch @@ -0,0 +1,37 @@ +diff -r 1852eb9052a0 libpurple/glibcompat.h +--- a/libpurple/glibcompat.h Fri Dec 25 15:20:41 2015 -0500 ++++ b/libpurple/glibcompat.h Fri Dec 25 15:49:07 2015 -0500 +@@ -61,6 +61,33 @@ + return FALSE; + } + ++#if !GLIB_CHECK_VERSION(2, 32, 0) ++ ++static inline GByteArray * g_byte_array_new_take(guint8 *data, gsize len) ++{ ++ GByteArray *array; ++ ++ array = g_byte_array_new(); ++ g_byte_array_append(array, data, len); ++ g_free(data); ++ ++ return array; ++} ++ ++static inline void g_queue_free_full(GQueue *queue, GDestroyNotify free_func) ++{ ++ g_queue_foreach(queue, (GFunc)free_func, NULL); ++ g_queue_free(queue); ++} ++ ++#if !GLIB_CHECK_VERSION(2, 30, 0) ++ ++#define G_VALUE_INIT {0, {{0}}} ++ ++#endif /* < 2.30.0 */ ++ ++#endif /* < 2.32.0 */ ++ + #endif /* < 2.36.0 */ + + diff --git a/patches/02-plugin.patch b/patches/03-plugin.patch similarity index 100% rename from patches/02-plugin.patch rename to patches/03-plugin.patch