From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ME8QL3X3fmEhAwAAgWs5BA (envelope-from ) for ; Sun, 31 Oct 2021 21:07:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id IIzEKnX3fmFDewAA1q6Kng (envelope-from ) for ; Sun, 31 Oct 2021 20:07:17 +0000 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 0479930004 for ; Sun, 31 Oct 2021 21:07:17 +0100 (CET) Received: from localhost ([::1]:49684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhH6q-0003xK-4o for larch@yhetil.org; Sun, 31 Oct 2021 16:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhH6d-0003wO-EV for guix-patches@gnu.org; Sun, 31 Oct 2021 16:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhH6c-0007sX-0L for guix-patches@gnu.org; Sun, 31 Oct 2021 16:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mhH6b-0002TB-Q3 for guix-patches@gnu.org; Sun, 31 Oct 2021 16:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51531] [PATCH] gnu: wine: Update to 6.20. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Oct 2021 20:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51531 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51531@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16357107859420 (code B ref -1); Sun, 31 Oct 2021 20:07:01 +0000 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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635710837; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=nVgMq5LIPGifi8x9Joqlcc2BzACROoBZRCMqAZDqiCw=; b=BMJiq4gDNdfyfQUVWMVYv7wWn1i6JRG8Nq2nFviIwTpGgwT1re5C2RpD8VgIJCCNu+4dQk EgCf404o52eFT85z4ooVpU5Bu40a0s3y/qXXDwbq0C+hI886pzwaADcDcoBbwrgXLKM2nf H1XZV7ZiGjxZVN9mKBhRNzF6BMHoHiGk+GWDjtx1AIZsTwwkJReKfmLMmV1iry2+3jX5By w8LcLT6hJ3XlDkT1P0xdUY9WfgWBu8c9S3vIZZ636Zz2qXasqK75ooxn2uuH6Gw6x9m62G qEBUCWO+8635vdUBuHdO9ivREk3jL2eAIGEGIiDfpEGmYvEmnTLV9yr4H1FXCw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635710837; a=rsa-sha256; cv=none; b=t3wnWC+mMwoMWsYx1qyDgOMLpAZUcjtP/8I89t4i4tfWvDJYAGBO3DVrTU0YvHmCGHeHzm 7yLT21PjA3QYf4aUnpGBmO5eHsuyOByeSUSNwKgXYTL9NimhZOH6SI6xZf7cnXcYcdamQc ei8ETnR9s6RN7qyrSUx7eZSKLqwruWhjRna8nzfxIjTo+Qap3fMjP0fpbuEn7ioSaT0OcD zBk/Gyi4SCiVds0cPFbUxFclbSdGgpMe0rSVKsoBaV0abMx1u7hwUX037N4CZamlw28eRI /iFN6qrEG+h81EoDJ+U2zboi8y/dSFsZMSbV+m4IRcyUZvjtrrSvDT2udSWNuQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=XmaMnIW4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.18 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=XmaMnIW4; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 0479930004 X-Spam-Score: 0.18 X-Migadu-Scanner: scn0.migadu.com X-TUID: IPRxDFhx5ewj 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