The package rpms/firefox.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firefox.git/commit/?id=19cba2b494....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 19cba2b4946f935f18001139fbc5fdd341b2788b
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Mar 4 12:35:58 2020 +0100
spec tweaks, disabled armv7hl
diff --git a/firefox.spec b/firefox.spec
index 418de36..6517a5e 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -5,7 +5,7 @@
%global build_with_asan 0
# Disabled arm due to rhbz#1658940
-# ExcludeArch: armv7hl
+ExcludeArch: armv7hl
# Disabled due to
https://pagure.io/fedora-infrastructure/issue/7581
ExcludeArch: s390x
# Disabled due to neon build error
@@ -22,11 +22,7 @@ ExcludeArch: s390x
%global enable_mozilla_crashreporter 0
%endif
-%if 0%{?fedora} > 31
%global system_nss 0
-%else
-%global system_nss 1
-%endif
%global system_ffi 1
%ifarch armv7hl
%global system_libvpx 1
@@ -89,7 +85,7 @@ ExcludeArch: s390x
%if %{?system_nss}
%global nspr_version 4.21
%global nspr_build_version %{nspr_version}
-%global nss_version 3.48.0
+%global nss_version 3.50
%global nss_build_version %{nss_version}
%endif
@@ -113,11 +109,14 @@ ExcludeArch: s390x
%global pre_tag .asan
%global build_with_pgo 0
%endif
+%if !%{system_nss}
+%global nss_tag .nss
+%endif
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 74.0
-Release: 1%{?dist}
+Release: 1%{?nss_tag}%{?dist}
URL:
https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0:
https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
commit d20d1ef15bd591aed3a91fbaf7268ff220eca189
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Mar 4 12:31:39 2020 +0100
removed build-missing-size_t.patch
diff --git a/build-missing-size_t.patch b/build-missing-size_t.patch
deleted file mode 100644
index 36c7a1f..0000000
--- a/build-missing-size_t.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up firefox-73.0.1/mfbt/FunctionTypeTraits.h.size_t
firefox-73.0.1/mfbt/FunctionTypeTraits.h
---- firefox-73.0.1/mfbt/FunctionTypeTraits.h.size_t 2020-02-26 11:59:48.643893199 +0100
-+++ firefox-73.0.1/mfbt/FunctionTypeTraits.h 2020-02-26 11:59:56.806921623 +0100
-@@ -10,6 +10,7 @@
- #define mozilla_FunctionTypeTraits_h
-
- #include <tuple>
-+#include <stddef.h>
-
- namespace mozilla {
-
commit 536fbf71958681e33a701351bbe62760b494830f
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Mar 4 12:30:27 2020 +0100
added mozbz#1609538
diff --git a/firefox.spec b/firefox.spec
index 0a1602d..418de36 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -184,6 +184,7 @@ Patch422: mozilla-1580174-webrtc-popup.patch
# Wayland specific upstream patches
Patch574: firefox-pipewire.patch
+Patch575: mozilla-1609538.patch
# PGO/LTO patches
Patch600: pgo.patch
@@ -388,6 +389,7 @@ This package contains results of tests executed during build.
# Wayland specific upstream patches
%patch574 -p1 -b .firefox-pipewire
+%patch575 -p1 -b .mozilla-1609538
# PGO patches
%patch600 -p1 -b .pgo
@@ -965,6 +967,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||
:
%changelog
* Tue Mar 03 2020 Martin Stransky <stransky(a)redhat.com> - 74.0-1
- Update to 74.0 Build 1
+- Added mozbz#1609538
* Mon Feb 24 2020 Martin Stransky <stransky(a)redhat.com> - 73.0.1-4
- Using pipewire-0.2 as buildrequire
diff --git a/mozilla-1609538.patch b/mozilla-1609538.patch
new file mode 100644
index 0000000..eb108db
--- /dev/null
+++ b/mozilla-1609538.patch
@@ -0,0 +1,69 @@
+diff -up firefox-74.0/widget/gtk/mozcontainer.cpp.mozilla-1609538
firefox-74.0/widget/gtk/mozcontainer.cpp
+--- firefox-74.0/widget/gtk/mozcontainer.cpp.mozilla-1609538 2020-03-02
23:04:56.000000000 +0100
++++ firefox-74.0/widget/gtk/mozcontainer.cpp 2020-03-04 12:26:05.561668537 +0100
+@@ -164,13 +164,15 @@ void moz_container_move(MozContainer* co
+
+ // wl_subsurface_set_position is actually property of parent surface
+ // which is effective when parent surface is commited.
+- wl_surface* parent_surface =
+- moz_gtk_widget_get_wl_surface(GTK_WIDGET(container));
+- if (parent_surface) {
+- wl_subsurface_set_position(container->subsurface, container->subsurface_dx,
+- container->subsurface_dy);
+- wl_surface_commit(parent_surface);
+- container->surface_position_needs_update = false;
++ wl_subsurface_set_position(container->subsurface, container->subsurface_dx,
++ container->subsurface_dy);
++ container->surface_position_needs_update = false;
++
++ GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(container));
++ if (window) {
++ GdkRectangle rect = (GdkRectangle){.width = gdk_window_get_width(window),
++ .height = gdk_window_get_height(window)};
++ gdk_window_invalidate_rect(window, &rect, false);
+ }
+ }
+
+@@ -575,11 +577,15 @@ static void moz_container_set_opaque_reg
+ gtk_widget_get_allocation(GTK_WIDGET(container), &allocation);
+
+ // Set region to mozcontainer which does not have any offset
+- wl_region* region =
+- CreateOpaqueRegionWayland(0, 0, allocation.width, allocation.height,
+- container->opaque_region_subtract_corners);
+- wl_surface_set_opaque_region(container->surface, region);
+- wl_region_destroy(region);
++ if (container->opaque_region_subtract_corners) {
++ wl_region* region =
++ CreateOpaqueRegionWayland(0, 0, allocation.width, allocation.height,
++ container->opaque_region_subtract_corners);
++ wl_surface_set_opaque_region(container->surface, region);
++ wl_region_destroy(region);
++ } else {
++ wl_surface_set_opaque_region(container->surface, nullptr);
++ }
+ }
+
+ struct wl_surface* moz_container_get_wl_surface(MozContainer* container) {
+diff -up firefox-74.0/widget/gtk/nsWindow.cpp.mozilla-1609538
firefox-74.0/widget/gtk/nsWindow.cpp
+--- firefox-74.0/widget/gtk/nsWindow.cpp.mozilla-1609538 2020-03-04 12:23:34.365414768
+0100
++++ firefox-74.0/widget/gtk/nsWindow.cpp 2020-03-04 12:23:34.368414793 +0100
+@@ -4866,10 +4866,14 @@ void nsWindow::UpdateTopLevelOpaqueRegio
+ return;
+ }
+
+- wl_region* region =
+- CreateOpaqueRegionWayland(x, y, width, height, aSubtractCorners);
+- wl_surface_set_opaque_region(surface, region);
+- wl_region_destroy(region);
++ if (!aSubtractCorners) {
++ wl_region* region =
++ CreateOpaqueRegionWayland(x, y, width, height, aSubtractCorners);
++ wl_surface_set_opaque_region(surface, region);
++ wl_region_destroy(region);
++ } else {
++ wl_surface_set_opaque_region(surface, nullptr);
++ }
+
+ GdkWindow* window = gtk_widget_get_window(mShell);
+ if (window) {
commit 807dde773296178ac026583602fb9696103a8e5b
Merge: 30ea1da fe769eb
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Mar 4 09:38:56 2020 +0100
Merge branch 'master' into f32
commit 30ea1da353c90464da5cd1088d4aa5c2ae9485f3
Author: Jan Horak <jhorak(a)redhat.com>
Date: Tue Mar 3 16:47:55 2020 +0100
Fixing pipewire on f32+ builds
diff --git a/firefox.spec b/firefox.spec
index 83f5fde..aafc264 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -233,7 +233,7 @@ BuildRequires: lld
%if 0%{?fedora} < 32
BuildRequires: pipewire-devel
%else
-BuildRequires: pipewire02-devel
+BuildRequires: pipewire0.2-devel
%endif
%if !0%{?use_bundled_cbindgen}
commit 7a8ced7da6985ce682f43001d28936433fc90ba9
Author: Jan Horak <jhorak(a)redhat.com>
Date: Tue Mar 3 16:41:48 2020 +0100
Fixing pipewire on f32+ builds
diff --git a/firefox.spec b/firefox.spec
index 26f50fc..83f5fde 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -229,7 +229,13 @@ BuildRequires: clang-libs
%if 0%{?build_with_clang}
BuildRequires: lld
%endif
+
+%if 0%{?fedora} < 32
BuildRequires: pipewire-devel
+%else
+BuildRequires: pipewire02-devel
+%endif
+
%if !0%{?use_bundled_cbindgen}
BuildRequires: cbindgen
%endif
commit c7b129f7b1e8e46826ab7d7b48e19887d10e1d30
Author: Jan Horak <jhorak(a)redhat.com>
Date: Tue Mar 3 15:31:19 2020 +0100
Bumped cbindgen
diff --git a/gen_cbindgen-vendor.sh b/gen_cbindgen-vendor.sh
index d3caeec..41e0211 100755
--- a/gen_cbindgen-vendor.sh
+++ b/gen_cbindgen-vendor.sh
@@ -12,7 +12,7 @@ to be used with 'cargo vendor' commmand.
"""
[dependencies]
-cbindgen = "0.12.0"
+cbindgen = "0.13.0"
[[bin]]
name = "dummy"
diff --git a/sources b/sources
index f425f6c..738d572 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (cbindgen-vendor.tar.xz) =
9709c47df2dfb615554c6616c1d9f94c7a408ea4382400bd9f75eae29b0819a6418b5625eb0df2508fcbbbb74672347d00a5f6557755b9dd9de7d42fb2e509c4
SHA512 (firefox-74.0.source.tar.xz) =
83fcdf1a8a702cc480314dbbef0a819f95fac2ebbe275207b052ba8d62bfa9d93dc21b25ebfc466e798933e3f7b9a3bd9afc6afc295451495bb3d8a2bf864f44
SHA512 (firefox-langpacks-74.0-20200303.tar.xz) =
3cdb50c27adaaa85d727f2a8c0c6a284092fa4af815fdfbc8d170066287b22b566d052cc8e151ed901bcebf1a5ae2f19bb68be543738d35eac4a316aadb78232
+SHA512 (cbindgen-vendor.tar.xz) =
a12d9dd45301614f3a7fcd77f61e3f731718fc418fcf84b0ac7363ef4ddd8ff60e057febef917620ac89d2d47d76b8dccfa71405935e346b849b93425732016a
commit 11bbed2d96bdec6b8c89372fd1f9b03fead54d0d
Merge: 532c760 96744c2
Author: Martin Stransky <stransky(a)redhat.com>
Date: Tue Mar 3 14:54:13 2020 +0100
fix
commit 532c76054c79497e893520dd5fc52922b4a7487f
Author: Jan Horak <jhorak(a)redhat.com>
Date: Wed Feb 26 12:04:37 2020 +0100
Trying to fix missing size_t
diff --git a/build-missing-size_t.patch b/build-missing-size_t.patch
new file mode 100644
index 0000000..36c7a1f
--- /dev/null
+++ b/build-missing-size_t.patch
@@ -0,0 +1,11 @@
+diff -up firefox-73.0.1/mfbt/FunctionTypeTraits.h.size_t
firefox-73.0.1/mfbt/FunctionTypeTraits.h
+--- firefox-73.0.1/mfbt/FunctionTypeTraits.h.size_t 2020-02-26 11:59:48.643893199 +0100
++++ firefox-73.0.1/mfbt/FunctionTypeTraits.h 2020-02-26 11:59:56.806921623 +0100
+@@ -10,6 +10,7 @@
+ #define mozilla_FunctionTypeTraits_h
+
+ #include <tuple>
++#include <stddef.h>
+
+ namespace mozilla {
+
diff --git a/firefox.spec b/firefox.spec
index ec8c995..cf15343 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -158,6 +158,7 @@ Patch47: fedora-shebang-build.patch
Patch48: build-arm-wasm.patch
Patch49: build-arm-libaom.patch
Patch50: Bug-1610814-Fix-NEON-compile-error-with-gcc-and-RGB-.patch
+Patch51: build-missing-size_t.patch
# Fedora specific patches
Patch215: firefox-enable-addons.patch
@@ -364,6 +365,7 @@ This package contains results of tests executed during build.
%patch48 -p1 -b .build-arm-wasm
%patch49 -p1 -b .build-arm-libaom
%patch50 -p1 -b .build-arm-SwizzleNEON
+%patch51 -p1 -b .build-missing-size_t
# Fedora patches
%patch215 -p1 -b .addons
commit 4e4419474507a4aeb0aecd11ed39e01a6f674342
Author: Jan Horak <jhorak(a)redhat.com>
Date: Wed Feb 26 10:11:43 2020 +0100
Fixing pipewire buildrequires
diff --git a/firefox.spec b/firefox.spec
index be209f6..ec8c995 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -233,7 +233,7 @@ BuildRequires: lld
%if 0%{?fedora} < 32
BuildRequires: pipewire-devel
%else
-BuildRequires: pipewire02-devel
+BuildRequires: pipewire0.2-devel
%endif
%if !0%{?use_bundled_cbindgen}