media-libs/libgpod: Fix segfault (#565052 by Julien Papasian) and build failure (#537968 by Toralf Förster).

Package-Manager: portage-2.2.28

2 files changed, 43 insertions, 0 deletions

diff --git a/media-libs/libgpod/files/libgpod-0.8.3-comment.patch b/media-libs/libgpod/files/libgpod-0.8.3-comment.patch
new file mode 100644
index 000000000000..6099b22870bc
--- /dev/null
+++ b/media-libs/libgpod/files/libgpod-0.8.3-comment.patch
@@ -0,0 +1,15 @@
+--- a/bindings/python/gpod.i.in.orig	2015-06-20 23:15:41.000000000 -0700
++++ b/bindings/python/gpod.i.in	2015-06-20 23:16:28.000000000 -0700
+@@ -298,9 +298,9 @@
+ %include "gpod_doc.i"
+ %include "@top_builddir@/config.h"
+ 
+-# be nicer to decode these utf8 strings into Unicode objects in the C
+-# layer. Here we are leaving it to the Python side, and just giving
+-# them utf8 encoded Strings.
++// be nicer to decode these utf8 strings into Unicode objects in the C
++// layer. Here we are leaving it to the Python side, and just giving
++// them utf8 encoded Strings.
+ typedef char gchar;
+ 
+ %typemap(in) time_t {
diff --git a/media-libs/libgpod/files/libgpod-0.8.3-segfault.patch b/media-libs/libgpod/files/libgpod-0.8.3-segfault.patch
new file mode 100644
index 000000000000..555188149f8b
--- /dev/null
+++ b/media-libs/libgpod/files/libgpod-0.8.3-segfault.patch
@@ -0,0 +1,28 @@
+# Patch from James Burton - https://github.com/jburton/libgpod/commit/342d49c5577682dd4fba35bfd5fb15f7287c7d5a
+--- a/src/itdb_itunesdb.c
++++ b/src/itdb_itunesdb.c
+@@ -1156,6 +1156,7 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
+     GHashTable *pc_dict, *track_dict;
+     GValue *to_parse;
+     GArray *array;
++    GValue value;
+     gint i;
+     guint32 mac_time;
+     guint64 *dbid;
+@@ -1174,13 +1175,14 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
+     playcounts = g_hash_table_new_full (g_int64_hash, g_int64_equal, g_free, g_free);
+
+     array = (GArray*)g_value_get_boxed (to_parse);
+     for (i = 0; i < array->len; i++) {
+-       if (!G_VALUE_HOLDS (g_array_index (array, GValue *, i), G_TYPE_HASH_TABLE)) {
++       value = g_array_index (array, GValue, i);
++       if (!G_VALUE_HOLDS (&value, G_TYPE_HASH_TABLE)) {
+           continue;
+        }
+
+-       track_dict = g_value_get_boxed (g_array_index (array, GValue *, i));
++       track_dict = g_value_get_boxed (&value);
+        if (track_dict == NULL)
+            continue;
+ 
+        to_parse = g_hash_table_lookup (track_dict, "persistentID");