01/02: gnu: supertux: Adjust for recent GCC and Boost.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 57d87f435fcb05a8e44a6d0545d0212429826bd0
Author: Marius Bakke <address@hidden>
Date:   Fri Jul 19 18:00:41 2019 +0200

    gnu: supertux: Adjust for recent GCC and Boost.
    
    * gnu/packages/patches/supertux-fix-build-with-gcc5.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/games.scm (supertux)[source](patches): Remove.
    [arguments]: Adjust <#:configure-flags>.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/games.scm                             |  6 +-
 .../patches/supertux-fix-build-with-gcc5.patch     | 75 ----------------------
 3 files changed, 3 insertions(+), 79 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 3577504..528ad70 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1307,7 +1307,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/superlu-dist-awpm-grid.patch            \
   %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
-  %D%/packages/patches/supertux-fix-build-with-gcc5.patch      \
   %D%/packages/patches/supertux-unbundle-squirrel.patch                \
   %D%/packages/patches/swig-guile-gc.patch                     \
   %D%/packages/patches/swish-e-search.patch                    \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8e9db14..1088d2f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3519,12 +3519,12 @@ with the \"Stamp\" tool within Tux Paint.")
              (base32
               "1h1s4abirkdv4ag22zvyk6zkk64skqbjmcnnba67ps4hdzxfbhy4"))
             (patches
-             (search-patches "supertux-fix-build-with-gcc5.patch"
-                             "supertux-unbundle-squirrel.patch"))))
+             (search-patches "supertux-unbundle-squirrel.patch"))))
    (arguments
     '(#:tests? #f
       #:configure-flags '("-DINSTALL_SUBDIR_BIN=bin"
-                          "-DENABLE_BOOST_STATIC_LIBS=OFF"
+                          ;; XXX: Work around <https://bugs.gnu.org/36721>.
+                          "-DBoost_NO_BOOST_CMAKE=ON"
                           "-DUSE_SYSTEM_PHYSFS=ON")
       #:phases
       (modify-phases %standard-phases
diff --git a/gnu/packages/patches/supertux-fix-build-with-gcc5.patch 
b/gnu/packages/patches/supertux-fix-build-with-gcc5.patch
deleted file mode 100644
index 6393215..0000000
--- a/gnu/packages/patches/supertux-fix-build-with-gcc5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Taken from 
https://github.com/SuperTux/supertux/commit/a75317ef0a94847d9b6a7833b9c6652ef29edde3.
-This patch fixes building with gcc versions earlier than 6.
-
-From a75317ef0a94847d9b6a7833b9c6652ef29edde3 Mon Sep 17 00:00:00 2001
-From: Ingo Ruhnke <address@hidden>
-Date: Fri, 28 Dec 2018 22:45:35 +0100
-Subject: [PATCH] Add workaround for backwards compatibilty with gcc5
-
-Fixes #1014
----
- src/video/gl/gl_painter.cpp | 11 ++++++-----
- src/video/ttf_surface.cpp   | 16 +++++++++-------
- 2 files changed, 15 insertions(+), 12 deletions(-)
-
-diff --git a/src/video/gl/gl_painter.cpp b/src/video/gl/gl_painter.cpp
-index 5e0d1e7b1e..32fb7a09b6 100644
---- a/src/video/gl/gl_painter.cpp
-+++ b/src/video/gl/gl_painter.cpp
-@@ -37,12 +37,13 @@ namespace {
- 
- inline std::tuple<GLenum, GLenum> blend_factor(Blend blend)
- {
-+  using B = std::tuple<GLenum, GLenum>;
-   switch(blend) {
--    case Blend::NONE: return {GL_ONE, GL_ZERO};
--    case Blend::BLEND: return {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA};
--    case Blend::ADD: return {GL_SRC_ALPHA, GL_ONE};
--    case Blend::MOD: return {GL_DST_COLOR, GL_ZERO};
--    default: return {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA};
-+    case Blend::NONE: return B(GL_ONE, GL_ZERO);
-+    case Blend::BLEND: return B(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-+    case Blend::ADD: return B(GL_SRC_ALPHA, GL_ONE);
-+    case Blend::MOD: return B(GL_DST_COLOR, GL_ZERO);
-+    default: return B(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-   }
- }
- 
-diff --git a/src/video/ttf_surface.cpp b/src/video/ttf_surface.cpp
-index 7c9505004f..b41d67b2c8 100644
---- a/src/video/ttf_surface.cpp
-+++ b/src/video/ttf_surface.cpp
-@@ -55,12 +55,13 @@ TTFSurface::create(const TTFFont& font, const std::string& 
text)
-     SDL_SetSurfaceColorMod(text_surface.get(), 0, 0, 0);
-     SDL_SetSurfaceBlendMode(text_surface.get(), SDL_BLENDMODE_BLEND);
- 
-+    using P = std::tuple<int, int>;
-     const std::initializer_list<std::tuple<int, int> > positions[] = {
-       {},
--      {{0, 0}},
--      {{-1, 0}, {1, 0}, {0, -1}, {0, 1}},
--      {{-2, 0}, {2, 0}, {0, -2}, {0, 2},
--       {-1, -1}, {1, -1}, {-1, 1}, {1, 1}}
-+      {P{0, 0}},
-+      {P{-1, 0}, P{1, 0}, P{0, -1}, P{0, 1}},
-+      {P{-2, 0}, P{2, 0}, P{0, -2}, P{0, 2},
-+       P{-1, -1}, P{1, -1}, P{-1, 1}, P{1, 1}}
-     };
- 
-     int shadow_size = std::min(2, font.get_shadow_size());
-@@ -77,11 +78,12 @@ TTFSurface::create(const TTFFont& font, const std::string& 
text)
-     SDL_SetSurfaceColorMod(text_surface.get(), 0, 0, 0);
-     SDL_SetSurfaceBlendMode(text_surface.get(), SDL_BLENDMODE_BLEND);
- 
-+    using P = std::tuple<int, int>;
-     const std::initializer_list<std::tuple<int, int> > positions[] = {
-       {},
--      {{-1, 0}, {1, 0}, {0, -1}, {0, 1}},
--      {{-2, 0}, {2, 0}, {0, -2}, {0, 2},
--       {-1, -1}, {1, -1}, {-1, 1}, {1, 1}}
-+      {P{-1, 0}, P{1, 0}, P{0, -1}, P{0, 1}},
-+      {P{-2, 0}, P{2, 0}, P{0, -2}, P{0, 2},
-+       P{-1, -1}, P{1, -1}, P{-1, 1}, P{1, 1}}
-     };
- 
-     int border = std::min(2, font.get_border());