diff options
Diffstat (limited to 'debian/patches')
19 files changed, 939 insertions, 0 deletions
diff --git a/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch b/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch new file mode 100644 index 0000000000..8f8d89d401 --- /dev/null +++ b/debian/patches/debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch @@ -0,0 +1,47 @@ +From: Mike Hommey <mh@glandium.org> +Date: Mon, 27 Dec 2010 10:44:28 +0100 +Subject: Add a 2 minutes timeout on xpcshell tests + +--- + testing/xpcshell/runxpcshelltests.py | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py +index 8ef8aed..9635de6 100755 +--- a/testing/xpcshell/runxpcshelltests.py ++++ b/testing/xpcshell/runxpcshelltests.py +@@ -10,6 +10,7 @@ import os + import pipes + import random + import re ++import select + import shutil + import signal + import subprocess +@@ -858,9 +859,23 @@ class XPCShellTestThread(Thread): + if self.interactive: + self.log.info("%s | Process ID: %d" % (name, self.proc_ident)) + +- # Communicate returns a tuple of (stdout, stderr), however we always +- # redirect stderr to stdout, so the second element is ignored. +- process_output, _ = self.communicate(proc) ++ if self.pStdout == PIPE: ++ process_stdout = "" ++ while True: ++ (r, w, e) = select.select([proc.stdout], [], [], 120) ++ if len(r) == 0: ++ process_stdout += "TEST-UNEXPECTED-FAIL | %s | application timed out after 120 seconds with no output" % (test) ++ proc.kill() ++ break ++ line = proc.stdout.read(1) ++ if line == "": ++ break ++ process_stdout += line ++ proc.wait() ++ else: ++ # Communicate returns a tuple of (stdout, stderr), however we always ++ # redirect stderr to stdout, so the second element is ignored. ++ process_output, _ = self.communicate(proc) + + if self.interactive: + # Not sure what else to do here... diff --git a/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch b/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch new file mode 100644 index 0000000000..ed41d24455 --- /dev/null +++ b/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch @@ -0,0 +1,34 @@ +From: Mike Hommey <glandium@debian.org> +Date: Sat, 21 Jun 2008 03:09:21 +0200 +Subject: Add another preferences directory for applications: + preferences/syspref + +It was existing in previous versions of iceweasel as a symlink to +/etc/iceweasel/pref. + +This has the side effect to make these preferences there work again, and +to disable the "set as default browser" dialog. +--- + toolkit/xre/nsXREDirProvider.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp +index 41d2353..ba4e3af 100644 +--- a/toolkit/xre/nsXREDirProvider.cpp ++++ b/toolkit/xre/nsXREDirProvider.cpp +@@ -676,6 +676,7 @@ static const char* const kAppendPrefDir[] = {"defaults", "preferences", + static const char* const kAppendBackgroundTasksPrefDir[] = { + "defaults", "backgroundtasks", nullptr}; + #endif ++static const char *const kAppendSysPrefDir[] = { "defaults", "syspref", nullptr }; + + NS_IMETHODIMP + nsXREDirProvider::GetFiles(const char* aProperty, +@@ -693,6 +694,7 @@ nsXREDirProvider::GetFiles(const char* aProperty, + LoadDirIntoArray(mXULAppDir, kAppendBackgroundTasksPrefDir, directories); + } + #endif ++ LoadDirIntoArray(mXULAppDir, kAppendSysPrefDir, directories); + + rv = NS_NewArrayEnumerator(aResult, directories, NS_GET_IID(nsIFile)); + } else if (!strcmp(aProperty, NS_APP_CHROME_DIR_LIST)) { diff --git a/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch new file mode 100644 index 0000000000..61963a5cc7 --- /dev/null +++ b/debian/patches/debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch @@ -0,0 +1,20 @@ +From: Mike Hommey <mh@glandium.org> +Date: Mon, 16 Dec 2013 10:53:58 +0900 +Subject: Add debian/extra-stuff to upstream build system directory traversal + +--- + moz.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/moz.build b/moz.build +index e33ad8e..e14428c 100644 +--- a/moz.build ++++ b/moz.build +@@ -213,4 +213,7 @@ SPHINX_TREES["mots"] = "docs/mots" + + SPHINX_TREES["update-infrastructure"] = "docs/update-infrastructure" + ++if not CONFIG["LIBXUL_SDK"]: ++ DIRS += ["debian/extra-stuff"] ++ + include("build/templates.mozbuild") diff --git a/debian/patches/debian-hacks/Allow-.js-preference-files-to-set-locked-prefs-with-.patch b/debian/patches/debian-hacks/Allow-.js-preference-files-to-set-locked-prefs-with-.patch new file mode 100644 index 0000000000..39908b6e81 --- /dev/null +++ b/debian/patches/debian-hacks/Allow-.js-preference-files-to-set-locked-prefs-with-.patch @@ -0,0 +1,81 @@ +From: Mike Hommey <glandium@debian.org> +Date: Sat, 21 Jun 2008 02:48:46 +0200 +Subject: Allow .js preference files to set locked prefs with lockPref() + +Upstream now supports locked prefs, but with a different syntax from +the syntax we had supported for a while. +--- + modules/libpref/parser/src/lib.rs | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/modules/libpref/parser/src/lib.rs b/modules/libpref/parser/src/lib.rs +index 3a0ad2c..c6e34be 100644 +--- a/modules/libpref/parser/src/lib.rs ++++ b/modules/libpref/parser/src/lib.rs +@@ -11,8 +11,9 @@ + //! ```text + //! <pref-file> = <pref>* + //! <pref> = <pref-spec> "(" <pref-name> "," <pref-value> <pref-attrs> ")" ";" +-//! <pref-spec> = "user_pref" | "pref" | "sticky_pref" // in default pref files ++//! <pref-spec> = "user_pref" | "pref" | "sticky_pref" | "lockPref" // in default pref files + //! <pref-spec> = "user_pref" // in user pref files ++//! <pref-spec> = "user_pref" | "pref" | "sticky_pref | lockPref" + //! <pref-name> = <string-literal> + //! <pref-value> = <string-literal> | "true" | "false" | <int-value> + //! <int-value> = <sign>? <int-literal> +@@ -169,6 +170,7 @@ enum Token { + // Keywords + Pref, // pref + StickyPref, // sticky_pref ++ LockPref, // lockPref + UserPref, // user_pref + True, // true + False, // false +@@ -291,7 +293,7 @@ struct KeywordInfo { + token: Token, + } + +-const KEYWORD_INFOS: [KeywordInfo; 7] = [ ++const KEYWORD_INFOS: [KeywordInfo; 8] = [ + // These are ordered by frequency. + KeywordInfo { + string: b"pref", +@@ -321,6 +323,10 @@ const KEYWORD_INFOS: [KeywordInfo; 7] = [ + string: b"sticky_pref", + token: Token::StickyPref, + }, ++ KeywordInfo { ++ string: b"lockPref", ++ token: Token::LockPref, ++ }, + ]; + + struct Parser<'t> { +@@ -373,14 +379,15 @@ impl<'t> Parser<'t> { + // this will be either the first token of a new pref, or EOF. + loop { + // <pref-spec> +- let (pref_value_kind, mut is_sticky) = match token { ++ let (pref_value_kind, mut is_sticky, mut is_locked) = match token { + Token::Pref if self.kind == PrefValueKind::Default => { +- (PrefValueKind::Default, false) ++ (PrefValueKind::Default, false, false) + } + Token::StickyPref if self.kind == PrefValueKind::Default => { +- (PrefValueKind::Default, true) ++ (PrefValueKind::Default, true, false) + } +- Token::UserPref => (PrefValueKind::User, false), ++ Token::LockPref => (PrefValueKind::Default, false, true), ++ Token::UserPref => (PrefValueKind::User, false, false), + Token::SingleChar(EOF) => return !self.has_errors, + _ => { + token = self.error_and_recover( +@@ -490,7 +497,6 @@ impl<'t> Parser<'t> { + }; + + // ("," <pref-attr>)* // default pref files only +- let mut is_locked = false; + let mut has_attrs = false; + if self.kind == PrefValueKind::Default { + let ok = loop { diff --git a/debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch b/debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch new file mode 100644 index 0000000000..5dd42994b1 --- /dev/null +++ b/debian/patches/debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch @@ -0,0 +1,34 @@ +From: Mike Hommey <mh@glandium.org> +Date: Wed, 20 Dec 2023 08:47:32 +0900 +Subject: Allow to build oxilangtag-ffi with rustc < 1.65 + +--- + intl/locale/rust/oxilangtag-ffi/src/lib.rs | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/intl/locale/rust/oxilangtag-ffi/src/lib.rs b/intl/locale/rust/oxilangtag-ffi/src/lib.rs +index 5a30e9b..e647fb0 100644 +--- a/intl/locale/rust/oxilangtag-ffi/src/lib.rs ++++ b/intl/locale/rust/oxilangtag-ffi/src/lib.rs +@@ -85,7 +85,9 @@ pub extern "C" fn lang_tag_matches(attribute: *const LangTag, selector: &nsACStr + loop { + // 4. When the language range's list has no more subtags, the match + // succeeds. +- let Some(range_subtag_str) = range_subtag else { ++ let range_subtag_str = if let Some(range_subtag_str) = range_subtag { ++ range_subtag_str ++ } else { + return true; + }; + +@@ -99,7 +101,9 @@ pub extern "C" fn lang_tag_matches(attribute: *const LangTag, selector: &nsACStr + + // B. Else, if there are no more subtags in the language tag's + // list, the match fails. +- let Some(lang_subtag_str) = lang_subtag else { ++ let lang_subtag_str = if let Some(lang_subtag_str) = lang_subtag { ++ lang_subtag_str ++ } else { + return false; + }; + diff --git a/debian/patches/debian-hacks/Allow-to-override-rust-LTO-flag.patch b/debian/patches/debian-hacks/Allow-to-override-rust-LTO-flag.patch new file mode 100644 index 0000000000..42699cb755 --- /dev/null +++ b/debian/patches/debian-hacks/Allow-to-override-rust-LTO-flag.patch @@ -0,0 +1,31 @@ +From: Mike Hommey <mh@glandium.org> +Date: Sun, 14 Aug 2022 15:05:23 +0900 +Subject: Allow to override rust LTO flag + +--- + config/makefiles/rust.mk | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk +index 894e2b3..cbe955a 100644 +--- a/config/makefiles/rust.mk ++++ b/config/makefiles/rust.mk +@@ -92,8 +92,9 @@ ifndef rustflags_sancov + # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. + ifndef MOZ_CODE_COVERAGE + ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) +-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) ++cargo_rustc_flags += $(or $(DEBIAN_RUST_LTO),-Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat)) + endif ++ifneq (-Clto=off,$(DEBIAN_RUST_LTO)) + # We need -Cembed-bitcode=yes for all crates when using -Clto. + RUSTFLAGS += -Cembed-bitcode=yes + endif +@@ -101,6 +102,7 @@ endif + endif + endif + endif ++endif + + ifdef CARGO_INCREMENTAL + export CARGO_INCREMENTAL diff --git a/debian/patches/debian-hacks/Avoid-using-vmrs-vmsr-on-armel.patch b/debian/patches/debian-hacks/Avoid-using-vmrs-vmsr-on-armel.patch new file mode 100644 index 0000000000..ffe17912ca --- /dev/null +++ b/debian/patches/debian-hacks/Avoid-using-vmrs-vmsr-on-armel.patch @@ -0,0 +1,21 @@ +From: Mike Hommey <mh@glandium.org> +Date: Tue, 22 May 2018 07:51:56 +0900 +Subject: Avoid using vmrs/vmsr on armel + +--- + dom/media/webaudio/blink/DenormalDisabler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dom/media/webaudio/blink/DenormalDisabler.h b/dom/media/webaudio/blink/DenormalDisabler.h +index 646482b..8803a7d 100644 +--- a/dom/media/webaudio/blink/DenormalDisabler.h ++++ b/dom/media/webaudio/blink/DenormalDisabler.h +@@ -45,7 +45,7 @@ namespace WebCore { + # define HAVE_DENORMAL 1 + #endif + +-#if defined(__arm__) || defined(__aarch64__) ++#if (defined(__arm__) && !defined(__SOFTFP__)) || defined(__aarch64__) + # define HAVE_DENORMAL 1 + #endif + diff --git a/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch b/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch new file mode 100644 index 0000000000..18e45daba2 --- /dev/null +++ b/debian/patches/debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch @@ -0,0 +1,37 @@ +From: Mike Hommey <mh@glandium.org> +Date: Thu, 12 Nov 2009 17:18:31 +0100 +Subject: Avoid wrong sessionstore data to keep windows out of user sight + +It happens that sessionstore can keep wrong information for the window +position or minimized state. Workaround this until the real bug is found +and fixed (probably in xulrunner). + +Closes: #552426, #553453 +--- + browser/components/sessionstore/SessionStore.sys.mjs | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs +index 602986e..99cf002 100644 +--- a/browser/components/sessionstore/SessionStore.sys.mjs ++++ b/browser/components/sessionstore/SessionStore.sys.mjs +@@ -5220,7 +5220,7 @@ var SessionStoreInternal = { + // _getWindowDimension. + let desktopToCssScale = + aWindow.desktopToDeviceScale / aWindow.devicePixelRatio; +- aWindow.moveTo(aLeft * desktopToCssScale, aTop * desktopToCssScale); ++ aWindow.moveTo((aLeft < -aWidth) ? 0 : aLeft * desktopToCssScale, (aTop < -aHeight) ? 0 : aTop * desktopToCssScale); + } + if ( + aWidth && +@@ -5248,9 +5248,8 @@ var SessionStoreInternal = { + case "minimized": + if (aSizeModeBeforeMinimized == "maximized") { + aWindow.maximize(); ++ break; + } +- aWindow.minimize(); +- break; + case "normal": + aWindow.restore(); + break; diff --git a/debian/patches/debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch b/debian/patches/debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch new file mode 100644 index 0000000000..354d66d377 --- /dev/null +++ b/debian/patches/debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch @@ -0,0 +1,21 @@ +From: Mike Hommey <mh@glandium.org> +Date: Fri, 17 Feb 2012 17:47:15 +0100 +Subject: Don't auto-disable extensions in system directories + +--- + browser/app/profile/firefox.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +index 621900f..a3483f8 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -56,7 +56,7 @@ pref("extensions.systemAddon.update.enabled", true); + + // Disable add-ons that are not installed by the user in all scopes by default. + // See the SCOPE constants in AddonManager.jsm for values to use here. +-pref("extensions.autoDisableScopes", 15); ++pref("extensions.autoDisableScopes", 3); + // Scopes to scan for changes at startup. + pref("extensions.startupScanScopes", 0); + diff --git a/debian/patches/debian-hacks/Don-t-build-image-gtests.patch b/debian/patches/debian-hacks/Don-t-build-image-gtests.patch new file mode 100644 index 0000000000..b6884bbd98 --- /dev/null +++ b/debian/patches/debian-hacks/Don-t-build-image-gtests.patch @@ -0,0 +1,23 @@ +From: Mike Hommey <mh@glandium.org> +Date: Thu, 9 Jun 2016 14:45:44 +0900 +Subject: Don't build image/ gtests + +Building them causes an ICE with GCC 4.7. As they are not part of what +is shipped, and not currently run either, just skip building them. +--- + image/moz.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/image/moz.build b/image/moz.build +index aab71c1..5f2192c 100644 +--- a/image/moz.build ++++ b/image/moz.build +@@ -5,8 +5,6 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + DIRS += ["build", "decoders", "encoders"] +-if CONFIG["ENABLE_TESTS"]: +- DIRS += ["test/gtest"] + + if CONFIG["FUZZING_INTERFACES"]: + DIRS += ["test/fuzzing"] diff --git a/debian/patches/debian-hacks/Fix-math_private.h-for-i386-FTBFS.patch b/debian/patches/debian-hacks/Fix-math_private.h-for-i386-FTBFS.patch new file mode 100644 index 0000000000..1da8156de8 --- /dev/null +++ b/debian/patches/debian-hacks/Fix-math_private.h-for-i386-FTBFS.patch @@ -0,0 +1,24 @@ +From: Mike Hommey <mh@glandium.org> +Date: Sat, 27 Nov 2021 06:49:44 +0900 +Subject: Fix math_private.h for i386 FTBFS + +--- + modules/fdlibm/src/math_private.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h +index f4373f2..632d2c4 100644 +--- a/modules/fdlibm/src/math_private.h ++++ b/modules/fdlibm/src/math_private.h +@@ -30,7 +30,11 @@ + * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t + */ + ++#if defined __FLT_EVAL_METHOD__ && (__FLT_EVAL_METHOD__ == 2) ++typedef long double __double_t; ++#else + typedef double __double_t; ++#endif + typedef __double_t double_t; + typedef float __float_t; + diff --git a/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch b/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch new file mode 100644 index 0000000000..337d004fff --- /dev/null +++ b/debian/patches/debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch @@ -0,0 +1,376 @@ +From: Mike Hommey <mh@glandium.org> +Date: Wed, 1 Mar 2023 07:19:18 +0900 +Subject: Relax minimum supporter rust version to 1.63 + +This reverts: +- https://phabricator.services.mozilla.com/D165236 +- https://phabricator.services.mozilla.com/D165332 +--- + Cargo.lock | 4 ++-- + python/mozboot/mozboot/util.py | 2 +- + servo/components/selectors/context.rs | 2 +- + servo/components/selectors/parser.rs | 4 ++-- + servo/components/style/gecko/selector_parser.rs | 7 ++++--- + servo/components/style/properties/gecko.mako.rs | 13 ++----------- + servo/components/style/style_resolver.rs | 5 +++-- + .../style/stylesheets/container_rule.rs | 16 ++++++++-------- + servo/components/style/stylist.rs | 12 +++++++----- + third_party/rust/cstr/.cargo-checksum.json | 2 +- + third_party/rust/cstr/Cargo.toml | 11 ++--------- + third_party/rust/cstr/README.md | 2 +- + third_party/rust/cstr/src/lib.rs | 4 ++-- + 13 files changed, 36 insertions(+), 48 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 1cb46da..9e5f122 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1040,9 +1040,9 @@ dependencies = [ + + [[package]] + name = "cstr" +-version = "0.2.11" ++version = "0.2.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8aa998c33a6d3271e3678950a22134cd7dd27cef86dee1b611b5b14207d1d90b" ++checksum = "a60f0dd132e4b67f20fd764d4835d968f666ff1a2f59e432983d168b98424deb" + dependencies = [ + "proc-macro2", + "quote", +diff --git a/python/mozboot/mozboot/util.py b/python/mozboot/mozboot/util.py +index 583c08b..a15cae2 100644 +--- a/python/mozboot/mozboot/util.py ++++ b/python/mozboot/mozboot/util.py +@@ -11,7 +11,7 @@ import certifi + from mach.site import PythonVirtualenv + from mach.util import get_state_dir + +-MINIMUM_RUST_VERSION = "1.66.0" ++MINIMUM_RUST_VERSION = "1.63.0" + + + def get_tools_dir(srcdir=False): +diff --git a/servo/components/selectors/context.rs b/servo/components/selectors/context.rs +index fc620ba..bc1a68d 100644 +--- a/servo/components/selectors/context.rs ++++ b/servo/components/selectors/context.rs +@@ -142,7 +142,7 @@ where + pub pseudo_element_matching_fn: Option<&'a dyn Fn(&Impl::PseudoElement) -> bool>, + + /// Extra implementation-dependent matching data. +- pub extra_data: Impl::ExtraMatchingData<'a>, ++ pub extra_data: Impl::ExtraMatchingData, + + /// The current element we're anchoring on for evaluating the relative selector. + current_relative_selector_anchor: Option<OpaqueElement>, +diff --git a/servo/components/selectors/parser.rs b/servo/components/selectors/parser.rs +index ca587e9..a15362f 100644 +--- a/servo/components/selectors/parser.rs ++++ b/servo/components/selectors/parser.rs +@@ -202,7 +202,7 @@ macro_rules! with_all_bounds { + /// are parameterized on SelectorImpl. See + /// <https://github.com/rust-lang/rust/issues/26925> + pub trait SelectorImpl: Clone + Debug + Sized + 'static { +- type ExtraMatchingData<'a>: Sized + Default; ++ type ExtraMatchingData: Sized + Default + 'static; + type AttrValue: $($InSelector)*; + type Identifier: $($InSelector)*; + type LocalName: $($InSelector)* + Borrow<Self::BorrowedLocalName>; +@@ -3344,7 +3344,7 @@ pub mod tests { + } + + impl SelectorImpl for DummySelectorImpl { +- type ExtraMatchingData<'a> = std::marker::PhantomData<&'a ()>; ++ type ExtraMatchingData = (); + type AttrValue = DummyAttrValue; + type Identifier = DummyAtom; + type LocalName = DummyAtom; +diff --git a/servo/components/style/gecko/selector_parser.rs b/servo/components/style/gecko/selector_parser.rs +index 6bf527b..08018fd 100644 +--- a/servo/components/style/gecko/selector_parser.rs ++++ b/servo/components/style/gecko/selector_parser.rs +@@ -15,6 +15,7 @@ use cssparser::{BasicParseError, BasicParseErrorKind, Parser}; + use cssparser::{CowRcStr, SourceLocation, ToCss, Token}; + use dom::{DocumentState, ElementState}; + use selectors::parser::SelectorParseErrorKind; ++use servo_arc::Arc; + use std::fmt; + use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss as ToCss_}; + use thin_vec::ThinVec; +@@ -239,7 +240,7 @@ pub struct SelectorImpl; + /// A set of extra data to carry along with the matching context, either for + /// selector-matching or invalidation. + #[derive(Default)] +-pub struct ExtraMatchingData<'a> { ++pub struct ExtraMatchingData { + /// The invalidation data to invalidate doc-state pseudo-classes correctly. + pub invalidation_data: InvalidationMatchingData, + +@@ -249,11 +250,11 @@ pub struct ExtraMatchingData<'a> { + + /// The style of the originating element in order to evaluate @container + /// size queries affecting pseudo-elements. +- pub originating_element_style: Option<&'a ComputedValues>, ++ pub originating_element_style: Option<Arc<ComputedValues>>, + } + + impl ::selectors::SelectorImpl for SelectorImpl { +- type ExtraMatchingData<'a> = ExtraMatchingData<'a>; ++ type ExtraMatchingData = ExtraMatchingData; + type AttrValue = AtomString; + type Identifier = AtomIdent; + type LocalName = AtomIdent; +diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs +index 4fe29098..01f41bb 100644 +--- a/servo/components/style/properties/gecko.mako.rs ++++ b/servo/components/style/properties/gecko.mako.rs +@@ -99,15 +99,6 @@ impl ComputedValues { + ).to_outer(None) + } + +- /// Converts the computed values to an Arc<> from a reference. +- pub fn to_arc(&self) -> Arc<Self> { +- // SAFETY: We're guaranteed to be allocated as an Arc<> since the +- // functions above are the only ones that create ComputedValues +- // instances in Gecko (and that must be the case since ComputedValues' +- // member is private). +- unsafe { Arc::from_raw_addrefed(self) } +- } +- + #[inline] + pub fn is_pseudo_style(&self) -> bool { + self.0.mPseudoType != PseudoStyleType::NotPseudo +@@ -228,8 +219,8 @@ impl ComputedValuesInner { + &self, + pseudo_ty, + ); +- // We're simulating move semantics by having C++ do a memcpy and +- // then forgetting it on this end. ++ // We're simulating move semantics by having C++ do a memcpy and then forgetting ++ // it on this end. + forget(self); + UniqueArc::assume_init(arc).shareable() + } +diff --git a/servo/components/style/style_resolver.rs b/servo/components/style/style_resolver.rs +index a082b2c..bc96fb7 100644 +--- a/servo/components/style/style_resolver.rs ++++ b/servo/components/style/style_resolver.rs +@@ -522,7 +522,7 @@ where + + fn match_pseudo( + &mut self, +- originating_element_style: &ComputedValues, ++ originating_element_style: &Arc<ComputedValues>, + pseudo_element: &PseudoElement, + visited_handling: VisitedHandlingMode, + ) -> Option<MatchingResults> { +@@ -558,7 +558,8 @@ where + self.context.shared.quirks_mode(), + NeedsSelectorFlags::Yes, + ); +- matching_context.extra_data.originating_element_style = Some(originating_element_style); ++ matching_context.extra_data.originating_element_style = ++ Some(originating_element_style.clone()); + + // NB: We handle animation rules for ::before and ::after when + // traversing them. +diff --git a/servo/components/style/stylesheets/container_rule.rs b/servo/components/style/stylesheets/container_rule.rs +index f9d488b..74ea7c5 100644 +--- a/servo/components/style/stylesheets/container_rule.rs ++++ b/servo/components/style/stylesheets/container_rule.rs +@@ -135,14 +135,14 @@ enum TraversalResult<T> { + Done(T), + } + +-fn traverse_container<E, F, R>( ++fn traverse_container<E, S, F, R>( + mut e: E, +- originating_element_style: Option<&ComputedValues>, ++ originating_element_style: Option<&S>, + evaluator: F, + ) -> Option<(E, R)> + where + E: TElement, +- F: Fn(E, Option<&ComputedValues>) -> TraversalResult<R>, ++ F: Fn(E, Option<&S>) -> TraversalResult<R>, + { + if originating_element_style.is_some() { + match evaluator(e, originating_element_style) { +@@ -185,7 +185,7 @@ impl ContainerCondition { + fn valid_container_info<E>( + &self, + potential_container: E, +- originating_element_style: Option<&ComputedValues>, ++ originating_element_style: Option<&Arc<ComputedValues>>, + ) -> TraversalResult<ContainerLookupResult<E>> + where + E: TElement, +@@ -198,7 +198,7 @@ impl ContainerCondition { + Some(d) => d, + None => return TraversalResult::InProgress, + }; +- &**data.styles.primary() ++ data.styles.primary() + }, + }; + let wm = style.writing_mode; +@@ -220,7 +220,7 @@ impl ContainerCondition { + } + + let size = potential_container.query_container_size(&box_style.clone_display()); +- let style = style.to_arc(); ++ let style = style.clone(); + TraversalResult::Done(ContainerLookupResult { + element: potential_container, + info: ContainerInfo { size, wm }, +@@ -232,7 +232,7 @@ impl ContainerCondition { + pub fn find_container<E>( + &self, + e: E, +- originating_element_style: Option<&ComputedValues>, ++ originating_element_style: Option<&Arc<ComputedValues>>, + ) -> Option<ContainerLookupResult<E>> + where + E: TElement, +@@ -254,7 +254,7 @@ impl ContainerCondition { + &self, + device: &Device, + element: E, +- originating_element_style: Option<&ComputedValues>, ++ originating_element_style: Option<&Arc<ComputedValues>>, + invalidation_flags: &mut ComputedValueFlags, + ) -> KleeneValue + where +diff --git a/servo/components/style/stylist.rs b/servo/components/style/stylist.rs +index 81f30ee..bbb80e9 100644 +--- a/servo/components/style/stylist.rs ++++ b/servo/components/style/stylist.rs +@@ -979,7 +979,7 @@ impl Stylist { + element: E, + pseudo: &PseudoElement, + rule_inclusion: RuleInclusion, +- originating_element_style: &ComputedValues, ++ originating_element_style: &Arc<ComputedValues>, + parent_style: &Arc<ComputedValues>, + is_probe: bool, + matching_fn: Option<&dyn Fn(&PseudoElement) -> bool>, +@@ -1125,7 +1125,7 @@ impl Stylist { + &self, + guards: &StylesheetGuards, + element: E, +- originating_element_style: &ComputedValues, ++ originating_element_style: &Arc<ComputedValues>, + parent_style: &Arc<ComputedValues>, + pseudo: &PseudoElement, + is_probe: bool, +@@ -1156,7 +1156,8 @@ impl Stylist { + ); + + matching_context.pseudo_element_matching_fn = matching_fn; +- matching_context.extra_data.originating_element_style = Some(originating_element_style); ++ matching_context.extra_data.originating_element_style = ++ Some(originating_element_style.clone()); + + self.push_applicable_declarations( + element, +@@ -1189,7 +1190,8 @@ impl Stylist { + needs_selector_flags, + ); + matching_context.pseudo_element_matching_fn = matching_fn; +- matching_context.extra_data.originating_element_style = Some(originating_element_style); ++ matching_context.extra_data.originating_element_style = ++ Some(originating_element_style.clone()); + + self.push_applicable_declarations( + element, +@@ -2502,7 +2504,7 @@ impl CascadeData { + .matches( + stylist.device(), + element, +- context.extra_data.originating_element_style, ++ context.extra_data.originating_element_style.as_ref(), + &mut context.extra_data.cascade_input_flags, + ) + .to_bool(/* unknown = */ false); +diff --git a/third_party/rust/cstr/.cargo-checksum.json b/third_party/rust/cstr/.cargo-checksum.json +index 9d9ca8a..d6c4e0e 100644 +--- a/third_party/rust/cstr/.cargo-checksum.json ++++ b/third_party/rust/cstr/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"9766da0dcd235f8d0d4ebdc925050558710adfd4495c123b1f4997666869d524","LICENSE":"5a9bf0e7661617253ca7c12313f51a96aa62dec0bcd15a59c533c88b8093d124","README.md":"8fdfa924e95d7a83f3c032dcc103cb411743c404e7e080b985c97b5db90eea24","src/lib.rs":"ad266f1d5c682943741344d84dba39c516c3b8b26b34a4ff2c858de9934cdfe5","src/parse.rs":"19214fac49af5852b93a37d43af6ee93e62a1e95e3a629f8d5da254925b7d294","tests/clippy_lints.rs":"4398124cd5bc3a7f295f6203d543fc7d99abfd945eb7418ccfa60535586d7e37","tests/compile_fail/empty.rs":"52dc3c0d4d6ee0bd6d89a34d1caf38d159830401f24ba30f5655f9de92697903","tests/compile_fail/empty.stderr":"dbcf3dab8a8638b833df9089d9bc9ff7494f39dbb91e94bdd769912678ccf7f8","tests/compile_fail/interior-nul.rs":"ecc09440020287377ca18e4b8308d1d516620a87612a5381bafc01fe48734d34","tests/compile_fail/interior-nul.stderr":"8bd003a7dfff248411403bdf666f8a0631307f468d589cf01e475b062db4b101","tests/compile_fail/non-str.rs":"e08be18a524a4482fb7f34cbc6e8448a878b41cf2c26dea99268aaabab6c3f3f","tests/compile_fail/non-str.stderr":"8dff245264d9c69dc151f742542a72400d7422f2a0f2b133a9f4d4fc96a4016a","tests/compile_fail/trash-after.rs":"7dff7a301c9087984c5acda183e34492f3d0f2ebec14b8dc0d2b11aab972a111","tests/compile_fail/trash-after.stderr":"487b5d6b687c52b80f9d9cba691a8654067a88f7d03d2d952d7e97d610ab70f3","tests/compile_test.rs":"13e3e0d22ec0dffa4d0be0c4db6381a03feff50cc25aa65c4950cc7e865d122d","tests/pass/byte_str_lit.rs":"9085e1f1e67dae193d33ff59c253cac23c9e23e9d8c7f92f0aba99097ade132e","tests/pass/const.rs":"777aeb93c3030349529a41ac62b3577b36badc4bada4ec46e45b5055d3676dbd","tests/pass/ident.rs":"5116ee71578d479d899345e039e5955b5dee442234dc504e1a9bfb9260cf8f15","tests/pass/macro.rs":"9596c936ed4d963fb40459ecd98b60610d3d90e41918f350ff45b6129b1aa0b7","tests/pass/str_lit.rs":"955fb887ebc01538bafe10fa810381eb53aebaafb8b36053e8712c081862fe7a"},"package":"8aa998c33a6d3271e3678950a22134cd7dd27cef86dee1b611b5b14207d1d90b"} +\ No newline at end of file ++{"files":{"Cargo.toml":"efcf30ffc92f8247fde5ac01eb17820b53de43d8407fdab0e6ba226e0538e0f2","LICENSE":"5a9bf0e7661617253ca7c12313f51a96aa62dec0bcd15a59c533c88b8093d124","README.md":"6dd83f5c2d0f29317921e2c1050740cb24e273d5d83409f21d5b955026934804","src/lib.rs":"a54a9c9b3ea2346a2b82f4a66f9614f5596278cd20857a502d272a9ce5c4da4e","src/parse.rs":"19214fac49af5852b93a37d43af6ee93e62a1e95e3a629f8d5da254925b7d294","tests/clippy_lints.rs":"4398124cd5bc3a7f295f6203d543fc7d99abfd945eb7418ccfa60535586d7e37","tests/compile_fail/empty.rs":"52dc3c0d4d6ee0bd6d89a34d1caf38d159830401f24ba30f5655f9de92697903","tests/compile_fail/empty.stderr":"dbcf3dab8a8638b833df9089d9bc9ff7494f39dbb91e94bdd769912678ccf7f8","tests/compile_fail/interior-nul.rs":"ecc09440020287377ca18e4b8308d1d516620a87612a5381bafc01fe48734d34","tests/compile_fail/interior-nul.stderr":"8bd003a7dfff248411403bdf666f8a0631307f468d589cf01e475b062db4b101","tests/compile_fail/non-str.rs":"e08be18a524a4482fb7f34cbc6e8448a878b41cf2c26dea99268aaabab6c3f3f","tests/compile_fail/non-str.stderr":"8dff245264d9c69dc151f742542a72400d7422f2a0f2b133a9f4d4fc96a4016a","tests/compile_fail/trash-after.rs":"7dff7a301c9087984c5acda183e34492f3d0f2ebec14b8dc0d2b11aab972a111","tests/compile_fail/trash-after.stderr":"487b5d6b687c52b80f9d9cba691a8654067a88f7d03d2d952d7e97d610ab70f3","tests/compile_test.rs":"13e3e0d22ec0dffa4d0be0c4db6381a03feff50cc25aa65c4950cc7e865d122d","tests/pass/byte_str_lit.rs":"9085e1f1e67dae193d33ff59c253cac23c9e23e9d8c7f92f0aba99097ade132e","tests/pass/const.rs":"777aeb93c3030349529a41ac62b3577b36badc4bada4ec46e45b5055d3676dbd","tests/pass/ident.rs":"5116ee71578d479d899345e039e5955b5dee442234dc504e1a9bfb9260cf8f15","tests/pass/macro.rs":"9596c936ed4d963fb40459ecd98b60610d3d90e41918f350ff45b6129b1aa0b7","tests/pass/str_lit.rs":"955fb887ebc01538bafe10fa810381eb53aebaafb8b36053e8712c081862fe7a"},"package":"a60f0dd132e4b67f20fd764d4835d968f666ff1a2f59e432983d168b98424deb"} +\ No newline at end of file +diff --git a/third_party/rust/cstr/Cargo.toml b/third_party/rust/cstr/Cargo.toml +index 712f393..046519f 100644 +--- a/third_party/rust/cstr/Cargo.toml ++++ b/third_party/rust/cstr/Cargo.toml +@@ -11,31 +11,24 @@ + + [package] + edition = "2018" +-rust-version = "1.64" + name = "cstr" +-version = "0.2.11" ++version = "0.2.10" + authors = ["Xidorn Quan <me@upsuper.org>"] + description = "Macro for building static CStr reference" + readme = "README.md" +-keywords = [ +- "macro", +- "cstr", +-] ++keywords = ["macro", "cstr"] + license = "MIT" + repository = "https://github.com/upsuper/cstr" + + [lib] + proc-macro = true +- + [dependencies.proc-macro2] + version = "1" + + [dependencies.quote] + version = "1" +- + [dev-dependencies.trybuild] + version = "1.0.30" +- + [badges.travis-ci] + branch = "master" + repository = "upsuper/cstr" +diff --git a/third_party/rust/cstr/README.md b/third_party/rust/cstr/README.md +index 7ee3ba2..9ebda24 100644 +--- a/third_party/rust/cstr/README.md ++++ b/third_party/rust/cstr/README.md +@@ -11,7 +11,7 @@ A macro for getting `&'static CStr` from literal or identifier. + This macro checks whether the given literal is valid for `CStr` + at compile time, and returns a static reference of `CStr`. + +-This macro can be used to to initialize constants on Rust 1.64 and above. ++This macro can be used to to initialize constants on Rust 1.59 and above. + + ## Example + +diff --git a/third_party/rust/cstr/src/lib.rs b/third_party/rust/cstr/src/lib.rs +index c9e69d9..91d83ae 100644 +--- a/third_party/rust/cstr/src/lib.rs ++++ b/third_party/rust/cstr/src/lib.rs +@@ -3,7 +3,7 @@ + //! This macro checks whether the given literal is valid for `CStr` + //! at compile time, and returns a static reference of `CStr`. + //! +-//! This macro can be used to to initialize constants on Rust 1.64 and above. ++//! This macro can be used to to initialize constants on Rust 1.59 and above. + //! + //! ## Example + //! +@@ -37,7 +37,7 @@ struct Error(Span, &'static str); + #[proc_macro] + pub fn cstr(input: RawTokenStream) -> RawTokenStream { + let tokens = match build_byte_str(input.into()) { +- Ok(s) => quote!(unsafe { ::core::ffi::CStr::from_bytes_with_nul_unchecked(#s) }), ++ Ok(s) => quote!(unsafe { ::std::ffi::CStr::from_bytes_with_nul_unchecked(#s) }), + Err(Error(span, msg)) => quote_spanned!(span => compile_error!(#msg)), + }; + tokens.into() diff --git a/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch b/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch new file mode 100644 index 0000000000..8839a39026 --- /dev/null +++ b/debian/patches/debian-hacks/Relax-nodejs-minimum-version.patch @@ -0,0 +1,21 @@ +From: Mike Hommey <mh@glandium.org> +Date: Wed, 21 Sep 2022 08:48:27 +0900 +Subject: Relax nodejs minimum version + +--- + python/mozbuild/mozbuild/nodeutil.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python/mozbuild/mozbuild/nodeutil.py b/python/mozbuild/mozbuild/nodeutil.py +index 8ec724a..efc7b7f 100644 +--- a/python/mozbuild/mozbuild/nodeutil.py ++++ b/python/mozbuild/mozbuild/nodeutil.py +@@ -11,7 +11,7 @@ from mozboot.util import get_tools_dir + from mozfile import which + from six import PY3 + +-NODE_MIN_VERSION = StrictVersion("12.22.12") ++NODE_MIN_VERSION = StrictVersion("12.22") + NPM_MIN_VERSION = StrictVersion("6.14.16") + + diff --git a/debian/patches/debian-hacks/Remove-workaround-for-old-libstdc-problem-which-now-.patch b/debian/patches/debian-hacks/Remove-workaround-for-old-libstdc-problem-which-now-.patch new file mode 100644 index 0000000000..27017a8a31 --- /dev/null +++ b/debian/patches/debian-hacks/Remove-workaround-for-old-libstdc-problem-which-now-.patch @@ -0,0 +1,56 @@ +From: Mike Hommey <mh@glandium.org> +Date: Mon, 15 Aug 2022 14:49:40 +0900 +Subject: Remove workaround for old libstdc++ problem, which now causes + problems with GCC 12 on arm + +--- + intl/icu/source/common/unicode/std_string.h | 5 ----- + intl/icu/source/common/utypeinfo.h | 3 --- + intl/icu/source/io/unicode/ustream.h | 4 ---- + 3 files changed, 12 deletions(-) + +diff --git a/intl/icu/source/common/unicode/std_string.h b/intl/icu/source/common/unicode/std_string.h +index bf87230..c8388ef 100644 +--- a/intl/icu/source/common/unicode/std_string.h ++++ b/intl/icu/source/common/unicode/std_string.h +@@ -29,11 +29,6 @@ + + #if U_SHOW_CPLUSPLUS_API + +-// Workaround for a libstdc++ bug before libstdc++4.6 (2011). +-// https://bugs.llvm.org/show_bug.cgi?id=13364 +-#if defined(__GLIBCXX__) +-namespace std { class type_info; } +-#endif + #include <string> + + #endif /* U_SHOW_CPLUSPLUS_API */ +diff --git a/intl/icu/source/common/utypeinfo.h b/intl/icu/source/common/utypeinfo.h +index c666373..5d97240 100644 +--- a/intl/icu/source/common/utypeinfo.h ++++ b/intl/icu/source/common/utypeinfo.h +@@ -24,9 +24,6 @@ + #include <exception> + using std::exception; + #endif +-#if defined(__GLIBCXX__) +-namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364 +-#endif + #include <typeinfo> // for 'typeid' to work + + #endif +diff --git a/intl/icu/source/io/unicode/ustream.h b/intl/icu/source/io/unicode/ustream.h +index 927342c..93ef51c 100644 +--- a/intl/icu/source/io/unicode/ustream.h ++++ b/intl/icu/source/io/unicode/ustream.h +@@ -34,10 +34,6 @@ + * C++ I/O stream API. + */ + +-#if defined(__GLIBCXX__) +-namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364 +-#endif +- + #include <iostream> + + U_NAMESPACE_BEGIN diff --git a/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch b/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch new file mode 100644 index 0000000000..fdd947bd4a --- /dev/null +++ b/debian/patches/debian-hacks/Set-DPI-to-system-settings.patch @@ -0,0 +1,21 @@ +From: Mike Hommey <glandium@debian.org> +Date: Thu, 13 Mar 2008 20:30:19 +0100 +Subject: Set DPI to system settings + +--- + modules/libpref/init/StaticPrefList.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml +index ba2705d..c1b0831 100644 +--- a/modules/libpref/init/StaticPrefList.yaml ++++ b/modules/libpref/init/StaticPrefList.yaml +@@ -8256,7 +8256,7 @@ + # interpretation of physical units such as "pt". + - name: layout.css.dpi + type: int32_t +- value: -1 ++ value: 0 + mirror: always + + # Whether Container Queries are enabled diff --git a/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch b/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch new file mode 100644 index 0000000000..35108a05b4 --- /dev/null +++ b/debian/patches/debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch @@ -0,0 +1,21 @@ +From: Mike Hommey <mh@glandium.org> +Date: Sun, 2 Apr 2017 06:33:19 +0900 +Subject: Use the Mozilla Location Service key when the Google Key is not there + +--- + modules/libpref/init/all.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js +index c7c6f0c..a772bd8 100644 +--- a/modules/libpref/init/all.js ++++ b/modules/libpref/init/all.js +@@ -3249,7 +3249,7 @@ pref("network.psl.onUpdate_notify", false); + + // All the Geolocation preferences are here. + // +-#ifndef EARLY_BETA_OR_EARLIER ++#if !defined(EARLY_BETA_OR_EARLIER) && defined(GOOGLE_LOCATION_SERVICE_API_KEY) + pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%"); + #else + // Use MLS on Nightly and early Beta. diff --git a/debian/patches/debian-hacks/Work-around-GCC-ICE-on-ppc64el.patch b/debian/patches/debian-hacks/Work-around-GCC-ICE-on-ppc64el.patch new file mode 100644 index 0000000000..17ffb8dd75 --- /dev/null +++ b/debian/patches/debian-hacks/Work-around-GCC-ICE-on-ppc64el.patch @@ -0,0 +1,29 @@ +From: Mike Hommey <mh@glandium.org> +Date: Tue, 11 Jul 2023 06:34:59 +0900 +Subject: Work around GCC ICE on ppc64el + +--- + gfx/skia/moz.build | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build +index 1d92936..ac0e0b2 100644 +--- a/gfx/skia/moz.build ++++ b/gfx/skia/moz.build +@@ -359,7 +359,15 @@ UNIFIED_SOURCES += [ + 'skia/src/sksl/SkSLConstantFolder.cpp', + 'skia/src/sksl/SkSLContext.cpp', + 'skia/src/sksl/SkSLErrorReporter.cpp', +- 'skia/src/sksl/SkSLInliner.cpp', ++] ++ ++# Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110606 ++if CONFIG['CC_TYPE'] == 'gcc' and CONFIG['CPU_ARCH'] == 'ppc64': ++ SOURCES += ['skia/src/sksl/SkSLInliner.cpp'] ++else: ++ UNIFIED_SOURCES += ['skia/src/sksl/SkSLInliner.cpp'] ++ ++UNIFIED_SOURCES += [ + 'skia/src/sksl/SkSLIntrinsicList.cpp', + 'skia/src/sksl/SkSLMangler.cpp', + 'skia/src/sksl/SkSLModuleLoader.cpp', diff --git a/debian/patches/debian-hacks/Work-around-https-sourceware.org-bugzilla-show_bug.c.patch b/debian/patches/debian-hacks/Work-around-https-sourceware.org-bugzilla-show_bug.c.patch new file mode 100644 index 0000000000..dec44b6324 --- /dev/null +++ b/debian/patches/debian-hacks/Work-around-https-sourceware.org-bugzilla-show_bug.c.patch @@ -0,0 +1,24 @@ +From: Mike Hommey <mh@glandium.org> +Date: Wed, 5 Jul 2023 05:25:35 +0900 +Subject: Work around https://sourceware.org/bugzilla/show_bug.cgi?id=30578 + +--- + media/ffvpx/config_unix64.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/media/ffvpx/config_unix64.h b/media/ffvpx/config_unix64.h +index c4311cf..b15c2be 100644 +--- a/media/ffvpx/config_unix64.h ++++ b/media/ffvpx/config_unix64.h +@@ -204,7 +204,11 @@ + #define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1 + #define HAVE_CABS 0 + #define HAVE_CEXP 0 ++#ifdef FFMPEG_DISABLE_INLINE_ASM ++#define HAVE_INLINE_ASM 0 ++#else + #define HAVE_INLINE_ASM 1 ++#endif + #define HAVE_SYMVER 1 + #define HAVE_X86ASM 1 + #define HAVE_BIGENDIAN 0 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000000..063523adb7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,18 @@ +debian-hacks/Avoid-wrong-sessionstore-data-to-keep-windows-out-of.patch +debian-hacks/Add-another-preferences-directory-for-applications-p.patch +debian-hacks/Add-a-2-minutes-timeout-on-xpcshell-tests.patch +debian-hacks/Add-debian-extra-stuff-to-upstream-build-system-dire.patch +debian-hacks/Don-t-build-image-gtests.patch +debian-hacks/Use-the-Mozilla-Location-Service-key-when-the-Google.patch +debian-hacks/Avoid-using-vmrs-vmsr-on-armel.patch +debian-hacks/Fix-math_private.h-for-i386-FTBFS.patch +debian-hacks/Allow-to-override-rust-LTO-flag.patch +debian-hacks/Remove-workaround-for-old-libstdc-problem-which-now-.patch +debian-hacks/Relax-nodejs-minimum-version.patch +debian-hacks/Relax-minimum-supporter-rust-version-to-1.63.patch +debian-hacks/Work-around-https-sourceware.org-bugzilla-show_bug.c.patch +debian-hacks/Allow-.js-preference-files-to-set-locked-prefs-with-.patch +debian-hacks/Set-DPI-to-system-settings.patch +debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch +debian-hacks/Work-around-GCC-ICE-on-ppc64el.patch +debian-hacks/Allow-to-build-oxilangtag-ffi-with-rustc-1.65.patch |