[packages/libimobiledevice] - patch to fix build with libplist 2.3.0

qboosh qboosh at pld-linux.org
Sun Nov 26 10:55:51 CET 2023


commit 7b511d24e2c5a7ec4111f5acd3b8568ed0908e0d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 26 09:46:55 2023 +0100

    - patch to fix build with libplist 2.3.0

 libimobiledevice-libplist.patch | 28 ++++++++++++++++++++++++++++
 libimobiledevice.spec           | 14 ++++++++------
 2 files changed, 36 insertions(+), 6 deletions(-)
---
diff --git a/libimobiledevice.spec b/libimobiledevice.spec
index dc02206..62386a5 100644
--- a/libimobiledevice.spec
+++ b/libimobiledevice.spec
@@ -23,13 +23,14 @@ Group:		Libraries
 Source0:	https://github.com/libimobiledevice/libimobiledevice/releases/download/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5:	c50a3a32acf33dc8c9ec88137ad12ec4
 Patch0:		%{name}-cython.patch
+Patch1:		%{name}-libplist.patch
 URL:		https://libimobiledevice.org/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 2.2.0}
 BuildRequires:	libgcrypt-devel
-BuildRequires:	libplist-devel >= 2.2.0
-BuildRequires:	libplist-c++-devel >= 2.2.0
+BuildRequires:	libplist-devel >= 2.3.0
+BuildRequires:	libplist-c++-devel >= 2.3.0
 BuildRequires:	libstdc++-devel
 %{?with_gnutls:BuildRequires:	libtasn1-devel >= 1.1}
 BuildRequires:	libtool
@@ -48,8 +49,8 @@ BuildRequires:	python3-devel >= 1:3.2
 BuildRequires:	python3-modules >= 1:3.2
 %endif
 BuildRequires:	rpm-pythonprov
-Requires:	libplist >= 2.2.0
-Requires:	libplist-c++ >= 2.2.0
+Requires:	libplist >= 2.3.0
+Requires:	libplist-c++ >= 2.3.0
 Requires:	libusbmuxd >= 2.0.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,8 +67,8 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libimobiledevice
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 %{?with_gnutls:Requires:	gnutls-devel >= 2.2.0}
-Requires:	libplist-devel >= 2.2.0
-Requires:	libplist-c++-devel >= 2.2.0
+Requires:	libplist-devel >= 2.3.0
+Requires:	libplist-c++-devel >= 2.3.0
 %{?with_gnutls:Requires:	libtasn1-devel >= 1.1}
 Requires:	libusbmuxd-devel >= 2.0.2
 %{?with_openssl:Requires:	openssl-devel >= 0.9.8}
@@ -131,6 +132,7 @@ Wiązania libimobiledevice dla Pythona 3.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/libimobiledevice-libplist.patch b/libimobiledevice-libplist.patch
new file mode 100644
index 0000000..87607ba
--- /dev/null
+++ b/libimobiledevice-libplist.patch
@@ -0,0 +1,28 @@
+--- libimobiledevice-1.3.0/common/utils.h.orig	2020-03-19 19:56:37.000000000 +0100
++++ libimobiledevice-1.3.0/common/utils.h	2023-11-26 09:34:42.338076752 +0100
+@@ -51,13 +51,8 @@ char *generate_uuid(void);
+ void buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length);
+ void buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length);
+ 
+-enum plist_format_t {
+-	PLIST_FORMAT_XML,
+-	PLIST_FORMAT_BINARY
+-};
+-
+ int plist_read_from_filename(plist_t *plist, const char *filename);
+-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format);
++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format);
+ 
+ void plist_print_to_stream(plist_t plist, FILE* stream);
+ 
+--- libimobiledevice-1.3.0/common/utils.c.orig	2020-03-19 19:56:37.000000000 +0100
++++ libimobiledevice-1.3.0/common/utils.c	2023-11-26 09:35:54.671018224 +0100
+@@ -314,7 +314,7 @@ int plist_read_from_filename(plist_t *pl
+ 	return 1;
+ }
+ 
+-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format)
++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format)
+ {
+ 	char *buffer = NULL;
+ 	uint32_t length;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libimobiledevice.git/commitdiff/7b511d24e2c5a7ec4111f5acd3b8568ed0908e0d



More information about the pld-cvs-commit mailing list