From nobody Tue Jun 25 20:20:58 2024 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 4W7x6f2QQVz5Px2V; Tue, 25 Jun 2024 20:20:58 +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 4W7x6f1wZsz4R32; Tue, 25 Jun 2024 20:20:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719346858; 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=WLPlOmoOEu2DMfqjZJmGOFRGvuKYGPcfePQo+benemE=; b=OxAVsbrCqBrGqWb/bvgNwJ9xkAsttQn8TL3i+chsRihtgp49BPfqOtnt9l4p6yOphqKLIi DV2Wj7b7DK2ixHP4c1WUTUz5XAwBOUCGAFBLi5SfgyrYHOFE518GX5l43ze5Vdf0Q+XEq4 eiqj1BNqVplxBezXmrNAAvHTYh/YH7cYSqmbpToN7tdVKVmlLoMR3kWT2aUbaeIrufDPjR joTxcYjPltk9Y4mm+fyPksmiiLCuwYYgGToxdcg/8+W9GD/Hqln22ojwwznf0jiQhxJyIc i9Jd7CcCJ3EDR8uWJJ36eWN81gnYfIgm1afX+RrySNpPYRt3rsa33+ujgY1aKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719346858; a=rsa-sha256; cv=none; b=inCdU/jZS/ZFWwdJcyb7zInLlfvS84Sz+JloNKCmQWaTpNapovYEgC4S6q7lyE0iji17Uu 3w/JXwtAJTsJoTGUp1+R8r9G7/jLguZCcIIL4SOx5MWQwOFHtQ+Pj1JGFADnZVbl28jpHi g1xY3OUGFpX+fiq4XswKY4Ti935SryTwjiaLKRZpdk8TkS11CCAz3K+W/k3CHDqZDneX1h 5/Kpu8HuUYZq4izrQdaAkSgeY+yAGIxm8o0E9JTT587cN8az8KpqEKwC9ugGa2TD8X9wkI QWMaaIGy7rJPx83t3inZ2EZGSYleQ+M2tBEHsz8XTQdE78M1pAjF5wHzmuimQA== 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=1719346858; 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=WLPlOmoOEu2DMfqjZJmGOFRGvuKYGPcfePQo+benemE=; b=DENUWbJJmmTsGnBcDQuejzbxFth3sidemIXHCZjhIZzt8LFMTohayx2QCQuXkbWpAUedyw vSPTeXNxYHquxJCio4948UkQm6bjuTRb6/oDqjXQsId5VygzH89WRkWefinzO1Bxcb2uP/ NFoloBNNZSowp4t3Q3bsbUKtrJfdDlGZEm6dIxWt+q9SRTrGGFEQzNHY+n0oCk30+tNtwY 9Ogoy2iekU5zgGeja4vXtGXo1w/HdaHTqXarUl0rGdHlVZYxxYbG14Tea1kxwEnc4glzGo TZp99vwi9m8c3mgO7IRpcA3J4Aag4ew3KKVbJ369chGGlFkBFj8aMy/bg/M37A== 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 4W7x6f1X0fzFv5; Tue, 25 Jun 2024 20:20:58 +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 45PKKwnu003333; Tue, 25 Jun 2024 20:20:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45PKKw7g003330; Tue, 25 Jun 2024 20:20:58 GMT (envelope-from git) Date: Tue, 25 Jun 2024 20:20:58 GMT Message-Id: <202406252020.45PKKw7g003330@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: c8a36ed58fae - main - games/openlierox: fix build with libxml 2.13, add license 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: c8a36ed58fae02809fb60be49c6b55dec733967e Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8a36ed58fae02809fb60be49c6b55dec733967e commit c8a36ed58fae02809fb60be49c6b55dec733967e Author: Dmitry Marakasov AuthorDate: 2024-06-25 13:44:54 +0000 Commit: Dmitry Marakasov CommitDate: 2024-06-25 19:13:58 +0000 games/openlierox: fix build with libxml 2.13, add license PR: 279765 Reported by: diizzy --- games/openlierox/Makefile | 3 +++ games/openlierox/files/patch-include_XMLutils.h | 10 ++++++++++ games/openlierox/files/patch-src_common_StringUtils.cpp | 14 ++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile index d04a2184e698..5d37f3dfce64 100644 --- a/games/openlierox/Makefile +++ b/games/openlierox/Makefile @@ -10,6 +10,9 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Extremely addictive realtime worms shoot-em-up WWW= https://openlierox.sourceforge.net/ +LICENSE= LGPL20 +LICENSE_FILE= ${WRKSRC}/COPYING.LIB + LIB_DEPENDS= libcurl.so:ftp/curl USES= cmake:insource compiler:c++11-lang gnome localbase pkgconfig \ diff --git a/games/openlierox/files/patch-include_XMLutils.h b/games/openlierox/files/patch-include_XMLutils.h new file mode 100644 index 000000000000..3dfb0e10777d --- /dev/null +++ b/games/openlierox/files/patch-include_XMLutils.h @@ -0,0 +1,10 @@ +--- include/XMLutils.h.orig 2018-01-30 13:49:55 UTC ++++ include/XMLutils.h +@@ -17,6 +17,7 @@ + + #include + #include ++#include + #include "Color.h" + + int xmlGetInt(xmlNodePtr node, const std::string& name, int def = 0); diff --git a/games/openlierox/files/patch-src_common_StringUtils.cpp b/games/openlierox/files/patch-src_common_StringUtils.cpp new file mode 100644 index 000000000000..ba5a96b679a5 --- /dev/null +++ b/games/openlierox/files/patch-src_common_StringUtils.cpp @@ -0,0 +1,14 @@ +--- src/common/StringUtils.cpp.orig 2018-02-01 15:56:41 UTC ++++ src/common/StringUtils.cpp +@@ -751,7 +751,11 @@ static void charactersParsed(void* context, const xmlC + } + + /* GCS: custom error function to ignore errors */ ++#if LIBXML_VERSION >= 21300 ++static void xmlErrorHandlerDummy(void *, const xmlError *) ++#else + static void xmlErrorHandlerDummy(void *, xmlErrorPtr) ++#endif + { + /* ignore all errors */ + }