<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a2a9b090fa9cc07e5ba89939b422b51463b1c9db">https://github.com/macports/macports-ports/commit/a2a9b090fa9cc07e5ba89939b422b51463b1c9db</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a2a9b090fa9 supertux: update to 0.6.2
</span>a2a9b090fa9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a2a9b090fa9cc07e5ba89939b422b51463b1c9db
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Sun Nov 15 13:17:50 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> supertux: update to 0.6.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - significant changes compared to old 0.1.3 version
</span><span style='display:block; white-space:pre;color:#404040;'> - uses cmake
</span><span style='display:block; white-space:pre;color:#404040;'> - generates it's own bundle
</span><span style='display:block; white-space:pre;color:#404040;'> - many upstream changes since last MacPorts version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/55163
</span>---
games/supertux/Portfile | 82 ++++++++++++++--------
games/supertux/files/patch-src_menu.h | 11 ---
games/supertux/files/patch-src_setup.cpp | 10 ---
games/supertux/files/patch-src_texture.h | 11 ---
.../files/patch-supertux-squirrel-linkagefix.diff | 21 ++++++
5 files changed, 73 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/supertux/Portfile b/games/supertux/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c6a7a2f05e5..d89050bb54c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/supertux/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/supertux/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +1,64 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name supertux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.1.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories games
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup SuperTux supertux 0.6.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description classic 2D jump and run sidescroller SuperMario clone
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description SuperTux is a classic 2D jump and run sidescroller \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- game in a similar style like the original SuperMario \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- games.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname SuperTux-v${version}-Source
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://supertux.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://download.berlios.de/supertux/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6ccc18343f32e41f832c96141bd26d0d19f11e95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 174295862
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 f2fc288459f33d5cd8f645fbca737a63
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories games
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description classic 2D jump'n run sidescroller game
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${name} is an open-source ${description} in a style similar\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to the original Super Mario games.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src_menu.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_texture.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://supertux.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libmikmod \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_mixer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# squirrel tries to use the C linker for code that uses c++ libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-supertux-squirrel-linkagefix.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-sdltest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.build_type Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_prefix ${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src_setup.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-apple-opengl-framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# don't use cpack -- this works better with MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DDISABLE_CPACK_BUNDLING=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# also uses libsdl2_ttf, but insists on building it's own copy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# upstream needs to accomodate a system version of this
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.name SuperTux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon supertux.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fribidi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glew \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libogg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libraqm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libvorbis \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:physfs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix case of icons file -- use the system command as much shorter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${applications_dir}/SuperTux.app/Contents/Resources "mv supertux.icns SuperTux.icns"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/share
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/supertux/files/patch-src_menu.h b/games/supertux/files/patch-src_menu.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cb380bf233e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/supertux/files/patch-src_menu.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/menu.h.orig 2005-06-21 16:16:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/menu.h 2011-08-29 03:28:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -207,7 +207,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool isToggled(int id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void Menu::get_controlfield_key_into_input(MenuItem *item);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void get_controlfield_key_into_input(MenuItem *item);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void draw ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void draw_item(int index, int menu_width, int menu_height);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/supertux/files/patch-src_setup.cpp b/games/supertux/files/patch-src_setup.cpp
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7c4b84ea528..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/supertux/files/patch-src_setup.cpp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/setup.cpp.orig 2005-07-08 07:19:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/setup.cpp 2011-08-29 04:08:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -578,7 +578,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set icon image: */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- seticon();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Unicode needed for input handling: */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/supertux/files/patch-src_texture.h b/games/supertux/files/patch-src_texture.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e60c027530f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/supertux/files/patch-src_texture.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/texture.h.orig 2005-07-23 18:12:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/texture.h 2005-07-23 18:12:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +137,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class SurfaceOpenGL : public SurfaceImpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- unsigned gl_texture;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GLuint gl_texture;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SurfaceOpenGL(SDL_Surface* surf, int use_alpha);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/supertux/files/patch-supertux-squirrel-linkagefix.diff b/games/supertux/files/patch-supertux-squirrel-linkagefix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..58e478ede45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/supertux/files/patch-supertux-squirrel-linkagefix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for some reason, upstream found a need to force a C linker, but the linked-in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libraries are c++ -- so the link fails when clang is called
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+we remove this force to a C linker, and cmake picks the right linker, clang++,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and the link succeeds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+kencu@macports.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git external/squirrel/sq/CMakeLists.txt external/squirrel/sq/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index daadb2d..a2b49ae 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- external/squirrel/sq/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ external/squirrel/sq/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,6 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT DEFINED DISABLE_STATIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(sq_static sq.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(sq_static PROPERTIES LINKER_LANGUAGE C)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(sq_static squirrel_static sqstdlib_static)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT DEFINED SQ_DISABLE_INSTALLER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS sq_static RUNTIME DESTINATION ${INSTALL_BIN_DIR})
</span></pre><pre style='margin:0'>
</pre>