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 356F9158020 for ; Sat, 5 Nov 2022 19:36:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80545E069C; Sat, 5 Nov 2022 19:36:15 +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 646CEE069C for ; Sat, 5 Nov 2022 19:36:15 +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 84282340B1F for ; Sat, 5 Nov 2022 19:36:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20D24622 for ; Sat, 5 Nov 2022 19:36:13 +0000 (UTC) From: "Louis Sautier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Louis Sautier" Message-ID: <1667676953.3c87eae224d451e0433cd4338773f945fb879277.sbraz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/airdcpp-webclient/, net-p2p/airdcpp-webclient/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch X-VCS-Directories: net-p2p/airdcpp-webclient/files/ net-p2p/airdcpp-webclient/ X-VCS-Committer: sbraz X-VCS-Committer-Name: Louis Sautier X-VCS-Revision: 3c87eae224d451e0433cd4338773f945fb879277 X-VCS-Branch: master Date: Sat, 5 Nov 2022 19:36:13 +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: 34b0e3fc-bbd6-401b-9e24-930b5a22706d X-Archives-Hash: 7b7b77a5ea1d3cc6201edea2d7c19be8 commit: 3c87eae224d451e0433cd4338773f945fb879277 Author: Louis Sautier gentoo org> AuthorDate: Sat Nov 5 19:12:03 2022 +0000 Commit: Louis Sautier gentoo org> CommitDate: Sat Nov 5 19:35:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c87eae2 net-p2p/airdcpp-webclient: fix build with strict flags, add Py3.11 Closes: https://bugs.gentoo.org/861839 Signed-off-by: Louis Sautier gentoo.org> .../airdcpp-webclient-2.11.2.ebuild | 6 +++++- .../files/airdcpp-webclient-2.11.2-fix-odr.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild index 8b834ebeb9f1..76af45cb877b 100644 --- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild +++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( pypy3 python3_{8..10} ) +PYTHON_COMPAT=( pypy3 python3_{8..11} ) inherit cmake python-any-r1 systemd @@ -38,6 +38,10 @@ BDEPEND=" " PDEPEND="webui? ( www-apps/airdcpp-webui )" +PATCHES=( + "${FILESDIR}/${P}-fix-odr.patch" +) + src_configure() { local mycmakeargs=( -DENABLE_NATPMP=$(usex nat-pmp) diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch new file mode 100644 index 000000000000..e44365ca1bd2 --- /dev/null +++ b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch @@ -0,0 +1,22 @@ +From 5f12f803c2fc0450111152e2ea5f649ed92f4b7f Mon Sep 17 00:00:00 2001 +From: maksis +Date: Thu, 13 Oct 2022 22:05:35 +0300 +Subject: [PATCH] Build: define the HAVE_POSIX_FADVISE flag correctly + +Fixes https://github.com/airdcpp-web/airdcpp-webclient/issues/425 +--- + airdcpp-core/CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/airdcpp-core/CMakeLists.txt ++++ b/airdcpp-core/CMakeLists.txt +@@ -75,8 +75,7 @@ if (HAVE_MNTENT_H) + endif (HAVE_MNTENT_H) + + if (HAVE_POSIX_FADVISE) +- set_property(SOURCE ${PROJECT_SOURCE_DIR}/airdcpp/File.cpp PROPERTY COMPILE_DEFINITIONS HAVE_POSIX_FADVISE APPEND) +- set_property(SOURCE ${PROJECT_SOURCE_DIR}/airdcpp/File.h PROPERTY COMPILE_DEFINITIONS HAVE_POSIX_FADVISE APPEND) ++ add_definitions (-DHAVE_POSIX_FADVISE) + endif (HAVE_POSIX_FADVISE) + +