From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gHFROp6admIJVgAAbAwnHQ (envelope-from ) for ; Sat, 07 May 2022 18:13:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 6DE9Op6admJlWQAAauVa8A (envelope-from ) for ; Sat, 07 May 2022 18:13:18 +0200 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 A68D92AEAE for ; Sat, 7 May 2022 18:13:18 +0200 (CEST) Received: from localhost ([::1]:47488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nnN3U-0007sZ-6A for larch@yhetil.org; Sat, 07 May 2022 12:13:17 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1651939998; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=/fN99LxKFEXvxzXHR/KngBhHm0x0Wmb9YfowDUXQ+7I=; b=Xva6x0Z8wg3sbpRMdQ2eAciOzFWR52PRy6uusYDnURR4hDIktF9gR/90QA6peFeq1y92fN /uEGwNsCw6G15iwM7JRWfP6NN4IaanSyWjNmIr5qODa1/lCamkIbsFdeLaJkMT+/Ugktks 6Zht3q80Zrgc3mCtFVaDOPPphLznXguelTdXbJqrGrwHqBPWXVLdBHZd3r3Avv2i37uhyS IWvHSoWD6vMC5MsPtiR7bCPifDDpyYLuiZLeYAX7itlxHJoG4wxqfQZljWy07m6jD2I2uP QT90JtQHAFkOCryNj3TzBNmyeopLMys0KQ9ym2oEYIFYUdOS11d8Ggg01B3V5w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1651939998; a=rsa-sha256; cv=none; b=owY9ZUN2NZw/0KQrYSSC3t144KPaAqsyACV5aOeZqHL9CDfiD6SyMOlS00QkVHinO7KHkj 5MrbEZz8Tk6k5JIZkCSGQ5FlwnmEK1i1LKpRv71vkK3tkUL0C7m0sZOwzYz2G7BO9OF5Fp Dg+b3iKzI2Ymh1sJsqjjVdMP2pGYvlaH1oP1UMQ3ZGtX/FttwmMqGmu68tHDsHVxrG9s4K Z6DxSDq7nmhVc25I2iN/V8iWLDzBVuKjATfPkcwjgqu3asWoL2/wIuQUNUow9jY1BTo8Eg 2ycOyJ2fN0v9zD6DpHd+u0r8enAQMwoAQSofqHAWQSZmJF+IQ36IPPTzEzPlEw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=KtQlEoFr; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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-Spam-Score: 6.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=KtQlEoFr; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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-Queue-Id: A68D92AEAE X-Spam-Score: 6.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: kK34BXeNuXHd * 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")))) -- 2.36.0