From owner-svn-ports-all@freebsd.org Wed Jul 8 21:42:38 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A08213561C3; Wed, 8 Jul 2020 21:42:38 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2CTB3Z86z46xN; Wed, 8 Jul 2020 21:42:38 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 465E526E91; Wed, 8 Jul 2020 21:42:38 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 068Lgck9085916; Wed, 8 Jul 2020 21:42:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 068Lgbu1085913; Wed, 8 Jul 2020 21:42:37 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202007082142.068Lgbu1085913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 8 Jul 2020 21:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541719 - in head/games/hedgewars: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/hedgewars: . files X-SVN-Commit-Revision: 541719 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2020 21:42:38 -0000 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()