CVS commit: pkgsrc/games/supertux

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 19 11:47:25 UTC 2025

Modified Files:
        pkgsrc/games/supertux: Makefile distinfo
        pkgsrc/games/supertux/patches: patch-external_squirrel_CMakeLists.txt
Added Files:
        pkgsrc/games/supertux/patches: patch-external_SDL__ttf_CMakeLists.txt
            patch-external_tinygettext_CMakeLists.txt

Log Message:
supertux: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/games/supertux/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/supertux/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/supertux/patches/patch-external_SDL__ttf_CMakeLists.txt \
    pkgsrc/games/supertux/patches/patch-external_tinygettext_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/supertux/patches/patch-external_squirrel_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/supertux/Makefile
diff -u pkgsrc/games/supertux/Makefile:1.62 pkgsrc/games/supertux/Makefile:1.63
--- pkgsrc/games/supertux/Makefile:1.62 Sat Apr 19 07:57:51 2025
+++ pkgsrc/games/supertux/Makefile      Tue Aug 19 11:47:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2025/04/19 07:57:51 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2025/08/19 11:47:25 wiz Exp $
 
 PKGNAME=               supertux-0.6.3
 PKGREVISION=           17
@@ -15,6 +15,7 @@ LICENSE=              gnu-gpl-v2
 CMAKE_CONFIGURE_ARGS+= -DINSTALL_SUBDIR_BIN=bin
 CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=off
 CMAKE_CONFIGURE_ARGS+= -DBoost_INCLUDE_DIR=${BUILDLINK_DIR}/include/boost
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 USE_TOOLS+=            pkg-config
 USE_LANGUAGES=         c c++14
 

Index: pkgsrc/games/supertux/distinfo
diff -u pkgsrc/games/supertux/distinfo:1.8 pkgsrc/games/supertux/distinfo:1.9
--- pkgsrc/games/supertux/distinfo:1.8  Fri Dec 22 20:53:49 2023
+++ pkgsrc/games/supertux/distinfo      Tue Aug 19 11:47:25 2025
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.8 2023/12/22 20:53:49 prlw1 Exp $
+$NetBSD: distinfo,v 1.9 2025/08/19 11:47:25 wiz Exp $
 
 BLAKE2s (SuperTux-v0.6.3-Source.tar.gz) = 9a3227e7426b437b3e529654897a95fd52b2c15135ff1ae08957c37704d62d24
 SHA512 (SuperTux-v0.6.3-Source.tar.gz) = c6540bab1b3befbd975756031c4587e5569d9613d9539dc829c728b574d1a4da92816d6a7e68947b32963cc13d9b8b52312701c199138640e9f89e5885433798
 Size (SuperTux-v0.6.3-Source.tar.gz) = 182065428 bytes
+SHA1 (patch-external_SDL__ttf_CMakeLists.txt) = bc16239630b099b92f308497d052ff9352c2b8b7
 SHA1 (patch-external_SDL__ttf_configure) = da5e257847458e0a4410be3b03299062d167d441
 SHA1 (patch-external_partio__zip_zip__manager.hpp) = 9b91692444a55d8a4d3c5c7c82cc591ee52454c3
 SHA1 (patch-external_physfs_src_physfs__platform__unix.c) = 2c8c6d7be1e02098065f5b177038ef71bac35dc5
-SHA1 (patch-external_squirrel_CMakeLists.txt) = 4376efef866ca4d03365724409ffbaf635707d01
+SHA1 (patch-external_squirrel_CMakeLists.txt) = 5e294e66a85b4bec48f2c28a38aacb543a9ee389
+SHA1 (patch-external_tinygettext_CMakeLists.txt) = 63ee77cfad60ba524a9fbd6076a48f7d5b48034d
 SHA1 (patch-external_tinygettext_include_tinygettext_iconv.hpp) = 4e9cf8c227af45ca2ae149fb18f29a9ad2a31b98

Index: pkgsrc/games/supertux/patches/patch-external_squirrel_CMakeLists.txt
diff -u pkgsrc/games/supertux/patches/patch-external_squirrel_CMakeLists.txt:1.1 pkgsrc/games/supertux/patches/patch-external_squirrel_CMakeLists.txt:1.2
--- pkgsrc/games/supertux/patches/patch-external_squirrel_CMakeLists.txt:1.1    Mon Jul  1 15:13:20 2019
+++ pkgsrc/games/supertux/patches/patch-external_squirrel_CMakeLists.txt        Tue Aug 19 11:47:25 2025
@@ -1,10 +1,16 @@
-$NetBSD: patch-external_squirrel_CMakeLists.txt,v 1.1 2019/07/01 15:13:20 nia Exp $
+$NetBSD: patch-external_squirrel_CMakeLists.txt,v 1.2 2025/08/19 11:47:25 wiz Exp $
 
 Disable building the dynamic library.
 
---- external/squirrel/CMakeLists.txt.orig      2018-12-23 19:11:41.000000000 +0000
+--- external/squirrel/CMakeLists.txt.orig      2021-12-22 23:02:04.000000000 +0000
 +++ external/squirrel/CMakeLists.txt
-@@ -6,6 +6,7 @@ endif()
+@@ -1,11 +1,8 @@
+-if(MSVC)
+-  cmake_minimum_required(VERSION 3.4)
+-else()
+-  cmake_minimum_required(VERSION 2.8)
+-endif()
++cmake_minimum_required(VERSION 3.5)
  
  set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}" CACHE PATH "")
  set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")

Added files:

Index: pkgsrc/games/supertux/patches/patch-external_SDL__ttf_CMakeLists.txt
diff -u /dev/null pkgsrc/games/supertux/patches/patch-external_SDL__ttf_CMakeLists.txt:1.1
--- /dev/null   Tue Aug 19 11:47:25 2025
+++ pkgsrc/games/supertux/patches/patch-external_SDL__ttf_CMakeLists.txt        Tue Aug 19 11:47:25 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-external_SDL__ttf_CMakeLists.txt,v 1.1 2025/08/19 11:47:25 wiz Exp $
+
+Fix build with cmake 4.
+
+--- external/SDL_ttf/CMakeLists.txt.orig       2025-08-19 11:42:41.777199279 +0000
++++ external/SDL_ttf/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ # Taken from https://github.com/Microsoft/vcpkg/blob/2ad118a2532e99a78c41dffa1b9648e7eca20a95/ports/sdl2-ttf/CMakeLists.txt
+ 
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ project(SDL2_TTF C)
+ 
+ find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
Index: pkgsrc/games/supertux/patches/patch-external_tinygettext_CMakeLists.txt
diff -u /dev/null pkgsrc/games/supertux/patches/patch-external_tinygettext_CMakeLists.txt:1.1
--- /dev/null   Tue Aug 19 11:47:25 2025
+++ pkgsrc/games/supertux/patches/patch-external_tinygettext_CMakeLists.txt     Tue Aug 19 11:47:25 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-external_tinygettext_CMakeLists.txt,v 1.1 2025/08/19 11:47:25 wiz Exp $
+
+Fix build with cmake 4.
+
+--- external/tinygettext/CMakeLists.txt.orig   2025-08-19 11:42:24.279160222 +0000
++++ external/tinygettext/CMakeLists.txt
+@@ -39,7 +39,7 @@ set(VERSION "0.1")
+ 
+ ### CMake configuration
+ 
+-cmake_minimum_required(VERSION 2.4)
++cmake_minimum_required(VERSION 3.5)
+ if(COMMAND cmake_policy)
+       CMAKE_POLICY(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)