gnu: epiphany: Update to 44.7.
Soup2 is not supported anymore, we do not need to disable it explicitely. * gnu/packages/gnome.scm (epiphany): Update to 44.7. [#:phases]<skip-gtk-update-icon-cache>: Update for build system changes. <disable-failing-tests>: Partially disable web_view_test. <pre-check>: Remove. <check>: Replace with a new phase. <gst-wrap>: New phase. [#:configure-flags]: Remove “-Dsoup2=disabled”. [inputs]: Replace gcr-3 with gcr and webkitgtk-for-gtk3 with webkitgtk. Add bash-minimal, gstreamer, gst-plugins-base, gst-plugins-good, and libadwaita. Remove libdazzle and libhandy. Change-Id: I95ab6551a1b38254191801549be9dba0abb04593 Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
		
							parent
							
								
									0831c72df6
								
							
						
					
					
						commit
						b369dc272e
					
				
					 1 changed files with 45 additions and 16 deletions
				
			
		| 
						 | 
					@ -7135,7 +7135,7 @@ almost all of them.")
 | 
				
			||||||
(define-public epiphany
 | 
					(define-public epiphany
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "epiphany")
 | 
					    (name "epiphany")
 | 
				
			||||||
    (version "42.5")
 | 
					    (version "44.7")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method url-fetch)
 | 
					              (method url-fetch)
 | 
				
			||||||
              (uri (string-append "mirror://gnome/sources/epiphany/"
 | 
					              (uri (string-append "mirror://gnome/sources/epiphany/"
 | 
				
			||||||
| 
						 | 
					@ -7143,7 +7143,7 @@ almost all of them.")
 | 
				
			||||||
                                  "epiphany-" version ".tar.xz"))
 | 
					                                  "epiphany-" version ".tar.xz"))
 | 
				
			||||||
              (sha256
 | 
					              (sha256
 | 
				
			||||||
               (base32
 | 
					               (base32
 | 
				
			||||||
                "0mln4iym0fqkri959650cccdhq3r4d4kfn8yld0vvdmzskmak4a6"))))
 | 
					                "1srdbn2rls4c0dvrjk0djfmxxnrd012jbji8aavslgkf8cs5mya4"))))
 | 
				
			||||||
    (build-system meson-build-system)
 | 
					    (build-system meson-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     (list
 | 
					     (list
 | 
				
			||||||
| 
						 | 
					@ -7153,8 +7153,9 @@ almost all of them.")
 | 
				
			||||||
          (add-after 'unpack 'skip-gtk-update-icon-cache
 | 
					          (add-after 'unpack 'skip-gtk-update-icon-cache
 | 
				
			||||||
            ;; Don't create 'icon-theme.cache'.
 | 
					            ;; Don't create 'icon-theme.cache'.
 | 
				
			||||||
            (lambda _
 | 
					            (lambda _
 | 
				
			||||||
              (substitute* "post_install.py"
 | 
					              (substitute* "meson.build"
 | 
				
			||||||
                (("gtk-update-icon-cache") "true"))))
 | 
					                (("gtk_update_icon_cache: true")
 | 
				
			||||||
 | 
					                 "gtk_update_icon_cache: false"))))
 | 
				
			||||||
          (add-after 'unpack 'disable-failing-tests
 | 
					          (add-after 'unpack 'disable-failing-tests
 | 
				
			||||||
            (lambda _
 | 
					            (lambda _
 | 
				
			||||||
              (substitute* "tests/meson.build"
 | 
					              (substitute* "tests/meson.build"
 | 
				
			||||||
| 
						 | 
					@ -7162,17 +7163,42 @@ almost all of them.")
 | 
				
			||||||
                ;; supports overriding the ftp schema web_app_utils fails due
 | 
					                ;; supports overriding the ftp schema web_app_utils fails due
 | 
				
			||||||
                ;; to missing network access.
 | 
					                ;; to missing network access.
 | 
				
			||||||
                (("(embed_shell|web_app_utils)_test,")
 | 
					                (("(embed_shell|web_app_utils)_test,")
 | 
				
			||||||
                 "find_program('sh'), args: ['-c', 'exit 77'],"))))
 | 
					                 "find_program('sh'), args: ['-c', 'exit 77'],")
 | 
				
			||||||
          (add-before 'check 'pre-check
 | 
					                ;; web_view_test partially fails, because it can’t run bwrap.
 | 
				
			||||||
            (lambda _
 | 
					                (("web_view_test,")
 | 
				
			||||||
              ;; Tests require a running X server.
 | 
					                 (string-append
 | 
				
			||||||
              (system "Xvfb :1 &")
 | 
					                  "web_view_test, args: ["
 | 
				
			||||||
              (setenv "DISPLAY" ":1"))))
 | 
					                  (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
 | 
					      #:configure-flags
 | 
				
			||||||
      ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component.
 | 
					      ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component.
 | 
				
			||||||
      #~(list (string-append "-Dc_link_args=-Wl,-rpath="
 | 
					      #~(list (string-append "-Dc_link_args=-Wl,-rpath="
 | 
				
			||||||
                             #$output "/lib/epiphany")
 | 
					                             #$output "/lib/epiphany"))))
 | 
				
			||||||
              "-Dsoup2=disabled")))     ;use libsoup 3
 | 
					 | 
				
			||||||
    (propagated-inputs (list dconf))
 | 
					    (propagated-inputs (list dconf))
 | 
				
			||||||
    (native-inputs
 | 
					    (native-inputs
 | 
				
			||||||
     (list desktop-file-utils           ; for update-desktop-database
 | 
					     (list desktop-file-utils           ; for update-desktop-database
 | 
				
			||||||
| 
						 | 
					@ -7184,15 +7210,18 @@ almost all of them.")
 | 
				
			||||||
           xorg-server-for-tests))
 | 
					           xorg-server-for-tests))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     (list avahi
 | 
					     (list avahi
 | 
				
			||||||
           gcr-3
 | 
					           bash-minimal                 ; for wrap-program
 | 
				
			||||||
 | 
					           gcr
 | 
				
			||||||
           glib-networking
 | 
					           glib-networking
 | 
				
			||||||
           gnome-desktop
 | 
					           gnome-desktop
 | 
				
			||||||
           gsettings-desktop-schemas
 | 
					           gsettings-desktop-schemas
 | 
				
			||||||
 | 
					           gst-plugins-base
 | 
				
			||||||
 | 
					           gst-plugins-good
 | 
				
			||||||
 | 
					           gstreamer
 | 
				
			||||||
           iso-codes
 | 
					           iso-codes
 | 
				
			||||||
           json-glib
 | 
					           json-glib
 | 
				
			||||||
 | 
					           libadwaita
 | 
				
			||||||
           libarchive
 | 
					           libarchive
 | 
				
			||||||
           libdazzle
 | 
					 | 
				
			||||||
           libhandy
 | 
					 | 
				
			||||||
           libnotify
 | 
					           libnotify
 | 
				
			||||||
           libportal
 | 
					           libportal
 | 
				
			||||||
           (librsvg-for-system)         ; for loading SVG files
 | 
					           (librsvg-for-system)         ; for loading SVG files
 | 
				
			||||||
| 
						 | 
					@ -7201,7 +7230,7 @@ almost all of them.")
 | 
				
			||||||
           libxslt
 | 
					           libxslt
 | 
				
			||||||
           nettle                       ; for hogweed
 | 
					           nettle                       ; for hogweed
 | 
				
			||||||
           sqlite
 | 
					           sqlite
 | 
				
			||||||
           webkitgtk-for-gtk3))
 | 
					           webkitgtk))
 | 
				
			||||||
    (home-page "https://wiki.gnome.org/Apps/Web")
 | 
					    (home-page "https://wiki.gnome.org/Apps/Web")
 | 
				
			||||||
    (synopsis "GNOME web browser")
 | 
					    (synopsis "GNOME web browser")
 | 
				
			||||||
    (description
 | 
					    (description
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue