Package: libgpod
Version: 0.8.3-19.1
Severity: normal
Tags: patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Add two patches from arch linux
to fix FTBFS with newer libplist
Thanks for considering the patch.
*** /tmp/tmp5qufybct/libgpod_0.8.3-19.1ubuntu2.debdiff
diff -Nru libgpod-0.8.3/debian/patches/fix-new-libplist.patch
libgpod-0.8.3/debian/patches/fix-new-libplist.patch
--- libgpod-0.8.3/debian/patches/fix-new-libplist.patch 1970-01-01
01:00:00.000000000 +0100
+++ libgpod-0.8.3/debian/patches/fix-new-libplist.patch 2024-03-22
14:54:42.000000000 +0100
@@ -0,0 +1,34 @@
+Description: Arch linux cherry-picked patch
+Origin:
https://gitlab.archlinux.org/archlinux/packaging/packages/libgpod/-/commit/37664b35631261bf707e88132d5920757bcf0958
+Last-Update: 2024-03-22
+
+--- libgpod-0.8.3.orig/tools/ipod-lockdown.c
++++ libgpod-0.8.3/tools/ipod-lockdown.c
+@@ -100,7 +100,7 @@ read_sysinfo_extended_by_uuid (const cha
+ plist_get_string_val(ptr, &str);
+ if (str != NULL) {
+ ptr = plist_new_string(str);
+- plist_dict_insert_item(value, "SerialNumber", ptr);
++ plist_dict_set_item(value, "SerialNumber", ptr);
+ free(str);
+ }
+
+@@ -112,15 +112,15 @@ read_sysinfo_extended_by_uuid (const cha
+ plist_get_string_val(ptr, &str);
+ if (str != NULL) {
+ ptr = plist_new_string(str);
+- plist_dict_insert_item(value, "VisibleBuildID", ptr);
++ plist_dict_set_item(value, "VisibleBuildID", ptr);
+ free(str);
+ }
+
+ ptr = plist_new_string(uuid);
+- plist_dict_insert_item(value, "FireWireGUID", ptr);
++ plist_dict_set_item(value, "FireWireGUID", ptr);
+
+ ptr = plist_new_string(uuid);
+- plist_dict_insert_item(value, "UniqueDeviceID", ptr);
++ plist_dict_set_item(value, "UniqueDeviceID", ptr);
+
+ plist_to_xml(value, &xml, &xml_length);
+
diff -Nru libgpod-0.8.3/debian/patches/newer-plist.patch
libgpod-0.8.3/debian/patches/newer-plist.patch
--- libgpod-0.8.3/debian/patches/newer-plist.patch 1970-01-01
01:00:00.000000000 +0100
+++ libgpod-0.8.3/debian/patches/newer-plist.patch 2024-03-22
14:54:42.000000000 +0100
@@ -0,0 +1,14 @@
+Description: Patch for newer libplist pkgconfig file
+Origin:
https://gitlab.archlinux.org/archlinux/packaging/packages/libgpod/-/commit/c8b8b172f84270323a227a1df565af1713c0bafb
+
+--- libgpod-0.8.3.orig/configure.ac
++++ libgpod-0.8.3/configure.ac
+@@ -42,7 +42,7 @@ AC_CHECK_FUNCS([localtime_r])
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
+ dnl sqlite3 is needed for newer ipod models (nano5g), and libplist is needed
+ dnl by libgpod sqlite code
+-PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >=
1.0 gmodule-2.0)
++PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0
>= 1.0 gmodule-2.0)
+
+ dnl ***************************************************
+ dnl The following functions are only available starting
diff -Nru libgpod-0.8.3/debian/patches/series
libgpod-0.8.3/debian/patches/series
--- libgpod-0.8.3/debian/patches/series 2023-12-09 14:05:31.000000000 +0100
+++ libgpod-0.8.3/debian/patches/series 2024-03-22 14:54:42.000000000 +0100
@@ -3,3 +3,5 @@
Upstream-change-to-speed-up-itdb_resolve_path-calls.patch
Fix-System-GLib.DateTime-ambiguity.patch
Fix-wrong-char-for-comments-in-gpod.i.patch
+newer-plist.patch
+fix-new-libplist.patch
