From patchwork Thu Feb 2 21:23:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46618 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 8BF7C27BBED; Thu, 2 Feb 2023 21:24:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A573F27BBE9 for ; Thu, 2 Feb 2023 21:24:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNh3s-0007Yx-Ej; Thu, 02 Feb 2023 16:24:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNh3q-0007YQ-Hd for guix-patches@gnu.org; Thu, 02 Feb 2023 16:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNh3q-0006da-5P for guix-patches@gnu.org; Thu, 02 Feb 2023 16:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNh3q-0003f4-0i for guix-patches@gnu.org; Thu, 02 Feb 2023 16:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v3 1/5] gnu: wine: Update to 8.0. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Feb 2023 21:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61067@debbugs.gnu.org Cc: Kaelyn Takata , liliana.prikler@gmail.com Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.167537302814028 (code B ref 61067); Thu, 02 Feb 2023 21:24:01 +0000 Received: (at 61067) by debbugs.gnu.org; 2 Feb 2023 21:23:48 +0000 Received: from localhost ([127.0.0.1]:35995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh3c-0003eB-9Y for submit@debbugs.gnu.org; Thu, 02 Feb 2023 16:23:48 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:24205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNh3a-0003dr-Fh for 61067@debbugs.gnu.org; Thu, 02 Feb 2023 16:23:47 -0500 Date: Thu, 02 Feb 2023 21:23:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675373020; x=1675632220; bh=HHvNkOgjDdFQV6CrFK/7OIG4zfMa6Ip/MzmwjKM0t0Q=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=crsL+kDG8RKG01Qs0+JQEECAwzxutiHmogr1qiwQE5uZKFqoZwP03rbp2Qm17xxgR E1/afH3501e8tR+lZABY6rgWTiDNuOTyp/gu40H8ELX6ZdHdlKlBMzcBRG7l7dI0wp S4u6V7eIN3jggsw3ICrzJkdgxjc5R8/j3/U3AV0lONArKUwFz5WfL8j7SiPc1dhBXr jA6mXN2xLvMdHFzFPfa1HBFNo73GwlaxTzVuA27HRMxySYR/mHNpzEB26Bz+3b4ozM NgLXEsLor1REp8be8PromsazrKwIhjTkaTRuaS2OUSCS1y5Z1fNdTeSPi/wt/oAHpB 1KADsWqiMLFLA== Message-ID: <3b141cbb5c1d77e218db28e505a5a14011370bfa.1675372737.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wine.scm (wine,wine64,wine-minimal): Update to 8.0. [arguments]: Remove superfluous rpath setting in configure-flags. --- gnu/packages/wine.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) -- 2.39.1 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e86add4e3..7ca2ac5bdf 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2022 Liliana Marie Prikler +;;; Copyright © 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,7 +77,7 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "7.19") + (version "8.0") (source (origin (method url-fetch) @@ -88,7 +89,7 @@ (define-public wine (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "08cxigkd83as6gkqgiwdpvr7cyy5ajsnhan3jbadwzqxdrz4kb23")))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2")))) (build-system gnu-build-system) (native-inputs (list bison flex gettext-minimal perl pkg-config)) @@ -142,9 +143,6 @@ (define-public wine ;; pass. #:tests? #f - #:configure-flags - #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine32")) - #:make-flags #~(list "SHELL=bash" (string-append "libdir=" #$output "/lib/wine32")) @@ -197,7 +195,7 @@ (define-public wine (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=%s \", so_dir );")))))))) + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description @@ -260,7 +258,7 @@ (define-public wine64 (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=%s \", so_dir );"))))) + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))) (add-after 'install 'copy-wine32-binaries (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) @@ -293,8 +291,7 @@ (define-public wine64 (("(#define SONAME_.* )\"(.*)\"" _ defso soname) (format #f "~a\"~a\"" defso (find-so soname)))))))) #:configure-flags - #~(list "--enable-win64" - (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine64")) + #~(list "--enable-win64") (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases #:system) (package-arguments wine))))