[trigger-rally] 06/14: Drop fix_build_gcc5.patch. Fixed upstream.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository trigger-rally.

commit 15d0302d5ff401ef8d56c19988bba0cfdc31271f
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 19 14:21:21 2016 +0100

    Drop fix_build_gcc5.patch. Fixed upstream.
---
 debian/changelog                    |  1 +
 debian/patches/fix_build_gcc5.patch | 45 -------------------------------------
 debian/patches/series               |  1 -
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b60d0f6..fe66449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ trigger-rally (0.6.5+dfsg-1) unstable; urgency=medium
   * Team upload.
   * New upstream version 0.6.5+dfsg.
   * Switch to compat level 10.
+  * Drop fix_build_gcc5.patch. Fixed upstream.
 
  -- Markus Koschany <apo at debian.org>  Mon, 19 Dec 2016 14:19:05 +0100
 
diff --git a/debian/patches/fix_build_gcc5.patch b/debian/patches/fix_build_gcc5.patch
deleted file mode 100644
index ca649cd..0000000
--- a/debian/patches/fix_build_gcc5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: fix build with gcc 5+
-Origin: upstream
-Applied-Upstream: commit: r798
---- a/src/include/hiscore1.h
-+++ b/src/include/hiscore1.h
-@@ -41,6 +41,16 @@
-         return InputStream;                                         \
- } else (void)0
- 
-+// TODO: remove duplicate code
-+#define GETLINE_SKIP_EMPTY_LINES_B(InputStream, String) if (true) { \
-+    while (std::getline(InputStream, String)) {                     \
-+        if (!String.empty())                                        \
-+            break;                                                  \
-+    }                                                               \
-+    if (String.empty())                                             \
-+        return static_cast<bool> (InputStream);                     \
-+} else (void)0
-+
- ///
- /// @brief Basic structure to load and save race results.
- ///
-@@ -724,19 +734,19 @@
-         std::istringstream sspdata(decrypt(pdata));
- #undef decrypt
- 
--        GETLINE_SKIP_EMPTY_LINES(sspdata, ts);
-+        GETLINE_SKIP_EMPTY_LINES_B(sspdata, ts);
-         nu = std::stoul(ts);
- 
-         while (nu-- != 0)
-         {
--            GETLINE_SKIP_EMPTY_LINES(sspdata, ts);
-+            GETLINE_SKIP_EMPTY_LINES_B(sspdata, ts);
-             allunlocks[pname].insert(ts);
-         }
- 
-         while (sspdata >> rd)
-             alltimes.insert({rd.mapname, rd});
- 
--        return sspdata;
-+        return static_cast<bool> (sspdata);
-     }
- 
-     ///
diff --git a/debian/patches/series b/debian/patches/series
index 1393732..56f9ba7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix_build_gcc5.patch
 20_system_tinyxml.patch
 813-config-path.patch
 811-flags.patch

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