From nobody Tue May 14 01:45:30 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 4VdfLy4TzYz5K6mK; Tue, 14 May 2024 01:45:30 +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 4VdfLy3dShz4MZk; Tue, 14 May 2024 01:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715651130; 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=l+5+ywpxt2IPA3kAjZhiADLM14LpEe7U0lLlbE8mDF4=; b=BLQh9xNqwTJex2sK6l0Xxh8HWzs8seUIhxtXUmUIidzF9ajPIMYZnpu5B+0pK8vJyZ7gs5 o948kz5NlefMkl8fTTAlRQXb+d+TqFasPGc+j+OHo1loLQENKbs/nnwmX3tbI3wY4Jm7Cm eIRMDnztOQcEEdwCI7iJAqCKaE+L1OpklkTi1LX/tbqn6/R67dAgkBwkqdVohq9MhI+ZFU UtSMEhDG1J3vK0C/y7xH0sF5P4iCllxaQaYVesvXStPrYLFo6fwDFDgl6KpqV8iFSK1RGs hbvuYJM5ZbkaH4ghoJ/9rlUeKaUJd7aX6VQP9MZ82+wJDBnEw49pCyOk6/aB2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715651130; a=rsa-sha256; cv=none; b=ONie7uAHE7VJTLeuhPH/bTtXRc/xnl7JtNITUvU+qqDUN5gV5SJGBtjX8ts4Lm5WlXr8uE Bv/PsDDzpLVN4hnqsjash9I18DI74LGh0bVgSNSgFhN4lN+G8qpQVeb4iLwMea10GiN/Eb dprAAVsgl2cLh8KIXRQTUfoUbMKIsKlvsOmWSW3tFfmf1uXbOdOAYnrS/bx/fX1CYqG5i9 ZI5z+Nxt++CdIMigc4s+MNa7QoUhhh8mu8S7nWOWAOnzGAFnny4h6fjh4WdhMRbs1VhQw1 4HKHiex7JR/gA8SN/yJENPOJD3iYnqcqu4CqKueCcDJpTvO+QX+vfGn8C6G96w== 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=1715651130; 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=l+5+ywpxt2IPA3kAjZhiADLM14LpEe7U0lLlbE8mDF4=; b=ll1vk8SHXgn9CFc77B7rXCW2VbThFgSl6c4M6Ghlt2floXAaSHp2htJVsu3B6f70nP4ZOU ysVG+aQzJLlkMhldJZZwwy9hPI3S9I9JJx0lssm04gz6ldRqasW/Ik2xkS/BzHAximysOv JekScUQdmJ7ifoyCtiztDZT8CYlDpV+GlPHa939ssom//+Xr5PnnbaBBGfeM8+/IaDAFpF iZBHAzylcZG0nDzBOiJtqzTOgBfKqZBZBmnQ2s8ETbpSwlHYkIG5OP1yeIP3+WrzI228Wr md58/yTqJ6DJk9Scrmz41+ioWJNPXXuYrJiYkwOXOO3uSDrLdhW9FVrdSKo/kQ== 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 4VdfLy3DvTz1BgR; Tue, 14 May 2024 01:45:30 +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 44E1jU1o080232; Tue, 14 May 2024 01:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E1jUTI080229; Tue, 14 May 2024 01:45:30 GMT (envelope-from git) Date: Tue, 14 May 2024 01:45:30 GMT Message-Id: <202405140145.44E1jUTI080229@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: 52371ce420c7 - main - games/xmoto: fix sqlite related startup crash 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: 52371ce420c779e73cd2feb68bd8627508fde655 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=52371ce420c779e73cd2feb68bd8627508fde655 commit 52371ce420c779e73cd2feb68bd8627508fde655 Author: Dmitry Marakasov AuthorDate: 2024-05-06 13:07:33 +0000 Commit: Dmitry Marakasov CommitDate: 2024-05-14 01:44:10 +0000 games/xmoto: fix sqlite related startup crash PR: 278669 Submitted by: dave@vasilevsky.ca Upstream PR: https://github.com/xmoto/xmoto/pull/188/files --- games/xmoto/Makefile | 2 +- games/xmoto/files/patch-src_db_xmDatabase.cpp | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index 7dcc488863a4..acd6e9bba988 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -1,7 +1,7 @@ PORTNAME= xmoto DISTVERSIONPREFIX= v DISTVERSION= 0.6.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/games/xmoto/files/patch-src_db_xmDatabase.cpp b/games/xmoto/files/patch-src_db_xmDatabase.cpp new file mode 100644 index 000000000000..bf49c52bfef4 --- /dev/null +++ b/games/xmoto/files/patch-src_db_xmDatabase.cpp @@ -0,0 +1,13 @@ +--- src/db/xmDatabase.cpp.orig 2024-04-30 19:43:06 UTC ++++ src/db/xmDatabase.cpp +@@ -58,6 +58,10 @@ void xmDatabase::openIfNot(const std::string &i_dbFile + ") : " + sqlite3_errmsg(m_db)); + } + ++#ifdef SQLITE_DBCONFIG_DQS_DML ++ sqlite3_db_config(m_db, SQLITE_DBCONFIG_DQS_DML, 1, NULL); ++#endif ++ + sqlite3_busy_timeout(m_db, DB_BUSY_TIMEOUT); + sqlite3_trace(m_db, sqlTrace, NULL); + createUserFunctions();