* [bug#67162] [PATCH] gnu: epiphany: Update to 44.7.
@ 2023-11-14 11:03 Vivien Kraus via Guix-patches via
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v4] " Vivien Kraus via Guix-patches via
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 11:03 UTC (permalink / raw)
To: 67162
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5958 bytes --]
Soup2 is not supported anymore, we do not need to disable it explicitely.
* gnu/packages/gnome.scm (epiphany): Update to 44.7.
[#:phase 'skip-gtk-update-icon-cache]: Update for build system changes.
[#:phase 'disable-failing-tests]: Partially disable web_view_test.
[#:phase 'pre-check]: Remove.
[#:phase 'check]: Replace with a new phase.
[#:phase 'wrap-epiphany]: New phase.
[#:configure-flags]: Remove soup2.
[native-inputs]: Add bash-minimal.
[inputs]: Replace gcr-3 with gcr and webkitgtk-for-gtk3 with webkitgtk. Add
gstreamer, gst-plugins-base, gst-plugins-good, libadwaita. Remove libdazzle
and libhandy.
Change-Id: I95ab6551a1b38254191801549be9dba0abb04593
---
gnu/packages/gnome.scm | 63 ++++++++++++++++++++++++++++++------------
1 file changed, 46 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2958da2cd9..5fd98b336d 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,20 +7123,46 @@ (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 'wrap-epiphany
+ (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" ":" prefix (,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
+ (list bash-minimal ; for wrap-program
+ desktop-file-utils ; for update-desktop-database
gettext-minimal
`(,glib "bin") ; for glib-mkenums
itstool
@@ -7144,15 +7171,17 @@ (define-public epiphany
xorg-server-for-tests))
(inputs
(list avahi
- gcr-3
+ 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
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#67162] [PATCH gnome-team v2] gnu: epiphany: Update to 44.7.
2023-11-14 11:03 [bug#67162] [PATCH] gnu: epiphany: Update to 44.7 Vivien Kraus via Guix-patches via
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v4] " Vivien Kraus via Guix-patches via
@ 2023-11-14 11:03 ` Vivien Kraus via Guix-patches via
2023-11-15 5:27 ` Liliana Marie Prikler
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v5] " Vivien Kraus via Guix-patches via
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v3] " Vivien Kraus via Guix-patches via
3 siblings, 1 reply; 8+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 11:03 UTC (permalink / raw)
To: 67162; +Cc: liliana.prikler, maxim.cournoyer, rg
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5958 bytes --]
Soup2 is not supported anymore, we do not need to disable it explicitely.
* gnu/packages/gnome.scm (epiphany): Update to 44.7.
[#:phase 'skip-gtk-update-icon-cache]: Update for build system changes.
[#:phase 'disable-failing-tests]: Partially disable web_view_test.
[#:phase 'pre-check]: Remove.
[#:phase 'check]: Replace with a new phase.
[#:phase 'wrap-epiphany]: New phase.
[#:configure-flags]: Remove soup2.
[native-inputs]: Add bash-minimal.
[inputs]: Replace gcr-3 with gcr and webkitgtk-for-gtk3 with webkitgtk. Add
gstreamer, gst-plugins-base, gst-plugins-good, libadwaita. Remove libdazzle
and libhandy.
Change-Id: I95ab6551a1b38254191801549be9dba0abb04593
---
gnu/packages/gnome.scm | 63 ++++++++++++++++++++++++++++++------------
1 file changed, 46 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2958da2cd9..5fd98b336d 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,20 +7123,46 @@ (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 'wrap-epiphany
+ (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" ":" prefix (,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
+ (list bash-minimal ; for wrap-program
+ desktop-file-utils ; for update-desktop-database
gettext-minimal
`(,glib "bin") ; for glib-mkenums
itstool
@@ -7144,15 +7171,17 @@ (define-public epiphany
xorg-server-for-tests))
(inputs
(list avahi
- gcr-3
+ 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
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#67162] [PATCH gnome-team v3] gnu: epiphany: Update to 44.7.
2023-11-14 11:03 [bug#67162] [PATCH] gnu: epiphany: Update to 44.7 Vivien Kraus via Guix-patches via
` (2 preceding siblings ...)
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v5] " Vivien Kraus via Guix-patches via
@ 2023-11-14 11:03 ` Vivien Kraus via Guix-patches via
3 siblings, 0 replies; 8+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 11:03 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 67162, maxim.cournoyer, rg
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5988 bytes --]
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.
<wrap-epiphany>: New phase.
[#:configure-flags]: Remove soup2.
[native-inputs]: Add bash-minimal.
[inputs]: Replace gcr-3 with gcr and webkitgtk-for-gtk3 with webkitgtk. Add
gstreamer, gst-plugins-base, gst-plugins-good, libadwaita. Remove libdazzle
and libhandy.
Change-Id: I95ab6551a1b38254191801549be9dba0abb04593
---
The new gstreamer dependency is actually checked at configure time.
gnu/packages/gnome.scm | 63 ++++++++++++++++++++++++++++++------------
1 file changed, 46 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2958da2cd9..0837edc360 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,20 +7123,46 @@ (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
+ (list bash-minimal ; for wrap-program
+ desktop-file-utils ; for update-desktop-database
gettext-minimal
`(,glib "bin") ; for glib-mkenums
itstool
@@ -7144,15 +7171,17 @@ (define-public epiphany
xorg-server-for-tests))
(inputs
(list avahi
- gcr-3
+ 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
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#67162] [PATCH gnome-team v4] gnu: epiphany: Update to 44.7.
2023-11-14 11:03 [bug#67162] [PATCH] gnu: epiphany: Update to 44.7 Vivien Kraus via Guix-patches via
@ 2023-11-14 11:03 ` Vivien Kraus via Guix-patches via
2023-11-16 7:56 ` Liliana Marie Prikler
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 11:03 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 67162, maxim.cournoyer, rg
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5774 bytes --]
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.
<wrap-epiphany>: 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(-)
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
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#67162] [PATCH gnome-team v5] gnu: epiphany: Update to 44.7.
2023-11-14 11:03 [bug#67162] [PATCH] gnu: epiphany: Update to 44.7 Vivien Kraus via Guix-patches via
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v4] " Vivien Kraus via Guix-patches via
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
@ 2023-11-14 11:03 ` Vivien Kraus via Guix-patches via
2024-01-07 17:39 ` bug#67162: " Liliana Marie Prikler
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v3] " Vivien Kraus via Guix-patches via
3 siblings, 1 reply; 8+ messages in thread
From: Vivien Kraus via Guix-patches via @ 2023-11-14 11:03 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 67162, maxim.cournoyer, rg
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 5840 bytes --]
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 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
---
Right, I forgot to rename my wrapping phase in the commit message, sorry!
Thanks for pointing it out.
Best regards,
Vivien
gnu/packages/gnome.scm | 61 +++++++++++++++++++++++++++++++-----------
1 file changed, 45 insertions(+), 16 deletions(-)
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
base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
--
2.41.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#67162] [PATCH gnome-team v2] gnu: epiphany: Update to 44.7.
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
@ 2023-11-15 5:27 ` Liliana Marie Prikler
0 siblings, 0 replies; 8+ messages in thread
From: Liliana Marie Prikler @ 2023-11-15 5:27 UTC (permalink / raw)
To: Vivien Kraus, 67162; +Cc: rg, maxim.cournoyer
Am Dienstag, dem 14.11.2023 um 12:03 +0100 schrieb Vivien Kraus:
> Soup2 is not supported anymore, we do not need to disable it
> explicitely.
>
> * gnu/packages/gnome.scm (epiphany): Update to 44.7.
> [#:phase 'skip-gtk-update-icon-cache]: Update for build system
> changes.
> [#:phase 'disable-failing-tests]: Partially disable web_view_test.
> [#:phase 'pre-check]: Remove.
> [#:phase 'check]: Replace with a new phase.
> [#:phase 'wrap-epiphany]: New phase.
> [#:configure-flags]: Remove soup2.
> [native-inputs]: Add bash-minimal.
> [inputs]: Replace gcr-3 with gcr and webkitgtk-for-gtk3 with
> webkitgtk. Add
> gstreamer, gst-plugins-base, gst-plugins-good, libadwaita. Remove
> libdazzle
> and libhandy.
>
> Change-Id: I95ab6551a1b38254191801549be9dba0abb04593
> ---
> gnu/packages/gnome.scm | 63 ++++++++++++++++++++++++++++++----------
> --
> 1 file changed, 46 insertions(+), 17 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 2958da2cd9..5fd98b336d 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,20 +7123,46 @@ (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 'wrap-epiphany
> + (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" ":" prefix (,gst-plugin-
> path)))))))
In this case it appears harmless, but I prefer suffix wraps for
GStreamer, as they allow user plugins (which use the same variable) to
be prepended.
There are some phases that already add GST_PLUGIN_SYSTEM_PATH to
inspire naming, but analogous to glib-or-gtk-wrap, we should probably
name this gst-wrap.
> #: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
> + (list bash-minimal ; for wrap-program
> + desktop-file-utils ; for update-desktop-
> database
> gettext-minimal
> `(,glib "bin") ; for glib-mkenums
> itstool
> @@ -7144,15 +7171,17 @@ (define-public epiphany
> xorg-server-for-tests))
> (inputs
> (list avahi
> - gcr-3
> + gcr
> glib-networking
> gnome-desktop
> gsettings-desktop-schemas
> + gst-plugins-base
> + gst-plugins-good
> + gstreamer
Any reason why those now became necessary? You might have to split
this into two parts if it's not related to the update.
> 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
>
> base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
Cheers
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#67162] [PATCH gnome-team v4] gnu: epiphany: Update to 44.7.
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v4] " Vivien Kraus via Guix-patches via
@ 2023-11-16 7:56 ` Liliana Marie Prikler
0 siblings, 0 replies; 8+ messages in thread
From: Liliana Marie Prikler @ 2023-11-16 7:56 UTC (permalink / raw)
To: Vivien Kraus; +Cc: 67162, maxim.cournoyer, rg
Am Dienstag, dem 14.11.2023 um 12:03 +0100 schrieb Vivien Kraus:
> 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.
> <wrap-epiphany>: 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.
Don't forget to update your ChangeLogs :)
^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#67162: [PATCH gnome-team v5] gnu: epiphany: Update to 44.7.
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v5] " Vivien Kraus via Guix-patches via
@ 2024-01-07 17:39 ` Liliana Marie Prikler
0 siblings, 0 replies; 8+ messages in thread
From: Liliana Marie Prikler @ 2024-01-07 17:39 UTC (permalink / raw)
To: Vivien Kraus; +Cc: rg, 67162-done, maxim.cournoyer
Am Dienstag, dem 14.11.2023 um 12:03 +0100 schrieb Vivien Kraus:
> 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 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
> ---
Pushed at last, with only minor changes to the commit message.
Sorry for taking so long.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-01-07 17:41 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-14 11:03 [bug#67162] [PATCH] gnu: epiphany: Update to 44.7 Vivien Kraus via Guix-patches via
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v4] " Vivien Kraus via Guix-patches via
2023-11-16 7:56 ` Liliana Marie Prikler
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v2] " Vivien Kraus via Guix-patches via
2023-11-15 5:27 ` Liliana Marie Prikler
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v5] " Vivien Kraus via Guix-patches via
2024-01-07 17:39 ` bug#67162: " Liliana Marie Prikler
2023-11-14 11:03 ` [bug#67162] [PATCH gnome-team v3] " Vivien Kraus via Guix-patches via
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.