From patchwork Tue Nov 14 11:03:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 56517 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 D3D8D27BBEA; Thu, 16 Nov 2023 06:53:10 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 C1D0327BBE2 for ; Thu, 16 Nov 2023 06:53:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3WFL-00037Y-Jf; Thu, 16 Nov 2023 01:53:03 -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 1r3WFK-00037L-Hz for guix-patches@gnu.org; Thu, 16 Nov 2023 01:53:02 -0500 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 1r3WFK-00056d-9j for guix-patches@gnu.org; Thu, 16 Nov 2023 01:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3WFJ-0000gp-OB for guix-patches@gnu.org; Thu, 16 Nov 2023 01:53:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67162] [PATCH gnome-team v4] gnu: epiphany: Update to 44.7. References: <300a45bb9a56e9d6dd73cc53b7295cf26981bc75.1699961910.git.vivien@planete-kraus.eu> In-Reply-To: <300a45bb9a56e9d6dd73cc53b7295cf26981bc75.1699961910.git.vivien@planete-kraus.eu> Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Nov 2023 06:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67162 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 67162@debbugs.gnu.org, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 67162-submit@debbugs.gnu.org id=B67162.17001175572619 (code B ref 67162); Thu, 16 Nov 2023 06:53:01 +0000 Received: (at 67162) by debbugs.gnu.org; 16 Nov 2023 06:52:37 +0000 Received: from localhost ([127.0.0.1]:54396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3WEu-0000gA-Ok for submit@debbugs.gnu.org; Thu, 16 Nov 2023 01:52:37 -0500 Received: from planete-kraus.eu ([89.234.140.182]:39904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3WEs-0000g1-Ke for 67162@debbugs.gnu.org; Thu, 16 Nov 2023 01:52:35 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 25b73d4e; Thu, 16 Nov 2023 06:52:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:cc:mime-version; s=albinoniA; bh=0RuEqTuFN4v43Do5jzOWnhnPyik=; b=N7EZbx36+wvJMu/4l2ZRAA+u8qkj afg1moYN83bqCyjI0EW1k4zv8vBeliDl7kwlgeLnStzT0oh10Vxr3fS6tJVh/8CJ k14Q+KwRrlBCeazmmhuPYkGNYAK7cY3rBAMmfWoRbtzauFWHMGa+7vaED1gtofRN HtzM/bsPgk0p7amhsVouAPW5k0APZn43sBD79qc5FTF9dHhXKl33YPf7ZjbFRKZd SxL9DiuYlvi9jeC8WMETSlHY57kben73mkemjPYVbo+iziEHLCX02rB4ZoIc97yX yRnCOsR8I9XsOGhJGcSl8qCiWiuf0jXRMA7VQDjDVEQa0WSqYAz+tKKkow== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id eed56d20 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 16 Nov 2023 06:52:33 +0000 (UTC) Message-ID: Date: Tue, 14 Nov 2023 12:03:36 +0100 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 Soup2 is not supported anymore, we do not need to disable it explicitely. * gnu/packages/gnome.scm (epiphany): Update to 44.7. [#:phases]: Update for build system changes. : Partially disable web_view_test. : Remove. : Replace with a new phase. : New phase. [#:configure-flags]: Remove soup2. [inputs]: Replace gcr-3 with gcr and webkitgtk-for-gtk3 with webkitgtk. Add bash-minimal, gstreamer, gst-plugins-base, gst-plugins-good, libadwaita. Remove libdazzle and libhandy. Change-Id: I95ab6551a1b38254191801549be9dba0abb04593 --- Sorry for the noise, I had to fix a lint issue. Vivien gnu/packages/gnome.scm | 61 +++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 16 deletions(-) base-commit: 72e886328c14c832b2ed71c400069b63852ee18d diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2958da2cd9..92648810eb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7095,7 +7095,7 @@ (define-public simple-scan (define-public epiphany (package (name "epiphany") - (version "42.5") + (version "44.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -7103,7 +7103,7 @@ (define-public epiphany "epiphany-" version ".tar.xz")) (sha256 (base32 - "0mln4iym0fqkri959650cccdhq3r4d4kfn8yld0vvdmzskmak4a6")))) + "1srdbn2rls4c0dvrjk0djfmxxnrd012jbji8aavslgkf8cs5mya4")))) (build-system meson-build-system) (arguments (list @@ -7113,8 +7113,9 @@ (define-public epiphany (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "post_install.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-after 'unpack 'disable-failing-tests (lambda _ (substitute* "tests/meson.build" @@ -7122,17 +7123,42 @@ (define-public epiphany ;; supports overriding the ftp schema web_app_utils fails due ;; to missing network access. (("(embed_shell|web_app_utils)_test,") - "find_program('sh'), args: ['-c', 'exit 77'],")))) - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1")))) + "find_program('sh'), args: ['-c', 'exit 77'],") + ;; web_view_test partially fails, because it can’t run bwrap. + (("web_view_test,") + (string-append + "web_view_test, args: [" + (string-join + (map (lambda (test) + (string-append "'-s', '/embed/ephy-web-view/" test "'")) + '("load_url" + "provisional_load_failure_updates_back_forward_list" + "error-pages-not-stored-in-history")) + ", ") + "],"))))) + (replace 'check + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + (setenv "MESON_TESTTHREADS" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (setenv "XDG_CACHE_HOME" (getcwd)) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (invoke "dbus-run-session" "--" + "meson" "test" "--print-errorlogs" "-t" "0")))) + (add-after 'install 'gst-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/epiphany") + `("GST_PLUGIN_SYSTEM_PATH" ":" suffix (,gst-plugin-path))))))) #:configure-flags ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component. #~(list (string-append "-Dc_link_args=-Wl,-rpath=" - #$output "/lib/epiphany") - "-Dsoup2=disabled"))) ;use libsoup 3 + #$output "/lib/epiphany")))) (propagated-inputs (list dconf)) (native-inputs (list desktop-file-utils ; for update-desktop-database @@ -7144,15 +7170,18 @@ (define-public epiphany xorg-server-for-tests)) (inputs (list avahi - gcr-3 + bash-minimal ; for wrap-program + gcr glib-networking gnome-desktop gsettings-desktop-schemas + gst-plugins-base + gst-plugins-good + gstreamer iso-codes json-glib + libadwaita libarchive - libdazzle - libhandy libnotify libportal (librsvg-for-system) ; for loading SVG files @@ -7161,7 +7190,7 @@ (define-public epiphany libxslt nettle ; for hogweed sqlite - webkitgtk-for-gtk3)) + webkitgtk)) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description