From nobody Wed Apr 13 18:46:26 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 9F1391B471B4; Wed, 13 Apr 2022 18:46:27 +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 4Kds4g0qN3z3HPn; Wed, 13 Apr 2022 18:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649875587; 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=fTdHqtlpy0QasLxO7z/bwW7165anZJrWCPSVUZePUUA=; b=GSg6A3CXwh8XN3ehaAqayIiqjnUfNk+X/byN8eyQ0kD4ZGrC/ZYFeHD5OtotHQJs6ZQoib +oA3bvXpfOFkD51sdszndX/XTa6+C6WlzXyzVrNCZDkopc/uXK9j0fvhxFOJr/9mLh40va gKvIDjlsvm3oAViljzl0BkRYHlhDTPaz/md1dHI9HZj6+5WipvNcrcZAUcUSG3kf1TcUwf QXh+QRccKIKMpez26RI4hMOTlZPiD0IhdhpMWR+9fxlDz0QtDBRhwogc1ikw4JwXLr27XU qEQVNJzLBSHVcZA+p11cKmng4jVReb0ZgqzvIyKmv4SrnxC0xWcculinfZeFPw== 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 A9E4211A21; Wed, 13 Apr 2022 18:46:26 +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 23DIkQge022373; Wed, 13 Apr 2022 18:46:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DIkQ48022372; Wed, 13 Apr 2022 18:46:26 GMT (envelope-from git) Date: Wed, 13 Apr 2022 18:46:26 GMT Message-Id: <202204131846.23DIkQ48022372@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: 70d74edf9c05 - main - games/rezerwar: unbreak on 13+ 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: 70d74edf9c059660e29f403edde40392fd4540ce Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649875587; 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=fTdHqtlpy0QasLxO7z/bwW7165anZJrWCPSVUZePUUA=; b=fGW/AJIzTikxqRXy5NBGrUOTI9NewWzH14/zlZ7MLoO89178LJKsIlX1nQQbdDePh4fwNO UBNWa01/fCHAQl+b9fGTt9C8mLAkbdJ86TZbuKBbKc4G6BAohpp7pKfY5T09xDP8rvQKPG mJcjeQSkZ2jcoMQZjAy5w8yg1X0XmkgzB1Vop2yLRDwcciDTicwDB4mifyEIolwcfLYQq+ 0deVthZgZ0fICtjtHGbjMbr8Tb15/bQvsa5UOLRbeqvKXNpkIHDPlxxAu67ftQKE8oCVyO g6b+v6BCXJ/6d8ajgYceEw9DqZmScoFK7BbpjAbHjisb1uDKZdlOLZj5+r8KIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649875587; a=rsa-sha256; cv=none; b=Lg5qy5AmsltWrcJBSrK2xg88QiD3XsV5eedY3nuWI1z8tH8X3zfIhTYVU6ylk8d4riajJl rS2pKASib6TfZ1rm6s+l+hczeTTLrc/x21grecPp5At60boyBXMMc6tkXK7LOT2ZvcXE2V oQUvOW/5xHb2k3QD76BShTNA0vIV0zz1DVIj8f49GmE2axsZinWtceujKA7EI7u6xyNrr1 ZMXFk/ZCwtW+oSl32XIjQlQtqop9UQDrN2/ySqfzISN0mxu4rxT2G1xIfaFUL4PI6sh80u snzepIFB2xTApsIzn7L51+uy61eAU0hIsWrmcOkmLv3YEstwdr/2KCI8Myg+Ww== 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=70d74edf9c059660e29f403edde40392fd4540ce commit 70d74edf9c059660e29f403edde40392fd4540ce Author: Dmitry Marakasov AuthorDate: 2022-04-13 15:51:28 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-13 18:41:55 +0000 games/rezerwar: unbreak on 13+ --- games/rezerwar/Makefile | 3 --- games/rezerwar/files/patch-src_events.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/games/rezerwar/Makefile b/games/rezerwar/Makefile index 5787b0942725..88a3e24b4168 100644 --- a/games/rezerwar/Makefile +++ b/games/rezerwar/Makefile @@ -8,9 +8,6 @@ MASTER_SITES= http://tamentis.com/projects/rezerwar/files/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Puzzle game involving organizing blocks with pipes -BROKEN_FreeBSD_13= ld: error: duplicate symbol: screen -BROKEN_FreeBSD_14= ld: error: duplicate symbol: screen - USES= gmake sdl USE_SDL= sdl mixer HAS_CONFIGURE= yes diff --git a/games/rezerwar/files/patch-src_events.c b/games/rezerwar/files/patch-src_events.c new file mode 100644 index 000000000000..43900ae63816 --- /dev/null +++ b/games/rezerwar/files/patch-src_events.c @@ -0,0 +1,11 @@ +--- src/events.c.orig 2010-05-09 16:25:03 UTC ++++ src/events.c +@@ -38,7 +38,7 @@ + + extern Board *board; + extern Configuration *conf; +-SDL_Surface *screen; ++extern SDL_Surface *screen; + Cube *speedy; // currently accelerated cube + +