From: yaydn@protonmail.com
Subject: Re: unbreak games/witchblast
To: Daniel Dickman <didickman@gmail.com>
Cc: "thfr@openbsd.org" <thfr@openbsd.org>, "ports@openbsd.org" <ports@openbsd.org>
Date: Thu, 25 Jun 2026 06:00:02 +0000

På torsdag 25. juni 2026 kl. 02:48, skrev Daniel Dickman
<didickman@gmail.com>:

> Hi Thomas, ports@
>
> See below for a diff to unbreak witchblast. The issue was that
> multimedia/sfml was switched to c++14 but this game needed a corresponding
> switch from c+11 to c++14 due a standards mismatch between the game and
> the library.
>
> ok?
>

Built on current/amd64 with privsep.

No regression tests and none of the update-patches port-lib-depends-check check-shlib-syms update-plist reported anything amiss.

Installed it and ran the startup animation for a few minutes on sway.

Looks fine. Hope this helps.
--
yaydn


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/witchblast/Makefile,v
> diff -u -p -u -r1.8 Makefile
> --- Makefile	2 Sep 2025 12:19:28 -0000	1.8
> +++ Makefile	25 Jun 2026 00:41:28 -0000
> @@ -1,4 +1,3 @@
> -BROKEN =	modern C++ issues in SFML/String.hpp
>  BROKEN-sparc64 =	undefined reference to XRRConfigRotations, etc.
>
>  COMMENT =	roguelite dungeon crawler game
> @@ -6,7 +5,7 @@ COMMENT =	roguelite dungeon crawler game
>  GH_ACCOUNT =	Cirrus-Minor
>  GH_PROJECT =	witchblast
>  GH_TAGNAME =	v0.7.5
> -REVISION =	2
> +REVISION =	3
>
>  CATEGORIES =	games x11
>
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/witchblast/patches/patch-CMakeLists_txt,v
> diff -u -p -u -r1.2 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt	11 Mar 2022 19:05:12 -0000	1.2
> +++ patches/patch-CMakeLists_txt	25 Jun 2026 00:41:28 -0000
> @@ -3,10 +3,30 @@ Add Unix install targets that are missin
>  Index: CMakeLists.txt
>  --- CMakeLists.txt.orig
>  +++ CMakeLists.txt
> -@@ -106,6 +106,20 @@ if(APPLE)
> -     DESTINATION ".")
> +@@ -1,4 +1,4 @@
> +-cmake_minimum_required(VERSION 2.8.12)
> ++cmake_minimum_required(VERSION 3.5)
> +
> + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
> +
> +@@ -12,9 +12,9 @@ elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
> +     set(USING_CLANG TRUE)
>   endif()
>
> +-# For GCC and Clang, enable C++11 support and add some other flags
> ++# For GCC and Clang, enable C++14 support and add some other flags
> + if(USING_GCC OR USING_CLANG)
> +-  add_compile_options(-std=c++11 -pedantic -Wall)
> ++  add_compile_options(-std=c++14 -pedantic -Wall)
> + endif()
> +
> + # Compilation options
> +@@ -104,6 +104,20 @@ if(APPLE)
> +     ${CMAKE_SOURCE_DIR}/COPYING.txt
> +     ${CMAKE_SOURCE_DIR}/readme.txt
> +     DESTINATION ".")
> ++endif()
> ++
>  +if(UNIX)
>  +	install(PROGRAMS ${CMAKE_BINARY_DIR}/Witch_Blast DESTINATION ${CMAKE_INSTALL_PREFIX}/share/witchblast)
>  +	install(
> @@ -19,8 +39,6 @@ Index: CMakeLists.txt
>  +	  ${CMAKE_SOURCE_DIR}/COPYING.txt
>  +	  ${CMAKE_SOURCE_DIR}/readme.txt
>  +	  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/witchblast)
> -+endif()
> -+
> + endif()
> +
>   # Packaging
> - SET(CPACK_PACKAGE_VERSION "0.7.5")
> - SET(CPACK_PACKAGE_VERSION_MAJOR "0")
>
>