commit 90a2af5f7e410418c7f8440aef6271d82e77aed1
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 26 19:26:05 2023 +0100
- adjusted for libplist 2.3.0; release 10
libgpod-libplist.patch | 32 +++++++++++++++++++++++++++++++-
libgpod.spec | 8 ++++----
2 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/libgpod.spec b/libgpod.spec
index 4b0e5c0..b61531b 100644
--- a/libgpod.spec
+++ b/libgpod.spec
@@ -18,7 +18,7 @@ Summary: Shared library to access the contents of an iPod
Summary(pl.UTF-8): Biblioteka współdzielona do dostępu do zawartości iPodów
Name: libgpod
Version: 0.8.3
-Release: 9
+Release: 10
License: GPL v2
Group: Libraries
Source0:
http://downloads.sourceforge.net/gtkpod/%{name}-%{version}.tar.bz2
@@ -39,7 +39,7 @@ BuildRequires: glib2-devel >= 1:2.16.0
BuildRequires: gtk-doc >= 1.0
BuildRequires: intltool >= 0.35
BuildRequires: libimobiledevice-devel >= 1.1.5
-BuildRequires: libplist-devel >= 2.2.0
+BuildRequires: libplist-devel >= 2.3.0
BuildRequires: libsmbios-devel
BuildRequires: libtool >= 2:2
BuildRequires: libusb-devel >= 1.0
@@ -66,7 +66,7 @@ BuildRequires: swig-python >= 1.3.24
%endif
Requires: glib2 >= 1:2.16.0
Requires: libimobiledevice >= 1.1.5
-Requires: libplist >= 2.2.0
+Requires: libplist >= 2.3.0
Suggests: udev-libgpod = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -86,7 +86,7 @@ Summary: UDEV rules and programs for iPod devices
Summary(pl.UTF-8): Reguły i programy używane przez UDEV dla urządzeń iPod
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-Obsoletes: hal-libgpod
+Obsoletes: hal-libgpod < 0.8.0-5
%description -n udev-libgpod
UDEV rules and programs to initialize iPod devices for libgpod
diff --git a/libgpod-libplist.patch b/libgpod-libplist.patch
index 7a9154a..c312539 100644
--- a/libgpod-libplist.patch
+++ b/libgpod-libplist.patch
@@ -5,7 +5,37 @@
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 >= 2.2.0 gmodule-2.0)
++PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3
libplist-2.0 >= 2.3.0 gmodule-2.0)
dnl ***************************************************
dnl The following functions are only available starting
+--- libgpod-0.8.3/tools/ipod-lockdown.c.orig 2013-07-10 15:57:39.000000000
+0200
++++ libgpod-0.8.3/tools/ipod-lockdown.c 2023-11-26 19:04:23.262902798
+0100
+@@ -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);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgpod.git/commitdiff/90a2af5f7e410418c7f8440aef6271d82e77aed1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
