From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id EDIRKh6NS2L/CQEAgWs5BA (envelope-from ) for ; Tue, 05 Apr 2022 02:28:14 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id oEJGJx6NS2KyrAAA9RJhRA (envelope-from ) for ; Tue, 05 Apr 2022 02:28:14 +0200 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 1AC8337B31 for ; Tue, 5 Apr 2022 02:28:14 +0200 (CEST) Received: from localhost ([::1]:57964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbX3N-0002cp-AA for larch@yhetil.org; Mon, 04 Apr 2022 20:28:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbX3C-0002Jz-Tk for guix-patches@gnu.org; Mon, 04 Apr 2022 20:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbX3C-00040C-LJ for guix-patches@gnu.org; Mon, 04 Apr 2022 20:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nbX3C-0001NI-J3 for guix-patches@gnu.org; Mon, 04 Apr 2022 20:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH v2 3/3] gnu: wpewebkit: Update to 2.36.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 05 Apr 2022 00:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54703 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54703@debbugs.gnu.org Cc: liliana.prikler@ist.tugraz.at, Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.16491184575228 (code B ref 54703); Tue, 05 Apr 2022 00:28:02 +0000 Received: (at 54703) by debbugs.gnu.org; 5 Apr 2022 00:27:37 +0000 Received: from localhost ([127.0.0.1]:53357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX2m-0001ME-QD for submit@debbugs.gnu.org; Mon, 04 Apr 2022 20:27:37 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:35742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbX2g-0001LX-DB for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 20:27:30 -0400 Received: by mail-qt1-f179.google.com with SMTP id z19so9249980qtw.2 for <54703@debbugs.gnu.org>; Mon, 04 Apr 2022 17:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+l3r0SE+r3ZP6xyD73PmTZMgOfAPL1XxBAB9V5IAPSU=; b=ZJv8bbbD8QbgluYihigQTEGWHUfawxLqLunoCpnYKZAUZdVomNI1X/sdxkMxw0mtSP lViNWjnaUPu51lHOI1cC3rVNhBxLFhDKmfFZG3tptfk4rHd8KfsXONy59WBazMTWlY1M 3GhkLly1A6ZDYOxBPp0gBE52+qSPSxrPEmX9knhWGcumAOWMs+ZXV84pdU4M70+Rm4fS ju3uYrZ5qQ9JfmRA5SFRksERKxN7TKK+dh0kWtUX24LCgh9jN+nfEc7Q0jxg6NfR3Jg0 tuM+gtRjy7e9W/cwZucl1P9o+27Wc0vJKiIVx1B2uBGT8B2hArdV9l3gKZY11Z6C/Vbt wI5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+l3r0SE+r3ZP6xyD73PmTZMgOfAPL1XxBAB9V5IAPSU=; b=L7vaV+jPFKt9TrW0FKPVIODvNkN3uq6mNSMNcXWDRqs3rnuVQjvxiyAwaciZzBlUCQ dRXrFId1kgDqk1acHqOICLSY53y1oU2/p9Ca/kSiBOT2/64w2sBBck7UPFkDh8cmT7J5 rIqvUTSrFIiegTtLJWJzqRWYql63B0NbWsa3bXvwMu9Mtj5JIury05c4zsQ/o5cFcUwS 4DSseJDBa/x3JRQRRHh7ybAIZSWILtzo5kFTG85Uxx9wAwPOmCnTj11FA/Bi3VF0IynZ 9jnWTUzCer3ZLYDho0xeL/utpgFw+2Y+2QL8TpKIvcVAKV6IGHGDU3nNawS+dyQR1586 VZwg== X-Gm-Message-State: AOAM530skw5m8QEKSag8qTX5W/CTjErDTCawJ0NAbmoYwW/us7+jU9/W Qv+XGD/b4Pca90wqp+cAqdtfMBeuoN1lKg== X-Google-Smtp-Source: ABdhPJys9qOWDAajjDKJDLhr/k0fAHeRYA4qL34BjoU4Mx/UQhqrLdBqIB2lCsOZuswREtbwWiSYjA== X-Received: by 2002:a05:622a:1a0b:b0:2e1:b574:f50b with SMTP id f11-20020a05622a1a0b00b002e1b574f50bmr894507qtb.156.1649118444769; Mon, 04 Apr 2022 17:27:24 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id n10-20020a05622a040a00b002e315b9f08asm10315613qtx.35.2022.04.04.17.27.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 17:27:24 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 20:27:05 -0400 Message-Id: <20220405002705.28218-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1649118494; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=+l3r0SE+r3ZP6xyD73PmTZMgOfAPL1XxBAB9V5IAPSU=; b=O4LF6QYpwNMNOsid231fccVFWiiVjn6mkjCtFJT/ljETHtWvu+IPhKulAzIwFRi1mu6X4X ncxDShcVePRWfZvXVC7mnrdeMllhBZ6UxJ1NPuxM381/zswAqk35RjpY6A1UxRRxfgbonJ nGlF145mY2UIIWyWjb3T2NGqthgRlXfUs2Vfl7i8HR1TlwqIgYie4ulJhnJIh/ukaI4CK+ bYiLKr8TooLxCz5ft3iV/2uRe3KALg7ksDrUK1ZtogXmnImFHbwK/ToTqvW42df40uTTME AysOfRvQEtAwkDZmu85hKjfsDuKPHWeXO4AtPkv58WluCF7U2CdzKTcAEr1yxQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649118494; a=rsa-sha256; cv=none; b=DzcZxUF/A05VCB/okgYllaM0DkszMZp29Zka2fupiBErygtxDEU93no7bW8PeWoNpYbfmK 6STzQqYbS05s+ggbOWdluK+Jay3AVEq1FH57I5qIfRC8M5buT7amYe7g9r7jMkOn/UuAWu TJnmWiA0vpEPcjCXfTUkcPv/+lpTgsIcqx46oJM2dc7bN9itamCcpNVq2msN8ccdvNGIu0 7NtjYmDQP+c3hroUduwyOW+5LAjgu+WL+oYe1ARVXf6bzLZcrKBQ59YpmelQK/ecI4aM/C 5Kx+IO7n8NUA7IdxpuhPI3Cgu6pQC2XdUi1IvC4Vuh/SJatPFWz/buyQuOCMWQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ZJv8bbbD; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Spam-Score: 6.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ZJv8bbbD; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Queue-Id: 1AC8337B31 X-Spam-Score: 6.42 X-Migadu-Scanner: scn1.migadu.com X-TUID: u0PA9pJn8FhN * gnu/packages/webkit.scm (%webkit-version): New variable. (wpewebkit): Update to 2.36.0, rewriting package to inherit from webkitgtk. (webkitgtk)[source]: Use %webkit-version, and adjust definition to match that of wpewebkit. --- gnu/packages/webkit.scm | 145 ++++++++-------------------------------- 1 file changed, 27 insertions(+), 118 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index f453372b1e..cfb80f591c 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -123,132 +123,18 @@ (define-public wpebackend-fdo engine that uses Wayland for graphics output.") (license license:bsd-2))) -(define-public wpewebkit - (package - (name "wpewebkit") - (version "2.34.3") - (source - (origin - (method url-fetch) - (uri - (string-append "https://wpewebkit.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 "1z20bza01ld4jvi0qx8xsl5y4czaniwpi8hxdjyirj1mrszy8pf3")))) - (build-system cmake-build-system) - (outputs '("out" "doc")) - (arguments - `(#:tests? #f ; XXX: To be enabled - #:configure-flags - (list - "-DPORT=WPE" - ;; XXX: To be enabled. - ;; "-DENABLE_ACCELERATED_2D_CANVAS=ON" - "-DUSE_SYSTEMD=OFF" - "-DENABLE_ENCRYPTED_MEDIA=OFF" - "-DENABLE_GTKDOC=ON" - "-DUSE_GSTREAMER_GL=OFF") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'setenv - (lambda _ - (setenv "HOME" "/tmp") - #t)) - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (for-each - (lambda (file) - (substitute* file - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/docbookx.dtd")))) - (find-files "Source" "\\.sgml$")) - #t)) - (add-after 'unpack 'patch-cmake - (lambda _ - (substitute* "Source/PlatformWPE.cmake" - (("(Documentation/wpe(-webextensions)?-)\\$\\{WPE_API_VERSION\\}" - all prefix) - (string-append prefix "${WPE_API_DOC_VERSION}")) - (("(html/wpe(-webextensions)?-)\\$\\{WPE_API_VERSION\\}" - all prefix) - (string-append prefix "${WPE_API_DOC_VERSION}"))))) - (add-after 'install 'move-doc-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share")) - (rename-file - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t)))))) - (native-inputs - `(("docbook-xml" ,docbook-xml-4.1.2) - ("docbook-xsl" ,docbook-xsl) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("python2" ,python-2.7) - ("ruby" ,ruby))) - (inputs - `(("atk" ,atk) - ("atk-bridge" ,at-spi2-atk) - ("bubblewrap" ,bubblewrap) - ("cairo" ,cairo) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("gperf" ,gperf) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("harfbuzz" ,harfbuzz) - ("icu" ,icu4c) - ("lcms" ,lcms) - ("libepoxy" ,libepoxy) - ("libgcrypt" ,libgcrypt) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libseccomp" ,libseccomp) - ("libtasn1" ,libtasn1) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("mesa" ,mesa) - ("openjpeg" ,openjpeg) - ("sqlite" ,sqlite) - ("webp" ,libwebp) - ("woff2" ,woff2) - ("xdg-dbus-proxy" ,xdg-dbus-proxy) - ("zlib" ,zlib))) - (propagated-inputs - `(("glib" ,glib) - ("libsoup" ,libsoup) - ("wpe" ,libwpe))) - (synopsis "WebKit port optimized for embedded devices") - (description "WPE WebKit allows embedders to create simple and performant -systems based on Web platform technologies. It is designed with hardware -acceleration in mind, leveraging common 3D graphics APIs for best performance.") - (home-page "https://wpewebkit.org/") - (license - (list - ;; Rendering and JavaScript Engines. - license:lgpl2.1+ - ;; Others - license:bsd-2)) - (properties '((cpe-name . "wpe_webkit"))))) +(define %webkit-version "2.36.0") (define-public webkitgtk (package (name "webkitgtk") - (version "2.36.0") + (version %webkit-version) (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" - "webkitgtk-" version ".tar.xz")) + name "-" version ".tar.xz")) (sha256 - (base32 - "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq")) + (base32 "0kf6avqlq9f74lwzji7l3xlnng5yqarc4ykwsmfmy8q5y6hwqxxq")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -396,3 +282,26 @@ (define-public webkitgtk-with-libsoup2 (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) (replace "libsoup" libsoup-minimal-2))))) + +(define-public wpewebkit + (package + (inherit webkitgtk) + (name "wpewebkit") + (version %webkit-version) + (source (origin + (inherit (package-source webkitgtk)) + (uri (string-append "https://wpewebkit.org/releases/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0nkdx6pckbkhs85z3pidnh4cbp0wfa38lf2qyn0grywvgpwajsh9")))) + (arguments + (substitute-keyword-arguments (package-arguments webkitgtk) + ((#:configure-flags flags) + #~(cons "-DPORT=WPE" + (delete "-DPORT=GTK" #$flags))))) + (synopsis "WebKit port optimized for embedded devices") + (description "WPE WebKit allows embedders to create simple and performant +systems based on Web platform technologies. It is designed with hardware +acceleration in mind, leveraging common 3D graphics APIs for best performance.") + (home-page "https://wpewebkit.org/") + (properties '((cpe-name . "wpe_webkit"))))) -- 2.34.0