Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jul 2020 21:42:37 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r541719 - in head/games/hedgewars: . files
Message-ID:  <202007082142.068Lgbu1085913@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Jul  8 21:42:37 2020
New Revision: 541719
URL: https://svnweb.freebsd.org/changeset/ports/541719

Log:
  Fix build on i386

Added:
  head/games/hedgewars/files/patch-CMakeLists.txt   (contents, props changed)
  head/games/hedgewars/files/patch-QTfrontend_CMakeLists.txt   (contents, props changed)
Modified:
  head/games/hedgewars/Makefile

Modified: head/games/hedgewars/Makefile
==============================================================================
--- head/games/hedgewars/Makefile	Wed Jul  8 21:24:18 2020	(r541718)
+++ head/games/hedgewars/Makefile	Wed Jul  8 21:42:37 2020	(r541719)
@@ -15,8 +15,6 @@ COMMENT=	Free Worms-like turn based strategy game
 LICENSE=	GPLv2 GFDL
 LICENSE_COMB=	multi
 
-BROKEN_i386=	uSound.pas: hGetContents: invalid argument (invalid byte sequence)
-
 LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libpng.so:graphics/png
 
@@ -39,6 +37,8 @@ PLIST_FILES=	bin/${PORTNAME} bin/hwengine \
 		lib/libphyslayer.so \
 		lib/libphyslayer.so.1.0
 PORTDATA=	*
+
+USE_LOCALE=	en_US.UTF-8
 
 OPTIONS_DEFINE=	VIDEOREC
 OPTIONS_DEFAULT=VIDEOREC

Added: head/games/hedgewars/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/hedgewars/files/patch-CMakeLists.txt	Wed Jul  8 21:42:37 2020	(r541719)
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2019-10-10 13:38:46 UTC
++++ CMakeLists.txt
+@@ -180,19 +180,6 @@ else()
+ endif()
+ 
+ 
+-#build engine without freepascal
+-if(BUILD_ENGINE_C AND NOT BUILD_ENGINE_JS)
+-    find_package(Clang REQUIRED)
+-
+-    if(${CLANG_VERSION} VERSION_LESS "3.0")
+-        message(FATAL_ERROR "LLVM/Clang compiler required version is 3.0 but version ${CLANG_VERSION} was found!")
+-    endif()
+-
+-    set(CMAKE_C_COMPILER ${CLANG_EXECUTABLE})
+-    set(CMAKE_CXX_COMPILER ${CLANG_EXECUTABLE})
+-endif()
+-
+-
+ #server
+ if(NOT NOSERVER)
+     add_subdirectory(gameServer)

Added: head/games/hedgewars/files/patch-QTfrontend_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/hedgewars/files/patch-QTfrontend_CMakeLists.txt	Wed Jul  8 21:42:37 2020	(r541719)
@@ -0,0 +1,16 @@
+--- QTfrontend/CMakeLists.txt.orig	2019-10-10 13:38:46 UTC
++++ QTfrontend/CMakeLists.txt
+@@ -247,13 +247,6 @@ if(WIN32 AND NOT UNIX)
+         )
+ endif()
+ 
+-if(CMAKE_CXX_COMPILER MATCHES "clang*")
+-    list(APPEND HW_LINK_LIBS stdc++ m)
+-    if(NOT APPLE)
+-        list(APPEND HW_LINK_LIBS atomic)
+-    endif()
+-endif()
+-
+ if(WIN32 AND VCPKG_TOOLCHAIN)
+     list(APPEND HW_LINK_LIBS Qt5::WinMain)
+ endif()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007082142.068Lgbu1085913>