From nobody Sat Nov 9 13:11:01 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xlx5L4qbyz5c7hq; Sat, 09 Nov 2024 13:11:02 +0000 (UTC) (envelope-from git@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xlx5K6rkNz3xqR; Sat, 9 Nov 2024 13:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731157862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=115wfDXyUVq9Ni5nBXtRTGmuIgbm/YWU2xQK1no5fF8=; b=oUdVYRvJBCmrFNBV0etf8bCywRqPitgGAG6xlRY2z02gqBOL9kA9V0Qb/vfsXOvfEbWgye MQModuOuHfAgMVhF7gcK3X48oURmYCFl1mQYrOMBSE5rnNomUItLbxxpjo+r631/YC7+6e H+ki7o/NFhPknQbrDr50CqKQNioPYEWHUB4f1G6H+oPWpzoqnWU/n7lUz8R1pTBLZ85+IQ MxeKFLoxtGEU/RawVxJQMrlmr0eQso2ajmE9m0Mg4QO0bRWKeqE4mjn7X9BqbU4/IfrTEl 0YEeUyJovjb36tBHXnB7k7IFyyFKa5zXoYZZlvyXN2qz5KW66VbiJ4PmcX76HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731157862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=115wfDXyUVq9Ni5nBXtRTGmuIgbm/YWU2xQK1no5fF8=; b=Djf1siscM5Mp8jeP2BfjQY8VirE0ABkpm20GG/i9hZzbLLmWlT+eMXuqTulx0DCBJbN8dF U1LfP2gDMsHbB6AfOJMALFV58GcjSpziEnVQueVE0k8K7nuS8GLMnmHvq0XSgPC97N8Ijd EARV/CLGN9FvoxF7eFetploPkJKej8VrJWUSQm6shEUM/BS+jgzQP5TxjhrDNdNV1+ibCp 7X0Llm8UXTT+FrsnlfF7i8GDkalrbohlWAL22RD//VbCaDJX7DlW3encpyqP3Ue3sewxnY VD/DMDNJnY6QU4pPeGT6UYvsNEwewfFLsAjIPXxixQY634n71l/CiRRqjkjiww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731157862; a=rsa-sha256; cv=none; b=ndS9hp+BZ+jH7UTd72cdknSnoNQGz+J36mWoHO43jx2fJwFHFobj481Nwf+Va4ruhyv+cI 32fbPYkHNExW6TSQYAAU5pgiX8khmYri6A5gJID5gaHmqQSs35H24xf6eRklQXflVaqH6j eg1gNvpqv+uSPtxjLknQd0E6RfQneba+kRw7HsFUivjG1LuPoEc9HdQ8i2OOGv41KSliZs TCguzBYXWUuAMko/1C/G171+9iwgP3JSa7nPbG8A55jkYb9nPEkI8U6WZF5TLFyqEjOao/ wVC5F/XVyiJj0iKPOZ0ijfevLNX/xtAuCLjoJC8mDkrjtLrrgT6g2DEOtoRYaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xlx5K546Tz1DRh; Sat, 9 Nov 2024 13:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A9DB1HT044712; Sat, 9 Nov 2024 13:11:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A9DB1Kd044709; Sat, 9 Nov 2024 13:11:01 GMT (envelope-from git) Date: Sat, 9 Nov 2024 13:11:01 GMT Message-Id: <202411091311.4A9DB1Kd044709@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Max Brazhnikov Subject: git: 26f212b0b220 - 2024Q4 - games/glob2: fix build with boost-1.85 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 26f212b0b220f96a2da7e5f3e2d32cb0c7ddbe9f Auto-Submitted: auto-generated The branch 2024Q4 has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=26f212b0b220f96a2da7e5f3e2d32cb0c7ddbe9f commit 26f212b0b220f96a2da7e5f3e2d32cb0c7ddbe9f Author: Max Brazhnikov AuthorDate: 2024-11-09 13:10:26 +0000 Commit: Max Brazhnikov CommitDate: 2024-11-09 13:10:26 +0000 games/glob2: fix build with boost-1.85 (cherry picked from commit e0a38371e522dbed3341bf8ff8732ae416c80b26) --- games/glob2/Makefile | 4 +--- games/glob2/files/patch-libusl_src_native.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/games/glob2/Makefile b/games/glob2/Makefile index d04d8d5071b3..840ef78acd48 100644 --- a/games/glob2/Makefile +++ b/games/glob2/Makefile @@ -1,6 +1,6 @@ PORTNAME= glob2 PORTVERSION= 0.9.5.0.g20240607 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= makc@FreeBSD.org @@ -10,8 +10,6 @@ WWW= https://globulation2.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with boost-1.85 - LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libportaudio.so:audio/portaudio \ libspeex.so:audio/speex \ diff --git a/games/glob2/files/patch-libusl_src_native.h b/games/glob2/files/patch-libusl_src_native.h new file mode 100644 index 000000000000..af83767f6a65 --- /dev/null +++ b/games/glob2/files/patch-libusl_src_native.h @@ -0,0 +1,11 @@ +--- libusl/src/native.h.orig 2024-06-07 07:47:17 UTC ++++ libusl/src/native.h +@@ -42,7 +42,7 @@ struct NativeValuePrototype: Prototype (private) + template + void addMethod(const std::string& name, const boost::function& function) + { +- BOOST_MPL_ASSERT(( boost::is_same::arg1_type> )); ++ BOOST_MPL_ASSERT(( boost::is_same::arg1_type> )); + NativeCode* native = new NativeFunction(name, function, true); + Prototype::addMethod(native); + }