From unknown Sun Aug 17 09:11:30 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#51531 <51531@debbugs.gnu.org> To: bug#51531 <51531@debbugs.gnu.org> Subject: Status: [PATCH] gnu: wine: Update to 6.20. Reply-To: bug#51531 <51531@debbugs.gnu.org> Date: Sun, 17 Aug 2025 16:11:30 +0000 retitle 51531 [PATCH] gnu: wine: Update to 6.20. reassign 51531 guix-patches submitter 51531 Liliana Marie Prikler severity 51531 normal tag 51531 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Oct 31 16:06:25 2021 Received: (at submit) by debbugs.gnu.org; 31 Oct 2021 20:06:25 +0000 Received: from localhost ([127.0.0.1]:33148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhH60-0002Rr-V3 for submit@debbugs.gnu.org; Sun, 31 Oct 2021 16:06:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:50340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mhH5z-0002Rk-Gh for submit@debbugs.gnu.org; Sun, 31 Oct 2021 16:06:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhH5z-000366-B8 for guix-patches@gnu.org; Sun, 31 Oct 2021 16:06:23 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhH5r-0007gX-El for guix-patches@gnu.org; Sun, 31 Oct 2021 16:06:23 -0400 Received: by mail-wm1-x344.google.com with SMTP id 133so2824340wme.0 for ; Sun, 31 Oct 2021 13:06:15 -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=nVgMq5LIPGifi8x9Joqlcc2BzACROoBZRCMqAZDqiCw=; b=XmaMnIW4MFUraLoNA7BTOnvRBcv3uNkbMeDo9I2nW5nggVTPHHqjQvI0Py8ErpNtGS 8CfeMm4ZznTLHncTW7H2rOmtegLan5pmF8a1b3VItE0yq3wINWWUwyWGVEdBTvtH3CEJ 4yT4yNrORzDcwW6wfbAhRaAGe5MWXvMT/wGVpTuTOMfRteiV7mnj/GyHBi5FdtBJstMo U68x67usjLZ5970RbvMPDMKGMTnS+Rz1neGTFzOIE1d9YvnxnaegAeG9AzcrQ/7ZPGHC 7M6agT7jTwU8tDL9IN9uKyOkWYSiTGfK4C+TwWVqYCuFrjZVenftSBfnlXzIHfPOTe6Y MXSw== 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=nVgMq5LIPGifi8x9Joqlcc2BzACROoBZRCMqAZDqiCw=; b=vhwEdycJUDE+6zJ0zwumj/C14JcIdr4Y6zKz9dzFTfm5Y93AsoYh6K/vCENcaooXCg J7N68u4L0UVMUQldFA0SRiF05AFW5UzAXYj+j+YECH07dIW4PwLXXIMee4h/CHLXr9TZ wAjAIUs/pzbQh5IZoDoE2o3fOdUxV2AJFVb7UxVrDbvVfTNZKXiyjGoKL3DlEBJoM2om u4Vgq3iNdQYI0OQbf10KpmXsbFRLqi6dU2O5p77MvzktLtrr3LtLUK3U5HhkwQOq02Vo hL12cvrJ9ky3jHREzW+S3HjXQ65aLVRSgV0n+X2+k+6+OF8UR2tyTDq7+5FaJEqc8Y5C BS7Q== X-Gm-Message-State: AOAM532Ybtuv3kyd3bs4wRcdBD67ewj6CIhr/Knplamy2EDF2gNyJOpg oiim8PH6AHp8MML3WkOXAeemRus4H7mLVg== X-Google-Smtp-Source: ABdhPJzUiXWq2O4pSgeqqqHzBRggcrEmKiipZZ3VJsDh9ifHcbJNs7E/D7lA4jgWMyoMDudK/m2lrA== X-Received: by 2002:a1c:9851:: with SMTP id a78mr14034613wme.116.1635710773617; Sun, 31 Oct 2021 13:06:13 -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 d3sm14019473wrb.36.2021.10.31.13.06.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Oct 2021 13:06:13 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 31 Oct 2021 19:30:40 +0100 Subject: [PATCH] gnu: wine: Update to 6.20. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 to: guix-patches@gnu.org Content-Transfer-Encoding: 8bit Message-ID: <7250e5e74d530ac737d52152661ddfd0f7b0138a.camel@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=liliana.prikler@gmail.com; helo=mail-wm1-x344.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This patch updates the logic by which the “so_dir” is patched onto RPATH. Unlike the old hack, this one affects all Unix libraries, so it might be a tad bit overkill, but better be safe than sorry when it comes to stuff that'd break in validate-runpaths. * gnu/packages/wine.scm (wine): Update to 6.20. [#:phases]: Replace ‘patch-makefile’ with ‘patch-makedep’. (wine64): Likewise. --- gnu/packages/wine.scm | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 4361cccd8d..271b0a88fb 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -75,7 +75,7 @@ (define-module (gnu packages wine) (define-public wine (package (name "wine") - (version "6.16") + (version "6.20") (source (origin (method url-fetch) @@ -87,7 +87,7 @@ (define-public wine (string-append "https://dl.winehq.org/wine/source/" dir "wine-" version ".tar.xz"))) (sha256 - (base32 "1s7sz1rimax4kxij1ngkwnx4hcljwjq3q5gksz22k8cq1l2r4l39")))) + (base32 "0wc4a8slb3k859sdw9wwy92zc4pq7xw1kbq4frnxbzbvkiz26a20")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -195,15 +195,12 @@ (define-public wine (("(#define SONAME_.* )\"(.*)\"" _ defso soname) (format #f "~a\"~a\"" defso (find-so soname)))) #t))) - (add-after 'patch-generated-file-shebangs 'patch-makefile + (add-after 'patch-generated-file-shebangs 'patch-makedep (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "Makefile") ; Makefile is first regenerated - (substitute* "Makefile" - (("-lntdll" id) - (string-append id - " -Wl,-rpath=" (assoc-ref outputs "out") - "/lib/wine32/wine/$(ARCH)-unix"))) - #t))))) + (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 @@ -263,15 +260,12 @@ (define-public wine64 #t))))) (_ `())) - (add-after 'patch-generated-file-shebangs 'patch-makefile + (add-after 'patch-generated-file-shebangs 'patch-makedep (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "Makefile") ; Makefile is first regenerated - (substitute* "Makefile" - (("-lntdll" id) - (string-append id - " -Wl,-rpath=" (assoc-ref outputs "out") - "/lib/wine64/wine/$(ARCH)-unix"))) - #t)) + (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")) -- 2.33.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 01 10:16:26 2021 Received: (at 51531) by debbugs.gnu.org; 1 Dec 2021 15:16:26 +0000 Received: from localhost ([127.0.0.1]:45072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRLO-00042g-Ka for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:16:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRLM-00042N-Rn for 51531@debbugs.gnu.org; Wed, 01 Dec 2021 10:16:25 -0500 Received: from [2001:470:142:3::e] (port=52858 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRLH-0002HI-M1; Wed, 01 Dec 2021 10:16:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=MdvLdlgJTQLt/+KT+0sSP6QV819j8zJRIme+tCKvXa4=; b=p+siINCiJcFBVh6whfGc KB1KOVvp2Nt0n2ltczJNce/1zDYyavyato/09jl7ZQeTQj6hbAEO/Og6xOXwoN9ARQSTNVkqk8C41 ny+rUzDjcScvH2IS/vbkyP3KpbaDDtGrJ+h1XsUPUUOLtVLz5mxp7oMgJVsWYuoKn4THaR0qoeohs QXpUIcCYXOv3X4wRRt9btIqEKFwO42e6/zibDxHAhICLpz/p72dV/QqY1QSs/ubrIuaf+yj/Y53AM H1NzoaKua37XR1XEzd6vloCbg/YWP2Q1i3vUqTFCIO1VRZ/WJ4cfDIuBqkoR7lYP/+BD/Ou/m2ONZ ND1ZWT8TRhiGsQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:63153 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRLH-0006ur-GP; Wed, 01 Dec 2021 10:16:19 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Liliana Marie Prikler Subject: Re: bug#51531: [PATCH] gnu: wine: Update to 6.20. References: <7250e5e74d530ac737d52152661ddfd0f7b0138a.camel@gmail.com> Date: Wed, 01 Dec 2021 16:16:16 +0100 In-Reply-To: <7250e5e74d530ac737d52152661ddfd0f7b0138a.camel@gmail.com> (Liliana Marie Prikler's message of "Sun, 31 Oct 2021 19:30:40 +0100") Message-ID: <87sfvc2w5b.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 51531 Cc: 51531@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Liliana Marie Prikler skribis: > This patch updates the logic by which the =E2=80=9Cso_dir=E2=80=9D is pat= ched onto RPATH. > Unlike the old hack, this one affects all Unix libraries, so it might be = a tad > bit overkill, but better be safe than sorry when it comes to stuff that'd > break in validate-runpaths. > > * gnu/packages/wine.scm (wine): Update to 6.20. > [#:phases]: Replace =E2=80=98patch-makefile=E2=80=99 with =E2=80=98patch-= makedep=E2=80=99. > (wine64): Likewise. LGTM, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 24 13:13:38 2021 Received: (at 51531-done) by debbugs.gnu.org; 24 Dec 2021 18:13:38 +0000 Received: from localhost ([127.0.0.1]:38018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0p4U-0005Br-Lw for submit@debbugs.gnu.org; Fri, 24 Dec 2021 13:13:38 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0p4P-0005BU-Lv for 51531-done@debbugs.gnu.org; Fri, 24 Dec 2021 13:13:37 -0500 Received: by mail-wr1-f68.google.com with SMTP id t18so18742350wrg.11 for <51531-done@debbugs.gnu.org>; Fri, 24 Dec 2021 10:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=FizfNFOJ3hVi7Abjf2RAB8zWnwOphW9WWKi4eZGReqc=; b=qtfCi18v32gxRWbQioyU6fWAj19IJ1ErH5m1fUBn+ErtjBCTbTDF3IWUz0SmQCu2NL nKU4oD/zvNlY6E9kPHQ6rHOL9DtWIxDAlcf5xZ9uwv7+jtPVRKhdgXdOok6SOB3ceHz4 1bVt/N32JRg0Xx77ks/KDgTFb7tEz44CQ0xIXxQv7aKroD/nAT1wHj7CHMUthBKVBPvO doXjb4QM5FDR8ersh9oxEllzyn9gXpl6c2rWDx+QkiWOhrsfG+XXmQe2mGH8e923gDah dfEpMVuX7fzgSc73gWlimVoNedhgpJGDRUSIQti64CQMSE2d/uvOVRN4RyeolzFOoA0X 1T8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=FizfNFOJ3hVi7Abjf2RAB8zWnwOphW9WWKi4eZGReqc=; b=QSyZlhOMD4mQJw10Qx2FUiOr4T7puSbIYU7GUICGI/EM7v3APrzZFaghavTaTbsPBh TzszdUu3gOJLS0sPn76Be1itx2GDn8Tcf8w4n7xR1iKAQ56NI4tCRjS1xAfaYswRdz0S K6G731E1UzbjUqgxKpknOWKGjH9CU9JK9sTXyCUZk/MK7NauqwsyHVzZUdujXWc9EaJg Ye+CySji1T7ZhjnwU0h6orQsdU50CyMGS8j6lEOENPRjQIGDLvMP5QCmbq2HNQc5VvDf tuHQRgRIKFTH1mHx0FXB3VETF9IxUn3R4zHp5EBaeMm//fu3Tyls1gzatthxUUU1eiDe bvkg== X-Gm-Message-State: AOAM5332B7080Dj+kEOdumWnsRJ5gwyl+9WGWO7bGuxauJqJbYrNl8KM lbHVO1RPbHF+yUhx6OEwzVg= X-Google-Smtp-Source: ABdhPJwmytPCtKj/RtK1XAZWFgTB3pdCNCwfJsr+dXJ0u+M7iB5WbD93KTvlg7/GVnS4DtKcyXVqZQ== X-Received: by 2002:adf:c751:: with SMTP id b17mr5276137wrh.560.1640369607966; Fri, 24 Dec 2021 10:13:27 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id d4sm8083722wrx.102.2021.12.24.10.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Dec 2021 10:13:27 -0800 (PST) Message-ID: <4170b76ef23c4abfd5bf3ecf3d837e87b7e5d966.camel@gmail.com> Subject: Re: bug#51531: [PATCH] gnu: wine: Update to 6.20. From: Liliana Marie Prikler To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Date: Fri, 24 Dec 2021 19:13:26 +0100 In-Reply-To: <87sfvc2w5b.fsf@gnu.org> References: <7250e5e74d530ac737d52152661ddfd0f7b0138a.camel@gmail.com> <87sfvc2w5b.fsf@gnu.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51531-done Cc: 51531-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 01.12.2021 um 16:16 +0100 schrieb Ludovic Courtès: > Hi, > > Liliana Marie Prikler skribis: > > > This patch updates the logic by which the “so_dir” is patched onto > > RPATH. > > Unlike the old hack, this one affects all Unix libraries, so it > > might be a tad > > bit overkill, but better be safe than sorry when it comes to stuff > > that'd > > break in validate-runpaths. > > > > * gnu/packages/wine.scm (wine): Update to 6.20. > > [#:phases]: Replace ‘patch-makefile’ with ‘patch-makedep’. > > (wine64): Likewise. > > LGTM, thanks! Pushed now, thanks! From unknown Sun Aug 17 09:11:30 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 22 Jan 2022 12:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator