public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Martin Stransky <stransky@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/firefox] f45: Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
Date: Fri, 21 Aug 2026 12:39:17 GMT [thread overview]
Message-ID: <178731595760.1.10688504041326519571.rpms-firefox-af7eb607f60e@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/firefox
Branch : f45
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=f45
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
next reply other threads:[~2026-08-21 12:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-21 12:39 Martin Stransky [this message]
2026-09-10 9:33 [rpms/firefox] f45: Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide Martin Stransky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178731595760.1.10688504041326519571.rpms-firefox-af7eb607f60e@fedoraproject.org \
--to=stransky@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox