From nobody Wed Aug 03 12:57:14 2022 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 4LyX230QKcz4YYG4; Wed, 3 Aug 2022 12:57:15 +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 4LyX2271nTz3Zfl; Wed, 3 Aug 2022 12:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659531435; 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=uZuaFIg6iBDOwr694nLEY6x4Lf9Pp+yPq7XO6iRR8dI=; b=LcPBKL8hVFKAZAOWvUaPurqg++fGh2NNjPOt7QKV0OD59q/hLEw41/tMpykToUYiDfYJtl jYt9cNDbBHid8XCR9luYWhApsOj1l0y6rl0X6hwt20gF2T3eGZsPOqql0DUAHMudPf1XAX XWs7rl+uhWuj4No1cztHpRWZ88EVHX1AbHW5YzphijNiS+ReOhl9wc44V0HAuhhXCQ/fFq njPGVhZSadFE1kGWXwdPzw/SPKqbP4r5Ln/rUo6oSawlYHKgCXz7TYac70Xdxoe28Lfcx3 AXUPkwfXZ9HN4aNoTvTUAoBe42rA94c+PVND4aG302MbNpTozy1tBwyBu1KD8A== 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 4LyX225qJszrhy; Wed, 3 Aug 2022 12:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 273CvEVV018782; Wed, 3 Aug 2022 12:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273CvE3f018781; Wed, 3 Aug 2022 12:57:14 GMT (envelope-from git) Date: Wed, 3 Aug 2022 12:57:14 GMT Message-Id: <202208031257.273CvE3f018781@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 5f0259f7402e - main - games/cataclysm-dda-tiles: fix build 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f0259f7402e8e50d188d1d9929a840d9d2aa6c4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659531435; 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=uZuaFIg6iBDOwr694nLEY6x4Lf9Pp+yPq7XO6iRR8dI=; b=K2PpqFNvHZ3k5eM2fSyfFPggPzbqF4KKodhBTVQJ4ij4pvDy8aZ5iiFi/b+7MccjrF2o0d hXjwb+wpM5CFMlDAhg6EMF4gsJAFBbXHnS91P+LTzVyAl5fQwmwJdRcMuGVD+agvpUEEJ7 zSkX0+x+DOnVpllM6SjMTmBneXoKfTxUP0A/T0Qz31cOVaY6NXovDcO0yqLw1PHRpP5csl pxhJJBVBWLpqg8hRVY3EMIlYvDJDfikIzrPSaXt2+aDVcEfqu/QcFTmmvHhyw4uNW2DsLY LJrUOZpx2DAQFs5As/hSt9QIQy8Tdu9KZi1Gz3gC+BdrB99YbCZzPxM0wncX+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659531435; a=rsa-sha256; cv=none; b=TbLhTkQ5NL92KLl/0dOBjtveob1VjlZsztxdFF1JnPWUJZFeN1kd9ovhkyZ/75WhVAjiSU 9fAPG6h6Y3Bf9RACCgcW9xBwNKehSMqWyo6aIpqt6biqMJ220LmztklEg04A+2KLF4l3Ts 4pSqqG9degijJBBAWMDyfpakvroPvUKEF6P+Urxbd5HiJieaYOiqPKEw4R63Q2e18ombjX 4jp+nRlXDvhThYZ25KPNb3Fg/FoH3V5b/yAWImbBs35BwYw5uW8acHFrg4uxlyATihB7S6 7aLaz8JgsXBQNTswgE39936H2nSag70dpfW3YHHulMLdxIn9fsiMAGnXQdzLNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f0259f7402e8e50d188d1d9929a840d9d2aa6c4 commit 5f0259f7402e8e50d188d1d9929a840d9d2aa6c4 Author: Dmitry Marakasov AuthorDate: 2022-08-03 12:55:29 +0000 Commit: Dmitry Marakasov CommitDate: 2022-08-03 12:57:07 +0000 games/cataclysm-dda-tiles: fix build Approved by: portmgr blanket --- games/cataclysm-dda/files/patch-src_sdl__font.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/games/cataclysm-dda/files/patch-src_sdl__font.cpp b/games/cataclysm-dda/files/patch-src_sdl__font.cpp new file mode 100644 index 000000000000..d647f1646e80 --- /dev/null +++ b/games/cataclysm-dda/files/patch-src_sdl__font.cpp @@ -0,0 +1,17 @@ +--- src/sdl_font.cpp.orig 2021-07-03 05:00:06 UTC ++++ src/sdl_font.cpp +@@ -22,12 +22,12 @@ static int test_face_size( const std::string &f, int s + { + const TTF_Font_Ptr fnt( TTF_OpenFontIndex( f.c_str(), size, faceIndex ) ); + if( fnt ) { +- char *style = TTF_FontFaceStyleName( fnt.get() ); ++ const char *style = TTF_FontFaceStyleName( fnt.get() ); + if( style != nullptr ) { + int faces = TTF_FontFaces( fnt.get() ); + for( int i = faces - 1; i >= 0; i-- ) { + const TTF_Font_Ptr tf( TTF_OpenFontIndex( f.c_str(), size, i ) ); +- char *ts = nullptr; ++ const char *ts = nullptr; + if( tf ) { + if( nullptr != ( ts = TTF_FontFaceStyleName( tf.get() ) ) ) { + if( 0 == strcasecmp( ts, style ) && TTF_FontHeight( tf.get() ) <= size ) {