From patchwork Sat May 7 09:46:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39142 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 539CB27BBE9; Sat, 7 May 2022 17:12:29 +0100 (BST) 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_ADSP_CUSTOM_MED, 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 2576327BBE9 for ; Sat, 7 May 2022 17:12:29 +0100 (BST) Received: from localhost ([::1]:45708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnN2i-0006ew-BU for patchwork@mira.cbaines.net; Sat, 07 May 2022 12:12:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnN2L-0006CL-2p for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnN2K-000396-Pd for guix-patches@gnu.org; Sat, 07 May 2022 12:12:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnN2K-0006Nt-L5 for guix-patches@gnu.org; Sat, 07 May 2022 12:12:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55302] [PATCH 1/4] gnu: wine: Update to 7.8. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 16:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55302 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55302@debbugs.gnu.org Received: via spool by 55302-submit@debbugs.gnu.org id=B55302.165193988924311 (code B ref 55302); Sat, 07 May 2022 16:12:04 +0000 Received: (at 55302) by debbugs.gnu.org; 7 May 2022 16:11:29 +0000 Received: from localhost ([127.0.0.1]:52772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN1k-0006Js-VR for submit@debbugs.gnu.org; Sat, 07 May 2022 12:11:29 -0400 Received: from mail-ed1-f47.google.com ([209.85.208.47]:40580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN1i-0006JQ-OA for 55302@debbugs.gnu.org; Sat, 07 May 2022 12:11:27 -0400 Received: by mail-ed1-f47.google.com with SMTP id p18so11771070edr.7 for <55302@debbugs.gnu.org>; Sat, 07 May 2022 09:11:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=NAM52k0CBKNIh2/TGNL9R8uw1H0K1n1mZ4keWFnbrwQ=; b=p+XxdIr4QwFynKnBIa9W/6QhRzRPUo4oz9qveiLa2eE4N1em5EWm1npz9UW/LFRgcP kOPHzg2kz/r/jw2pvC3vF9uU2Ch2iDqFy+udX+MXJ9nPDyRwN+NQxdRmUEKC+NVj8IXL zH9ESY55sm+GWxYW2rheHq+W2PvITKzHEmHfAjNCD04DeqM7nx6f64CDG/TDfqc8WviP zYKx4lhwMkfXY0S9akiCMp5/NnM4KBXs/qW44gVIMYl72zvq2GSA9LjQhI/GV8B4R7p2 ERvfbD+r2jH280WhT2xHCj91osuXpa0jaISYS33bm78IeM3RAoGtv3xz7WTBLGVTnNwE FPDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=NAM52k0CBKNIh2/TGNL9R8uw1H0K1n1mZ4keWFnbrwQ=; b=YKLXhIMHfR6t7nwFKKh3JNRunojVKtAfPcMG3Zwwh2U2iJTBX/6jROQIWeKESu/BG4 oN4vp3bXPQqybza0M/4oHIAYE1AiWHNObOyz/QEv+yzhpEp1MqlZJGuGwPENG6/5F1YQ n6sPzpKPBBRwv9lGTy5qEsgfdW6UwpDNNU8aJnRqyTNsgWr1Y0j9JSgKPZ+bQraOT6Pp 7yghyRkhTGiyQCMETZtTglOqF78wzzh7uEZxj9QLrAYvFlLeEE83jScBw2EZOfoVLiIn 0bZKtEteOaFuCx7kOW1YOdIFCn8UwgA/0wkhd6HRokwWWWqGJid9GmEKX38exqx0N7g1 sENw== X-Gm-Message-State: AOAM530vNP58OF4nCpEZfWP6Wi89PD7Hc5duOeHMr4ivgvu5GKNxNl3o e7G6F9DoFy/kRX2PsR9JlYQKmm/WVsA= X-Google-Smtp-Source: ABdhPJyIScRMOL2l2Xvd/xgtS4s1AYz0y+TOqtCx139DouEcKjrwaD13PqaieYBNzYzUhe6O7JaDSw== X-Received: by 2002:a05:6402:3208:b0:427:d928:e3d2 with SMTP id g8-20020a056402320800b00427d928e3d2mr9310788eda.240.1651939880896; Sat, 07 May 2022 09:11:20 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e15-20020a50e44f000000b0042617ba63c7sm3769813edm.81.2022.05.07.09.11.20 for <55302@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 May 2022 09:11:20 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 7 May 2022 11:46:23 +0200 Message-ID: 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: , 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 7.8. --- gnu/packages/wine.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 7ca2b9d0c7..5d8e9f5b90 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -74,7 +74,7 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "7.0") + (version "7.8") (source (origin (method url-fetch) @@ -86,7 +86,7 @@ (define-public wine (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "0sq8vsr8jf1a8fanh76rq7vyxm8h0cc4ckirjy7v2p08biyy4hsv")))) + (base32 "1f0r00b6lk59cmpj42b7f2jrd58d7vxfvpp54j7arwjhdg4yjxlg")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) From patchwork Sat May 7 15:36:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39147 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 D80B127BBEB; Sat, 7 May 2022 17:13:09 +0100 (BST) 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_ADSP_CUSTOM_MED, 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 277F227BBEA for ; Sat, 7 May 2022 17:13:09 +0100 (BST) Received: from localhost ([::1]:47252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnN3M-0007iq-BP for patchwork@mira.cbaines.net; Sat, 07 May 2022 12:13:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnN2L-0006E8-FC for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnN2L-00039C-5r for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnN2L-0006O0-1V for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55302] [PATCH 2/4] gnu: wine: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 16:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55302 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55302@debbugs.gnu.org Received: via spool by 55302-submit@debbugs.gnu.org id=B55302.165193989224327 (code B ref 55302); Sat, 07 May 2022 16:12:04 +0000 Received: (at 55302) by debbugs.gnu.org; 7 May 2022 16:11:32 +0000 Received: from localhost ([127.0.0.1]:52775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN1n-0006KJ-N1 for submit@debbugs.gnu.org; Sat, 07 May 2022 12:11:32 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:34519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN1j-0006JR-8v for 55302@debbugs.gnu.org; Sat, 07 May 2022 12:11:28 -0400 Received: by mail-ej1-f67.google.com with SMTP id g6so19527053ejw.1 for <55302@debbugs.gnu.org>; Sat, 07 May 2022 09:11:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=Onvo+ag0ZGnArDjAHDJULGVWb8M1glhxuK1QW+KZp+k=; b=lG3qsRb+49fLsySTWi9K0ClO5RlIxBB56znYsT1ex62IVkrdu3jD6sQff6j1vPeLeC WKwT2qV4gADVPmS60XHabeupD6Mj0E35syj+ZTQ9ejNjO1JHqFNhBMTPg8LiEbI3b0qk mFqEuKkAXeX9a/ZFqq9pur/RGfwPbBKprt5ZCxQ8khJFTTxqtzIKhyF1ox4bxPB7BW6G LXts/rPK4ya/Y2mMb72AML9Y/rVC3c50n3fSfg/wFu/T15ShaCBN84G/qP14d9ruVoKd SmGHwSfbXIIW9H2HW/vP86CGnzPVJM520um5nM3nOgwkP+kOU1TmSh63bQA5zAm6rFtO 5rGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=Onvo+ag0ZGnArDjAHDJULGVWb8M1glhxuK1QW+KZp+k=; b=h1JZUoLWIWj/+S+U1bVPmWW5BtFKfksGJWZ6M0AQHg/EvhxoWpJ5Dt9AmzcDq+racD MFDqka8gpFn5yVU3zUnG7pUQ06Vn6COLeSprljr2W0W7vT/re1rCjQIUZnpDGFouiZ3r Jlf6yjCHmecn9NUxzQZi9QVcOLjHtKsnUdZ4PfEETR6vlsHCwRsndYzccwbPKFXO7q68 PfNhe42mW1ZkVa8cEl4Sc2EZqPvTZJzBl9HgNw/pf9F49l4jjwn9RYe9r5gl1OEIt9cx sWlaWyx7+jxlrHHTTwkMxCqOuqn2fSHs4HL4sw35FgzZt+1mEdIv5LIG5r9ui+CPEDJo qAEw== X-Gm-Message-State: AOAM533HGgqre9z0sryHd+1xAMbmYoHg2OU40S+8zfIJGLCymmVarPqF 1q7J7QvicTcJxjvfYBScqimcrhfGqSY= X-Google-Smtp-Source: ABdhPJxj0QUttKkj9y1skXqKQmT00hz5+1mRKSx/5Z9/884KDuRLSE+j1kmp7TOwEq+Dry+CRqY7OQ== X-Received: by 2002:a17:906:1f52:b0:6f4:ebc2:da82 with SMTP id d18-20020a1709061f5200b006f4ebc2da82mr8021853ejk.176.1651939881605; Sat, 07 May 2022 09:11:21 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e15-20020a50e44f000000b0042617ba63c7sm3769813edm.81.2022.05.07.09.11.20 for <55302@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 May 2022 09:11:21 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 7 May 2022 17:36:07 +0200 MIME-Version: 1.0 Message-ID: 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)[inputs, native-inputs]: Drop labels. [arguments]: Convert to list of G-Expressions. <#:configure-flags,#:make-flags>: Replace ‘%output’ with ‘#$output’. <#:phases>: Use ‘search-input-file’ instead of input labels. --- gnu/packages/wine.scm | 187 +++++++++++++++++++++--------------------- 1 file changed, 92 insertions(+), 95 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 5d8e9f5b90..eb71a8caa8 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2020 Nicolas Goaziou ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pierre Neidhardt +;;; Copyright © 2022 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ (define-module (gnu packages wine) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) @@ -89,118 +91,113 @@ (define-public wine (base32 "1f0r00b6lk59cmpj42b7f2jrd58d7vxfvpp54j7arwjhdg4yjxlg")))) (build-system gnu-build-system) (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ("gettext" ,gettext-minimal) - ("perl" ,perl) - ("pkg-config" ,pkg-config))) + (list bison flex gettext-minimal perl pkg-config)) (inputs ;; Some libraries like libjpeg are now compiled into native PE objects. ;; The ELF objects provided by Guix packages are of no use. Whilst this ;; is technically bundling, it's quite defensible. It might be possible ;; to build some of these from Guix PACKAGE-SOURCE but attempts were not ;; fruitful so far. See . - `(("alsa-lib" ,alsa-lib) - ("dbus" ,dbus) - ("cups" ,cups) - ("eudev" ,eudev) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("gnutls" ,gnutls) - ("gst-plugins-base" ,gst-plugins-base) - ("libgphoto2" ,libgphoto2) - ("libldap" ,openldap) - ("libnetapi" ,samba) - ("libsane" ,sane-backends) - ("libpcap" ,libpcap) - ("libusb" ,libusb) - ("libICE" ,libice) - ("libX11" ,libx11) - ("libXi" ,libxi) - ("libXext" ,libxext) - ("libXcursor" ,libxcursor) - ("libXrender" ,libxrender) - ("libXrandr" ,libxrandr) - ("libXinerama" ,libxinerama) - ("libXxf86vm" ,libxxf86vm) - ("libXcomposite" ,libxcomposite) - ("mit-krb5" ,mit-krb5) - ("openal" ,openal) - ("pulseaudio" ,pulseaudio) - ("sdl2" ,sdl2) - ("unixodbc" ,unixodbc) - ("v4l-utils" ,v4l-utils) - ("vkd3d" ,vkd3d) - ("vulkan-loader" ,vulkan-loader))) + (list alsa-lib + cups + dbus + eudev + fontconfig + freetype + gnutls + gst-plugins-base + libgphoto2 + openldap + samba + sane-backends + libpcap + libusb + libice + libx11 + libxi + libxext + libxcursor + libxrender + libxrandr + libxinerama + libxxf86vm + libxcomposite + mit-krb5 + openal + pulseaudio + sdl2 + unixodbc + v4l-utils + vkd3d + vulkan-loader)) (arguments - `(;; Force a 32-bit build targeting a similar architecture, i.e.: - ;; armhf for armhf/aarch64, i686 for i686/x86_64. - #:system ,@(match (%current-system) - ((or "armhf-linux" "aarch64-linux") - `("armhf-linux")) - (_ - `("i686-linux"))) + (list + ;; Force a 32-bit build targeting a similar architecture, i.e.: + ;; armhf for armhf/aarch64, i686 for i686/x86_64. + #:system (match (%current-system) + ((or "armhf-linux" "aarch64-linux") "armhf-linux") + (_ "i686-linux")) ;; XXX: There's a test suite, but it's unclear whether it's supposed to ;; pass. #:tests? #f #:configure-flags - (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib/wine32")) + #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine32")) #:make-flags - (list "SHELL=bash" - (string-append "libdir=" %output "/lib/wine32")) + #~(list "SHELL=bash" + (string-append "libdir=" #$output "/lib/wine32")) #:phases - (modify-phases %standard-phases - ;; Explicitly set the 32-bit version of vulkan-loader when installing - ;; to i686-linux or x86_64-linux. - ;; TODO: Add more JSON files as they become available in Mesa. - ,@(match (%current-system) - ((or "i686-linux" "x86_64-linux") - `((add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (icd (string-append out "/share/vulkan/icd.d"))) - (mkdir-p icd) - (copy-file (string-append - (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/radeon_icd.i686.json") - (string-append icd "/radeon_icd.i686.json")) - (copy-file (string-append - (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/intel_icd.i686.json") - (string-append icd "/intel_icd.i686.json")) - (wrap-program (string-append out "/bin/wine-preloader") - `("VK_ICD_FILENAMES" ":" = - (,(string-append icd - "/radeon_icd.i686.json" ":" - icd "/intel_icd.i686.json"))))))))) - (_ - `())) - (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))))))) - (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 \", so_dir );")))))))) + #~(modify-phases %standard-phases + ;; Explicitly set the 32-bit version of vulkan-loader when installing + ;; to i686-linux or x86_64-linux. + ;; TODO: Add more JSON files as they become available in Mesa. + #$@(match (%current-system) + ((or "i686-linux" "x86_64-linux") + `((add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (icd (string-append out "/share/vulkan/icd.d"))) + (mkdir-p icd) + (copy-file (search-input-file + inputs + "/share/vulkan/icd.d/radeon_icd.i686.json") + (string-append icd "/radeon_icd.i686.json")) + (copy-file (search-input-file + inputs + "/share/vulkan/icd.d/intel_icd.i686.json") + (string-append icd "/intel_icd.i686.json")) + (wrap-program (string-append out "/bin/wine-preloader") + `("VK_ICD_FILENAMES" ":" = + (,(string-append icd + "/radeon_icd.i686.json" ":" + icd "/intel_icd.i686.json"))))))))) + (_ + `())) + (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))))))) + (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 \", so_dir );")))))))) (home-page "https://www.winehq.org/") (synopsis "Implementation of the Windows API (32-bit only)") (description From patchwork Sat May 7 15:39:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39144 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 EC3F527BBEC; Sat, 7 May 2022 17:12:42 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 DD30927BBEA for ; Sat, 7 May 2022 17:12:41 +0100 (BST) Received: from localhost ([::1]:46362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnN2v-00077k-3K for patchwork@mira.cbaines.net; Sat, 07 May 2022 12:12:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnN2L-0006FB-RA for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnN2L-00039I-I1 for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnN2L-0006O7-Dc for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55302] [PATCH 3/4] gnu: wine64: Use new package style. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 16:12:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55302 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55302@debbugs.gnu.org Received: via spool by 55302-submit@debbugs.gnu.org id=B55302.165193989324337 (code B ref 55302); Sat, 07 May 2022 16:12:05 +0000 Received: (at 55302) by debbugs.gnu.org; 7 May 2022 16:11:33 +0000 Received: from localhost ([127.0.0.1]:52777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN1p-0006KR-83 for submit@debbugs.gnu.org; Sat, 07 May 2022 12:11:33 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:34524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN1k-0006JT-1H for 55302@debbugs.gnu.org; Sat, 07 May 2022 12:11:29 -0400 Received: by mail-ed1-f68.google.com with SMTP id a21so11788202edb.1 for <55302@debbugs.gnu.org>; Sat, 07 May 2022 09:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=vG5OZWc0JurEGrsCdNiAAx/3Uyrs/GLzaXFoR9yU8y4=; b=WhZloC27WiF13A8p1ztCN3VByJbduyh4qQJ8jNldjkLXat+cjyWBQe993hEHZepmti wAM2WIVuyO9Zqx6QFjCTXH8Fu5ojdtHYS4rRVIzVhUzReduG30QErGtL4EkM1oisgRc/ 0TQaHQWTYTPNrGDysba1LYsxiHOSldX7ouVTOqslhgraLCGODUxm6n6N9OaxKM2W9oBE 6FgHrfMGy1cD08mCZpO20GU2ZXJO39/zbmB7bQjAwC9ybNfQiKKJfMGkJiFXMfGygDKl yOtBVfE2KAWGMfakz7omN2VtHwINAFTb4GptuPZENlyRcO3K0EPz+A6CL+i3u50Ox95b x/7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=vG5OZWc0JurEGrsCdNiAAx/3Uyrs/GLzaXFoR9yU8y4=; b=Ml8ztY7aD+4s9B8VVyYF/B+1ZZKZNykqlfOjRNlkGLd2mfp+2ODrSFj7XC/Yu7buhX tTgt57+XuT5zHcS3TUQuPNO3tCXKLtRfWHxJWPnmUFwJRi+4HKESQInZzrjnJA1T6u1l WO/zJ3mmbFL/nqT9t3My+9zzxzkph1TBTNC/Ne8IarXXP7utD3JBzVNZqPdVnutjDK1n URaSa5cWYEbL1/plSHJoE79G7dr9QyxcvG0FcIGGLuBtkPqHsXaO4usU4+B/zjoA+LCU /6DG1+PdACNN1EcjdkDA2EIFlC0ZrndbWscmZWP03YqoXhcchPvSoFq/M2Pn+NdBBde0 mHNQ== X-Gm-Message-State: AOAM533AjPemsWHX8YfDDHp9U02bCV2Xgr8HSFr14uqiYRR3m2+fLl7V CeidQ/psWwFRcMiQyYdMlQyouFQ4SXY= X-Google-Smtp-Source: ABdhPJwf13b11d26fr8OIHEfgB38HlfwOvxnNYLzKkXiO3WfqTVVTk2cvCWAr4+g3ncAjS+Qzk3q5Q== X-Received: by 2002:a05:6402:289a:b0:425:d682:105d with SMTP id eg26-20020a056402289a00b00425d682105dmr9315853edb.175.1651939882297; Sat, 07 May 2022 09:11:22 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e15-20020a50e44f000000b0042617ba63c7sm3769813edm.81.2022.05.07.09.11.21 for <55302@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 May 2022 09:11:21 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 7 May 2022 17:39:25 +0200 MIME-Version: 1.0 Message-ID: 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 (wine64)[arguments]: Convert to list of G-Expessions. <#:configure-flags,#:make-flags>: Use ‘#$output’ instead of ‘%output’. <#:phases>: Replace labels with search-input-file. --- gnu/packages/wine.scm | 169 ++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 90 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index eb71a8caa8..1ab9153f84 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -219,96 +219,85 @@ (define-public wine64 (inputs (modify-inputs (package-inputs wine) (prepend wine))) (arguments - `(#: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"))) - (wrap-program (string-append out "/bin/wine-preloader") - `("VK_ICD_FILENAMES" ":" = - (,(string-append - (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/radeon_icd.x86_64.json" ":" - (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/intel_icd.x86_64.json" ":" - (assoc-ref inputs "wine") - "/share/vulkan/icd.d/radeon_icd.i686.json" ":" - (assoc-ref inputs "wine") - "/share/vulkan/icd.d/intel_icd.i686.json")))) - (wrap-program (string-append out "/bin/wine64-preloader") - `("VK_ICD_FILENAMES" ":" = - (,(string-append - (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/radeon_icd.x86_64.json" - ":" (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/intel_icd.x86_64.json" - ":" (assoc-ref inputs "wine") - "/share/vulkan/icd.d/radeon_icd.i686.json" - ":" (assoc-ref inputs "wine") - "/share/vulkan/icd.d/intel_icd.i686.json")))) - #t))))) - (_ - `())) - (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 \", so_dir );"))))) - (add-after 'install 'copy-wine32-binaries - (lambda* (#:key outputs #:allow-other-keys) - (let* ((wine32 (assoc-ref %build-inputs "wine")) - (out (assoc-ref %outputs "out"))) - ;; Copy the 32-bit binaries needed for WoW64. - (copy-file (string-append wine32 "/bin/wine") - (string-append out "/bin/wine")) - ;; Copy the real 32-bit wine-preloader instead of the wrapped - ;; version. - (copy-file (string-append wine32 "/bin/.wine-preloader-real") - (string-append out "/bin/wine-preloader"))))) - (add-after 'install 'copy-wine32-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let* ((wine32 (assoc-ref %build-inputs "wine")) - (out (assoc-ref %outputs "out"))) - (copy-recursively (string-append wine32 "/lib/wine32") - (string-append out "/lib/wine32"))))) - (add-after 'compress-documentation 'copy-wine32-manpage - (lambda* (#:key outputs #:allow-other-keys) - (let* ((wine32 (assoc-ref %build-inputs "wine")) - (out (assoc-ref %outputs "out"))) - ;; Copy the missing man file for the wine binary from wine. - (copy-file (string-append wine32 "/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" - (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib/wine64")) - ,@(strip-keyword-arguments '(#:configure-flags #:make-flags #:phases - #:system) - (package-arguments wine)))) + (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 \", so_dir );"))))) + (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" + (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib/wine64")) + (strip-keyword-arguments '(#:configure-flags #:make-flags #:phases + #:system) + (package-arguments wine)))) (synopsis "Implementation of the Windows API (WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux")))) From patchwork Sat May 7 09:47:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 39148 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 EF9AE27BBEA; Sat, 7 May 2022 17:13:16 +0100 (BST) 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_ADSP_CUSTOM_MED, 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 458C527BBE9 for ; Sat, 7 May 2022 17:13:16 +0100 (BST) Received: from localhost ([::1]:47488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnN3T-0007sZ-F2 for patchwork@mira.cbaines.net; Sat, 07 May 2022 12:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nnN2M-0006Gf-9W for guix-patches@gnu.org; Sat, 07 May 2022 12:12:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nnN2L-00039R-VH for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nnN2L-0006OG-QY for guix-patches@gnu.org; Sat, 07 May 2022 12:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55302] [PATCH 4/4] gnu: wine-staging: Update to 7.8. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 May 2022 16:12:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55302 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55302@debbugs.gnu.org Received: via spool by 55302-submit@debbugs.gnu.org id=B55302.165193989424343 (code B ref 55302); Sat, 07 May 2022 16:12:05 +0000 Received: (at 55302) by debbugs.gnu.org; 7 May 2022 16:11:34 +0000 Received: from localhost ([127.0.0.1]:52779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN1p-0006KU-NU for submit@debbugs.gnu.org; Sat, 07 May 2022 12:11:34 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:34523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nnN1k-0006JV-QZ for 55302@debbugs.gnu.org; Sat, 07 May 2022 12:11:29 -0400 Received: by mail-ed1-f66.google.com with SMTP id a21so11788226edb.1 for <55302@debbugs.gnu.org>; Sat, 07 May 2022 09:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=/fN99LxKFEXvxzXHR/KngBhHm0x0Wmb9YfowDUXQ+7I=; b=KtQlEoFrDDxOHYupbSpMuIS1lFHNAteOL2PKmUIYVAM2RAlzI6F4Jo/vvV0Sh/1A/e OpXbNIBt8mKqwhI+s6jPVAvyE/KYyQGeN1irqGm8/6EDt80OwXh46wivzWtQ6f/1k5oJ 4UIRNo95OtT+72pBNMdcEhrFbDpVgWrkSvvvk9/qR1pfTUAHxPM25Rx/yZLyt9ER5tH7 UEwZiPqEW8WGP+NFiTTVGN2n7DGFzeD7vNC01L4XwS/UNGYdOXer64OtT66EnQ8+VjHU 7l4RzSqHkSIv7KLhDvj7YY0JkayQMGGY1KDgk6MHKP1SmaoXZjZF98kMRQX94TwOxawR GoTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=/fN99LxKFEXvxzXHR/KngBhHm0x0Wmb9YfowDUXQ+7I=; b=etl9djzwnwhwxCpBGkCxy6AR9A1MAMNoYPmddPcxgd/HKEgRIQnzHEPoNNcU1j1g9R yOo7YVWukqR7ghU4rIQZo3NWPkjho2qyPWQJ/9s59FjIVTArYA3ALgwwLAmnSfqybwfa HNzSNeSTxmKUePP64vromi5m0ijf6fugHnRK30Udax1UyVJi2QXLghH268Uia57o8qr6 CfMyoaawQpEMFKDt3aal7bPFxCZQKjsYp8YfUNriZ9t2DMk3KSu/YacR5glzxnIuFlw9 JONC+HTVcID1ReYVHEokTU6GzKL3wcQAvXf3vRyYD046HTA3DrF8BVtP8+HkNeLr/UiK oXug== X-Gm-Message-State: AOAM530xzIiI4mAWCPDMIpVPalI+IpZ6jO8ukWGJoEUGHu/OXk1ucExV FEjDIxMNbt2il+YLhw16VFqwtscWLv8= X-Google-Smtp-Source: ABdhPJx6HeSAj26Grvt9wVC4Ks3KvWJjjDz8gFIhjXJNCFeY7qwHDdpHogASNczxIbbC+JhU/ICEmQ== X-Received: by 2002:a05:6402:b4d:b0:425:ec4a:a37e with SMTP id bx13-20020a0564020b4d00b00425ec4aa37emr9083472edb.292.1651939883222; Sat, 07 May 2022 09:11:23 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e15-20020a50e44f000000b0042617ba63c7sm3769813edm.81.2022.05.07.09.11.22 for <55302@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 May 2022 09:11:22 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 7 May 2022 11:47:45 +0200 MIME-Version: 1.0 Message-ID: <7d524bedc294858d9a6c3f84069482d1b8f2fd1f.camel@gmail.com> 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-staging-patchset-data): Update to 7.8. (wine-staging, wine64-staging)[arguments]: Reuse arguments from wine and wine64 respectively via substitute-keyword-arguments. <#:phases>: Rename ‘patch-source-wine-staging’ to ‘apply-wine-staging-patches’. Reorder, so that ‘patch-SHELL’ is applied afterwards. Drop trailing #t. --- gnu/packages/wine.scm | 170 +++++++----------------------------------- 1 file changed, 29 insertions(+), 141 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 1ab9153f84..231366c5de 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -339,7 +339,7 @@ (define-public wine-minimal (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "6.6") + (version "7.8") (source (origin (method git-fetch) @@ -348,7 +348,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0d5m9pvafr0iw99ny7rgzfmw7zw45q5wfcw68zj88mvzs47xkgms")))) + (base32 "02rgpymhqrdr3aamvv6yvpgh82rj1n4adr36mi26cs3zbkx8zb55")))) (build-system trivial-build-system) (native-inputs (list bash coreutils)) @@ -398,7 +398,7 @@ (define-public wine-staging "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1bc4zmqpdqs1ncz3qisp8a313pqzi5a31gq1s99ivb60vk325rcr"))))) + (base32 "1f0r00b6lk59cmpj42b7f2jrd58d7vxfvpp54j7arwjhdg4yjxlg"))))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg @@ -409,54 +409,19 @@ (define-public wine-staging util-linux ; for hexdump wine-staging-patchset-data))) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Explicitly set the 32-bit version of vulkan-loader when installing - ;; to i686-linux or x86_64-linux. - ;; TODO: Add more JSON files as they become available in Mesa. - ,@(match (%current-system) - ((or "i686-linux" "x86_64-linux") - `((add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (icd (string-append out "/share/vulkan/icd.d"))) - (mkdir-p icd) - (copy-file (search-input-file inputs - "/share/vulkan/icd.d/radeon_icd.i686.json") - (string-append icd "/radeon_icd.i686.json")) - (copy-file (search-input-file inputs - "/share/vulkan/icd.d/intel_icd.i686.json") - (string-append icd "/intel_icd.i686.json")) - (wrap-program (string-append out "/bin/wine-preloader") - `("VK_ICD_FILENAMES" ":" = - (,(string-append icd - "/radeon_icd.i686.json" ":" - icd "/intel_icd.i686.json")))) - #t))))) - (_ - `()) - ) - (add-before 'configure 'patch-source-wine-staging - (lambda* (#:key outputs #:allow-other-keys) - (let* ((source (assoc-ref %build-inputs "source")) - (script (string-append (assoc-ref %build-inputs - "wine-staging-patchset-data") - "/share/wine-staging/patches/patchinstall.sh"))) - (invoke script (string-append "DESTDIR=" ".") "--all") - #t))) - (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)))) - #t)))) - ,@(strip-keyword-arguments '(#:phases) - (package-arguments wine)))) + (substitute-keyword-arguments (package-arguments wine) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'patch-SHELL) + (add-before 'configure 'apply-wine-staging-patches + (lambda* (#:key inputs #:allow-other-keys) + (invoke (search-input-file + inputs + "/share/wine-staging/patches/patchinstall.sh") + "DESTDIR=." + "--all"))) + (add-after 'apply-wine-staging-patches 'patch-SHELL + (assoc-ref #$phases 'patch-SHELL)))))) (synopsis "Implementation of the Windows API (staging branch, 32-bit only)") (description "Wine-Staging is the testing area of Wine. It contains bug fixes and features, which have not been integrated into @@ -479,96 +444,19 @@ (define-public wine64-staging (inputs (modify-inputs (package-inputs wine-staging) (prepend wine-staging))) (arguments - `(#: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"))) - (wrap-program (string-append out "/bin/wine-preloader") - `("VK_ICD_FILENAMES" ":" = - (,(string-append (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/radeon_icd.x86_64.json" ":" - (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/intel_icd.x86_64.json" ":" - (assoc-ref inputs "wine-staging") - "/share/vulkan/icd.d/radeon_icd.i686.json" ":" - (assoc-ref inputs "wine-staging") - "/share/vulkan/icd.d/intel_icd.i686.json")))) - (wrap-program (string-append out "/bin/wine64-preloader") - `("VK_ICD_FILENAMES" ":" = - (,(string-append (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/radeon_icd.x86_64.json" - ":" (assoc-ref inputs "mesa") - "/share/vulkan/icd.d/intel_icd.x86_64.json" - ":" (assoc-ref inputs "wine-staging") - "/share/vulkan/icd.d/radeon_icd.i686.json" - ":" (assoc-ref inputs "wine-staging") - "/share/vulkan/icd.d/intel_icd.i686.json")))) - #t))))) - (_ - `()) - ) - (add-before 'configure 'patch-source-wine-staging - (lambda* (#:key outputs #:allow-other-keys) - (let* ((source (assoc-ref %build-inputs "source")) - (script (string-append (assoc-ref %build-inputs - "wine-staging-patchset-data") - "/share/wine-staging/patches/patchinstall.sh"))) - (invoke script (string-append "DESTDIR=" ".") "--all") - #t))) - (add-after 'install 'copy-wine32-binaries - (lambda* (#:key outputs #:allow-other-keys) - (let* ((wine32 (assoc-ref %build-inputs "wine-staging")) - (out (assoc-ref %outputs "out"))) - ;; Copy the 32-bit binaries needed for WoW64. - (copy-file (string-append wine32 "/bin/wine") - (string-append out "/bin/wine")) - ;; Copy the real 32-bit wine-preloader instead of the wrapped - ;; version. - (copy-file (string-append wine32 "/bin/.wine-preloader-real") - (string-append out "/bin/wine-preloader")) - #t))) - (add-after 'install 'copy-wine32-libraries - (lambda* (#:key outputs #:allow-other-keys) - (let* ((wine32 (assoc-ref %build-inputs "wine-staging")) - (out (assoc-ref %outputs "out"))) - (copy-recursively (string-append wine32 "/lib/wine32") - (string-append out "/lib/wine32")) - #t))) - (add-after 'compress-documentation 'copy-wine32-manpage - (lambda* (#:key outputs #:allow-other-keys) - (let* ((wine32 (assoc-ref %build-inputs "wine-staging")) - (out (assoc-ref %outputs "out"))) - ;; Copy the missing man file for the wine binary from - ;; wine-staging. - (copy-file (string-append wine32 "/share/man/man1/wine.1.gz") - (string-append out "/share/man/man1/wine.1.gz")) - #t))) - (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)))) - #t)))) - #:configure-flags - (list "--enable-win64" - (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib/wine64")) - ,@(strip-keyword-arguments '(#:configure-flags #:make-flags #:phases - #:system) - (package-arguments wine-staging)))) + (substitute-keyword-arguments (package-arguments wine64) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'patch-SHELL) + (add-before 'configure 'apply-wine-staging-patches + (lambda* (#:key inputs #:allow-other-keys) + (invoke (search-input-file + inputs + "/share/wine-staging/patches/patchinstall.sh") + "DESTDIR=." + "--all"))) + (add-after 'apply-wine-staging-patches 'patch-SHELL + (assoc-ref #$phases 'patch-SHELL)))))) (synopsis "Implementation of the Windows API (staging branch, WoW64 version)") (supported-systems '("x86_64-linux" "aarch64-linux"))))