remove 1459597 and fix 1443208

bug1240930-253/mozilla/1443208-1only-62a1.patch

@@ -157,14 +157,14 @@ diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuil
 diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
 --- a/python/mozbuild/mozbuild/frontend/emitter.py
 +++ b/python/mozbuild/mozbuild/frontend/emitter.py
-@@ -1386,17 +1386,17 @@ class TreeMetadataEmitter(LoggingMixin):
-                     if (isinstance(p, SourcePath) and
-                             not os.path.exists(p.full_path)):
-                         raise SandboxValidationError(
-                             'Input for generating %s does not exist: %s'
-                             % (f, p.full_path), context)
-                     inputs.append(p)
- 
+@@ -1347,17 +1347,17 @@ class TreeMetadataEmitter(LoggingMixin):
+                             raise SandboxValidationError(
+                                 'Input for generating %s does not exist: %s'
+                                 % (f, p.full_path), context)
+                         inputs.append(p)
+                 else:
+                     script = None
+                     method = None
                  yield GeneratedFile(context, script, method, outputs, inputs,
 -                                    flags.flags, localized=localized)
 +                                    flags.flags, localized=localized, force=flags.force)

bug1240930-253/mozilla/1459597-62a1.patch

@@ -1,40 +0,0 @@
-# HG changeset patch
-# User Ted Mielczarek <ted@mielczarek.org>
-# Date 1526054172 14400
-# Node ID bad54bae22fada00a6441796e2f9e181ccd3d2fd
-# Parent  a9c20695f9621c00de310dfcb208655e6866d16f
-bug 1459597 - fix Original Filename display in Windows file version info. r=chmanchester
-
-MozReview-Commit-ID: 1JdpRcbS6qN
-
-diff --git a/config/version.mk b/config/version.mk
---- a/config/version.mk
-+++ b/config/version.mk
-@@ -18,23 +18,23 @@ RESFILE=./module.res
- _RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(MOZILLA_DIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME "$(MOZ_APP_DISPLAYNAME)" -APPVERSION $(MOZ_APP_VERSION)
- ifdef MOZILLA_OFFICIAL
- _RC_STRING += -OFFICIAL 1
- endif
- ifdef MOZ_DEBUG
- _RC_STRING += -DEBUG 1
- endif
- ifdef PROGRAM
--_RC_STRING += -BINARY $(PROGRAM)
-+_RC_STRING += -BINARY $(notdir $(PROGRAM))
- else
- ifdef _PROGRAM
--_RC_STRING += -BINARY $(_PROGRAM)
-+_RC_STRING += -BINARY $(notdir $(_PROGRAM))
- else
- ifdef SHARED_LIBRARY
--_RC_STRING += -BINARY $(SHARED_LIBRARY)
-+_RC_STRING += -BINARY $(notdir $(SHARED_LIBRARY))
- endif
- endif
- endif
- ifdef RCINCLUDE
- _RC_STRING += -RCINCLUDE $(srcdir)/$(RCINCLUDE)
- endif
- 
- GARBAGE += $(RESFILE) $(RCFILE)
-

bug1240930-253/mozilla/series-append

@@ -1,4 +1,3 @@
-1459597-62a1.patch
 1443208-1only-62a1.patch
 1455504-62a1.patch
 1454912-2no1-62a1.patch