From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +P6lKwBq2WOtAAAAbAwnHQ (envelope-from ) for ; Tue, 31 Jan 2023 20:20:32 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MOm7KgBq2WOqQQAAG6o9tA (envelope-from ) for ; Tue, 31 Jan 2023 20:20:32 +0100 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 3C0558F06 for ; Tue, 31 Jan 2023 20:20:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMwAz-0001mb-TE; Tue, 31 Jan 2023 14:20:17 -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 1pMwAk-0001k6-Vk for guix-patches@gnu.org; Tue, 31 Jan 2023 14:20:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMwAk-0008TR-68 for guix-patches@gnu.org; Tue, 31 Jan 2023 14:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMwAj-0000T4-Vu for guix-patches@gnu.org; Tue, 31 Jan 2023 14:20:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61067] [PATCH v2 3/5] gnu: wine-minimal: Share phases with parent wine package. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Jan 2023 19:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kaelyn Cc: 61067@debbugs.gnu.org Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.16751927701751 (code B ref 61067); Tue, 31 Jan 2023 19:20:01 +0000 Received: (at 61067) by debbugs.gnu.org; 31 Jan 2023 19:19:30 +0000 Received: from localhost ([127.0.0.1]:55034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMwAE-0000SB-0N for submit@debbugs.gnu.org; Tue, 31 Jan 2023 14:19:30 -0500 Received: from mail-ej1-f65.google.com ([209.85.218.65]:41754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMwAA-0000Ru-3a for 61067@debbugs.gnu.org; Tue, 31 Jan 2023 14:19:28 -0500 Received: by mail-ej1-f65.google.com with SMTP id m2so44221471ejb.8 for <61067@debbugs.gnu.org>; Tue, 31 Jan 2023 11:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=HKbO0Tz+3aus5A+DxQK5Yba1QaDOb6/EIS32NwUhEhM=; b=iOE4Jeae37u7ndSVdcGaT4jMVBMEmMD5QR7CSjCH2CzznzX+PwyY7ohDS0fO5Dlc/6 yEJRhvsSF9A1ClUsQUpNaEq5t3SKpByC82U/WtBkustdQyO7veH3br0FxwrObjWKIOKK BhXUUhwTz0+4RP6zRlhRTB5cwKhgVpt+HUyCE7nUDXM2k+45DX4eEGbOwi4TyQCc48vg wytpxf5bo95a40ula7bC+6zRcQbI+ixWV3GcRBqV9CzWvLuRHVANmVz4z2DpZjUmwvtJ rXRj8NchOk/thdRGNAxJ8Ou1RSsR2qgrG02Xx/WXks0t9z+SAhbhvKOupDQo6weIpLov PWXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HKbO0Tz+3aus5A+DxQK5Yba1QaDOb6/EIS32NwUhEhM=; b=hiuIZEl5+0kSt3aTW+m9sIeWaTT8VYDU/peHLHJvfz1tbB/0jrvlEBW+BR9xlA00Ko lCNanxb0VOp9k7jtjKr+C+Ngh1PXn5ohxHgGAW0D2UPNewgesyFGLci6UqY0PB4JWyL4 QIupXsIchP6vGknKqM5Z/Rrz/8xQWWfwp8cnb/pLomAg1O7X3ETxJR6fjdJFUid2Be6V /T5F3B88wVwyxacIsmi4/RjBSij6Cs3DLO8JUPw+T7YYCxPy+JgYq3HUJISc3QaLqHiA kgAB8e+RWvHjlTctEz/q2aBCwIMyNeSvMXJjZqsPTpq2SftP7Adc7L+rL6SLqax9GVsw 3UwQ== X-Gm-Message-State: AO0yUKV+Q8f0ODKfOIPddVk+n7u2s70qg/1uLE7ZCZLkMn92BiIDAXPh M9xJv52qsCLUlZyZSLmrxSI= X-Google-Smtp-Source: AK7set+wZBEeCwzNqTmIL0s+LOySP21dzghvvDYDzZQQH472ycBOT1MCgTUs1brNK2AVmaPnq4SoYQ== X-Received: by 2002:a17:907:78ce:b0:87b:d3dd:e0ca with SMTP id kv14-20020a17090778ce00b0087bd3dde0camr4031786ejc.26.1675192760004; Tue, 31 Jan 2023 11:19:20 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id c23-20020a170906155700b00869f2ca6a87sm8776020ejd.135.2023.01.31.11.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 11:19:19 -0800 (PST) Message-ID: <1674132a10aba74f838a1cd80c76a1864bf52c19.camel@gmail.com> From: Liliana Marie Prikler Date: Tue, 31 Jan 2023 20:19:18 +0100 In-Reply-To: References: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675192832; a=rsa-sha256; cv=none; b=HuGfYA34QA8cnveDgL1b+tlCYjOLSbx03xJuoTzMWko79g+WAQw16AdQYZvIJeGuV1DKsZ EcSKo/d9Ec1UmMRdNPQZUCRZ/Ev2x+Qe7npxYOQ03ngOAl34Wl1WFkk+7rSg47LzOntVS7 vIeAj28ctC4gnblyvMGsPXMSUl7XeJYMlmCjYz2nQT9GERFa4K08/VSFHy5dDA1o40xdV4 bXgL8NswqxmVkOWJBtyexl5kw0G9NXAdTkewA25S0gGGslPUA2Pv1UA4XAasgBgYsRvC9r xzY/TJ5uRpnBKGNSMiaewi0/nhgqmO3Aou19Iwqy/qTD32SqR2jPBSRhaUvkOw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=iOE4Jeae; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675192832; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=HKbO0Tz+3aus5A+DxQK5Yba1QaDOb6/EIS32NwUhEhM=; b=JE/rLKXkaydA53rdVr1Vb9W6Ab/GGH8GugXWh69RE+KHIUGUq9qK0OWfDle9cYhOMa/wol 0DeWmLKJCLSijHqbqRtvLMQQDhAR0cddWMpdCmssOMDFpkz8xd0WB3iWTMpBmjgYfq1kdl KFWT8EApC2ZDjeo4LEVZ4Qu5+YFYnCzxt22DMxxfcKrbZRdW6Ak+ScDr6k0iUGFinqMGMl JD+Nwu17+bYqpPtWSYKiTssZcW/qsGearZ9FNRPue1z6QBfhK+n9tKykTtx+rMvA3VykuP 8ry/HlWTRTWJFuJOhjnLnk/kZn+e+DLhn5kC3favG/XGgI1j8Asv1WXOnF7JvQ== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=iOE4Jeae; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 7.42 X-Spam-Score: 7.42 X-Migadu-Queue-Id: 3C0558F06 X-TUID: rhYwBpaG4sKi Am Montag, dem 30.01.2023 um 20:39 +0000 schrieb Kaelyn: > ------- Original Message ------- > On Friday, January 27th, 2023 at 6:03 PM, Liliana Marie Prikler > wrote: >=20 >=20 > >=20 > >=20 > > Am Freitag, dem 27.01.2023 um 01:08 +0000 schrieb Kaelyn Takata: > >=20 > > > * gnu/packages/wine.scm (wine-minimal): Share phases with parent > > > wine > > > package. > > > --- > > > gnu/packages/wine.scm | 31 +++++++------------------------ > > > 1 file changed, 7 insertions(+), 24 deletions(-) > > >=20 > > > diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm > > > index 6e43494c68..b9a8396b75 100644 > > > --- a/gnu/packages/wine.scm > > > +++ b/gnu/packages/wine.scm > > > @@ -308,30 +308,13 @@ (define-public wine-minimal > > > (delete "gettext" "perl" "pkg-config"))) > > > (inputs `()) (arguments -` (#:validate-runpath? #f > > > - #:phases > > > - (modify-phases %standard-phases > > > - (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)))))))) > > > - #:configure-flags > > > - (list "--without-freetype" > > > - "--without-x") > > > - ,@(strip-keyword-arguments '(#:configure-flags #:phases) > > > - (package-arguments wine)))))) > > > + (substitute-keyword-arguments (package-arguments wine) > > > + ((#:phases phases) > > > + #~(modify-phases #$phases > > > + (delete 'wrap-executable))) ;; Don't reference Vulkan > > > ICD files. > > > + ((#:configure-flags _ '()) > > > + #~(list "--without-freetype" > > > + "--without-x")))))) > > >=20 > > > (define-public wine-staging-patchset-data > > > (package > > > -- > >=20 > > Doing it this way is actually dangerous, because changes in wine > > get > > propagated to wine-minimal even if they don't affect it (we had a > > similar error in emacs blowing up the size of emacs-minimal > > recently). > > There are two possible solutions: Bind the common phases to a > > variable > > and use that instead of %standard-phases, or make wine inherit > > wine- > > minimal. >=20 > I just sent a patch to this issue to make wine inherit from wine- > minimal instead of vice versa. If it seems fairly reasonable, I'll > rebase and reorder the patch series to include the change > (essentially to fold it into the commit that updates wine-minimal to > share phases with wine). Please do. Also, don't forget to bump the reroll count as well as adding me to CC. Thanks