From patchwork Fri Jan 24 11:23:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 37692 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 1138627BBEA; Fri, 24 Jan 2025 18:12:16 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 7C9CC27BBE2 for ; Fri, 24 Jan 2025 18:12:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbO9z-0002r5-TJ; Fri, 24 Jan 2025 13:12:03 -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 1tbO9y-0002qm-HV for guix-patches@gnu.org; Fri, 24 Jan 2025 13:12:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tbO9y-0007FU-8a for guix-patches@gnu.org; Fri, 24 Jan 2025 13:12:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=kWwxKy0K864p46yg8sleghI1BSehh0DlKGfAPS77ggU=; b=uHCsavEPb8Xkah4bJdHB6kouuCAGYwoxD/ThK/MLi7LCt63Ehxic4Tk/RZX879X6XKEgssq33G7vH1U7QcJRLprSDRJ6aoEnwzEsxiGQQ4FIhdFqZ8XlikT21xm+D3dWw5RjoadI4c6C/3da0lWlrd6d47U0toDIeml08uPBntN/lRJA95z9Dg82tcTmLarJfUZwZuk8DmflWQ+UwO4lIK/YJltoSfeqx8TffC1/ViT/Dzh6JTzYZJbtXD2L3Xnhrxqk+TEXyYBntPiiCUSEMs7QjlhmxvxGsvm2RyYt9PWB6erDTCu6B3wD/fbMtAr+VoBhiKmU93QKic2vJZZmaA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbO9y-0005kI-2o; Fri, 24 Jan 2025 13:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75811] [PATCH 2/2] gnu: wine-staging: Update to 10.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 24 Jan 2025 18:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75811 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75811@debbugs.gnu.org Cc: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net X-Debbugs-Original-Xcc: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net Received: via spool by 75811-submit@debbugs.gnu.org id=B75811.173774226821986 (code B ref 75811); Fri, 24 Jan 2025 18:12:02 +0000 Received: (at 75811) by debbugs.gnu.org; 24 Jan 2025 18:11:08 +0000 Received: from localhost ([127.0.0.1]:46986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbO95-0005iY-U5 for submit@debbugs.gnu.org; Fri, 24 Jan 2025 13:11:08 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:61928) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tbO8x-0005hV-1m for 75811@debbugs.gnu.org; Fri, 24 Jan 2025 13:10:59 -0500 Received: by mail-wm1-x344.google.com with SMTP id 5b1f17b1804b1-4368a293339so26611645e9.3 for <75811@debbugs.gnu.org>; Fri, 24 Jan 2025 10:10:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737742253; x=1738347053; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=kWwxKy0K864p46yg8sleghI1BSehh0DlKGfAPS77ggU=; b=bYk6NEdtmIqUcsd6ki1hDlvSV3qde5IkvqGWLop4gILQ6LutrqJMb5V1ZoqhmasJQn x3ZN7dIhx1xtYuIiUrPAkh/X3ot20xdYPSl9ZbyEzoF7geBicH/9Lvb6JRpYPJtstFYk bOi4QGnRblB/cKM/FOm3XTAF0KAyQ5uftW9xbbjzqWcuOwFnuTT0biXHzbKgztgDpIXv OyF7QpNeZS6YkJxfQ9cwtSf7Ee1i+e7Ex2FGr5sWd/F4UkxOVImmPGCdyuOVaHSDBjF3 7KExIwaFPAZEti6RTZN1Y/loscmDEbXPQiJ0fD5pEmPr9lyr6vJnL0ksrkrNhGEwIqtY NJOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737742253; x=1738347053; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kWwxKy0K864p46yg8sleghI1BSehh0DlKGfAPS77ggU=; b=NQxwfk9mLrSbk/UOwf8YPSxRnBWJdhKnjAsZHiIGZddBWn3klMBkgm7JSxAeSgWfC8 YE4LEcUQwLTbR3TawBkqN+EQ0TjZV4lCNO7/SZ8gR+15E8Kc8uI9ngbqB2qrOZ7OKnPs /qHZejZoXhoPS90t5pQGmHzgZ5jtvn/EFNgFwfr0z3JVh4zwdPpWkairGefwcYbh6BWf LtuL6soqarxMdmhdMsau6MbYFRNl4X5hD2OwQWDWkSxMCia6JXuk9xh3Bj/VX91KqLZu nHMMm9kgc9Q9cLwZVxv1QvaDRDIXYPGIKsBlT1B5GOBZXSeypuRgN8211HZnn8kszybz nkpQ== X-Gm-Message-State: AOJu0Yy4su8JS933XU3mSp65iN60pKBtJpd4VEu/7VhyIiVYuPlGrqtZ xHtMuI8YnlE1c14Xq0cAqy1Uxhva2Y9C5gNU0rhb2z20p3gK02kVb3s6QS+9 X-Gm-Gg: ASbGncvR1mrnmFfZq98cSJqMNrr+h+jB1dzMN5Z+fkagBY+jPm0XB+h7rMftHHE0mFx kJ6hW/NlwniauDRKXqU5CNKpI9YXl8sd0+v2zzQwv8wVYT70Ew2egtBuG18ET+l1xnstTWf0DjQ IwbHxbbjC5lzysGUqcyIE3is8ZPpVxjOHln76hYYh8YeL2NKiTc4ILAtyucaLpLmRtGUNGoctnj /c/sctPYzKvOqt5d+FkzD05aGWSgZcR5w9M9UtU9zxykUu8f5WQJrqF6X/3PgrCRgeQ7SE539sw wBEkIEs++1MJFPT2zoH8pS2s0hp9nI7/K0X6maWYz9e8Rv00DN3pdUmE X-Google-Smtp-Source: AGHT+IGMLJM/E0X4nFHBbYMw27Z/8C6a3chLK9261pTKnfPZ024NyQi7ZFrXsMuM2pX7tNhZw2LLFQ== X-Received: by 2002:a05:600c:46cb:b0:436:1b96:7072 with SMTP id 5b1f17b1804b1-438913bebe7mr302010635e9.5.1737742252824; Fri, 24 Jan 2025 10:10:52 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438bd47f355sm34332035e9.4.2025.01.24.10.10.51 for <75811@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 10:10:51 -0800 (PST) Message-ID: <1effbd01e09fd996b230142d60290844c6e86e90.1737724936.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Fri, 24 Jan 2025 12:23:19 +0100 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wine.scm (wine-staging-patchset-data): Update to 10.0. (wine-staging)[source]: Update hash. [#:phases]: Exclude “server-Stored_ACLs”. (wine64-staging): Likewise. --- gnu/packages/wine.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 6dbe384e59..df1796f780 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -310,7 +310,7 @@ (define-public wine64 (define-public wine-staging-patchset-data (package (name "wine-staging-patchset-data") - (version "9.0") + (version "10.0") (source (origin (method git-fetch) @@ -319,7 +319,7 @@ (define-public wine-staging-patchset-data (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0xdinbj9byihy8snv6h1mcb79rh35zwhhld4g7mjg0k2wvjgskwl")))) + (base32 "17lslhmad0z5im0xlan5xwsnfvnxzi6iaj8bc51sc9sslfhwlv6j")))) (build-system trivial-build-system) (native-inputs (list coreutils)) @@ -365,7 +365,7 @@ (define-public wine-staging "wine-" wine-version ".tar.xz")) (file-name (string-append name "-" wine-version ".tar.xz")) (sha256 - (base32 "1vm61hrkinjqicxidhbhq3j8sb1iianfypdvjmnvgxcmac50kzbw"))))) + (base32 "009nmi0z60ilrlrxjj9msdqk2n2wp0jcdnflkh7b7bzgyzsv7q65"))))) (inputs (modify-inputs (package-inputs wine) (prepend autoconf ; for autoreconf ffmpeg @@ -389,6 +389,9 @@ (define-public wine-staging inputs "/share/wine-staging/staging/patchinstall.py") "DESTDIR=." + ;; Broken upstream, does not apply. + ;; TODO: Remove once fixed. + "-W" "server-Stored_ACLs" "--all"))) (add-after 'apply-wine-staging-patches 'patch-SHELL (assoc-ref #$phases 'patch-SHELL)))))) @@ -424,6 +427,8 @@ (define-public wine64-staging inputs "/share/wine-staging/staging/patchinstall.py") "DESTDIR=." + ;; Note: Keep in sync with wine-staging. + "-W" "server-Stored_ACLs" "--all"))) (add-after 'apply-wine-staging-patches 'patch-SHELL (assoc-ref #$phases 'patch-SHELL))))))