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

@@ -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!(
-     <g>DENO_NO_PROMPT</>       Set to disable permission prompts on access
-                          (alternative to passing --no-prompt on invocation)
- 
--    <g>DENO_NO_UPDATE_CHECK</> Set to disable checking if a newer Deno version is
--                         available
--
-     <g>DENO_TLS_CA_STORE</>    Comma-separated list of order dependent certificate
-                          stores. Possible values: "system", "mozilla".
-                          Defaults to "mozilla".

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<String>,
- }
- 
--#[derive(Clone, Debug, Eq, PartialEq)]
--pub struct UpgradeFlags {
--  pub dry_run: bool,
--  pub force: bool,
--  pub canary: bool,
--  pub version: Option<String>,
--  pub output: Option<String>,
--}
--
- #[derive(Clone, Debug, Eq, PartialEq)]
- pub struct VendorFlags {
-   pub specifiers: Vec<String>,
- #[derive(Clone, Debug, Eq, PartialEq)]
- pub struct VendorFlags {
-   pub specifiers: Vec<String>,
-@@ -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<String>) -> clap::error::Result<Flags> {
        "test" => test_parse(&mut flags, &mut m),
        "types" => types_parse(&mut flags, &mut m),

deno.changes

@@ -3,8 +3,9 @@ Sun Jun  9 20:33:44 UTC 2024 - Avindra Goolcharan <avindra@opensuse.org>
 
 - 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 <avindra@opensuse.org>

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