public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/firefox] f43: Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
@ 2026-09-10 9:33 Martin Stransky
0 siblings, 0 replies; 2+ messages in thread
From: Martin Stransky @ 2026-09-10 9:33 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/firefox
Branch : f43
Commit : c2c5302bc41fa4011b9ca8fe4e5b73f68376c9be
Author : Martin Stransky <stransky@redhat.com>
Date : 2026-09-10T11:30:39+02:00
Stats : +197/-273 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/firefox/c/c2c5302bc41fa4011b9ca8fe4e5b73f68376c9be?branch=f43
Log:
Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
---
diff --git a/D318191.1787388141.diff b/D318191.1787388141.diff
deleted file mode 100644
index c3a43e3..0000000
--- a/D318191.1787388141.diff
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -up firefox-155.0/gfx/gl/gtest/moz.build.D318191 firefox-155.0/gfx/gl/gtest/moz.build
---- firefox-155.0/gfx/gl/gtest/moz.build.D318191 2026-08-26 23:11:41.000000000 +0200
-+++ firefox-155.0/gfx/gl/gtest/moz.build 2026-08-27 11:24:19.402580859 +0200
-@@ -6,8 +6,15 @@ LOCAL_INCLUDES += [
- "/gfx/gl",
- ]
-
-+include("/ipc/chromium/chromium-config.mozbuild")
-+
- UNIFIED_SOURCES += [
- "TestColorspaces.cpp",
- ]
-
-+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-+ UNIFIED_SOURCES += [
-+ "TestMozFramebuffer.cpp",
-+ ]
-+
- FINAL_LIBRARY = "xul-gtest"
-diff -up firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp
---- firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 2026-08-27 11:24:19.402718907 +0200
-+++ firefox-155.0/gfx/gl/gtest/TestMozFramebuffer.cpp 2026-08-27 11:24:19.402718907 +0200
-@@ -0,0 +1,82 @@
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#include "GLContext.h"
-+#include "GLContextProvider.h"
-+#include "MozFramebuffer.h"
-+#include "ScopedGLHelpers.h"
-+#include "gfxPlatform.h"
-+#include "gtest/gtest.h"
-+
-+namespace mozilla::gl {
-+
-+static already_AddRefed<GLContext> CreateTestContext(
-+ nsACString* const aFailureId) {
-+ return GLContextProvider::CreateHeadless({}, aFailureId);
-+}
-+
-+TEST(MozFramebuffer, OwnedColorBackingIsDeletedWithFramebuffer)
-+{
-+ gfxPlatform::GetPlatform();
-+
-+ nsCString failureId;
-+ RefPtr<GLContext> gl = CreateTestContext(&failureId);
-+ ASSERT_TRUE(gl)
-+ << failureId.get();
-+ ASSERT_TRUE(gl->MakeCurrent());
-+
-+ const gfx::IntSize size(16, 16);
-+ GLuint texture = gl->CreateTexture();
-+ {
-+ const ScopedBindTexture bindTexture(gl, texture);
-+ gl->TexParams_SetClampNoMips(LOCAL_GL_TEXTURE_2D);
-+ gl->fTexImage2D(LOCAL_GL_TEXTURE_2D, 0, LOCAL_GL_RGBA, size.width,
-+ size.height, 0, LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE,
-+ nullptr);
-+ }
-+ ASSERT_TRUE(gl->fIsTexture(texture));
-+
-+ {
-+ auto framebuffer = MozFramebuffer::CreateForBacking(
-+ gl, size, 0, false, false, LOCAL_GL_TEXTURE_2D, texture);
-+ ASSERT_TRUE(framebuffer);
-+ }
-+
-+ EXPECT_FALSE(gl->fIsTexture(texture));
-+}
-+
-+TEST(MozFramebuffer, BorrowedColorBackingSurvivesFramebufferDestruction)
-+{
-+ gfxPlatform::GetPlatform();
-+
-+ nsCString failureId;
-+ RefPtr<GLContext> gl = CreateTestContext(&failureId);
-+ ASSERT_TRUE(gl)
-+ << failureId.get();
-+ ASSERT_TRUE(gl->MakeCurrent());
-+
-+ const gfx::IntSize size(16, 16);
-+ GLuint texture = gl->CreateTexture();
-+ {
-+ const ScopedBindTexture bindTexture(gl, texture);
-+ gl->TexParams_SetClampNoMips(LOCAL_GL_TEXTURE_2D);
-+ gl->fTexImage2D(LOCAL_GL_TEXTURE_2D, 0, LOCAL_GL_RGBA, size.width,
-+ size.height, 0, LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE,
-+ nullptr);
-+ }
-+ ASSERT_TRUE(gl->fIsTexture(texture));
-+
-+ {
-+ auto framebuffer = MozFramebuffer::CreateForBacking(
-+ gl, size, 0, false, false, LOCAL_GL_TEXTURE_2D, texture,
-+ MozFramebuffer::ColorBackingOwnership::Borrowed);
-+ ASSERT_TRUE(framebuffer);
-+ EXPECT_EQ(framebuffer->ColorTex(), texture);
-+ }
-+
-+ EXPECT_TRUE(gl->fIsTexture(texture));
-+ gl->DeleteTexture(texture);
-+}
-+
-+} // namespace mozilla::gl
-diff -up firefox-155.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-155.0/gfx/gl/MozFramebuffer.cpp
---- firefox-155.0/gfx/gl/MozFramebuffer.cpp.D318191 2026-08-26 23:11:40.000000000 +0200
-+++ firefox-155.0/gfx/gl/MozFramebuffer.cpp 2026-08-27 11:29:08.891005510 +0200
-@@ -69,37 +69,41 @@ UniquePtr<MozFramebuffer> MozFramebuffer
- (depth || stencil) ? DepthAndStencilBuffer::Create(
- gl, size, samples, depth, stencil)
- : nullptr,
-- colorTarget, colorName);
-+ colorTarget, colorName,
-+ ColorBackingOwnership::Owned);
- }
-
- UniquePtr<MozFramebuffer> MozFramebuffer::CreateForBacking(
- GLContext* const gl, const gfx::IntSize& size, const uint32_t samples,
- bool depth, bool stencil, const GLenum colorTarget,
-- const GLuint colorName) {
-+ const GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership) {
- return CreateImpl(gl, size, samples,
- (depth || stencil) ? DepthAndStencilBuffer::Create(
- gl, size, samples, depth, stencil)
- : nullptr,
-- colorTarget, colorName);
-+ colorTarget, colorName, colorBackingOwnership);
- }
-
- /* static */ UniquePtr<MozFramebuffer>
- MozFramebuffer::CreateForBackingWithSharedDepthAndStencil(
- const gfx::IntSize& size, const uint32_t samples, GLenum colorTarget,
- GLuint colorName,
-- const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer) {
-+ const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer,
-+ ColorBackingOwnership colorBackingOwnership) {
- auto gl = depthAndStencilBuffer->gl();
- if (!gl || !gl->MakeCurrent()) {
- return nullptr;
- }
- return CreateImpl(gl, size, samples, depthAndStencilBuffer, colorTarget,
-- colorName);
-+ colorName, colorBackingOwnership);
- }
-
- /* static */ UniquePtr<MozFramebuffer> MozFramebuffer::CreateImpl(
- GLContext* const gl, const gfx::IntSize& size, const uint32_t samples,
- const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer,
-- const GLenum colorTarget, const GLuint colorName) {
-+ const GLenum colorTarget, const GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership) {
- GLuint fb = gl->CreateFramebuffer();
- const ScopedBindFramebuffer bindFB(gl, fb);
-
-@@ -137,7 +141,8 @@ MozFramebuffer::CreateForBackingWithShar
- }
-
- return UniquePtr<MozFramebuffer>(new MozFramebuffer(
-- gl, size, fb, samples, depthAndStencilBuffer, colorTarget, colorName));
-+ gl, size, fb, samples, depthAndStencilBuffer, colorTarget, colorName,
-+ colorBackingOwnership));
- }
-
- /* static */ RefPtr<DepthAndStencilBuffer> DepthAndStencilBuffer::Create(
-@@ -187,14 +192,16 @@ MozFramebuffer::CreateForBackingWithShar
- MozFramebuffer::MozFramebuffer(
- GLContext* const gl, const gfx::IntSize& size, GLuint fb,
- const uint32_t samples, RefPtr<DepthAndStencilBuffer> depthAndStencilBuffer,
-- const GLenum colorTarget, const GLuint colorName)
-+ const GLenum colorTarget, const GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership)
- : mWeakGL(gl),
- mSize(size),
- mSamples(samples),
- mFB(fb),
- mColorTarget(colorTarget),
- mDepthAndStencilBuffer(std::move(depthAndStencilBuffer)),
-- mColorName(colorName) {
-+ mColorName(colorName),
-+ mColorBackingOwnership(colorBackingOwnership) {
- MOZ_ASSERT(mColorTarget);
- MOZ_ASSERT(mColorName);
- }
-@@ -207,7 +214,9 @@ MozFramebuffer::~MozFramebuffer() {
-
- gl->DeleteFramebuffer(mFB);
-
-- DeleteByTarget(gl, mColorTarget, mColorName);
-+ if (mColorBackingOwnership == ColorBackingOwnership::Owned) {
-+ DeleteByTarget(gl, mColorTarget, mColorName);
-+ }
- }
-
- bool MozFramebuffer::HasDepth() const {
-diff -up firefox-155.0/gfx/gl/MozFramebuffer.h.D318191 firefox-155.0/gfx/gl/MozFramebuffer.h
---- firefox-155.0/gfx/gl/MozFramebuffer.h.D318191 2026-08-26 23:11:41.000000000 +0200
-+++ firefox-155.0/gfx/gl/MozFramebuffer.h 2026-08-27 11:26:51.124546166 +0200
-@@ -43,7 +43,13 @@ class DepthAndStencilBuffer final : publ
- };
-
- class MozFramebuffer final {
-+ public:
-+ // A borrowed color backing must outlive the MozFramebuffer that wraps it.
-+ enum class ColorBackingOwnership { Owned, Borrowed };
-+
-+ private:
- const WeakPtr<GLContext> mWeakGL;
-+ const ColorBackingOwnership mColorBackingOwnership;
-
- public:
- const gfx::IntSize mSize;
-@@ -66,7 +72,9 @@ class MozFramebuffer final {
- // Assumes that gl is the current context.
- static UniquePtr<MozFramebuffer> CreateForBacking(
- GLContext* gl, const gfx::IntSize& size, uint32_t samples, bool depth,
-- bool stencil, GLenum colorTarget, GLuint colorName);
-+ bool stencil, GLenum colorTarget, GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership =
-+ ColorBackingOwnership::Owned);
-
- // Create a new framebuffer backed by an existing texture or buffer.
- // Use the same GLContext, size, and samples as framebufferToShareWith.
-@@ -76,19 +84,23 @@ class MozFramebuffer final {
- static UniquePtr<MozFramebuffer> CreateForBackingWithSharedDepthAndStencil(
- const gfx::IntSize& size, const uint32_t samples, GLenum colorTarget,
- GLuint colorName,
-- const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer);
-+ const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer,
-+ ColorBackingOwnership colorBackingOwnership =
-+ ColorBackingOwnership::Owned);
-
- private:
- MozFramebuffer(GLContext* gl, const gfx::IntSize& size, GLuint fb,
- uint32_t samples,
- RefPtr<DepthAndStencilBuffer> depthAndStencilBuffer,
-- GLenum colorTarget, GLuint colorName);
-+ GLenum colorTarget, GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership);
-
- // gl must be the current context when this is called.
- static UniquePtr<MozFramebuffer> CreateImpl(
- GLContext* const gl, const gfx::IntSize& size, const uint32_t samples,
- const RefPtr<DepthAndStencilBuffer>& depthAndStencilBuffer,
-- const GLenum colorTarget, const GLuint colorName);
-+ const GLenum colorTarget, const GLuint colorName,
-+ ColorBackingOwnership colorBackingOwnership);
-
- public:
- ~MozFramebuffer();
-diff -up firefox-155.0/gfx/layers/SurfacePoolWayland.cpp.D318191 firefox-155.0/gfx/layers/SurfacePoolWayland.cpp
---- firefox-155.0/gfx/layers/SurfacePoolWayland.cpp.D318191 2026-08-26 23:11:40.000000000 +0200
-+++ firefox-155.0/gfx/layers/SurfacePoolWayland.cpp 2026-08-27 11:30:02.112072624 +0200
-@@ -296,7 +296,8 @@ UniquePtr<MozFramebuffer> SurfacePoolWay
- // framebuffer that shares it.
- if (auto buffer = GetDepthBufferForSharing(aProofOfLock, aGL, aSize)) {
- return MozFramebuffer::CreateForBackingWithSharedDepthAndStencil(
-- aSize, 0, LOCAL_GL_TEXTURE_2D, aTexture, buffer);
-+ aSize, 0, LOCAL_GL_TEXTURE_2D, aTexture, buffer,
-+ MozFramebuffer::ColorBackingOwnership::Borrowed);
- }
- }
-
-@@ -305,7 +306,7 @@ UniquePtr<MozFramebuffer> SurfacePoolWay
- // mDepthBuffers.
- UniquePtr<MozFramebuffer> fb = MozFramebuffer::CreateForBacking(
- aGL, aSize, 0, aNeedsDepthBuffer, aNeedsDepthBuffer, LOCAL_GL_TEXTURE_2D,
-- aTexture);
-+ aTexture, MozFramebuffer::ColorBackingOwnership::Borrowed);
- if (fb && fb->GetDepthAndStencilBuffer()) {
- mDepthBuffers.AppendElement(
- DepthBufferEntry{aGL, aSize, fb->GetDepthAndStencilBuffer().get()});
diff --git a/D324870.1789116963.diff b/D324870.1789116963.diff
new file mode 100644
index 0000000..10475b5
--- /dev/null
+++ b/D324870.1789116963.diff
@@ -0,0 +1,84 @@
+diff --git a/widget/gtk/nsWindowWayland.h b/widget/gtk/nsWindowWayland.h
+--- a/widget/gtk/nsWindowWayland.h
++++ b/widget/gtk/nsWindowWayland.h
+@@ -234,11 +234,11 @@
+
+ RefPtr<mozilla::WaylandVsyncSource> mWaylandVsyncSource;
+ RefPtr<mozilla::VsyncDispatcher> mWaylandVsyncDispatcher;
+ LayoutDeviceIntPoint mNativeLockedPoint;
+ xdg_toplevel_session_v1* mSessionRestoreToken = nullptr;
+- nsString mSessionID;
++ nsString mWorkspaceID;
+
+ gulong mXdgToplevelRealizedID = 0;
+
+ zwp_locked_pointer_v1* mLockedPointer = nullptr;
+ zwp_relative_pointer_v1* mRelativePointer = nullptr;
+diff --git a/widget/gtk/nsWindowWayland.cpp b/widget/gtk/nsWindowWayland.cpp
+--- a/widget/gtk/nsWindowWayland.cpp
++++ b/widget/gtk/nsWindowWayland.cpp
+@@ -111,11 +111,11 @@
+ LOG("nsWindowWayland::CreateRestoreSession(): failed to get restore "
+ "session, quit.");
+ return false;
+ }
+
+- NS_ConvertUTF16toUTF8 id(mSessionID);
++ NS_ConvertUTF16toUTF8 id(mWorkspaceID);
+ if (aRestoreWindow) {
+ mSessionRestoreToken =
+ xdg_session_v1_restore_toplevel(session, toplevel, id.get());
+ } else {
+ mSessionRestoreToken =
+@@ -126,17 +126,17 @@
+ id.get(), aRestoreWindow, mSessionRestoreToken);
+ return !!mSessionRestoreToken;
+ }
+
+ void nsWindowWayland::GetWorkspaceID(nsAString& workspaceID) {
+- if (mSessionID.IsEmpty() && !GenerateWorkspaceID(mSessionID)) {
++ if (mWorkspaceID.IsEmpty() && !GenerateWorkspaceID(mWorkspaceID)) {
+ return;
+ }
+- workspaceID.Assign(mSessionID);
++ workspaceID.Assign(mWorkspaceID);
+
+ LOG("nsWindowWayland::GetWorkspaceID() ID %s token %p",
+- NS_ConvertUTF16toUTF8(mSessionID).get(), mSessionRestoreToken);
++ NS_ConvertUTF16toUTF8(mWorkspaceID).get(), mSessionRestoreToken);
+
+ if (mSessionRestoreToken) {
+ return;
+ }
+
+@@ -154,11 +154,11 @@
+ };
+ #endif
+
+ void nsWindowWayland::RestoreXdgToplevel() {
+ LOG("nsWindowWayland::RestoreXdgToplevel() ID %s GdkWindow [%p]",
+- NS_ConvertUTF16toUTF8(mSessionID).get(), GetToplevelGdkWindow());
++ NS_ConvertUTF16toUTF8(mWorkspaceID).get(), GetToplevelGdkWindow());
+ if (CreateRestoreSession(/* aRestoreWindow */ true)) {
+ #ifdef MOZ_LOGGING
+ if (LOG_ENABLED()) {
+ xdg_toplevel_session_v1_add_listener(mSessionRestoreToken,
+ &sSessionListener, this);
+@@ -166,14 +166,14 @@
+ #endif
+ }
+ }
+
+ void nsWindowWayland::MoveToWorkspace(const nsAString& workspaceIDStr) {
+- mSessionID.Assign(workspaceIDStr);
++ mWorkspaceID.Assign(workspaceIDStr);
+ LOG("nsWindowWayland::MoveToWorkspace() session ID %s "
+ "mWaitingToSessionRestore %d mNeedsShow %d",
+- NS_ConvertUTF16toUTF8(mSessionID).get(), mWaitingToSessionRestore,
++ NS_ConvertUTF16toUTF8(mWorkspaceID).get(), mWaitingToSessionRestore,
+ mNeedsShow);
+ if (!mWaitingToSessionRestore) {
+ return;
+ }
+ mWaitingToSessionRestore = false;
+
diff --git a/D324871.1789116972.diff b/D324871.1789116972.diff
new file mode 100644
index 0000000..054dd2a
--- /dev/null
+++ b/D324871.1789116972.diff
@@ -0,0 +1,77 @@
+diff --git a/widget/gtk/nsWindowWayland.cpp b/widget/gtk/nsWindowWayland.cpp
+--- a/widget/gtk/nsWindowWayland.cpp
++++ b/widget/gtk/nsWindowWayland.cpp
+@@ -55,30 +55,31 @@
+
+ Likewise we use GetWorkspaceID() to create/save the xdg_toplevel session
+ for later restore.
+ */
+
+-bool GenerateWorkspaceID(nsAString& aName) {
++// Make the GenerateWorkspaceID() failures fatal as missing workspace ID
++// leads to broken profile (Bug 2059617).
++static void GenerateWorkspaceID(nsAString& aName) {
+ nsresult rv;
+ nsCOMPtr<nsIUUIDGenerator> uuidGenerator =
+ do_GetService("@mozilla.org/uuid-generator;1", &rv);
+- if (NS_WARN_IF(NS_FAILED(rv))) {
+- return false;
++ if (NS_FAILED(rv)) {
++ MOZ_CRASH("Missing component!");
+ }
+
+ nsID id;
+ rv = uuidGenerator->GenerateUUIDInPlace(&id);
+- if (NS_WARN_IF(NS_FAILED(rv))) {
+- return false;
++ if (NS_FAILED(rv)) {
++ MOZ_CRASH("GenerateUUIDInPlace() failed!");
+ }
+
+ char chars[NSID_LENGTH];
+ id.ToProvidedString(chars);
+
+ // NSID_LENGTH counts the null terminator.
+ aName.AssignASCII(chars, NSID_LENGTH - 1);
+- return true;
+ }
+
+ static struct xdg_toplevel* GetXdgToplevelFromGdkWindow(GdkWindow* aWindow) {
+ static auto sGdkWaylandWindowGetXdgToplevel =
+ (struct xdg_toplevel * (*)(GdkWindow*))
+@@ -111,10 +112,19 @@
+ LOG("nsWindowWayland::CreateRestoreSession(): failed to get restore "
+ "session, quit.");
+ return false;
+ }
+
++ // If we have old profile / workspace ID just replace it by
++ // UUID to avoid protocol error crash (Bug 2059617).
++ nsresult ret;
++ (void)mWorkspaceID.ToInteger(&ret);
++ if (NS_SUCCEEDED(ret)) {
++ GenerateWorkspaceID(mWorkspaceID);
++ aRestoreWindow = false;
++ }
++
+ NS_ConvertUTF16toUTF8 id(mWorkspaceID);
+ if (aRestoreWindow) {
+ mSessionRestoreToken =
+ xdg_session_v1_restore_toplevel(session, toplevel, id.get());
+ } else {
+@@ -126,12 +136,12 @@
+ id.get(), aRestoreWindow, mSessionRestoreToken);
+ return !!mSessionRestoreToken;
+ }
+
+ void nsWindowWayland::GetWorkspaceID(nsAString& workspaceID) {
+- if (mWorkspaceID.IsEmpty() && !GenerateWorkspaceID(mWorkspaceID)) {
+- return;
++ if (mWorkspaceID.IsEmpty()) {
++ GenerateWorkspaceID(mWorkspaceID);
+ }
+ workspaceID.Assign(mWorkspaceID);
+
+ LOG("nsWindowWayland::GetWorkspaceID() ID %s token %p",
+ NS_ConvertUTF16toUTF8(mWorkspaceID).get(), mSessionRestoreToken);
+
diff --git a/D324876.1789116899.diff b/D324876.1789116899.diff
new file mode 100644
index 0000000..0f7b148
--- /dev/null
+++ b/D324876.1789116899.diff
@@ -0,0 +1,19 @@
+diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
+--- a/widget/gtk/nsAppShell.cpp
++++ b/widget/gtk/nsAppShell.cpp
+@@ -624,10 +624,14 @@
+ }
+ if (!StaticPrefs::widget_wayland_session_management_enabled_AtStartup()) {
+ LOGW("nsAppShell::IsSessionRestoreSupported(): disabled by pref.");
+ return false;
+ }
++ if (IsGnomeDesktopEnvironment()) {
++ LOGW("nsAppShell::IsSessionRestoreSupported(): disabled due to Bug 2070815.");
++ return false;
++ }
+
+ GType waylandWindowType = g_type_from_name("GdkWaylandWindow");
+ bool supported =
+ waylandWindowType &&
+ g_signal_lookup("xdg-toplevel-realized", waylandWindowType);
+
diff --git a/D324877.1789117000.diff b/D324877.1789117000.diff
new file mode 100644
index 0000000..5be8d62
--- /dev/null
+++ b/D324877.1789117000.diff
@@ -0,0 +1,17 @@
+diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
+--- a/modules/libpref/init/StaticPrefList.yaml
++++ b/modules/libpref/init/StaticPrefList.yaml
+@@ -20896,11 +20896,11 @@
+ mirror: always
+
+ # Use xdg-session-management-v1 for session restore on Wayland.
+ - name: widget.wayland.session-management.enabled
+ type: bool
+- value: @IS_EARLY_BETA_OR_EARLIER@
++ value: true
+ mirror: once
+
+ # Use native D&D session type on Wayland instead of Gtk.
+ # Recently disabled due compositor bugs (Bug 2046911).
+ - name: widget.wayland.native-data-session
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [rpms/firefox] f43: Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
@ 2026-08-21 12:39 Martin Stransky
0 siblings, 0 replies; 2+ messages in thread
From: Martin Stransky @ 2026-08-21 12:39 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/firefox
Branch : f43
Commit : af7eb607f60e09c97548ee12d1a3e750fe35409d
Author : Martin Stransky <stransky@redhat.com>
Date : 2026-08-21T14:29:28+02:00
Stats : +16/-14 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/firefox/c/af7eb607f60e09c97548ee12d1a3e750fe35409d?branch=f43
Log:
Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
---
diff --git a/D318191.1787388141.diff b/D318191.1787388141.diff
index 465d936..83e222d 100644
--- a/D318191.1787388141.diff
+++ b/D318191.1787388141.diff
@@ -1,6 +1,6 @@
diff -up firefox-154.0/gfx/gl/gtest/moz.build.D318191 firefox-154.0/gfx/gl/gtest/moz.build
--- firefox-154.0/gfx/gl/gtest/moz.build.D318191 2026-08-12 23:13:26.000000000 +0200
-+++ firefox-154.0/gfx/gl/gtest/moz.build 2026-08-21 10:46:40.907696298 +0200
++++ firefox-154.0/gfx/gl/gtest/moz.build 2026-08-21 12:20:33.454753264 +0200
@@ -6,8 +6,15 @@ LOCAL_INCLUDES += [
"/gfx/gl",
]
@@ -18,8 +18,8 @@ diff -up firefox-154.0/gfx/gl/gtest/moz.build.D318191 firefox-154.0/gfx/gl/gtest
+
FINAL_LIBRARY = "xul-gtest"
diff -up firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp
---- firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 2026-08-21 10:46:40.907621345 +0200
-+++ firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp 2026-08-21 10:46:40.907612718 +0200
+--- firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 2026-08-21 12:20:33.454831890 +0200
++++ firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp 2026-08-21 12:20:33.454831890 +0200
@@ -0,0 +1,82 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -105,7 +105,7 @@ diff -up firefox-154.0/gfx/gl/gtest/TestMozFramebuffer.cpp.D318191 firefox-154.0
+} // namespace mozilla::gl
diff -up firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/MozFramebuffer.cpp
--- firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 2026-08-12 23:13:27.000000000 +0200
-+++ firefox-154.0/gfx/gl/MozFramebuffer.cpp 2026-08-21 10:50:28.692698450 +0200
++++ firefox-154.0/gfx/gl/MozFramebuffer.cpp 2026-08-21 12:20:33.454934471 +0200
@@ -67,35 +67,38 @@ UniquePtr<MozFramebuffer> MozFramebuffer
return CreateImpl(
gl, size, samples,
@@ -193,8 +193,8 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.cpp.D318191 firefox-154.0/gfx/gl/Mo
bool MozFramebuffer::HasDepth() const {
diff -up firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 firefox-154.0/gfx/gl/MozFramebuffer.h
--- firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 2026-08-12 23:13:27.000000000 +0200
-+++ firefox-154.0/gfx/gl/MozFramebuffer.h 2026-08-21 10:51:52.430220791 +0200
-@@ -42,6 +42,11 @@ class DepthAndStencilBuffer final : publ
++++ firefox-154.0/gfx/gl/MozFramebuffer.h 2026-08-21 13:22:27.412567385 +0200
+@@ -42,7 +42,13 @@ class DepthAndStencilBuffer final : publ
};
class MozFramebuffer final {
@@ -204,9 +204,11 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 firefox-154.0/gfx/gl/MozF
+
+ private:
const WeakPtr<GLContext> mWeakGL;
++ const ColorBackingOwnership mColorBackingOwnership;
public:
-@@ -64,7 +69,9 @@ class MozFramebuffer final {
+ const gfx::IntSize mSize;
+@@ -64,7 +70,9 @@ class MozFramebuffer final {
// Assumes that gl is the current context.
static UniquePtr<MozFramebuffer> CreateForBacking(
GLContext* gl, const gfx::IntSize& size, uint32_t samples,
@@ -217,7 +219,7 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 firefox-154.0/gfx/gl/MozF
// Create a new framebuffer backed by an existing texture or buffer.
// Use the same GLContext, size, and samples as framebufferToShareWith.
-@@ -74,19 +81,23 @@ class MozFramebuffer final {
+@@ -74,19 +82,23 @@ class MozFramebuffer final {
static UniquePtr<MozFramebuffer> CreateForBackingWithSharedDepthAndStencil(
const gfx::IntSize& size, const uint32_t samples, GLenum colorTarget,
GLuint colorName,
@@ -246,7 +248,7 @@ diff -up firefox-154.0/gfx/gl/MozFramebuffer.h.D318191 firefox-154.0/gfx/gl/MozF
~MozFramebuffer();
diff -up firefox-154.0/gfx/layers/SurfacePoolWayland.cpp.D318191 firefox-154.0/gfx/layers/SurfacePoolWayland.cpp
--- firefox-154.0/gfx/layers/SurfacePoolWayland.cpp.D318191 2026-08-12 23:13:28.000000000 +0200
-+++ firefox-154.0/gfx/layers/SurfacePoolWayland.cpp 2026-08-21 10:47:56.479614816 +0200
++++ firefox-154.0/gfx/layers/SurfacePoolWayland.cpp 2026-08-21 12:20:33.455125046 +0200
@@ -296,7 +296,8 @@ UniquePtr<MozFramebuffer> SurfacePoolWay
// framebuffer that shares it.
if (auto buffer = GetDepthBufferForSharing(aProofOfLock, aGL, aSize)) {
diff --git a/wasi.patch b/wasi.patch
index 3090070..daf7a2b 100644
--- a/wasi.patch
+++ b/wasi.patch
@@ -6,7 +6,7 @@ diff -up firefox-134.0.1/toolkit/moz.configure.wasi firefox-134.0.1/toolkit/moz.
if wasi_sysroot:
log.info("Using wasi sysroot in %s", wasi_sysroot)
- return ["--sysroot=%s" % wasi_sysroot]
-+ return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs", "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/raid/CVS/firefox/firefox-154.0-build/firefox-154.0/wasi-sdk-30/build/sysroot/install/wasi-resource-dir/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a"]
++ return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs", "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/home/komat/CVS/firefox/firefox-154.0-build/firefox-154.0/wasi-sdk-30/build/sysroot/install/wasi-resource-dir/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a"]
return []
set_config("WASI_SYSROOT", wasi_sysroot)
diff --git a/firefox.spec b/firefox.spec
index 019815a..3bf2150 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -32,11 +32,15 @@ ExcludeArch: i686
%global enable_replace_malloc 0
%endif
+%if !%{release_build}
+ %bcond wasi_sdk 0
+%else
%ifarch s390x
%bcond wasi_sdk 0
%else
%bcond wasi_sdk 1
%endif
+%endif
%bcond build_with_clang 0
%if %{with build_with_clang}
@@ -90,13 +94,9 @@ ExcludeArch: i686
%global build_with_pgo 0
%ifarch x86_64
%if %{release_build}
-%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11
-%global build_with_pgo 1
-%else
%global build_with_pgo 1
%endif
%endif
-%endif
%if 0%{?flatpak}
%global build_with_pgo 0
%endif
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-10 9:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-10 9:33 [rpms/firefox] f43: Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide Martin Stransky
-- strict thread matches above, loose matches on Subject: below --
2026-08-21 12:39 Martin Stransky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox