Merge branch 'rawhide' of ssh://pkgs.fedoraproject.org/rpms/firefox into rawhide
This commit is contained in:
commit
29ecde0d62
76
firefox-112.0-commasplit.patch
Normal file
76
firefox-112.0-commasplit.patch
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
--- firefox-111.0.1/build/moz.configure/rust.configure 2023-03-21 06:16:03.000000000 -0700
|
||||||
|
+++ firefox-111.0.1/build/moz.configure/rust.configure.new 2023-04-05 08:57:29.403219120 -0700
|
||||||
|
@@ -593,7 +593,7 @@
|
||||||
|
|
||||||
|
# ==============================================================
|
||||||
|
|
||||||
|
-option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags")
|
||||||
|
+option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags", comma_split=False)
|
||||||
|
set_config("RUSTFLAGS", depends("RUSTFLAGS")(lambda flags: flags))
|
||||||
|
|
||||||
|
|
||||||
|
--- firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py 2023-03-21 06:16:09.000000000 -0700
|
||||||
|
+++ firefox-111.0.1/python/mozbuild/mozbuild/configure/options.py.new 2023-04-05 08:57:31.270193468 -0700
|
||||||
|
@@ -191,6 +191,10 @@
|
||||||
|
to instantiate an option indirectly. Set this to a positive integer to
|
||||||
|
force the script to look into a deeper stack frame when inferring the
|
||||||
|
`category`.
|
||||||
|
+ - `comma_split` specifies whether the value string should be split on
|
||||||
|
+ commas. The default is True. Setting it False is necessary for things
|
||||||
|
+ like compiler flags which should be a single string that may contain
|
||||||
|
+ commas.
|
||||||
|
"""
|
||||||
|
|
||||||
|
__slots__ = (
|
||||||
|
@@ -205,6 +209,7 @@
|
||||||
|
"possible_origins",
|
||||||
|
"category",
|
||||||
|
"define_depth",
|
||||||
|
+ "comma_split",
|
||||||
|
)
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
@@ -218,6 +223,7 @@
|
||||||
|
category=None,
|
||||||
|
help=None,
|
||||||
|
define_depth=0,
|
||||||
|
+ comma_split=True,
|
||||||
|
):
|
||||||
|
if not name and not env:
|
||||||
|
raise InvalidOptionError(
|
||||||
|
@@ -335,9 +341,10 @@
|
||||||
|
self.choices = choices
|
||||||
|
self.help = help
|
||||||
|
self.category = category or _infer_option_category(define_depth)
|
||||||
|
+ self.comma_split = comma_split
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
- def split_option(option):
|
||||||
|
+ def split_option(option, comma_split=True):
|
||||||
|
"""Split a flag or variable into a prefix, a name and values
|
||||||
|
|
||||||
|
Variables come in the form NAME=values (no prefix).
|
||||||
|
@@ -350,7 +357,13 @@
|
||||||
|
|
||||||
|
elements = option.split("=", 1)
|
||||||
|
name = elements[0]
|
||||||
|
- values = tuple(elements[1].split(",")) if len(elements) == 2 else ()
|
||||||
|
+ if len(elements) == 2:
|
||||||
|
+ if comma_split:
|
||||||
|
+ values = tuple(elements[1].split(","))
|
||||||
|
+ else:
|
||||||
|
+ values = (elements[1],)
|
||||||
|
+ else:
|
||||||
|
+ values = ()
|
||||||
|
if name.startswith("--"):
|
||||||
|
name = name[2:]
|
||||||
|
if not name.islower():
|
||||||
|
@@ -426,7 +439,7 @@
|
||||||
|
% (option, origin, ", ".join(self.possible_origins))
|
||||||
|
)
|
||||||
|
|
||||||
|
- prefix, name, values = self.split_option(option)
|
||||||
|
+ prefix, name, values = self.split_option(option, self.comma_split)
|
||||||
|
option = self._join_option(prefix, name)
|
||||||
|
|
||||||
|
assert name in (self.name, self.env)
|
@ -267,6 +267,12 @@ Patch990: work-around-GCC-ICE-on-arm.patch
|
|||||||
# Work around broken moz.build file on ppc64le (mozb#1779545, mozb#1775202)
|
# Work around broken moz.build file on ppc64le (mozb#1779545, mozb#1775202)
|
||||||
Patch1100: mozilla-1775202.patch
|
Patch1100: mozilla-1775202.patch
|
||||||
|
|
||||||
|
# tentative patch for RUSTFLAGS parsing issue:
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2184743
|
||||||
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=1474486
|
||||||
|
# not upstreaming till I'm more sure it's correct
|
||||||
|
Patch1200: firefox-112.0-commasplit.patch
|
||||||
|
|
||||||
%if %{?system_nss}
|
%if %{?system_nss}
|
||||||
BuildRequires: pkgconfig(nspr) >= %{nspr_version}
|
BuildRequires: pkgconfig(nspr) >= %{nspr_version}
|
||||||
BuildRequires: pkgconfig(nss) >= %{nss_version}
|
BuildRequires: pkgconfig(nss) >= %{nss_version}
|
||||||
@ -543,6 +549,7 @@ This package contains results of tests executed during build.
|
|||||||
|
|
||||||
%patch990 -p1 -b .work-around-GCC-ICE-on-arm
|
%patch990 -p1 -b .work-around-GCC-ICE-on-arm
|
||||||
%patch1100 -p1 -b .ppc-mobzuild
|
%patch1100 -p1 -b .ppc-mobzuild
|
||||||
|
%patch1200 -p1 -b .rustflags-commasplit
|
||||||
|
|
||||||
rm -f .mozconfig
|
rm -f .mozconfig
|
||||||
cp %{SOURCE10} .mozconfig
|
cp %{SOURCE10} .mozconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user