rebase correctly

mozilla-central/patches/9999999-with-vs2019.patch

@@ -7,7 +7,7 @@ Bug 9999999 - permit --with-visual-studio-version=2019.
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -527,26 +527,26 @@ def get_vc_paths(topsrcdir):
+@@ -527,17 +527,17 @@ def get_vc_paths(topsrcdir):
          )
          tools_path = os.path.join(path, r"VC\Tools\MSVC", tools_version)
          yield (Version(install["installationVersion"]), tools_path)
@@ -17,7 +17,7 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
      "--with-visual-studio-version",
      nargs=1,
 -    choices=("2017",),
-+    choices=("2017", "2019",),
++    choices=("2017", "2019"),
      when=host_is_windows,
      help="Select a specific Visual Studio version to use",
  )
@@ -25,15 +25,4 @@ diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolc
  
  @depends_if("--with-visual-studio-version", when=host_is_windows)
  def vs_version(value):
--    return value[0]
--
-+    if value:
-+        return {"2017": 15, "2019": 16}[value[0]]
- 
- @depends(target, host)
- def is_windows(target, host):
-     return host.kernel == "WINNT" or target.kernel == "WINNT"
- 
- 
- # Calling this a sysroot is a little weird, but it's the terminology clang went
- # with with its -winsysroot flag.
+     return value[0]