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 05AF615849D for ; Sun, 2 Jun 2024 00:41:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC205E2A9B; Sun, 2 Jun 2024 00:41:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 D3F3EE2A9B for ; Sun, 2 Jun 2024 00:41:42 +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 E6C5C34300B for ; Sun, 2 Jun 2024 00:41:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39E9F1C02 for ; Sun, 2 Jun 2024 00:41:40 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1717288848.9e75d69eba362f8033d454a2003bbd6afe22cbfd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/, dev-libs/capstone/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/capstone/capstone-9999.ebuild dev-libs/capstone/files/capstone-9999-werror.patch X-VCS-Directories: dev-libs/capstone/files/ dev-libs/capstone/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9e75d69eba362f8033d454a2003bbd6afe22cbfd X-VCS-Branch: master Date: Sun, 2 Jun 2024 00:41:40 +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: 3c4e4298-7201-4c98-a4ef-3b970c0bc592 X-Archives-Hash: 5a2abe2792f3af10c2b50044e0d8c731 commit: 9e75d69eba362f8033d454a2003bbd6afe22cbfd Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sun Apr 28 15:04:52 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 2 00:40:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e75d69e dev-libs/capstone: fix patch for upstream changes Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-libs/capstone/capstone-9999.ebuild | 4 ++-- dev-libs/capstone/files/capstone-9999-werror.patch | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-libs/capstone/capstone-9999.ebuild b/dev-libs/capstone/capstone-9999.ebuild index 12ef627d0db9..76028da788a3 100644 --- a/dev-libs/capstone/capstone-9999.ebuild +++ b/dev-libs/capstone/capstone-9999.ebuild @@ -37,8 +37,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( # Currently "-Werror" is only added in the `next`-development branch, but - # not merged into 5.* releases. Eventually this patch may be needed in - # version 5 releas line. See bug #911481. + # not merged into 5.* releases. Eventually this patch may be needed in the + # version 5 release line. See bug #911481. "${FILESDIR}/${P}-werror.patch" ) diff --git a/dev-libs/capstone/files/capstone-9999-werror.patch b/dev-libs/capstone/files/capstone-9999-werror.patch index 1ec58fa056a3..d5f09ca7d656 100644 --- a/dev-libs/capstone/files/capstone-9999-werror.patch +++ b/dev-libs/capstone/files/capstone-9999-werror.patch @@ -2,12 +2,12 @@ Bug: https://bugs.gentoo.org/911481 Upstream: https://github.com/capstone-engine/capstone/pull/2114 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,7 +28,7 @@ project(capstone - if (MSVC) - add_compile_options(/W1 /w14189) - else() -- add_compile_options(-Werror -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context) -+ add_compile_options(-Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context) - endif() +@@ -25,7 +25,7 @@ project(capstone + VERSION 5.0 + ) +-set(UNIX_COMPILER_OPTIONS -Werror -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation) ++set(UNIX_COMPILER_OPTIONS -Wall -Warray-bounds -Wshift-negative-value -Wreturn-type -Wformat -Wmissing-braces -Wunused-function -Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context -Wmisleading-indentation) + # maybe-unitialzied is only supported by newer versions of GCC. + # Unfortunately, it is pretty unreliable and reports wrong results.