[lgogdownloader] 03/03: New upstream release

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository lgogdownloader.

commit bbcc903b61f12768ee186a2dc114c11261b65f53
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Jun 10 23:24:05 2017 +0200

    New upstream release
---
 debian/changelog                                   |  6 +++
 debian/control                                     |  1 +
 debian/patches/Fix-crash-in-Website-getGames.patch | 49 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f030c4d..d87dc1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lgogdownloader (3.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Stephen Kitt <skitt at debian.org>  Sat, 10 Jun 2017 23:13:03 +0200
+
 lgogdownloader (3.1-2) unstable; urgency=medium
 
   [ Simon McVittie ]
diff --git a/debian/control b/debian/control
index 256681e..8047759 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: cmake,
                help2man,
                libboost-date-time-dev,
                libboost-filesystem-dev,
+               libboost-iostreams-dev,
                libboost-program-options-dev,
                libboost-regex-dev,
                libboost-system-dev,
diff --git a/debian/patches/Fix-crash-in-Website-getGames.patch b/debian/patches/Fix-crash-in-Website-getGames.patch
deleted file mode 100644
index a689162..0000000
--- a/debian/patches/Fix-crash-in-Website-getGames.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Sude <lgogdownloader at gmail.com>
-Date: Fri, 20 Jan 2017 00:15:50 +0200
-Subject: Fix crash in Website::getGames
-
-JSON value for updates can be null in some cases. For example when user owns a dlc but not the base game.
-This caused a crash due to std::stoi throwing std::invalid_argument exception
-
-Origin: upstream, 3.2, commit:22f47de4fcd8cd7ecc2a89fbb25f94efb1b3f743
----
- src/website.cpp | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/src/website.cpp b/src/website.cpp
-index 0803432..8ca4c8c 100644
---- a/src/website.cpp
-+++ b/src/website.cpp
-@@ -163,7 +163,31 @@ std::vector<gameItem> Website::getGames()
-                 gameItem game;
-                 game.name = product["slug"].asString();
-                 game.id = product["id"].isInt() ? std::to_string(product["id"].asInt()) : product["id"].asString();
--                game.updates = product["updates"].isInt() ? product["updates"].asInt() : std::stoi(product["updates"].asString());
-+
-+                if (product.isMember("updates"))
-+                {
-+                    if (product["updates"].isNull())
-+                    {
-+                        /* In some cases the value can be null.
-+                         * For example when user owns a dlc but not the base game
-+                         * https://github.com/Sude-/lgogdownloader/issues/101
-+                         * Assume that there are no updates in this case */
-+                        game.updates = 0;
-+                    }
-+                    else if (product["updates"].isInt())
-+                        game.updates = product["updates"].asInt();
-+                    else
-+                    {
-+                        try
-+                        {
-+                            game.updates = std::stoi(product["updates"].asString());
-+                        }
-+                        catch (std::invalid_argument& e)
-+                        {
-+                            game.updates = 0; // Assume no updates
-+                        }
-+                    }
-+                }
- 
-                 unsigned int platform = 0;
-                 if (product["worksOn"]["Windows"].asBool())
diff --git a/debian/patches/series b/debian/patches/series
index 69eb314..48af9e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-Fix-crash-in-Website-getGames.patch
 manpage-whatis.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lgogdownloader.git