5 files changed, 95 insertions, 2 deletions
diff --git a/source/l/libgpod/0001-323-Segmentation-fault-when-opening-ipod.patch b/source/l/libgpod/0001-323-Segmentation-fault-when-opening-ipod.patch
new file mode 100644
index 000000000..727f18b37
--- /dev/null
+++ b/source/l/libgpod/0001-323-Segmentation-fault-when-opening-ipod.patch
@@ -0,0 +1,43 @@
+From 8dc5015ae036b219c4c9579a156886aa3a722aa5 Mon Sep 17 00:00:00 2001
+From: phantomjinx <p.g.richardson@phantomjinx.co.uk>
+Date: Sat, 9 Aug 2014 19:57:10 +0100
+Subject: [PATCH] #323 Segmentation fault when opening ipod
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Patch submitted in bug report from François Melchior / James Burton
+---
+ src/itdb_itunesdb.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
+index 4cc771a..1e85476 100644
+--- 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;
+@@ -1175,11 +1176,12 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data)
+ 
+     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;
+ 
+-- 
+2.12.2
+
diff --git a/source/l/libgpod/libgpod-0.8.2-pkgconfig_overlinking.patch b/source/l/libgpod/libgpod-0.8.2-pkgconfig_overlinking.patch
new file mode 100644
index 000000000..a5dafb285
--- /dev/null
+++ b/source/l/libgpod/libgpod-0.8.2-pkgconfig_overlinking.patch
@@ -0,0 +1,11 @@
+diff -up libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking libgpod-0.8.2/libgpod-1.0.pc.in
+--- libgpod-0.8.2/libgpod-1.0.pc.in.pkgconfig_overlinking	2011-04-15 03:37:34.000000000 -0500
++++ libgpod-0.8.2/libgpod-1.0.pc.in	2012-08-10 13:53:00.294631805 -0500
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: libgpod
+ Description: A library to manipulate songs and playlists stored on an ipod
+ Version: @VERSION@
+-Requires: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@
++Requires.private: glib-2.0 >= 2.8.0 gobject-2.0 @GDKPIXBUF_REQ@ @LIBIMOBILEDEVICE_REQ@
+ Libs: -L${libdir} -lgpod
+ Cflags: -I${includedir}/gpod-1.0
diff --git a/source/l/libgpod/libgpod-0.8.3-pkgconfig_sharp.patch b/source/l/libgpod/libgpod-0.8.3-pkgconfig_sharp.patch
new file mode 100644
index 000000000..d12ef2b83
--- /dev/null
+++ b/source/l/libgpod/libgpod-0.8.3-pkgconfig_sharp.patch
@@ -0,0 +1,17 @@
+diff -Nurp libgpod-0.8.3/bindings/mono/libgpod-sharp/Makefile.am libgpod-0.8.3-pkgconfig_sharp/bindings/mono/libgpod-sharp/Makefile.am
+--- libgpod-0.8.3/bindings/mono/libgpod-sharp/Makefile.am	2013-07-09 09:37:38.000000000 +0000
++++ libgpod-0.8.3-pkgconfig_sharp/bindings/mono/libgpod-sharp/Makefile.am	2023-02-05 21:34:47.042376473 +0000
+@@ -23,12 +23,12 @@ libgpod-sharp.dll.config: $(top_srcdir)/
+ 	sed "s/@DLNAME@/$(dlname)/g" $< >$@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libgpod-sharp.pc
+ EXTRAS = \
+ 	libgpod-sharp.pc.in
+ 
+ if HAVE_MONO
+ include $(srcdir)/../Makefile.include
++pkgconfig_DATA = libgpod-sharp.pc
+ module_SCRIPTS += libgpod-sharp.dll.config
+ EXTRA_DIST += libgpod-sharp.dll.config.in
+ DISTCLEANFILES += libgpod-sharp.dll.config
diff --git a/source/l/libgpod/libgpod-udev.patch b/source/l/libgpod/libgpod-udev.patch
new file mode 100644
index 000000000..42b762b67
--- /dev/null
+++ b/source/l/libgpod/libgpod-udev.patch
@@ -0,0 +1,15 @@
+--- ./tools/90-libgpod.rules.in.orig	2011-07-24 06:03:29.000000000 -0500
++++ ./tools/90-libgpod.rules.in	2023-12-02 14:01:52.672726550 -0600
+@@ -16,10 +16,10 @@
+ 
+ 
+ # "iPods" using the afc protocol (iPhone, iPod Touch, ...)
+-ACTION=="add|change", ENV{USBMUX_SUPPORTED}=="1", IMPORT{program}+="@udevdir@/iphone-set-info", GOTO="libgpod_end"
++ACTION=="add|change", ENV{USBMUX_SUPPORTED}=="1", IMPORT{program}=="@udevdir@/iphone-set-info", GOTO="libgpod_end"
+ # with a new enough usbmuxd, the rule below is not useful since it will
+ # take care of setting USBMUX_SUPPORTED for all supported devices. Keep
+ # this rule for now until distros ship a new enough usbmuxd
+-ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", IMPORT{program}+="@udevdir@/iphone-set-info"
++ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", IMPORT{program}=="@udevdir@/iphone-set-info"
+ 
+ LABEL="libgpod_end"
diff --git a/source/l/libgpod/libgpod.SlackBuild b/source/l/libgpod/libgpod.SlackBuild
index b62f3751a..599c4257f 100755
--- a/source/l/libgpod/libgpod.SlackBuild
+++ b/source/l/libgpod/libgpod.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2006, 2007, 2008, 2009, 2010, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2018, 2023  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libgpod
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-12}
+BUILD=${BUILD:-13}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,6 +78,13 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+sed -e 's|libplist >= 1.0|libplist-2.0 >= 2.2|' -i configure.ac # support libplist 2.2
+sed -e 's|plist_dict_insert_item|plist_dict_set_item|' -i tools/ipod-lockdown.c # support libplist 2.3
+cat $CWD/libgpod-udev.patch | patch -p1 --verbose || exit 1
+cat $CWD/0001-323-Segmentation-fault-when-opening-ipod.patch | patch -p1 --verbose || exit 1
+cat $CWD/libgpod-0.8.2-pkgconfig_overlinking.patch | patch -p1 --verbose || exit 1
+cat $CWD/libgpod-0.8.3-pkgconfig_sharp.patch | patch -p1 --verbose || exit 1
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \