From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2C72158064 for ; Mon, 6 May 2024 14:48:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10859E2A2C; Mon, 6 May 2024 14:48:04 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8DD7E2A2C for ; Mon, 6 May 2024 14:48:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1DE8E3430CB for ; Mon, 6 May 2024 14:48:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73E0993E for ; Mon, 6 May 2024 14:48:01 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1715006860.ef95b8d7d6e3f6bd16348d4f2fc31a083859fb87.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/mgba/, games-emulation/mgba/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch games-emulation/mgba/mgba-0.10.3.ebuild games-emulation/mgba/mgba-9999.ebuild X-VCS-Directories: games-emulation/mgba/files/ games-emulation/mgba/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: ef95b8d7d6e3f6bd16348d4f2fc31a083859fb87 X-VCS-Branch: master Date: Mon, 6 May 2024 14:48:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 12c715d4-eeb3-48a2-9310-03239fe17d16 X-Archives-Hash: 9d122eea6f1b78310c2b333b56538ec7 commit: ef95b8d7d6e3f6bd16348d4f2fc31a083859fb87 Author: Ionen Wolkens gentoo org> AuthorDate: Mon May 6 14:45:55 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon May 6 14:47:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef95b8d7 games-emulation/mgba: fix bundled rapidjson with gcc14 (only used with USE=discord) Closes: https://bugs.gentoo.org/924019 Signed-off-by: Ionen Wolkens gentoo.org> .../mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch | 17 +++++++++++++++++ games-emulation/mgba/mgba-0.10.3.ebuild | 1 + games-emulation/mgba/mgba-9999.ebuild | 1 + 3 files changed, 19 insertions(+) diff --git a/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch b/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch new file mode 100644 index 000000000000..516c81199bda --- /dev/null +++ b/games-emulation/mgba/files/mgba-0.10.3-rapidjson-gcc14-const.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/924019 +(same as https://bugs.gentoo.org/914583 given rapidjson is bundled) + +https://github.com/Tencent/rapidjson/issues/718 +https://github.com/Tencent/rapidjson/commit/3b2441b87f99ab65f37b141a7b548ebadb607b96 +From: Janusz Chorko +Date: Fri, 26 Aug 2016 21:17:38 +0200 +Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718 +--- a/src/third-party/discord-rpc/include/rapidjson/document.h ++++ b/src/third-party/discord-rpc/include/rapidjson/document.h +@@ -317,6 +317,4 @@ + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } diff --git a/games-emulation/mgba/mgba-0.10.3.ebuild b/games-emulation/mgba/mgba-0.10.3.ebuild index 1ae84af200cd..0e746e84b175 100644 --- a/games-emulation/mgba/mgba-0.10.3.ebuild +++ b/games-emulation/mgba/mgba-0.10.3.ebuild @@ -60,6 +60,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.10.0-optional-updater.patch + "${FILESDIR}"/${PN}-0.10.3-rapidjson-gcc14-const.patch ) pkg_setup() { diff --git a/games-emulation/mgba/mgba-9999.ebuild b/games-emulation/mgba/mgba-9999.ebuild index d4ce0e18832b..97441a1c618f 100644 --- a/games-emulation/mgba/mgba-9999.ebuild +++ b/games-emulation/mgba/mgba-9999.ebuild @@ -63,6 +63,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.10.0-optional-updater.patch + "${FILESDIR}"/${PN}-0.10.3-rapidjson-gcc14-const.patch ) pkg_setup() {