From patchwork Sun Oct 22 13:01:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55114 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 7305027BBEA; Sun, 22 Oct 2023 14:07:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 8FE0427BBE9 for ; Sun, 22 Oct 2023 14:06:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quYAB-0006O7-HP; Sun, 22 Oct 2023 09:06:40 -0400 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 1quYA7-0006M3-Uv for guix-patches@gnu.org; Sun, 22 Oct 2023 09:06:35 -0400 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 1quYA5-0005Fa-ON for guix-patches@gnu.org; Sun, 22 Oct 2023 09:06:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quYAX-00058t-Ie for guix-patches@gnu.org; Sun, 22 Oct 2023 09:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66480] [PATCH gnome-team] fixup! gnu: Make webkitgtk-next the new webkitgtk. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Oct 2023 13:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66480 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66480@debbugs.gnu.org Received: via spool by 66480-submit@debbugs.gnu.org id=B66480.169797999419728 (code B ref 66480); Sun, 22 Oct 2023 13:07:01 +0000 Received: (at 66480) by debbugs.gnu.org; 22 Oct 2023 13:06:34 +0000 Received: from localhost ([127.0.0.1]:45625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYA5-000588-IP for submit@debbugs.gnu.org; Sun, 22 Oct 2023 09:06:33 -0400 Received: from planete-kraus.eu ([89.234.140.182]:46772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quYA0-00057v-Aj for 66480@debbugs.gnu.org; Sun, 22 Oct 2023 09:06:32 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 65676db3 for <66480@debbugs.gnu.org>; Sun, 22 Oct 2023 13:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to :mime-version; s=albinoniB; bh=yM+Hq1JN9b3WCiPOU1zfeXqyvb0=; b=A CL13i4NOfVtpjdn1JDK72DBZ6jqgwei9OkckGnYbShM+eCxcNDbWAVcYGI0614DD wuTkxfObT8eGNXNr3bN2x7Wh6PhnMBlYNXl41fcpzGtOvk82eqbUPD67Icd78bse B3LmYV4wbu50zqwi1+26+UmW9ZBTe3WXN8CYUU4aZPn8wQlKiVL8jCL1b67DVJS+ cUlU3H+iiCk29aSv4pKeU3AIvyXhcaL8YyiAIF8vAuAGLzmlwAQg5VJ1lHnQ+yG3 J+3pDY/2ArW8oWivJBSXlz4iSxxWe8T2dy8ezPI47HCYibhEvl5qb0n6xevUMy8O FSLJwP1+MMS1dwWbLceVg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 97f6b89a (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <66480@debbugs.gnu.org>; Sun, 22 Oct 2023 13:05:57 +0000 (UTC) Message-ID: <7bfd3d0707130c3e633858671cb13b85f8f71661.1697979906.git.vivien@planete-kraus.eu> In-Reply-To: <5fa950e307c7e1bb8fbc9b4075f57bd06cc90aee.1697971092.git.vivien@planete-kraus.eu> References: <5fa950e307c7e1bb8fbc9b4075f57bd06cc90aee.1697971092.git.vivien@planete-kraus.eu> Date: Sun, 22 Oct 2023 15:01:25 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 --- Dear guix, I was puzzled as to why webkitgtk-with-libsoup2 received -DUSE_GTK4=ON, when it was strictly removed from its base, webkitgtk-for-gtk3. Now I know. Best regards, Vivien gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: a7be930240c69207eee87368fe3f6ad57c9e24cf prerequisite-patch-id: 66465be264c2a9d61434147df12d649236de42fd prerequisite-patch-id: c62b68675eca65ffc5a468d51f722fa849609111 prerequisite-patch-id: fcec6d4aa0e02f9cef07d44e6dbb2ea8664e89b2 prerequisite-patch-id: 72cb2efc1b4a24f25196480972bddf0b4d78103a diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index a374711119..7e0370abc0 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -304,11 +304,11 @@ (define-public webkitgtk-for-gtk3 (define-public webkitgtk-with-libsoup2 (package/inherit webkitgtk-for-gtk3 (name "webkitgtk-with-libsoup2") - (arguments (substitute-keyword-arguments (package-arguments webkitgtk) + (arguments (substitute-keyword-arguments (package-arguments webkitgtk-for-gtk3) ((#:configure-flags flags) #~(cons "-DUSE_SOUP2=ON" #$flags)))) (propagated-inputs - (modify-inputs (package-propagated-inputs webkitgtk) + (modify-inputs (package-propagated-inputs webkitgtk-for-gtk3) (replace "libsoup" libsoup-minimal-2))))) (define-public wpewebkit