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 ms0.migadu.com with LMTPS id krA8INmNSmICZgEAgWs5BA (envelope-from ) for ; Mon, 04 Apr 2022 08:19:05 +0200 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 iCrmG9mNSmLUbgAAauVa8A (envelope-from ) for ; Mon, 04 Apr 2022 08:19:05 +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 E66F337DC9 for ; Mon, 4 Apr 2022 08:19:04 +0200 (CEST) Received: from localhost ([::1]:34940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nbG3L-0007KI-PH for larch@yhetil.org; Mon, 04 Apr 2022 02:19:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbG0S-0006sE-2b for guix-patches@gnu.org; Mon, 04 Apr 2022 02:16:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nbG0Q-0004Ai-NC for guix-patches@gnu.org; Mon, 04 Apr 2022 02:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nbG0Q-0002nM-7c for guix-patches@gnu.org; Mon, 04 Apr 2022 02:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54703] [PATCH 3/3] gnu: wpewebkit: Update to 2.36.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Apr 2022 06:16: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: Maxim Cournoyer , 54703@debbugs.gnu.org Received: via spool by 54703-submit@debbugs.gnu.org id=B54703.164905290310661 (code B ref 54703); Mon, 04 Apr 2022 06:16:02 +0000 Received: (at 54703) by debbugs.gnu.org; 4 Apr 2022 06:15:03 +0000 Received: from localhost ([127.0.0.1]:50275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbFzT-0002lt-6f for submit@debbugs.gnu.org; Mon, 04 Apr 2022 02:15:03 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:6630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbFzP-0002l4-QD for 54703@debbugs.gnu.org; Mon, 04 Apr 2022 02:15:01 -0400 Received: from lprikler-laptop.ist.intra (gw.ist.tugraz.at [129.27.202.101]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4KX0qc1Lf8z1LWpd; Mon, 4 Apr 2022 08:14:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4KX0qc1Lf8z1LWpd DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1649052892; bh=tbj8Osuk6zTYXFm6Eudm1xQkQFrjbl5jVtr+hT2IVHE=; h=Subject:From:To:Date:In-Reply-To:References:From; b=HwwBt3QyVH588BFSMFnJ9RCkLKdOrq7susEvo4W8YtSPjgUrRB6c7zjK/Pe6cSbwF Ae2kctPNJHkwDkays45U38IK4Ha4oquSufSuJc08ql3w4qgzO7u2PQ5oXeSE6Hcw1G Zdo87KHlZfuh4Y8kyIqdKe10TAkQ7j/Chu7KurXU= Message-ID: From: Liliana Marie Prikler Date: Mon, 04 Apr 2022 08:14:51 +0200 In-Reply-To: <20220404041743.11131-3-maxim.cournoyer@gmail.com> References: <20220404041743.11131-1-maxim.cournoyer@gmail.com> <20220404041743.11131-3-maxim.cournoyer@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: waObeELIUl4ypBWmcn/8wQ X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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=1649053145; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=tbj8Osuk6zTYXFm6Eudm1xQkQFrjbl5jVtr+hT2IVHE=; b=VtOwJcYB7kqV22rwMApCIgnK9kouiCiahbH26wGNXEV5FeRljnoYBesYKd97Ey049tYkwN d/hFTCNwEH860pAWmNJqhJVb7IKaWgVkMqRJOw9+5ppmV8xhs6ehquHxzrf7nBuoZKO+TE cSjGU40YHRYG2r804eGP44xufekvIGbAf1wjV+sXhWMXaqQJv/x8LhWpwq4To1KpoCzhye Xmi2QwJ0WRzHDAzlYD4F1XNrYRwlBN2lvcYK+MOzQjpjx7tSnpsLwfzcmXIDD8/T9G+iC0 04iez6SjMLSRRxGfxYY29Vq4KHbJhnEzFnXqWRrUQbWsjeHBVVQ2UtkgMiyCKw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1649053145; a=rsa-sha256; cv=none; b=BmZyzCXL/elgJ6D63STVlgWNntbn2v9V+jOwx7gpc8mnzdWZ7SHAgSVnp4+vkuZ1LkZBsl t5ZJrTd2WNaHYt7mgGSiqAEnDUBVE0Iz1HRop1BV5AAQRX3Xl4aDYe2ZYRKGMO4hiOtKY8 mGCQYkLkVgRc592lhPtllyWLJyN624561+dRqmXCiEh1tO9/4MISo+juvS2Aleqb7C2HPc A4HLDc/6bIzD1JRkzYOFELI2wqqdA82iiX2lNBqmNvFRRZTuGbPDBg9JXYb4TYZQDk0Rbt Rt4g2M5Sq1WDIB0joNH6IH+ejcKo3yb8kxYr/WafyNDfXg6I/0iS5KciopjW3A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=HwwBt3Qy; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (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: 5.72 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=HwwBt3Qy; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tugraz.at (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: E66F337DC9 X-Spam-Score: 5.72 X-Migadu-Scanner: scn0.migadu.com X-TUID: JUU71mzj9C2h Am Montag, dem 04.04.2022 um 00:17 -0400 schrieb Maxim Cournoyer: > * 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"))))) You're not packaging WPEWebkit here, you are packaging WebkitGTK and labelling it WPEWebkit.