From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id CD9771582EF for ; Thu, 06 Mar 2025 18:19:51 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id AA685343077 for ; Thu, 06 Mar 2025 18:19:51 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3AD97110370; Thu, 06 Mar 2025 18:19:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 31DB1110370 for ; Thu, 06 Mar 2025 18:19:41 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9484F342FDF for ; Thu, 06 Mar 2025 18:19:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC9EB2853 for ; Thu, 06 Mar 2025 18:19:39 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1741271782.1935ca60a2c444dc867f5a004e4f0a2fc25c9920.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/megasync/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/megasync/files/megasync-5.8.0.2-clang.patch X-VCS-Directories: net-misc/megasync/files/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 1935ca60a2c444dc867f5a004e4f0a2fc25c9920 X-VCS-Branch: master Date: Thu, 06 Mar 2025 18:19:39 +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: 5289233a-c22e-40cf-9031-1a2810717a52 X-Archives-Hash: d26af87c799afa47fcaf7cfcb6c6f99f commit: 1935ca60a2c444dc867f5a004e4f0a2fc25c9920 Author: Takuya Wakazono gmail com> AuthorDate: Thu Mar 6 14:25:21 2025 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Thu Mar 6 14:36:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1935ca60 net-misc/megasync: adjust clang build patch based on upstream feedback https://github.com/meganz/MEGAsync/issues/1055 Signed-off-by: Takuya Wakazono gmail.com> net-misc/megasync/files/megasync-5.8.0.2-clang.patch | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/net-misc/megasync/files/megasync-5.8.0.2-clang.patch b/net-misc/megasync/files/megasync-5.8.0.2-clang.patch index 6ab8f59c3..51c984b5d 100644 --- a/net-misc/megasync/files/megasync-5.8.0.2-clang.patch +++ b/net-misc/megasync/files/megasync-5.8.0.2-clang.patch @@ -1,17 +1,14 @@ https://bugs.gentoo.org/950311 https://github.com/meganz/MEGAsync/issues/1055 -Fix build with clang by removing broken and unused constructor. +Fix build with clang by mark mutex as mutable. --- a/src/MEGASync/control/ProtectedQueue.h +++ b/src/MEGASync/control/ProtectedQueue.h -@@ -13,11 +13,6 @@ public: - ProtectedQueue(){} - virtual ~ProtectedQueue(){} +@@ -107,7 +107,7 @@ public: -- ProtectedQueue(const ProtectedQueue& other) -- { -- std::lock_guard guard( other.mMutex ); -- mQueue = other.mQueue; -- } + private: + std::queue mQueue; +- std::mutex mMutex; ++ mutable std::mutex mMutex; + }; - ProtectedQueue& operator= (ProtectedQueue& other) - { + #endif // PROTECTED_QUEUE