Date: Saturday, May 6, 2023 @ 17:17:55
  Author: heftig
Revision: 476878

1.1.1-3: libplist 2.3.0

Added:
  usbmuxd/trunk/libplist-2.3.0.diff
Modified:
  usbmuxd/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   21 +++++++++++++++------
 libplist-2.3.0.diff |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-05-06 17:12:45 UTC (rev 476877)
+++ PKGBUILD    2023-05-06 17:17:55 UTC (rev 476878)
@@ -3,7 +3,7 @@
 
 pkgname=usbmuxd
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="USB Multiplex Daemon"
 url="https://marcansoft.com/blog/iphonelinux/usbmuxd/";
 arch=('x86_64')
@@ -10,18 +10,27 @@
 license=('GPL2' 'GPL3')
 depends=('libimobiledevice' 'libusb' 'libplist')
 makedepends=('git' 'systemd')
-_commit=79c8b38d1488a6b07e1e68f39d8caec3f1a45622
-source=("git+https://github.com/libimobiledevice/usbmuxd#commit=$_commit"; 
usbmuxd.sysusers)
-sha256sums=('SKIP'
-            '044bfb2810b27f7d6c066f142210775176b7484e76a78ea91794f40fdcda6fd9')
+_commit=79c8b38d1488a6b07e1e68f39d8caec3f1a45622  # tags/1.1.1
+source=(
+  "git+https://github.com/libimobiledevice/usbmuxd#commit=$_commit";
+  usbmuxd.sysusers
+  libplist-2.3.0.diff
+)
+b2sums=('SKIP'
+        
'67a843cd95e750555d1c43c4d01cc90e325ae1b69a5b24bb0e72480b903064f81baeaaa9e1dd95758b456b1444ed869b099be903d6533bb7f5dfe88a87ca1d4e'
+        
'483559477f83f59933d95a8279b21abf92a9d5ad6fe29802ff8966b4a94a79ac80d11f7fc0648846a189484b9f3a7ffa3bd8337940aa255a13ae78b61bb556f4')
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/-/+/g'
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
   cd $pkgname
+
+  # Compatibility with libplist 2.3.0
+  git apply -3 ../libplist-2.3.0.diff
+
   NOCONFIGURE=1 ./autogen.sh
 }
 

Added: libplist-2.3.0.diff
===================================================================
--- libplist-2.3.0.diff                         (rev 0)
+++ libplist-2.3.0.diff 2023-05-06 17:17:55 UTC (rev 476878)
@@ -0,0 +1,32 @@
+diff --git i/src/utils.c w/src/utils.c
+index 206c684..a91faea 100644
+--- i/src/utils.c
++++ w/src/utils.c
+@@ -302,7 +302,7 @@ int plist_read_from_filename(plist_t *plist, const char 
*filename)
+       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;
+diff --git i/src/utils.h w/src/utils.h
+index b5cab3f..3e9eb41 100644
+--- i/src/utils.h
++++ w/src/utils.h
+@@ -78,13 +78,8 @@ char *string_concat(const char *str, ...);
+ int buffer_read_from_filename(const char *filename, char **buffer, uint64_t 
*length);
+ int 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);
+ 
+ uint64_t mstime64(void);
+ void get_tick_count(struct timeval * tv);

Reply via email to