From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KE0uJ4VXIF8ECAAA0tVLHw (envelope-from ) for ; Tue, 28 Jul 2020 16:51:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4OC3IoVXIF9pZAAA1q6Kng (envelope-from ) for ; Tue, 28 Jul 2020 16:51:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3E64394013C for ; Tue, 28 Jul 2020 16:51:17 +0000 (UTC) Received: from localhost ([::1]:39330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0Sou-0003Iv-9J for larch@yhetil.org; Tue, 28 Jul 2020 12:51:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44072) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0Sog-00032j-DG for guix-patches@gnu.org; Tue, 28 Jul 2020 12:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0Sog-0006wx-4f for guix-patches@gnu.org; Tue, 28 Jul 2020 12:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0Sog-0005Uf-43 for guix-patches@gnu.org; Tue, 28 Jul 2020 12:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42587] [PATCH 3/5] gnu: libimobiledevice: Update to 1.3.0. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Jul 2020 16:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42587 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42587@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 42587-submit@debbugs.gnu.org id=B42587.159595502121045 (code B ref 42587); Tue, 28 Jul 2020 16:51:02 +0000 Received: (at 42587) by debbugs.gnu.org; 28 Jul 2020 16:50:21 +0000 Received: from localhost ([127.0.0.1]:58964 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0So0-0005TH-UY for submit@debbugs.gnu.org; Tue, 28 Jul 2020 12:50:21 -0400 Received: from mout01.posteo.de ([185.67.36.65]:50192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0Snz-0005Sm-EM for 42587@debbugs.gnu.org; Tue, 28 Jul 2020 12:50:20 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C95B3160061 for <42587@debbugs.gnu.org>; Tue, 28 Jul 2020 18:50:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1595955013; bh=tynLXxSOkVEKTKIksImICwmRZuouEGg5UvAXvZ5Jf48=; h=From:To:Cc:Subject:Date:From; b=GVg1zXa3qPVvKjJEkmVa2GfoA9xgdjQcgvEhruSaz7dbLgVkL0jALmxGU4RMjVAZc IMIA7hW3XrH8SKShv8GpCRRHdB+md1mok+JbxLKF/v2QKLjFpsJjxwiAzmzY56gcum iKU4Vthta0X/ZdXdxpWHfEn9Sp3m7JFC3CebARiPt9OQZf7oESsqYzJEX6r3Vdf17S P2VJY5mJf295US96ru/vEU+7OOHXJQTv6WTxadbl8X0If8r0aPErl+CqU9gim01een A3gNixCmtJaXXug/+riqpGowrS624+yvn3u90CBFjtZaMBXD0yUPWZv6g8lZZxVcX8 a6N/OZM9peVTg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4BGN2X6WfPz9rxG; Tue, 28 Jul 2020 18:50:12 +0200 (CEST) From: Kei Kebreau Date: Tue, 28 Jul 2020 12:49:59 -0400 Message-Id: <20200728165001.3905-2-kkebreau@posteo.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200728165001.3905-1-kkebreau@posteo.net> References: <20200728165001.3905-1-kkebreau@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=posteo.net header.s=2017 header.b=GVg1zXa3; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 5.09 X-TUID: Y9BB9yon90pO * 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