From patchwork Mon Jan 16 17:02:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 46205 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 3DD7B27BBEB; Mon, 16 Jan 2023 17:18:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 D541527BBE9 for ; Mon, 16 Jan 2023 17:18:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHT7j-0003oS-J9; Mon, 16 Jan 2023 12:18:19 -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 1pHT7U-0003n5-Or for guix-patches@gnu.org; Mon, 16 Jan 2023 12:18:07 -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 1pHT7S-0002CF-ME for guix-patches@gnu.org; Mon, 16 Jan 2023 12:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHT7S-0007av-Hm for guix-patches@gnu.org; Mon, 16 Jan 2023 12:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60864] [PATCH] gnu: Unify webkitgtk and webkitgtk-next. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 17:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60864 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60864@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167388943429133 (code B ref -1); Mon, 16 Jan 2023 17:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jan 2023 17:17:14 +0000 Received: from localhost ([127.0.0.1]:34584 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHT6g-0007Zo-5E for submit@debbugs.gnu.org; Mon, 16 Jan 2023 12:17:14 -0500 Received: from lists.gnu.org ([209.51.188.17]:35280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHT6c-0007Zd-58 for submit@debbugs.gnu.org; Mon, 16 Jan 2023 12:17: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 1pHT6U-0003Vi-Ra for guix-patches@gnu.org; Mon, 16 Jan 2023 12:17:04 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHT6S-00025S-VG for guix-patches@gnu.org; Mon, 16 Jan 2023 12:17:02 -0500 Received: by mail-ej1-x644.google.com with SMTP id tz11so5222914ejc.0 for ; Mon, 16 Jan 2023 09:17:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=dHSWLSaL4D2lfYIcCVqazDc5UmZkWyy8P5xQcgbmuls=; b=A8lE1yuZaWcFaK8J4BcsP0bozUdMC3J9rT6vjWE2PyOs5frsEo6YxNNTrrK5Q1U7k3 VViwfTW01DRMcyQkhVPxxQYDkqfLXhYb4wrom7lC6Nl97zcPHUc77WJ6xNpOr5eM8t0H 3uhcGRxXUruhq4dywmWLH1+Xz66LaWx5+Ll4zI5aMpwTqz3eDYtl0FMGrALN5bC6GZ5p 092hahNZpX0jnW+JNHv6zxOYTHIYDrpWBqiVIgKeElcQ1hA3eefr+7WwGYuUeTWL1i+H /UtMdB0laXO+Yy+7krR11qh87vedmflZNhtyFjt4p1GHSkEkzwew9kEmbJC5KWdaasv0 5erg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dHSWLSaL4D2lfYIcCVqazDc5UmZkWyy8P5xQcgbmuls=; b=8H307MkWJYINUHk0zqGSePyMA3C7MJWphmLw4ruuOGZxI9I7yvzy/xP/JkPnJNlYFk WodmgCwZaxtAFXuLngMpz7EOl3AOABCcXOxkwBgkiNfN/Q9gxJXLdJD9/Z3kk4jRW3MT GvXXHs/p+y2bqMc09TEJA+epB01zGEmRGvTO0w25kCFNZUMJSmJiEB0PmosehhQIm0LL 07i820SMMWERQ30Z+xJDQZ7LUdf2A4bNdVBy/oWCRcdgix7IyKN+QgvIg36/85Ipf23m OrlVCU+YwV/h6QJGssF1wHKrFvXlCbAIDGyWKrhKw/2CPgIoTXPXDNu+mBtjEgi49ICa Fh3w== X-Gm-Message-State: AFqh2kogDc+TuqS8XaMN6azxtjuS/PegsnrEhU61+elN3WoDdT1Wn7PY wv8W2SFt2PQZbem/uRpp4rNAVwu6+ec= X-Google-Smtp-Source: AMrXdXuQvwKT2DmovqLXfwP4YXcj1hxl/UOG6F07E7hpv2+Y+nz4J8fyKsS+yghkZxDRBtykfnNEmA== X-Received: by 2002:a17:907:a609:b0:7c1:22a6:818f with SMTP id vt9-20020a170907a60900b007c122a6818fmr15396185ejc.25.1673889418923; Mon, 16 Jan 2023 09:16:58 -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 r2-20020a17090609c200b007bd28b50305sm12059647eje.200.2023.01.16.09.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 09:16:58 -0800 (PST) From: Liliana Marie Prikler Date: Mon, 16 Jan 2023 18:02:01 +0100 MIME-Version: 1.0 Message-ID: <7fefb08b5d40d00b116f38c519425c95da19a63a.camel@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x644.google.com X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 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, RAZOR2_CF_RANGE_51_100=1.886, RAZOR2_CHECK=0.922, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/webkit.scm (%webkit-version): Update to 2.38.3. (webkitgtk)[source]: Update hash. [arguments]<#:phases>: Add ‘set-CC’. Remove ‘patch-gtk-doc-scan’. [native-inputs]: Remove gtk-doc/stable and docbook-xml. Add gi-docgen. (webkitgtk-next)[name]: Rename to ‘webkitgtk-next’. [source, native-inputs]: Inherit fully. [arguments]<#:phases>: Inherit fully. --- Hi Guix, our Webkit packages diverged a little with the introduction of webkitgtk-next. Since the only difference between it and regular webkitgtk is the use of gtk4 as toolkit, however, I think that resynchronizing them might be better overall. Cheers gnu/packages/webkit.scm | 45 ++++++++++------------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 29f89721b7..400cf8372c 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -124,18 +124,18 @@ (define-public wpebackend-fdo engine that uses Wayland for graphics output.") (license license:bsd-2))) -(define %webkit-version "2.36.8") ;webkit2gtk4 +(define %webkit-version "2.38.3") (define-public webkitgtk (package - (name "webkitgtk") + (name "webkitgtk") ; webkit2gtk4 (version %webkit-version) (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0dq4s0rw3cmsxlv22pc38qdsq4wx2yyq9wgsi4wgw243y9mzpn8a")) + (base32 "0njac0878ksh53gn50phly1vzvj08q7g5aclncv6k324xp8h3w21")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -166,6 +166,11 @@ (define-public webkitgtk #:make-flags #~(list "-j" (number->string (max 2 (parallel-job-count)))) #:phases #~(modify-phases %standard-phases + (add-before 'build 'set-CC + (lambda _ + ;; Some Perl scripts check for the CC environment variable, else + ;; use /usr/bin/gcc. + (setenv "CC" #$(cc-for-target)))) (add-after 'unpack 'configure-bubblewrap-store-directory (lambda _ ;; This phase works in tandem with @@ -189,12 +194,6 @@ (define-public webkitgtk ;; the pkg-config search to locate headers. (("pkg_check_modules\\(PC_SYSTEMD QUIET libsystemd") "pkg_check_modules(PC_SYSTEMD QUIET libelogind")))) - (add-after 'unpack 'patch-gtk-doc-scan - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (substitute* (find-files "Source" "\\.sgml$") - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (search-input-file (or native-inputs inputs) - "xml/dtd/docbook/docbookx.dtd"))))) (add-after 'unpack 'embed-absolute-wpebackend-reference (lambda* (#:key inputs #:allow-other-keys) (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) @@ -223,9 +222,7 @@ (define-public webkitgtk perl pkg-config python-wrapper - ;; These are required to build the documentation. - gtk-doc/stable - docbook-xml + gi-docgen ruby)) (propagated-inputs (list gtk+ libsoup)) @@ -282,33 +279,13 @@ (define-public webkitgtk (define-public webkitgtk-next (package (inherit webkitgtk) - (name "webkitgtk") - (version "2.38.3") ;webkit2gtk5 - (source (origin - (inherit (package-source webkitgtk)) - (method url-fetch) - (uri (string-append "https://www.webkitgtk.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 "0njac0878ksh53gn50phly1vzvj08q7g5aclncv6k324xp8h3w21")))) - (build-system cmake-build-system) + (name "webkitgtk-next") ; webkit2gtk5 (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) #~(cons* "-DENABLE_INTROSPECTION=ON" "-DUSE_GTK4=ON" - (delete "-DENABLE_GTKDOC=ON" #$flags))) - ((#:phases phases) - #~(modify-phases #$phases - (add-before 'build 'set-CC - (lambda _ - ;; Some Perl scripts check for the CC environment variable, else - ;; use /usr/bin/gcc. - (setenv "CC" "gcc"))))))) - (native-inputs - (modify-inputs (package-native-inputs webkitgtk) - (delete "docbook-xml" "gtk-doc") - (append gi-docgen))) + (delete "-DENABLE_GTKDOC=ON" #$flags))))) (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) (replace "gtk+" gtk)))