mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-21 20:34:17 +08:00
Rollback uutils rev to fix locale issues
This commit is contained in:
parent
b84543a488
commit
044843eec5
@ -1,8 +1,9 @@
|
||||
# TODO Fix coreutils i18n/l10n behavior on Redox
|
||||
# TODO Fix locale init bug on aarch64 before removing patches
|
||||
# TODO https://github.com/uutils/coreutils/commit/e6f7ad06 broke locales on x86_64
|
||||
[source]
|
||||
git = "https://github.com/uutils/coreutils"
|
||||
rev = "0.7.0"
|
||||
rev = "1f7c81f5d2d3e56c518349c0392158871a1ea9ec"
|
||||
patches = [
|
||||
"redox.patch"
|
||||
]
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index b0015fa6f..cfb2b1b30 100644
|
||||
index 5f417bd42..b7b895a9c 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -326,6 +326,7 @@ feat_os_unix_redox = [
|
||||
@ -49,10 +49,10 @@ index fd1f30303..c508f6b9b 100644
|
||||
mod tests {
|
||||
// Note this useful idiom: importing names from outer (for mod tests) scope.
|
||||
diff --git a/src/uucore/src/lib/mods/locale.rs b/src/uucore/src/lib/mods/locale.rs
|
||||
index e7d05f4c7..d86e51e98 100644
|
||||
index b670f8976..a4ff9f983 100644
|
||||
--- a/src/uucore/src/lib/mods/locale.rs
|
||||
+++ b/src/uucore/src/lib/mods/locale.rs
|
||||
@@ -212,10 +212,11 @@ fn init_localization(
|
||||
@@ -211,10 +211,11 @@ fn init_localization(
|
||||
}
|
||||
};
|
||||
|
||||
@ -66,7 +66,7 @@ index e7d05f4c7..d86e51e98 100644
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -431,10 +432,12 @@ pub fn setup_localization(p: &str) -> Result<(), LocalizationError> {
|
||||
@@ -422,10 +423,12 @@ pub fn setup_localization(p: &str) -> Result<(), LocalizationError> {
|
||||
let english_bundle = create_english_bundle_from_embedded(&default_locale, p)?;
|
||||
let localizer = Localizer::new(english_bundle);
|
||||
|
||||
@ -78,6 +78,6 @@ index e7d05f4c7..d86e51e98 100644
|
||||
.map_err(|_| LocalizationError::Bundle("Localizer already initialized".into()))
|
||||
- })?;
|
||||
+ });
|
||||
Ok(())
|
||||
}
|
||||
LOCALIZER_IS_SET.with(|f| f.set(true));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user