From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 KK72I0Ar2GNoyQAAbAwnHQ (envelope-from ) for ; Mon, 30 Jan 2023 21:40: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 mp12.migadu.com with LMTPS id CJfYI0Ar2GNJnAAAauVa8A (envelope-from ) for ; Mon, 30 Jan 2023 21:40: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 514EF40F20 for ; Mon, 30 Jan 2023 21:40:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMawm-0007qY-0v; Mon, 30 Jan 2023 15:40:12 -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 1pMawc-0007os-La for guix-patches@gnu.org; Mon, 30 Jan 2023 15:40: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 1pMawc-0001tY-Dq for guix-patches@gnu.org; Mon, 30 Jan 2023 15:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pMawc-00066T-AG for guix-patches@gnu.org; Mon, 30 Jan 2023 15:40:02 -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: Kaelyn Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Jan 2023 20:40:02 +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: Liliana Marie Prikler Cc: 61067@debbugs.gnu.org Received: via spool by 61067-submit@debbugs.gnu.org id=B61067.167511117123412 (code B ref 61067); Mon, 30 Jan 2023 20:40:02 +0000 Received: (at 61067) by debbugs.gnu.org; 30 Jan 2023 20:39:31 +0000 Received: from localhost ([127.0.0.1]:50677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMaw6-00065X-GC for submit@debbugs.gnu.org; Mon, 30 Jan 2023 15:39:30 -0500 Received: from mail-4322.protonmail.ch ([185.70.43.22]:62605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMaw5-00065G-Kh for 61067@debbugs.gnu.org; Mon, 30 Jan 2023 15:39:30 -0500 Date: Mon, 30 Jan 2023 20:39:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1675111163; x=1675370363; bh=C5i5BAZeQITK/VlPmseg3XusJmFcwBEc9RBjnzYHZSI=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=sSqlPE5vxNLquSbuu4UujUyQVRmZfy4cxxd1kJ8hh4BDLRXUoFfenlYsFUFrExKpt Fda2Zuse20ZbTz2a3dEzP+TBBq7/RXyxQ8LIeK/jMaMi/at124b2QcR2Y7xhiXap4l CGr+KM2+TCxmLmojIeEh79C0tyK2KklCM9ACKhqHJMPNEfYlwoz+Ss4vDc/wVoIeCW fR8dtmB+Xgh0wlVcvpBXk+/mS/tp1HFURSnaCO6Mk2tzaJhfp9b6Yo1EQNchF0moI4 gcH/43rs1j3FKP5PC5TOlsshyjw5dQPhxDAo7uMsyF3KfLWsFFMWwZkuLnBOqwP3Px czqHNCZu4l2iw== Message-ID: In-Reply-To: <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> References: <8781968f75fffd5c133f52f4d2ee7808e7b543fa.1674781160.git.kaelyn.alexi@protonmail.com> <69c359a823949ac876bccaefa92323ec4d631da0.camel@gmail.com> Feedback-ID: 34709329:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Reply-to: Kaelyn X-ACL-Warn: , Kaelyn via Guix-patches From: Kaelyn via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675111232; h=from:from:sender:sender:reply-to: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=C5i5BAZeQITK/VlPmseg3XusJmFcwBEc9RBjnzYHZSI=; b=qB9qlnbS84E6aYO7XpLBjXGHqpFSjax0AkXO42l293bdAwdt0+kNinKbOzkW7mtcp0w/g8 LE+BcSnkpoeYc9th+MtDMhPzMYHmJwmTSo612/WAPu38nYGM4t0X+cMhtcXKpYpcLj9wj0 9U26YBPZLaERxxX1t4rlYYPwVIuuGSxTvva829M7t0AdlassUOE9zqB1jkH9NtaYqMrgZn uASqdk34+RPU7tXU9j5ZCsCu+3Sof4V0XoNI2wPSOq7xWIQy18L5EWag8/wwGBPhZiTKi+ IBqfI2HQ5E5pOTBmr8cRD4zo9DkMCpBoHWeXY8qGpKuM1b9ARIh3yNDrBrPa/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=sSqlPE5v; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675111232; a=rsa-sha256; cv=none; b=VxaI2GKZD2WD+M+520xhwW6AouPS/a0+CthxPIVFyMJp24AK9WcFhJdWrssWi3niDPGT47 kNT+jmjZsS9IoWHO60zio/OlvVM/NyBi+kojhAUb+ynxNXYSzPYlFp0RGelohmzsHmNMni a8qSs42J6nUszrRNjSkMAyEV4IysXwT48l9zKQT2FTbIi1cTDPQ2UV8YxTbjLqc9qf9mzm 63f8IXuFaYCVe0h77IHNsOqitZIhPfR/TSWgjzjrIbzhs2PBRgpjmUgQqMbG6GQtSzHj4Z WIEsJ+FnCOYxf7jSqs+/8Zbmu2Phccj9NDUfbswmI/S2vHeywMYYsy//yMYtdQ== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b=sSqlPE5v; 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=pass (policy=none) header.from=gnu.org X-Migadu-Scanner: scn0.migadu.com X-Spam-Score: -2.58 X-Migadu-Queue-Id: 514EF40F20 X-Migadu-Spam-Score: -2.58 X-TUID: Jum5LLtaC5G6 ------- Original Message ------- On Friday, January 27th, 2023 at 6:03 PM, Liliana Marie Prikler wrote: >=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. I just sent a patch to this issue to make wine inherit from wine-minimal in= stead 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 co= mmit that updates wine-minimal to share phases with wine). BTW, the patch also addresses a few lint messages. Cheers, Kaelyn >=20 > Side note: QA failed :( >=20 > Cheers