From patchwork Fri Jan 27 01:08:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46437 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 D280327BBEB; Fri, 27 Jan 2023 01:09:55 +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=unavailable 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 D6A7327BBE9 for ; Fri, 27 Jan 2023 01:09:53 +0000 (GMT) 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 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)))) From patchwork Fri Jan 27 01:08:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46434 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 65DA227BBED; Fri, 27 Jan 2023 01:09:31 +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 A6B0227BBE9 for ; Fri, 27 Jan 2023 01:09:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLDEn-0008F8-MW; Thu, 26 Jan 2023 20:09:05 -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 1pLDEl-0008DW-Au for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:03 -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-0006ZB-Sl 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-0003jv-OA for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v2 2/5] gnu: wine-staging: 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.167478171514290 (code B ref 61067); Fri, 27 Jan 2023 01:09:02 +0000 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:35 +0000 Received: from localhost ([127.0.0.1]:36462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEI-0003iP-N1 for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:34 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:60225) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEH-0003iB-C5 for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:33 -0500 Date: Fri, 27 Jan 2023 01:08:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781707; x=1675040907; bh=NU+uBePYo9ejiZYdZ7WgvfMbcCLORwW/Gw3XNUMqtwA=; 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=SOGJPm/O/G7FOGtW/7hjSS1DXicnGSb+cs9sV3FpvvHlWUIAam65PZWffQ1Rajwy6 qFMzL5qbJGRvoADm0nJKJ8smgJOyXfp/lL3sEO288JSbEriNn6OsiEZVutiX0WSjCV 1Yv5ZAMEU+xGN2LFCejVFUlUtRjZGhaIG7U+HARALQ6q2BNLqJreSd8CUR0KvvDWkd EwmXoGoYQ6XKzFoLIUwBG/PvvHDDQySayMsVQvn4DWwuO/hjuaTxUM8fwfIeB4DNIs kT5K5DrP5qIjqo7sla/sf97OgZGQu3zJirh+ZAZzoTXAsTwSJ1hQqhqCrw73XsFcaI iTWScNGGsMHRw== Message-ID: <0c388c2f56254ce14335bf7542f2f4bc946e5e2f.1674781160.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-staging,wine64-staging): Update to 8.0. --- gnu/packages/wine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.39.1 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 7ca2ac5bdf..6e43494c68 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -336,7 +336,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "7.8") + (version "8.0") (source (origin (method git-fetch) @@ -345,7 +345,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02rgpymhqrdr3aamvv6yvpgh82rj1n4adr36mi26cs3zbkx8zb55")))) + (base32 "11q9fa1jdrv1pd9piaicgqvidq1c08imkwpqhyzcj5r711rl7581")))) (build-system trivial-build-system) (native-inputs (list bash coreutils)) @@ -395,7 +395,7 @@ (define-public wine-staging "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1f0r00b6lk59cmpj42b7f2jrd58d7vxfvpp54j7arwjhdg4yjxlg"))))) + (base32 "0bkr3klvjy8h4djddr31fvapsi9pc2rsiyhaa7j1lwpq704w4wh2"))))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg From patchwork Fri Jan 27 01:08:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46435 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 A219C27BBED; Fri, 27 Jan 2023 01:09:51 +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 BC1D527BBE9 for ; Fri, 27 Jan 2023 01:09:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLDEn-0008Ee-DD; Thu, 26 Jan 2023 20:09:05 -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 1pLDEl-0008Df-Ot for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:03 -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 1pLDEl-0006ZK-Aj for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLDEl-0003k4-4q for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 01:09:03 +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.167478172114308 (code B ref 61067); Fri, 27 Jan 2023 01:09:03 +0000 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:41 +0000 Received: from localhost ([127.0.0.1]:36466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEP-0003ii-0e for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:41 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:62467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEN-0003iI-7s for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:39 -0500 Date: Fri, 27 Jan 2023 01:08:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781712; x=1675040912; bh=wMjzQnbl7T1j8J3ZaIX3bA7xh62hrZlVAGWkuhfEWAI=; 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=s6ZTmzeVOOOWzPIYbVw4klz5RgpuaiyV7/k7lyINS5D2baPjVONxJ8SuncPQ3jT7Z N/Be60adxmohHTC12DskreZPxFUockgbD6+3ZoyC9UA2upDJlo4ny7ZsA57Nv65pcT bELeOxcIIUa7vvZUHwzKkUn+C3K+5B5KAj+UJZg6PY4749Ea1YKM3WQ8n5UaMpV5vu v4Xe1MotISZl30yPPN0wwKh3GDGmwiyzi1qkke7xJAbFiVc99aPCU72ibruDinPA2J nwZprVmenzyQWrciovbzZ01mv3XqjQoz1d+0sPWGA4f+a7aH7VdfCPDv7EiwxFuUpO sYR7KPMNm0TIQ== Message-ID: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.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-minimal): Share phases with parent wine package. --- gnu/packages/wine.scm | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) -- 2.39.1 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6e43494c68..b9a8396b75 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -308,30 +308,13 @@ (define-public wine-minimal (delete "gettext" "perl" "pkg-config"))) (inputs `()) (arguments - `(#:validate-runpath? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL later. - (("/bin/sh") - (which "bash"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - (list "--without-freetype" - "--without-x") - ,@(strip-keyword-arguments '(#:configure-flags #:phases) - (package-arguments wine)))))) + (substitute-keyword-arguments (package-arguments wine) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'wrap-executable))) ;; Don't reference Vulkan ICD files. + ((#:configure-flags _ '()) + #~(list "--without-freetype" + "--without-x")))))) (define-public wine-staging-patchset-data (package From patchwork Fri Jan 27 01:08:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46433 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 80C8B27BBED; Fri, 27 Jan 2023 01:09:13 +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 C795E27BBE9 for ; Fri, 27 Jan 2023 01:09:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLDEo-0008Fd-LZ; Thu, 26 Jan 2023 20:09:06 -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 1pLDEm-0008Dn-1q for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:04 -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 1pLDEl-0006ZU-Pi for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLDEl-0003kB-Kz for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v2 4/5] gnu: wine64: Share phases with parent wine package. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 01:09:03 +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.167478173214332 (code B ref 61067); Fri, 27 Jan 2023 01:09:03 +0000 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:08:52 +0000 Received: from localhost ([127.0.0.1]:36470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEZ-0003j5-Co for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:51 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:36561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEX-0003is-Jn for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:50 -0500 Date: Fri, 27 Jan 2023 01:08:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781723; x=1675040923; bh=DVSGeYq6q9yeTDb25Sfur4zzOxrzKAigp/8DmekqhrU=; 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=MDFw8DyITamSomm+pOU+nPp+vuMfzG6PHz31DN3BcNZkrvboo6fKmbsS5JaqQei7k EjvvvnTpQKN9AQviZAGbVI4RVMjYgx7Yc1vI+8fHA8KWyvBsLg6yP6QEcXF1le+Tlc TAgBKGSIq7rNZIAdhXmUcOJHU+MUorvLmCV7vkYN2MLbSQoU5EmIAvko7xG+v/sKWY XqeRkYhcv+owzI0MBCG7VNnzwoifHgUKN+Jqz+lSPuWOwTGjI1li4Hsg2yLSo5vH2P 0Z/HSucMgPGFNuGR4vJ9W6ZBrbXUyw6xuujeT4ONZWjSppE/Gs/gSGbGNz8phd9qlU zLZSkxupuKfCQ== Message-ID: <7f816cebacd3a33ec675fbe75bcee4f311efa3ac.1674781160.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 (wine64): Share phases with parent wine package. --- gnu/packages/wine.scm | 134 ++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 78 deletions(-) -- 2.39.1 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index b9a8396b75..263ec80416 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -217,84 +217,62 @@ (define-public wine64 (inputs (modify-inputs (package-inputs wine) (prepend wine))) (arguments - (cons* - #:make-flags - #~(list "SHELL=bash" - (string-append "libdir=" #$output "/lib/wine64")) - #:phases - #~(modify-phases %standard-phases - ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-loader - ;; when installing to x86_64-linux so both are available. - ;; TODO: Add more JSON files as they become available in Mesa. - #$@(match (%current-system) - ((or "x86_64-linux") - `((add-after 'copy-wine32-binaries 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (icd-files (map - (lambda (basename) - (search-input-file - inputs - (string-append "/share/vulkan/icd.d/" - basename))) - '("radeon_icd.x86_64.json" - "intel_icd.x86_64.json" - "radeon_icd.i686.json" - "intel_icd.i686.json")))) - (wrap-program (string-append out "/bin/wine-preloader") - `("VK_ICD_FILENAMES" ":" = ,icd-files)) - (wrap-program (string-append out "/bin/wine64-preloader") - `("VK_ICD_FILENAMES" ":" = ,icd-files))))))) - (_ - `())) - (add-after 'unpack 'patch-SHELL - (lambda _ - (substitute* "configure" - ;; configure first respects CONFIG_SHELL, clobbers SHELL later. - (("/bin/sh") - (which "bash"))))) - (add-after 'patch-generated-file-shebangs 'patch-makedep - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "tools/makedep.c" - (("output_filenames\\( unix_libs \\);" all) - (string-append all - "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"))) - ;; Copy the 32-bit binaries needed for WoW64. - (copy-file (search-input-file inputs "/bin/wine") - (string-append out "/bin/wine")) - ;; Copy the real 32-bit wine-preloader instead of the wrapped - ;; version. - (copy-file (search-input-file inputs "/bin/.wine-preloader-real") - (string-append out "/bin/wine-preloader"))))) - (add-after 'install 'copy-wine32-libraries - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - (copy-recursively (search-input-directory inputs "/lib/wine32") - (string-append out "/lib/wine32"))))) - (add-after 'compress-documentation 'copy-wine32-manpage - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out"))) - ;; Copy the missing man file for the wine binary from wine. - (copy-file (search-input-file inputs "/share/man/man1/wine.1.gz") - (string-append out "/share/man/man1/wine.1.gz"))))) - (add-after 'configure 'patch-dlopen-paths - ;; Hardcode dlopened sonames to absolute paths. - (lambda _ - (let* ((library-path (search-path-as-string->list - (getenv "LIBRARY_PATH"))) - (find-so (lambda (soname) - (search-path library-path soname)))) - (substitute* "include/config.h" - (("(#define SONAME_.* )\"(.*)\"" _ defso soname) - (format #f "~a\"~a\"" defso (find-so soname)))))))) - #:configure-flags - #~(list "--enable-win64") - (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases - #:system) - (package-arguments wine)))) + (substitute-keyword-arguments + (strip-keyword-arguments '(#:system) (package-arguments wine)) + ((#:make-flags _) + #~(list "SHELL=bash" + (string-append "libdir=" #$output "/lib/wine64")) + ) + ((#:phases phases) + #~(modify-phases #$phases + ;; Explicitly set both the 64-bit and 32-bit versions of vulkan-loader + ;; when installing to x86_64-linux so both are available. + ;; TODO: Add more JSON files as they become available in Mesa. + #$@(match (%current-system) + ((or "x86_64-linux") + `((delete 'wrap-executable) + (add-after 'copy-wine32-binaries 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (icd-files (map + (lambda (basename) + (search-input-file + inputs + (string-append "/share/vulkan/icd.d/" + basename))) + '("radeon_icd.x86_64.json" + "intel_icd.x86_64.json" + "radeon_icd.i686.json" + "intel_icd.i686.json")))) + (wrap-program (string-append out "/bin/wine-preloader") + `("VK_ICD_FILENAMES" ":" = ,icd-files)) + (wrap-program (string-append out "/bin/wine64-preloader") + `("VK_ICD_FILENAMES" ":" = ,icd-files))))))) + (_ + `())) + (add-after 'install 'copy-wine32-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref %outputs "out"))) + ;; Copy the 32-bit binaries needed for WoW64. + (copy-file (search-input-file inputs "/bin/wine") + (string-append out "/bin/wine")) + ;; Copy the real 32-bit wine-preloader instead of the wrapped + ;; version. + (copy-file (search-input-file inputs "/bin/.wine-preloader-real") + (string-append out "/bin/wine-preloader"))))) + (add-after 'install 'copy-wine32-libraries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + (copy-recursively (search-input-directory inputs "/lib/wine32") + (string-append out "/lib/wine32"))))) + (add-after 'compress-documentation 'copy-wine32-manpage + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out"))) + ;; Copy the missing man file for the wine binary from wine. + (copy-file (search-input-file inputs "/share/man/man1/wine.1.gz") + (string-append out "/share/man/man1/wine.1.gz"))))))) + ((#:configure-flags configure-flags '()) + #~(cons "--enable-win64" #$configure-flags)))) (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) From patchwork Fri Jan 27 01:08:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 46436 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 2026F27BBE9; Fri, 27 Jan 2023 01:09:52 +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=unavailable 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 C352D27BBEB for ; Fri, 27 Jan 2023 01:09:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLDEn-0008FL-Uo; Thu, 26 Jan 2023 20:09:05 -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 1pLDEm-0008EG-Dv for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:04 -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 1pLDEm-0006Zc-51 for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLDEm-0003kJ-0P for guix-patches@gnu.org; Thu, 26 Jan 2023 20:09:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v2 5/5] gnu: wine: Build more reproducibly. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 01:09:03 +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.167478174014352 (code B ref 61067); Fri, 27 Jan 2023 01:09:03 +0000 Received: (at 61067) by debbugs.gnu.org; 27 Jan 2023 01:09:00 +0000 Received: from localhost ([127.0.0.1]:36474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEh-0003jQ-TZ for submit@debbugs.gnu.org; Thu, 26 Jan 2023 20:09:00 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:32719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLDEg-0003jD-3d for 61067@debbugs.gnu.org; Thu, 26 Jan 2023 20:08:58 -0500 Date: Fri, 27 Jan 2023 01:08:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1674781732; x=1675040932; bh=kSglZduQyOGvJGVgsEB02gPdnZO2DjSqJd/uDvHC7sg=; 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=VKL5QQjQ5HlfJMYqThJ7WwSlaJQdl2ri2CqC8TnuJhQG8ngqXeul1Go3ygvo6Mwlk iFJdSGnV9V8WMzB9l3qcGHDOyvkvLS4xVD2nH7cJxp6OMTZ+SqGCA1uLWuGZlq16o8 3OoDfc32eNKg/Z3ur053zmDrtvLdfqWFhYmfcvpYBbJ5NSVWAt+2ceXc7OTtWlG1Ze 8WKWl14xG+g74SP5kCQtjDEBQ4DfWaKTwj5fHkpthOuepuXsUyvC/Z7h+OZQvKyas2 d04VbMDdPy4AqnGLGK9GA1mfKE0eUrFb1Xh6/rM/5f0IipECs7My5YIxvC/fZxOaXo edDZ9CIX/IVWg== Message-ID: <74e8a897c40d4f68ee36875b87ad6113af80f792.1674781160.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)[phases]: Add a new 'set-widl-time-override phase. --- gnu/packages/wine.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.39.1 diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 263ec80416..10cae76ed8 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -195,7 +195,12 @@ (define-public wine (substitute* "tools/makedep.c" (("output_filenames\\( unix_libs \\);" all) (string-append all - "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );")))))))) + "output ( \" -Wl,-rpath=%s \", arch_install_dirs[arch] );"))))) + (add-before 'build 'set-widl-time-override + ;; Set WIDL_TIME_OVERRIDE to avoid embedding the current date in + ;; files generated by WIDL. + (lambda _ + (setenv "WIDL_TIME_OVERRIDE" "315532800")))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description