From ca3d7bcb3126761ac24ef4642964d7e16b1df428 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 5 Nov 2022 21:18:38 +0000 Subject: gentoo auto-resync : 05:11:2022 - 21:18:38 --- net-p2p/Manifest.gz | Bin 7435 -> 7440 bytes net-p2p/airdcpp-webclient/Manifest | 3 ++- .../airdcpp-webclient-2.11.2.ebuild | 6 +++++- .../files/airdcpp-webclient-2.11.2-fix-odr.patch | 22 +++++++++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index b565cad6198c..023104e0219a 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest index 3261e6250b12..3110eb270c32 100644 --- a/net-p2p/airdcpp-webclient/Manifest +++ b/net-p2p/airdcpp-webclient/Manifest @@ -1,6 +1,7 @@ +AUX airdcpp-webclient-2.11.2-fix-odr.patch 847 BLAKE2B 6d6789e1b587be53fd1d31ca5d06e4ae8a246807ec60afb2f618b0ca58d223f754ee5ebb2ee268cd9d5c024ac14f60945cb0afd5ccbb18b74de2a639bbdd7979 SHA512 70f9c57822a4f16297a022e21d67ca123d2b6b424b450e567327c4fdbc7b0c1ddc39b2265a5b4e273af0675c6966ff9966920f7a83c706186d441052ad977bf0 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721 AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508 DIST airdcpp-webclient-2.11.2.tar.gz 978294 BLAKE2B cb15e02dc5381cc5f0ecb1b4d65cdd1c4a3d007f3ea1e78a159b8a62af03831318b8f6d8c0692c5a9145dda616627ea97f4bd3eeb1270a7452c7d78bf01d147f SHA512 281d4a9da88f23a4c02eef7f09c4fc2c91c44ac93d932ea4bfe097029b45dbd12a8d04d4ef8b493d261f5dade15b62ed4d564197fbfb2d9d98b9dfcc9a9e6379 -EBUILD airdcpp-webclient-2.11.2.ebuild 1381 BLAKE2B cb4bccfa74cfc0d08ba2487d09eff47ab025161c55d03a06106d6e8804b46dbbb0fbdaa7a6db6370965eea3ff76fe39d64d3f2281c40ae7782288d464d3b4165 SHA512 7a6e648627a8ef333cadc2f382f4cdddc3eaef8a5c17a3d6f07b8bd72699bb9e59744d405e307fff20bb34e25203a0d8f3dfe22c8a26d24927af288334a8b87c +EBUILD airdcpp-webclient-2.11.2.ebuild 1428 BLAKE2B 45914928c08e33ea0459fac62aa8c093fed3e0a25281b6e651ff6ae51912fe9d08383e53366dcb786804ecd7926ab7f274833906880e61d9f19d40075d80432a SHA512 6e835a66c0749ee052fd7d0dd2fe55daf2fff67c0f3c49d3605a570be9f7871841e8bff7337e61184f685edd4083fc24afeb207a0e3f9872e96f424d05cbebb9 MISC metadata.xml 805 BLAKE2B f62a540005c5d447e9ddd18b31eb88b1e875161af3b54e8c8753034700a70f28b3d4059d34988a8cf9225c2588ac921b39293e30ed2abf65a2bd0970b75a4628 SHA512 f8ff1e2d21ad685843abdb11672450b08c190203fbaead9170985dcf14332b7deebefb1565df6ce88671a87eb5e22ae80df5eaccf4c42ad49e882dd00b7ec81d 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) + + -- cgit v1.2.3