* [bug#73643] [PATCH 0/2] Fix LibreWolf context menu & livestreaming
@ 2024-10-05 16:12 Ian Eure
2024-10-05 16:19 ` [bug#73643] [PATCH 1/2] gnu: librewolf: Fix broken context menu Ian Eure
2024-10-08 7:39 ` bug#73643: [PATCH 0/2] Fix LibreWolf context menu & livestreaming Maxim Cournoyer
0 siblings, 2 replies; 4+ messages in thread
From: Ian Eure @ 2024-10-05 16:12 UTC (permalink / raw)
To: 73643; +Cc: Ian Eure
After #73429 merged, I received reports of two problems:
- The right-click context menu has manu duplicate and broken entries. This was caused by removing the genai module, but retaining code in the chrome which references it. Until I find a better approach to this, I’ve reverted the change.
- Livestreamed video wouldn’t play. This was caused by the patch from #72265. I’ve reverted this, and will look into other approaches.
Ian Eure (2):
gnu: librewolf: Fix broken context menu.
gnu: librewolf: Revert video acceleration fix
gnu/packages/librewolf.scm | 25 +++++++++++++------
...librewolf-add-paths-to-rdd-allowlist.patch | 11 --------
2 files changed, 17 insertions(+), 19 deletions(-)
delete mode 100644 gnu/packages/patches/librewolf-add-paths-to-rdd-allowlist.patch
--
2.46.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#73643] [PATCH 1/2] gnu: librewolf: Fix broken context menu.
2024-10-05 16:12 [bug#73643] [PATCH 0/2] Fix LibreWolf context menu & livestreaming Ian Eure
@ 2024-10-05 16:19 ` Ian Eure
2024-10-05 16:19 ` [bug#73643] [PATCH 2/2] gnu: librewolf: Revert video acceleration fix Ian Eure
2024-10-08 7:39 ` bug#73643: [PATCH 0/2] Fix LibreWolf context menu & livestreaming Maxim Cournoyer
1 sibling, 1 reply; 4+ messages in thread
From: Ian Eure @ 2024-10-05 16:19 UTC (permalink / raw)
To: 73643; +Cc: Ian Eure
This patch fixes a reported bug where context (right-click) menus contain many
duplicate and incorrect entries.
* gnu/packages/librewolf.scm (librewolf): Include genai browser component.
Change-Id: I288545ce80b9a7e854edfc26a7ffe43433303458
---
gnu/packages/librewolf.scm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 6fd0aa51f1..32b6d13d54 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -212,7 +212,7 @@ (define rust-librewolf rust) ; 1.75 is the default in Guix, 1.65 is the minimum.
;; Update this id with every update to its release date.
;; It's used for cache validation and therefore can lead to strange bugs.
;; ex: date '+%Y%m%d%H%M%S'
-(define %librewolf-build-id "20240922110507")
+(define %librewolf-build-id "20241003201141")
(define-public librewolf
(package
@@ -324,9 +324,6 @@ (define (write-setting key value)
libavcodec)))))
(add-after 'unpack 'neuter-genai
(lambda* _
- ;; Don't compile the code in.
- (substitute* "browser/components/moz.build"
- (("\"genai\",") ""))
;; Lock the preferences so they can't be enabled.
(substitute* "lw/librewolf.cfg"
(("defaultPref\\(\"browser\\.ml\\.")
--
2.46.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#73643] [PATCH 2/2] gnu: librewolf: Revert video acceleration fix
2024-10-05 16:19 ` [bug#73643] [PATCH 1/2] gnu: librewolf: Fix broken context menu Ian Eure
@ 2024-10-05 16:19 ` Ian Eure
0 siblings, 0 replies; 4+ messages in thread
From: Ian Eure @ 2024-10-05 16:19 UTC (permalink / raw)
To: 73643; +Cc: Ian Eure
This patch partly reverts #73429, because that change makes livestreaming
video refuse to play.
* gnu/packages/librewolf.scm (librewolf): Revert video acceleration fix
Change-Id: Iaf36c64464cd078538fda677ea4fa7b13e7c110f
---
gnu/packages/librewolf.scm | 22 ++++++++++++++-----
...librewolf-add-paths-to-rdd-allowlist.patch | 11 ----------
2 files changed, 17 insertions(+), 16 deletions(-)
delete mode 100644 gnu/packages/patches/librewolf-add-paths-to-rdd-allowlist.patch
diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 32b6d13d54..31de7a7171 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -212,7 +212,7 @@ (define rust-librewolf rust) ; 1.75 is the default in Guix, 1.65 is the minimum.
;; Update this id with every update to its release date.
;; It's used for cache validation and therefore can lead to strange bugs.
;; ex: date '+%Y%m%d%H%M%S'
-(define %librewolf-build-id "20241003201141")
+(define %librewolf-build-id "20241005085731")
(define-public librewolf
(package
@@ -223,9 +223,7 @@ (define-public librewolf
(inherit (make-librewolf-source
#:version version
#:firefox-hash "0w4z3fq5zhm63a0wmhvmqrj263bvy962dir25q3z0x5hx6hjawh2"
- #:librewolf-hash "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd"))
- (patches
- (search-patches "librewolf-add-paths-to-rdd-allowlist.patch"))))
+ #:librewolf-hash "0f80pihn375bdjhjmmg2v1w96wpn76zb60ycy39wafwh1dnzybrd"))))
(build-system gnu-build-system)
(arguments
(list
@@ -592,12 +590,26 @@ (define (runpaths-of-input label)
;; For U2F and WebAuthn
"eudev")))
+ ;; VA-API is run in the RDD (Remote Data Decoder) sandbox
+ ;; and must be explicitly given access to files it needs.
+ ;; Rather than adding the whole store (as Nix had
+ ;; upstream do, see
+ ;; <https://github.com/NixOS/nixpkgs/pull/165964> and
+ ;; linked upstream patches), we can just follow the
+ ;; runpaths of the needed libraries to add everything to
+ ;; LD_LIBRARY_PATH. These will then be accessible in the
+ ;; RDD sandbox.
+ (rdd-whitelist (map (cut string-append <> "/")
+ (delete-duplicates (append-map
+ runpaths-of-input
+ '("mesa"
+ "ffmpeg")))))
(gtk-share (string-append (assoc-ref inputs
"gtk+")
"/share")))
(wrap-program (car (find-files lib "^librewolf$"))
`("LD_LIBRARY_PATH" prefix
- ,libs)
+ (,@libs ,@rdd-whitelist))
`("XDG_DATA_DIRS" prefix
(,gtk-share))
`("MOZ_LEGACY_PROFILES" =
diff --git a/gnu/packages/patches/librewolf-add-paths-to-rdd-allowlist.patch b/gnu/packages/patches/librewolf-add-paths-to-rdd-allowlist.patch
deleted file mode 100644
index 1bee0bddf5..0000000000
--- a/gnu/packages/patches/librewolf-add-paths-to-rdd-allowlist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
-+++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp
-@@ -920,6 +920,8 @@
- policy->AddDir(rdonly, "/usr/lib64");
- policy->AddDir(rdonly, "/run/opengl-driver/lib");
- policy->AddDir(rdonly, "/nix/store");
-+ policy->AddDir(rdonly, "/gnu/store");
-+ policy->AddDir(rdonly, "/run/current-system/profile/lib");
-
- // Bug 1647957: memory reporting.
- AddMemoryReporting(policy.get(), aPid);
--
2.46.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#73643: [PATCH 0/2] Fix LibreWolf context menu & livestreaming
2024-10-05 16:12 [bug#73643] [PATCH 0/2] Fix LibreWolf context menu & livestreaming Ian Eure
2024-10-05 16:19 ` [bug#73643] [PATCH 1/2] gnu: librewolf: Fix broken context menu Ian Eure
@ 2024-10-08 7:39 ` Maxim Cournoyer
1 sibling, 0 replies; 4+ messages in thread
From: Maxim Cournoyer @ 2024-10-08 7:39 UTC (permalink / raw)
To: Ian Eure; +Cc: 73643-done
Hi Ian,
Ian Eure <ian@retrospec.tv> writes:
> After #73429 merged, I received reports of two problems:
>
> - The right-click context menu has manu duplicate and broken entries. This was caused by removing the genai module, but retaining code in the chrome which references it. Until I find a better approach to this, I’ve reverted the change.
> - Livestreamed video wouldn’t play. This was caused by the patch from #72265. I’ve reverted this, and will look into other approaches.
>
> Ian Eure (2):
> gnu: librewolf: Fix broken context menu.
> gnu: librewolf: Revert video acceleration fix
I've pushed these two fixes, un-registering the removed patch from
gnu/local.mk and refining the ChangeLog commit messages; please take
a look!
Thanks for the fix-up.
--
Maxim
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-08 7:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-05 16:12 [bug#73643] [PATCH 0/2] Fix LibreWolf context menu & livestreaming Ian Eure
2024-10-05 16:19 ` [bug#73643] [PATCH 1/2] gnu: librewolf: Fix broken context menu Ian Eure
2024-10-05 16:19 ` [bug#73643] [PATCH 2/2] gnu: librewolf: Revert video acceleration fix Ian Eure
2024-10-08 7:39 ` bug#73643: [PATCH 0/2] Fix LibreWolf context menu & livestreaming Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).