From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id GKyDCGIk02NYvAAAbAwnHQ (envelope-from ) for ; Fri, 27 Jan 2023 02:09:54 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id CCSuB2Ik02NzSgAAG6o9tA (envelope-from ) for ; Fri, 27 Jan 2023 02:09:54 +0100 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 E2383123C6 for ; Fri, 27 Jan 2023 02:09:53 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLDEm-0008E6-C1; Thu, 26 Jan 2023 20:09: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 1pLDEk-0008DG-PA for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09: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 1pLDEk-0006Z5-Gp for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLDEk-0003jo-CU for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v2 1/5] gnu: wine: Update to 8.0. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 01:09:02 +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 Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.167478169814259 (code B ref 61067); Fri, 27 Jan 2023 01:09:02 +0000 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:18 +0000 Received: from localhost ([127.0.0.1]:36458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDE2-0003hu-7n for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:18 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:23553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDE0-0003hh-IT for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:17 -0500 Date: Fri, 27 Jan 2023 01:08:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781690; x=1675040890; 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=O8gjDUgM72vRRE9H37jVZjtPHVmzI08p8XpqmRyfsRbs0NXcGnHVlG7d5cOFzkaMS 45NFmYexQnhJ14gRobEXwW/9g8JrrJqwwrUClmakJ+2Yr5mxcMIMdXTgM5tcbtoYVw cgQQXLCgUEfVd0de0kd9HUq8pMcHzCRy4MSwNmWiOc3jECtpevyoKjN8S8fdC4UQEV 9wXHQ7GAHN+dbj0V+oKTwfrlYYpZ/MTRYj9C7uMxLkrS80XxMJuO84mDfONxTyXfuQ cGDWTjurB7NBVcyEwwYXQKZNRnxGuc+8FrzrZs4GwzGp5AG8e1bDy3zVsyHo1+51tm GNcR+uUuJCv3A== Message-ID: <11be5fb96c13b55f8185fcbf8256e9b440187816.1674781160.git.kaelyn.alexi@protonmail.com> In-Reply-To: References: Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 From: Kaelyn Takata via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674781793; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=HHvNkOgjDdFQV6CrFK/7OIG4zfMa6Ip/MzmwjKM0t0Q=; b=Ne+v+CY1F19UNDiswqkMAnB0vMICCv7KP+APaRMSh4tmH8UqkGTYV2reh7LsztLOItG+nK tUYZo87bS8OCcJaVg7sS9Oew/wA70Q6JS8d+tk/D1AJtXOYAiFkjFKRpGCKHdivmyIxKUZ IfLP+O/b/EI95dMDzb3Ti6OClXlIjTe5V5doouP49ijykqfFgE4QRCVl1E6sOQD7+n7gVl FXxPycL3tY4BqkII/6T8ikMrKZKXEsm3uJ/ynfCPI2DdoprkWQaJvXnlhCJF6BBF2dXK6c jYqx7TnzkK/xUbdhXfk+0khV67dUFb13gmlYwv0vzGCFKoLmuWY4awwFe5PRjw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=O8gjDUgM; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674781793; a=rsa-sha256; cv=none; b=pA/3TYfA+W4orMQx1ZO92gHLPi9K0g2SUjeaHLvyApg9Rh3L+1TeRlnaWx8TL92e/YSDPw tSgTAyTd2qhCI8w+bLE1vSHYARES5PJSML4xApFxrh0noFn6Q+P4WxQbrNCoZ8REhhneN9 kC8z4ke7V6PODKWXUGzxvaAxpN0NFeeBES82jzZz/kzP0N4+j1XvqQg/kjezi/pu42aML6 cummC67X3uMnn33J9QlUp7ysEfMatIVDPEZQyMMy1WjvtrTu6O3X7867zdGH+IcWR+lrvJ hvTZJmigoLywYeqPKPjdA47o9PMWrJRmi+wGmTdf+RZZ8p9cDWKQp/rPV/+5Aw== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=O8gjDUgM; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -2.37 X-Spam-Score: -2.37 X-Migadu-Queue-Id: E2383123C6 X-TUID: XFDoAfq0wuCB * 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(-) 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 =C2=A9 2018=E2=80=932021 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2019 Pierre Neidhardt ;;; Copyright =C2=A9 2022 Liliana Marie Prikler +;;; Copyright =C2=A9 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=3D-Wl,-rpath=3D" #$output "/lib/win= e32")) - #:make-flags #~(list "SHELL=3Dbash" (string-append "libdir=3D" #$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=3D%s \", so_dir )= ;")))))))) + "output ( \" -Wl,-rpath=3D%s \", arch_ins= tall_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=3D%s \", so_dir );= "))))) + "output ( \" -Wl,-rpath=3D%s \", arch_inst= all_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=3D-Wl,-rpath=3D" #$output "/lib/wine= 64")) + #~(list "--enable-win64") (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases #:system) (package-arguments wine)))) -- 2.39.1