[Pkg-cli-libs-commits] [newtonsoft-json] 08/14: Refreshed d/p/Use-single-argument-BigInteger.Parse-calls.patch

Jo Shields directhex at moszumanska.debian.org
Mon Dec 14 14:43:28 UTC 2015


This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/6.0.8+dfsg-1
in repository newtonsoft-json.

commit 244916d206e60b5f008f91bc1e5cb9d5e0600654
Author: Jo Shields <jo.shields at xamarin.com>
Date:   Mon Dec 14 13:25:32 2015 +0000

    Refreshed d/p/Use-single-argument-BigInteger.Parse-calls.patch
---
 ...se-single-argument-BigInteger.Parse-calls.patch | 76 +++++++++++-----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/debian/patches/Use-single-argument-BigInteger.Parse-calls.patch b/debian/patches/Use-single-argument-BigInteger.Parse-calls.patch
index 223ec57..bc71ef4 100644
--- a/debian/patches/Use-single-argument-BigInteger.Parse-calls.patch
+++ b/debian/patches/Use-single-argument-BigInteger.Parse-calls.patch
@@ -6,47 +6,47 @@ BigInteger.Parse is supposed to accept two arguments in .NET 4.0, but apparently
 only supports one in Mono. This patch reverts to the single-argument call to let
 it compile.
 ---
- Source/Src/Newtonsoft.Json/JsonTextReader.cs         | 4 ++--
- Source/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs | 4 ++--
+ Src/Newtonsoft.Json/JsonTextReader.cs         | 4 ++--
+ Src/Newtonsoft.Json/Utilities/ConvertUtils.cs | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/Source/Src/Newtonsoft.Json/JsonTextReader.cs b/Source/Src/Newtonsoft.Json/JsonTextReader.cs
-index 52ddc74..3ce3d07 100644
---- a/Source/Src/Newtonsoft.Json/JsonTextReader.cs
-+++ b/Source/Src/Newtonsoft.Json/JsonTextReader.cs
-@@ -1269,7 +1269,7 @@ namespace Newtonsoft.Json
-           {
- #if !(NET20 || NET35 || SILVERLIGHT || PORTABLE40 || PORTABLE)
-             string number = _stringReference.ToString();
--            numberValue = BigInteger.Parse(number, CultureInfo.InvariantCulture);
-+            numberValue = BigInteger.Parse(number);
-             numberType = JsonToken.Integer;
- #else
-             // todo - validate number was a valid integer to make sure overflow was the reason for failure
-@@ -1565,4 +1565,4 @@ namespace Newtonsoft.Json
-       get { return _charPos - _lineStartPos; }
-     }
-   }
+Index: newtonsoft-json/Src/Newtonsoft.Json/JsonTextReader.cs
+===================================================================
+--- newtonsoft-json.orig/Src/Newtonsoft.Json/JsonTextReader.cs
++++ newtonsoft-json/Src/Newtonsoft.Json/JsonTextReader.cs
+@@ -1357,7 +1357,7 @@ namespace Newtonsoft.Json
+         [MethodImpl(MethodImplOptions.NoInlining)]
+         private static object BigIntegerParse(string number, CultureInfo culture)
+         {
+-            return System.Numerics.BigInteger.Parse(number, culture);
++            return System.Numerics.BigInteger.Parse(number);
+         }
+ #endif
+ 
+@@ -1668,4 +1668,4 @@ namespace Newtonsoft.Json
+             get { return _charPos - _lineStartPos; }
+         }
+     }
 -}
 \ No newline at end of file
-+}
-diff --git a/Source/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs b/Source/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs
-index 95f471e..6c9d3d6 100644
---- a/Source/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs
-+++ b/Source/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs
-@@ -301,7 +301,7 @@ namespace Newtonsoft.Json.Utilities
-       if (value is BigInteger)
-         return (BigInteger)value;
-       if (value is string)
--        return BigInteger.Parse((string)value, CultureInfo.InvariantCulture);
-+        return BigInteger.Parse((string)value);
-       if (value is float)
-         return new BigInteger((float)value);
-       if (value is double)
-@@ -681,4 +681,4 @@ namespace Newtonsoft.Json.Utilities
-       return ParseResult.Success;
-     }
-   }
++}
+Index: newtonsoft-json/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs
+===================================================================
+--- newtonsoft-json.orig/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs
++++ newtonsoft-json/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs
+@@ -310,7 +310,7 @@ namespace Newtonsoft.Json.Utilities
+             if (value is BigInteger)
+                 return (BigInteger)value;
+             if (value is string)
+-                return BigInteger.Parse((string)value, CultureInfo.InvariantCulture);
++                return BigInteger.Parse((string)value);
+             if (value is float)
+                 return new BigInteger((float)value);
+             if (value is double)
+@@ -798,4 +798,4 @@ namespace Newtonsoft.Json.Utilities
+ #endif
+         }
+     }
 -}
 \ No newline at end of file
-+}
++}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/newtonsoft-json.git



More information about the Pkg-cli-libs-commits mailing list