From nobody Wed Sep 27 14:36:51 2023 X-Original-To: dev-commits-ports-main@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 4RwfM81SZ1z4vXmM; Wed, 27 Sep 2023 14:36:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RwfM80t9Dz3D9q; Wed, 27 Sep 2023 14:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695825412; 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=cWx7vz3cdRfCemsi7g09KzRBuZsMJVNLzaHDRCVx9ZQ=; b=ZPZPFsFAqvpSnKEiC3AWYtjoyhVAzQBmKvSDzB0Rz1rq6S3/adpFeyql/t6swbBiYMhofe kpkaPzJFI4rMniJMBiTfAOkf2x/+s3LXTEUw9Okt3gN+uXRKk9+jKHgKI2rPlNYA2n4H6N FBp7TTrFl9z8wGSPUPxVnNamDKdIjPRdkNw9d+V1p/G3sJT2hsBJAecfoM1WCsMLOXw5SE DGwk7Pe5CCTWpl+o9nYdQOLm9CNXyM61N12zjIqIlyn6ePx9S0kU2R3wItsbhEwgU1KqYu qeuckl2jxNUQGgupK73JxI2ze6QBoAFTFSeMnOJ2RqJFBiEOIYWqEzeWPnmISg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695825412; a=rsa-sha256; cv=none; b=STN8mCUBBOLwiFLB9WIMOgxFgVoinLlMokvQMFDs9C+l951Fq55tAPu07qd03MAXHQKa0f DP0WtaOLyQos4aCMAu5+pOE6l8fb16edzwYZNP0K1GO4NcLa7Xwou1h3qXwhIYIlPF2gDd kKfC6UJVFeFXQo5XlElV80evHiEh0Pez1E1okGLDsnHO7MlM6ORxR2V8+NY6SlI/hYo8yJ 0UmxXlGLvM+3vKTgnGqrXXidZdqNxN3vvzsP257ZweIlMGnxGaa2VYW1nw8G2HHDmx2tFL HR23cIqMVzMcuA1iPkUwlSlDs3vw1Qjtq+7TpsBOu4ZDYbcx2cn9EPI43O4cYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695825412; 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=cWx7vz3cdRfCemsi7g09KzRBuZsMJVNLzaHDRCVx9ZQ=; b=Ii7FdylgxoVfFMLrPA8trxgWvDOth/3lLOJr+Hyql5DIivbL/ez8F33leVuj7HLpeWTxDt dbSuV3mWUVhFUty/50Kk4nvIaFvzSD261ESkRdMFhvjgbjp+VfyZkF5JgcJhwIgQPKE4ap B6URJfwgUy992PMqfKRmSrqL1RZt0raX6Ta3+XbKXFliNOWpUK+EE0kpXx6x5hLDpmD7lq 5K4hpwqNglnn2ZL/mYmgux6bbVT93By2RmQBjEkzMdJrWjoZF4cUjoCBwpy6ssghVAn8YU QtA6i2b93BLofNwFq23JdBNQ9zLBjmCyT0Hp+pZVvpQnbBME7rb3p9GlWNxkgQ== 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 4RwfM775FRzjpT; Wed, 27 Sep 2023 14:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38REaphm092681; Wed, 27 Sep 2023 14:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38REap9v092678; Wed, 27 Sep 2023 14:36:51 GMT (envelope-from git) Date: Wed, 27 Sep 2023 14:36:51 GMT Message-Id: <202309271436.38REap9v092678@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 358336d31aa7 - main - games/wesnoth: update to 1.16.10 release, support Boost-1.83.0 (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 358336d31aa7b14c5b62e4ad128c2d4454f0c954 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=358336d31aa7b14c5b62e4ad128c2d4454f0c954 commit 358336d31aa7b14c5b62e4ad128c2d4454f0c954 Author: Dima Panov AuthorDate: 2023-09-27 14:03:27 +0000 Commit: Dima Panov CommitDate: 2023-09-27 14:36:29 +0000 games/wesnoth: update to 1.16.10 release, support Boost-1.83.0 (+) Release Notes: https://www.wesnoth.org/start/1.16/ Changelog: https://github.com/wesnoth/wesnoth/blob/1.16/changelog.md --- games/wesnoth/Makefile | 14 +++++++------- games/wesnoth/distinfo | 6 +++--- games/wesnoth/files/patch-boost-1.83 | 26 ++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index bfbf570b119a..0c831f717705 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,5 +1,5 @@ PORTNAME= wesnoth -PORTVERSION= 1.16.9 +PORTVERSION= 1.16.10 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ @@ -22,16 +22,16 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libicudata.so:devel/icu \ libharfbuzz.so:print/harfbuzz -LDFLAGS+= -L${LOCALBASE}/lib -lboost_system - -PORTSCOUT= limitw:1,even - -USES= cmake compiler:c++17-lang cpe gnome pkgconfig \ +USES= cmake compiler:c++17-lang cpe desktop-file-utils gnome pkgconfig \ python:run readline shebangfix ssl sdl tar:bzip2 xorg USE_SDL= image2 mixer2 ttf2 -USE_LDCONFIG= yes USE_GNOME= cairo pango USE_XORG= ice sm x11 xext + +LDFLAGS+= -L${LOCALBASE}/lib -lboost_system + +PORTSCOUT= limitw:1,even + SHEBANG_FILES= data/tools/about_cfg_to_wiki \ data/tools/addon_manager/html.py \ data/tools/expand-terrain-macros.py \ diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index 59e9d0236ec7..14fe12a9e6b8 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681753961 -SHA256 (wesnoth-1.16.9.tar.bz2) = 3ded6938fb24100b9884ab5a902711f6c7a25cef65aafddb3e3b8a15b7652386 -SIZE (wesnoth-1.16.9.tar.bz2) = 476167874 +TIMESTAMP = 1695160694 +SHA256 (wesnoth-1.16.10.tar.bz2) = a60521b1ee1c2ddc7dfde89a038b893a4b43337085bd1478f4bc92dab7da7fc7 +SIZE (wesnoth-1.16.10.tar.bz2) = 476195873 diff --git a/games/wesnoth/files/patch-boost-1.83 b/games/wesnoth/files/patch-boost-1.83 new file mode 100644 index 000000000000..b3161206616e --- /dev/null +++ b/games/wesnoth/files/patch-boost-1.83 @@ -0,0 +1,26 @@ +From 136e651d69fc91fa7a4154f8a4a7e977cc46eca4 Mon Sep 17 00:00:00 2001 +From: Pentarctagon +Date: Thu, 17 Aug 2023 23:19:21 -0500 +Subject: [PATCH] Compile fix for boost 1.83. + +Fixes #7849 +--- + src/gettext.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git src/gettext.cpp src/gettext.cpp +index 9888dede35ad..fa9b17ba85b2 100644 +--- src/gettext.cpp ++++ src/gettext.cpp +@@ -169,7 +169,11 @@ namespace + return msg; + } + ++#if BOOST_VERSION < 108300 + const char* get(int domain_id, const char* ctx, const char* sid, int n) const override ++#else ++ const char* get(int domain_id, const char* ctx, const char* sid, bl::count_type n) const override ++#endif + { + auto& base = get_base(); + const char* msg = base.get(domain_id, ctx, sid, n);