unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Kei Kebreau <kkebreau@posteo.net>
To: 42587@debbugs.gnu.org
Cc: Kei Kebreau <kkebreau@posteo.net>
Subject: [bug#42587] [PATCH 3/5] gnu: libimobiledevice: Update to 1.3.0.
Date: Tue, 28 Jul 2020 12:49:59 -0400	[thread overview]
Message-ID: <20200728165001.3905-2-kkebreau@posteo.net> (raw)
In-Reply-To: <20200728165001.3905-1-kkebreau@posteo.net>

* gnu/packages/libusb.scm (%libimobiledevice-patches): Delete variable.
(libimobiledevice): Update to 1.3.0.
[source, home-page]: Update URLs.
[arguments]: Delete 'force-bootstrap phase. Add argument to detect the correct
Python binary.
[propagated-inputs]: Replace openssl-1.0 with openssl.
[native-inputs]: Remove autoconf, automake, and libtool.
---
 gnu/packages/libusb.scm | 49 +++++++++--------------------------------
 1 file changed, 10 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 8dcc38a772..19f3b81c6e 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -403,61 +403,32 @@ connections from and to iOS devices by connecting to a socket provided by a
 @code{usbmuxd} daemon.")
     (license license:lgpl2.1+)))
 
-;; These patches are needed to build with Python 3.8.
-(define %libimobiledevice-patches
-  (list (origin
-          (method url-fetch)
-          (uri (string-append "https://github.com/libimobiledevice/libimobiledevice"
-                              "/commit/1ff3448d2e27f1bac8d2f0af8b8e952854860278.patch"))
-          (file-name "libimobiledevice-python-config.patch")
-          (sha256
-           (base32
-            "1mkwhp8vvhajij29jk3w4rkgcfh8d8waf908drh3076k70hb6i8y")))
-        (origin
-          (method url-fetch)
-          (uri (string-append "https://github.com/libimobiledevice/libimobiledevice"
-                              "/commit/eea4f1be9107c8ab621fd71460e47d0d38e55d71.patch"))
-          (file-name "libimobiledevice-python-3.8-compat.patch")
-          (sha256
-           (base32
-            "1zz8v7kgwyq5ck1qp03l29pcmljygnjwls9d6q28nv5pkwa6848w")))))
-
 (define-public libimobiledevice
   (package
     (name "libimobiledevice")
-    (version "1.2.0")
+    (version "1.3.0")
     (source (origin
               (method url-fetch)
-              (uri (string-append "https://www.libimobiledevice.org/downloads/"
-                                  "libimobiledevice-" version ".tar.bz2"))
-              ;; Note: Remove the 'force-bootstrap' phase and the autoconf
-              ;; inputs below when removing these patches.
-              (patches %libimobiledevice-patches)
+              (uri (string-append "https://github.com/libimobiledevice"
+                                  "/libimobiledevice/releases/download/"
+                                  version "/libimobiledevice-" version
+                                  ".tar.bz2"))
               (sha256
                (base32
-                "0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq"))))
+                "1xmhfnypg6j7shl73wfkrrn4mj9dh8qzaj3258q9zkb5cc669wjk"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-before 'bootstrap 'force-bootstrap
-                    (lambda _
-                      (delete-file "configure")
-                      #t)))))
+     '(#:configure-flags '("PYTHON_VERSION=3")))
     (propagated-inputs
-     `(("openssl" ,openssl-1.0)
+     `(("openssl" ,openssl)
        ("libplist" ,libplist)
        ("libusbmuxd" ,libusbmuxd)))
     (inputs
      `(("python" ,python)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("python-cython" ,python-cython)
-
-       ;; These are required because we patch and bootstrap the build system.
-       ("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)))
-    (home-page "https://www.libimobiledevice.org/")
+       ("python-cython" ,python-cython)))
+    (home-page "https://libimobiledevice.org/")
     (synopsis "Protocol library and tools to communicate with Apple devices")
     (description "libimobiledevice is a software library that talks the
 protocols to support Apple devices.  It allows other software to easily access
-- 
2.27.0





  reply	other threads:[~2020-07-28 16:51 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-28 16:45 [bug#42587] [PATCH 1/5] gnu: libplist: Update to 2.2.0 Kei Kebreau
2020-07-28 16:49 ` [bug#42587] [PATCH 2/5] gnu: libusbmuxd: Update to 2.0.2 Kei Kebreau
2020-07-28 16:49   ` Kei Kebreau [this message]
2020-07-28 16:50   ` [bug#42587] [PATCH 4/5] gnu: ifuse: Update to 1.1.4 Kei Kebreau
2020-07-28 16:50   ` [bug#42587] [PATCH 5/5] gnu: usbmuxd: Update to 1.1.1 Kei Kebreau
2020-08-15  0:32     ` bug#42587: " Kei Kebreau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200728165001.3905-2-kkebreau@posteo.net \
    --to=kkebreau@posteo.net \
    --cc=42587@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).