From patchwork Thu Aug 5 19:10:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 31853 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F1CC627BC78; Thu, 5 Aug 2021 20:11:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B507D27BC6B for ; Thu, 5 Aug 2021 20:11:17 +0100 (BST) Received: from localhost ([::1]:58502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mBilw-0003QV-MD for patchwork@mira.cbaines.net; Thu, 05 Aug 2021 15:11:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBili-0003Lz-Qm for guix-patches@gnu.org; Thu, 05 Aug 2021 15:11:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mBili-0001zf-KX for guix-patches@gnu.org; Thu, 05 Aug 2021 15:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mBili-0002XC-Gn for guix-patches@gnu.org; Thu, 05 Aug 2021 15:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49900] [PATCH] gnu: wine: Update to 6.14. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Aug 2021 19:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49900 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49900@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16281906409710 (code B ref -1); Thu, 05 Aug 2021 19:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Aug 2021 19:10:40 +0000 Received: from localhost ([127.0.0.1]:48469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBilL-0002WY-L3 for submit@debbugs.gnu.org; Thu, 05 Aug 2021 15:10:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:45232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mBilK-0002WQ-2J for submit@debbugs.gnu.org; Thu, 05 Aug 2021 15:10:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBilD-0002nL-MO for guix-patches@gnu.org; Thu, 05 Aug 2021 15:10:37 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:7403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mBil9-0001SR-CK for guix-patches@gnu.org; Thu, 05 Aug 2021 15:10:30 -0400 Received: from localhost.localdomain (194-118-35-216.adsl.highway.telekom.at [194.118.35.216]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4GgdTz6T6lz1LB21 for ; Thu, 5 Aug 2021 21:10:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4GgdTz6T6lz1LB21 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1628190615; bh=kaFfhc/OQ+/mkYljkKkKA1omHfU6oCp7EfQLuwBrH6w=; h=From:To:Subject:Date:From; b=qNdvDtaDym0VIjIfGYMeLSAttjgg+oTza0MlHNXrX0n/1eZA6ZJYjWM1kmjl+p4XZ 7yLjH5n34D6y+hBzAFDvpuyWLhRtx1NSZarnuD/sVUHe4Ht8o7fASpxxANwxpgCIY6 kZ6Z7d0wT82sTcUy6WXFIkz5T4daW8EVqLPe+euk= From: Leo Prikler Date: Thu, 5 Aug 2021 21:10:05 +0200 Message-Id: <20210805191005.20997-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wine.scm (wine): Update to 6.14. [#:phases]: Patch Makefile to correctly locate ntdll.so. (wine64)[#:phases]: Likewise. --- gnu/packages/wine.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 5c6d02eec5..fccdc186d2 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -75,7 +75,7 @@ (define-public wine (package (name "wine") - (version "6.8") + (version "6.14") (source (origin (method url-fetch) @@ -87,7 +87,7 @@ (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "1n7bd6kkhfgi23bz981qml3lajgvbs3ibqrc2mqjhhfqczg2shjv")))) + (base32 "00jjqbl0xzsp2swzxgx3a2b16p26qbxvcz82a7ihig23k69p3d34")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -194,7 +194,16 @@ (substitute* "include/config.h" (("(#define SONAME_.* )\"(.*)\"" _ defso soname) (format #f "~a\"~a\"" defso (find-so soname)))) - #t)))))) + #t))) + (add-after 'patch-generated-file-shebangs 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "Makefile") ; Makefile is first regenerated + (substitute* "Makefile" + (("-lntdll" id) + (string-append id + " -Wl,-rpath=" (assoc-ref outputs "out") + "/lib/wine32/wine/$(ARCH)-unix"))) + #t))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -254,6 +263,15 @@ integrate Windows applications into your desktop.") #t))))) (_ `())) + (add-after 'patch-generated-file-shebangs 'patch-makefile + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "Makefile") ; Makefile is first regenerated + (substitute* "Makefile" + (("-lntdll" id) + (string-append id + " -Wl,-rpath=" (assoc-ref outputs "out") + "/lib/wine64/wine/$(ARCH)-unix"))) + #t)) (add-after 'install 'copy-wine32-binaries (lambda* (#:key outputs #:allow-other-keys) (let* ((wine32 (assoc-ref %build-inputs "wine"))