summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-voip/telepathy-salut/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-voip/telepathy-salut/files')
-rw-r--r--net-voip/telepathy-salut/files/telepathy-salut-0.5.0-uninitialized.patch13
-rw-r--r--net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch22
2 files changed, 35 insertions, 0 deletions
diff --git a/net-voip/telepathy-salut/files/telepathy-salut-0.5.0-uninitialized.patch b/net-voip/telepathy-salut/files/telepathy-salut-0.5.0-uninitialized.patch
new file mode 100644
index 000000000000..83723612dfc4
--- /dev/null
+++ b/net-voip/telepathy-salut/files/telepathy-salut-0.5.0-uninitialized.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/ext/wocky/wocky/wocky-sasl-scram.c b/lib/ext/wocky/wocky/wocky-sasl-scram.c
+index 7261956..c508196 100644
+--- a/lib/ext/wocky/wocky/wocky-sasl-scram.c
++++ b/lib/ext/wocky/wocky/wocky-sasl-scram.c
+@@ -523,7 +523,7 @@ scram_handle_server_final_message (WockySaslScram *self,
+ gchar *message,
+ GError **error)
+ {
+- gchar attr, *value = NULL;
++ gchar attr = 0, *value = NULL;
+
+ if (!scram_get_next_attr_value (&message, &attr, &value) && attr != 'v')
+ goto invalid;
diff --git a/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch b/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch
new file mode 100644
index 000000000000..9488f68e1037
--- /dev/null
+++ b/net-voip/telepathy-salut/files/telepathy-salut-0.6.0-glib-gtypes.h.patch
@@ -0,0 +1,22 @@
+From 3c43751dc90e4cdb08f57f48e2a8e6adf715ed8e Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Wed, 12 Oct 2011 16:45:49 +0000
+Subject: test-resolver: don't include glib/types.h directly
+
+Use the glib.h header instead.
+---
+diff --git a/lib/ext/wocky/tests/test-resolver.h b/lib/ext/wocky/tests/test-resolver.h
+index 7823ee6..3948fdc 100644
+--- a/lib/ext/wocky/tests/test-resolver.h
++++ b/lib/ext/wocky/tests/test-resolver.h
+@@ -22,7 +22,7 @@
+ #define __TEST_RESOLVER_H__
+
+ #include <gio/gio.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--
+cgit v0.9.0.2-2-gbebe