From patchwork Mon Apr 4 04:17:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 1367 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 32A7127BBEA; Mon, 4 Apr 2022 05:19:50 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 A126727BBE9 for ; Mon, 4 Apr 2022 05:19:49 +0100 (BST) Received: from localhost ([::1]:47194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbEBw-0006rt-QI for patchwork@mira.cbaines.net; Mon, 04 Apr 2022 00:19:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbEBD-0006fw-2c for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbEBC-00048X-PE for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nbEBC-00088Q-LX for guix-patches@gnu.org; Mon, 04 Apr 2022 00:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH 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: Mon, 04 Apr 2022 04:19: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: Maxim Cournoyer Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164904589031197 (code B ref 54703); Mon, 04 Apr 2022 04:19:02 +0000 Received: (at 54703) by debbugs.gnu.org; 4 Apr 2022 04:18:10 +0000 Received: from localhost ([127.0.0.1]:50136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEAL-000871-SD for submit@debbugs.gnu.org; Mon, 04 Apr 2022 00:18:10 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:37649) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbEAH-00086H-9K for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 00:18:05 -0400 Received: by mail-qt1-f178.google.com with SMTP id t19so6796645qtc.4 for <54703@debbugs.gnu.org>; Sun, 03 Apr 2022 21:18:05 -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=KO3iyYMJv7oI0Qvph42k5tT8Zq3fPdZtbFNyL2SbqMQ=; b=YL1AezzHj9T+rt6qmZGWP6Y5PR9yXFhHB9wkNnwHvnnz6DGv27PhctwvyyMDCgK0IY VZdPxiq0IAahnNApjW99w98sYKuiBD2RDLeEiu08r6myUYbCt/cx/APImua/IBZBxXjg xKatr1te5fZ6XDvJLn6VLwZybIvdLUAoea3NeQXGrNKK8AXA6c8Gk8oj04MidSQc/Gi+ LVtf1QVdwZukUqDayW5C+8koHyHu/t8WkJHWyTTGCCVhUXJD/9IMnLGFb29erXcAdMzV z14umbJrj/jsymh/mM/FnIjKUmPjuOuQYKoCflzJkkcQrmMWpuXw+ATt0U9JOS24pj5Q wcSw== 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=KO3iyYMJv7oI0Qvph42k5tT8Zq3fPdZtbFNyL2SbqMQ=; b=WY3VG3WMs4zb5q7ncMhhSVmj2s8EySa2V/QPavwqf8P1PB5YTGdhTEt4g4VRMru9Oo ogCkSgA8JXhOgArnNbGu+R5bg4bjeYxWq1SgTEdwhnAJcOSH63i6pA7n0ws2avRwwmkr KEXWIzKWy0ku1wQlIz7eRmQ4AvW91r52tUbUE2yY3wpbaWqh7iavKR4dSDwfOqxwL9ka uGLuZBjb5lGfuskx4WR2YxiPlPMvtoVbQ6LCdobBQ6fLzjfAVy/hSfq3cPbMAKp2n2D3 2BP5+YhzLJN15C4iHtEA/faL6VNzmsn3mUooXNRIryFLEW8YeSAHsJ+Y6/zSkkKM38NR clpQ== X-Gm-Message-State: AOAM530IODLhfWUT6WTiWGukhDYN8tb51hCq2+/MrjidJwKiS/v67GdV IGN5+fm2xvGhfY1n+7lIVgv7gW5coRE= X-Google-Smtp-Source: ABdhPJwYj+tRnMShvNwBEP9esd4OJm2xvlhvv3vLOdtbhBz0U/QkxiKQy5BfeAsW4qgVYzCGy8psCw== X-Received: by 2002:a05:622a:30a:b0:2e2:3029:6b8b with SMTP id q10-20020a05622a030a00b002e230296b8bmr16192622qtw.605.1649045879612; Sun, 03 Apr 2022 21:17:59 -0700 (PDT) Received: from localhost.localdomain (dsl-154-119.b2b2c.ca. [66.158.154.119]) by smtp.gmail.com with ESMTPSA id u13-20020a05622a010d00b002e1d653c2e1sm7642015qtw.46.2022.04.03.21.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Apr 2022 21:17:59 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 4 Apr 2022 00:17:43 -0400 Message-Id: <20220404041743.11131-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220404041743.11131-1-maxim.cournoyer@gmail.com> References: <20220404041743.11131-1-maxim.cournoyer@gmail.com> 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/webkit.scm (wpewebkit): Update to 2.36.0, rewriting package to inherit from webkitgtk. --- gnu/packages/webkit.scm | 126 ++++------------------------------------ 1 file changed, 11 insertions(+), 115 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index cd19404228..bc3ae388f7 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -123,121 +123,6 @@ (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-public webkitgtk (package (name "webkitgtk") @@ -398,3 +283,14 @@ (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") + (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")))))