From 8e6ed8231c24168f71dd4dbc279ac4d04a75d1df871c034cb5b26c05fac52024 Mon Sep 17 00:00:00 2001 From: Avindra Goolcharan Date: Sun, 9 Jun 2024 22:42:08 +0000 Subject: [PATCH] merge upgrade removal patches + rebase OBS-URL: https://build.opensuse.org/package/show/devel:languages:javascript/deno?expand=0&rev=186 --- deno-disable-update-check.patch | 33 ------------ ...upgrade-cmd.patch => deno-rm-upgrade.patch | 54 +++++++++---------- deno.changes | 5 +- deno.spec | 3 +- 4 files changed, 31 insertions(+), 64 deletions(-) delete mode 100644 deno-disable-update-check.patch rename deno-rm-upgrade-cmd.patch => deno-rm-upgrade.patch (89%) diff --git a/deno-disable-update-check.patch b/deno-disable-update-check.patch deleted file mode 100644 index 98011c5..0000000 --- a/deno-disable-update-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/cli/tools/run/mod.rs.1 b/cli/tools/run/mod.rs -index 4805ea7..57bb752 100644 ---- a/cli/tools/run/mod.rs.1 -+++ b/cli/tools/run/mod.rs -@@ -51,14 +51,6 @@ To grant permissions, set them before the script argument. For example: - ); - } - -- // Run a background task that checks for available upgrades or output -- // if an earlier run of this background task found a new version of Deno. -- #[cfg(feature = "upgrade")] -- super::upgrade::check_for_upgrades( -- http_client.clone(), -- deno_dir.upgrade_check_file_path(), -- ); -- - let main_module = cli_options.resolve_main_module()?; - - maybe_npm_install(&factory).await?; -diff --git a/cli/args/flags.rs.1 b/cli/args/flags.rs -index fa28241..d6e2baa 100644 ---- a/cli/args/flags.rs.1 -+++ b/cli/args/flags.rs -@@ -1062,9 +1062,6 @@ static ENV_VARIABLES_HELP: &str = color_print::cstr!( - DENO_NO_PROMPT Set to disable permission prompts on access - (alternative to passing --no-prompt on invocation) - -- DENO_NO_UPDATE_CHECK Set to disable checking if a newer Deno version is -- available -- - DENO_TLS_CA_STORE Comma-separated list of order dependent certificate - stores. Possible values: "system", "mozilla". - Defaults to "mozilla". diff --git a/deno-rm-upgrade-cmd.patch b/deno-rm-upgrade.patch similarity index 89% rename from deno-rm-upgrade-cmd.patch rename to deno-rm-upgrade.patch index 796184c..911ddb2 100644 --- a/deno-rm-upgrade-cmd.patch +++ b/deno-rm-upgrade.patch @@ -1,3 +1,22 @@ +diff --git a/cli/tools/run/mod.rs.1 b/cli/tools/run/mod.rs +index 4805ea7..57bb752 100644 +--- a/cli/tools/run/mod.rs.1 ++++ b/cli/tools/run/mod.rs +@@ -51,14 +51,6 @@ To grant permissions, set them before the script argument. For example: + ); + } + +- // Run a background task that checks for available upgrades or output +- // if an earlier run of this background task found a new version of Deno. +- #[cfg(feature = "upgrade")] +- super::upgrade::check_for_upgrades( +- http_client.clone(), +- deno_dir.upgrade_check_file_path(), +- ); +- + let main_module = cli_options.resolve_main_module()?; + + maybe_npm_install(&factory).await?; diff --git a/cli/main.rs.1 b/cli/main.rs index 031ab07..4f3b05c 100644 --- a/cli/main.rs.1 @@ -22,26 +41,7 @@ diff --git a/cli/args/flags.rs.1 b/cli/args/flags.rs index 72841df..1c93da1 100644 --- a/cli/args/flags.rs.1 +++ b/cli/args/flags.rs -@@ -295,15 +295,6 @@ pub struct TestFlags { - pub junit_path: Option, - } - --#[derive(Clone, Debug, Eq, PartialEq)] --pub struct UpgradeFlags { -- pub dry_run: bool, -- pub force: bool, -- pub canary: bool, -- pub version: Option, -- pub output: Option, --} -- - #[derive(Clone, Debug, Eq, PartialEq)] - pub struct VendorFlags { - pub specifiers: Vec, - #[derive(Clone, Debug, Eq, PartialEq)] - pub struct VendorFlags { - pub specifiers: Vec, -@@ -328,7 +319,6 @@ pub enum DenoSubcommand { +@@ -397,7 +397,6 @@ pub enum DenoSubcommand { Task(TaskFlags), Test(TestFlags), Types, @@ -49,15 +49,15 @@ index 72841df..1c93da1 100644 Vendor(VendorFlags), Publish(PublishFlags), } -@@ -768,7 +768,7 @@ impl Flags { +@@ -917,7 +917,7 @@ impl Flags { + Some(current_dir.to_path_buf()) } Add(_) | Bundle(_) | Completions(_) | Doc(_) | Fmt(_) | Init(_) - | Install(_) | Uninstall(_) | Jupyter(_) | Lsp | Lint(_) | Types -- | Upgrade(_) | Vendor(_) => None, -+ | Vendor(_) => None, - } - } - +- | Uninstall(_) | Jupyter(_) | Lsp | Lint(_) | Types | Upgrade(_) ++ | Uninstall(_) | Jupyter(_) | Lsp | Lint(_) | Types + | Vendor(_) => None, + Install(_) => { + if *DENO_FUTURE { @@ -944,7 +934,6 @@ pub fn flags_from_vec(args: Vec) -> clap::error::Result { "test" => test_parse(&mut flags, &mut m), "types" => types_parse(&mut flags, &mut m), diff --git a/deno.changes b/deno.changes index fd35019..63384af 100644 --- a/deno.changes +++ b/deno.changes @@ -3,8 +3,9 @@ Sun Jun 9 20:33:44 UTC 2024 - Avindra Goolcharan - update to 1.44.1 * many changes since April 4, see GitHub releases for info -- rebase deno-disable-update-check.patch -- rebase deno-rm-upgrade-cmd.patch +- add deno-rm-upgrade.patch (merged 2 patches) +- remove deno-disable-update-check.patch +- remove deno-rm-upgrade-cmd.patch ------------------------------------------------------------------- Thu Apr 4 19:01:31 UTC 2024 - Avindra Goolcharan diff --git a/deno.spec b/deno.spec index 83ed34f..87062ce 100644 --- a/deno.spec +++ b/deno.spec @@ -29,8 +29,7 @@ Source0: %{name}-%{version}.tar.xz Source1: vendor.tar.xz Source2: cargo_config Source99: revendor_source.sh -Patch0: deno-disable-update-check.patch -Patch1: deno-rm-upgrade-cmd.patch +Patch1: deno-rm-upgrade.patch BuildRequires: cargo-packaging # gcc-c++ needed to build SPIRV-Cross BuildRequires: clang