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 EA86515800F for ; Sun, 1 Jan 2023 18:16:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9F29E0876; Sun, 1 Jan 2023 18:16:39 +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 pigeon.gentoo.org (Postfix) with ESMTPS id BDE77E0876 for ; Sun, 1 Jan 2023 18:16:39 +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 63813340D9F for ; Sun, 1 Jan 2023 18:16:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF45E807 for ; Sun, 1 Jan 2023 18:16:35 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1672596981.80a271c641255263e69e23c7956789d4cf917a2d.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/curl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/curl/files/curl-7.84.0-easylock.patch net-misc/curl/files/curl-7.84.0-include-sched.patch X-VCS-Directories: net-misc/curl/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 80a271c641255263e69e23c7956789d4cf917a2d X-VCS-Branch: master Date: Sun, 1 Jan 2023 18:16:35 +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: e2f7a305-bba0-49cd-92aa-863dbc5dcc52 X-Archives-Hash: 2be375b46fa1ceb9c7837cd4ccb0141c commit: 80a271c641255263e69e23c7956789d4cf917a2d Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Dec 27 17:07:23 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Jan 1 18:16:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a271c6 net-misc/curl: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28858 Signed-off-by: Conrad Kostecki gentoo.org> net-misc/curl/files/curl-7.84.0-easylock.patch | 30 ---------------------- .../curl/files/curl-7.84.0-include-sched.patch | 24 ----------------- 2 files changed, 54 deletions(-) diff --git a/net-misc/curl/files/curl-7.84.0-easylock.patch b/net-misc/curl/files/curl-7.84.0-easylock.patch deleted file mode 100644 index 77ee610fc117..000000000000 --- a/net-misc/curl/files/curl-7.84.0-easylock.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Tue, 28 Jun 2022 09:00:25 +0200 -Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool - -To work with more compilers without requiring separate libs to -link. Like with gcc-12 for RISC-V on Linux. - -Reported-by: Adam Sampson -Fixes #9055 -Closes #9061 ---- - lib/easy_lock.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/easy_lock.h b/lib/easy_lock.h -index 07c85c5ffdd19..9c11bc50c5f20 100644 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -40,8 +40,8 @@ - #include - #endif - --#define curl_simple_lock atomic_bool --#define CURL_SIMPLE_LOCK_INIT false -+#define curl_simple_lock atomic_int -+#define CURL_SIMPLE_LOCK_INIT 0 - - static inline void curl_simple_lock_lock(curl_simple_lock *lock) - { diff --git a/net-misc/curl/files/curl-7.84.0-include-sched.patch b/net-misc/curl/files/curl-7.84.0-include-sched.patch deleted file mode 100644 index 842310d2eaab..000000000000 --- a/net-misc/curl/files/curl-7.84.0-include-sched.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/curl/curl/commit/e2e7f54b7bea521fa8373095d0f43261a720cda0 -https://bugs.gentoo.org/855710 - -From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg -Date: Mon, 27 Jun 2022 08:46:21 +0200 -Subject: [PATCH] easy_lock.h: include sched.h if available to fix build - -Patched-by: Harry Sintonen - -Closes #9054 ---- a/lib/easy_lock.h -+++ b/lib/easy_lock.h -@@ -36,6 +36,9 @@ - - #elif defined (HAVE_ATOMIC) - #include -+#if defined(HAVE_SCHED_YIELD) -+#include -+#endif - - #define curl_simple_lock atomic_bool - #define CURL_SIMPLE_LOCK_INIT false -