Merge updates from master

This commit is contained in:
Repository mirror & CI
2026-06-29 16:00:54 +00:00
19 changed files with 39 additions and 291 deletions

View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=hatchling
PYPI_VERIFY_REPO=https://github.com/Tinche/aiofiles
PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi

View File

@@ -1,11 +1,11 @@
# Copyright 2024-2025 Gentoo Authors
# Copyright 2024-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=flit
PYPI_VERIFY_REPO=https://github.com/omnilib/aioitertools
PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi

View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_EXT=1
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi
@@ -33,4 +33,5 @@ RDEPEND="
"
EPYTEST_PLUGINS=()
EPYTEST_XDIST=1
distutils_enable_tests pytest

View File

@@ -1,11 +1,11 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=flit
PYPI_VERIFY_REPO=https://github.com/omnilib/aiosqlite
PYTHON_COMPAT=( python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
PYTHON_REQ_USE="sqlite"
inherit distutils-r1 pypi

View File

@@ -1,10 +1,10 @@
# Copyright 2022-2025 Gentoo Authors
# Copyright 2022-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1

View File

@@ -1,10 +1,10 @@
# Copyright 2023-2025 Gentoo Authors
# Copyright 2023-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1
@@ -30,4 +30,5 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.0-py314.patch
)
EPYTEST_PLUGINS=()
distutils_enable_tests pytest

View File

@@ -1,18 +1,23 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..14} )
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi
DESCRIPTION="Async JSON-RPC 2.0 protocol + server powered by asyncio"
HOMEPAGE="https://github.com/pavlov99/ajsonrpc"
HOMEPAGE="
https://github.com/pavlov99/ajsonrpc/
https://pypi.org/project/ajsonrpc/
"
# Don't use GH for now; seems to not have valid version set
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
EPYTEST_PLUGINS=()
distutils_enable_tests pytest

View File

@@ -1,10 +1,10 @@
# Copyright 2022-2025 Gentoo Authors
# Copyright 2022-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi
@@ -18,4 +18,5 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
EPYTEST_PLUGINS=()
distutils_enable_tests pytest

View File

@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=pdm-backend
PYPI_VERIFY_REPO=https://github.com/fastapi/annotated-doc
PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi

View File

@@ -1,10 +1,10 @@
# Copyright 2023-2025 Gentoo Authors
# Copyright 2023-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=hatchling
PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi
@@ -18,25 +18,5 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
BDEPEND="
test? (
dev-python/pytest-mock[${PYTHON_USEDEP}]
)
"
EPYTEST_PLUGINS=( pytest-mock )
distutils_enable_tests pytest
python_test() {
local EPYTEST_DESELECT=()
case ${EPYTHON} in
pypy3*)
EPYTEST_DESELECT+=(
# https://github.com/annotated-types/annotated-types/issues/71
'tests/test_main.py::test_predicate_repr[pred2-Predicate(math.isfinite)]'
)
;;
esac
epytest
}

View File

@@ -1,10 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1
@@ -24,4 +24,5 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
EPYTEST_PLUGINS=()
distutils_enable_tests pytest

View File

@@ -1,10 +1,10 @@
# Copyright 1999-2025 Gentoo Authors
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi
@@ -22,4 +22,5 @@ BDEPEND="
>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
"
EPYTEST_PLUGINS=()
distutils_enable_tests pytest

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1

View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1

View File

@@ -1,10 +1,10 @@
# Copyright 2022-2025 Gentoo Authors
# Copyright 2022-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1
@@ -25,13 +25,6 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 arm64 ~riscv x86"
src_prepare() {
# https://github.com/antlr/antlr4/pull/4593
sed -i -e 's:assertEquals:assertEqual:' tests/TestIntervalSet.py || die
distutils-r1_src_prepare
}
python_test() {
"${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}"
}

View File

@@ -1,10 +1,10 @@
# Copyright 2023-2025 Gentoo Authors
# Copyright 2023-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517=flit
PYTHON_COMPAT=( pypy3_11 python3_{11..14} )
PYTHON_COMPAT=( python3_{12..15} )
inherit distutils-r1 pypi

View File

@@ -1,4 +1,2 @@
DIST freerdp-3.26.0.tar.gz 11500641 BLAKE2B 5ea781f1a00b2adb56022953415340cc6a3008cea39080359b1b8ff2e33d6434d09cb6f03ee1569de4e072f70b868970aec8551f83c87ce3c0bfa992875e4b17 SHA512 c17bcb1711abec42abf8dac6f497d95b77478e38b3e7a33d0903542cf80d6b4d584e2d76e43df652b67cd27629e2fb7be1be7f52c67e0e43c269fc8db4ee0e17
DIST freerdp-3.26.0.tar.gz.asc 228 BLAKE2B 384800120a7959f93665235e0c4c08a7eb235c73975a104d4fc67556340ae237c3564bf2941c1e633e47db687cb0c91f62ceaa29778f20ef038bf392f8862008 SHA512 81a9135d6224d0da789f440a0bf54287401bfe1de0098bf9c536abb42e95601fceb4cda3689d641f3347bcc57cc56c8be99740b22a7f945bbbd8d04dd8592ad6
DIST freerdp-3.27.1.tar.gz 11452205 BLAKE2B ee08cfc2e4d203e6a2796bc52fa5b2285d6359d38482c5a4ffcc8dd3bd11c2593ab21a5772bdc13acaf810a8f229d669324f8d6d573d5c7ee9bec20dcfd46c4e SHA512 8d564dd8552abf3ecd592a106c43434f62895caeebb425fa2b259456d6670e64d513d6174ffc31a26aac57697e954156e0f8bb9900524d6f96efd3d8d4f3afe5
DIST freerdp-3.27.1.tar.gz.asc 228 BLAKE2B 5d0d86bd3e1643b8c325d6197295c74e8ccaa38d2cabb497fbe98ee285f9ab73ffc6f28f1ee4428bab57d7a54952d9ee6daef68761109dc25a3cfd7d5768471b SHA512 32f052e66ecec48315288e2f675853ab823309f20e090596e38a00177e6fecdb69df77d6021564bc4ea6f2c5b914504de105639f1b29ce810fb07d9511910242

View File

@@ -1,37 +0,0 @@
https://github.com/FreeRDP/FreeRDP/pull/12746
From e9b95a5a3cf6a182837773b92c825f48df953821 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 6 May 2026 12:17:23 -0400
Subject: [PATCH] Call winpr_InitializeSSL in TestWinPRUtils/TestNTLM
This is needed to load the OpenSSL legacy provider when that library is
in use.
Closes: https://github.com/FreeRDP/FreeRDP/issues/12744
---
winpr/libwinpr/utils/test/TestNTLM.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/winpr/libwinpr/utils/test/TestNTLM.c b/winpr/libwinpr/utils/test/TestNTLM.c
index 4421270ef9de..b8838aaee2f8 100644
--- a/winpr/libwinpr/utils/test/TestNTLM.c
+++ b/winpr/libwinpr/utils/test/TestNTLM.c
@@ -2,6 +2,7 @@
#include <winpr/ntlm.h>
#include <winpr/string.h>
#include <winpr/print.h>
+#include <winpr/ssl.h>
typedef struct
{
@@ -311,6 +312,9 @@ static BOOL testNTOWFv2FromHash(size_t x, const test_case_from_hash_t* test)
int TestNTLM(WINPR_ATTR_UNUSED int argc, WINPR_ATTR_UNUSED char* argv[])
{
+ /* Make sure we load the OpenSSL legacy provider if needed */
+ winpr_InitializeSSL(WINPR_SSL_INIT_DEFAULT);
+
for (size_t x = 0; x < ARRAYSIZE(ntofw1tests); x++)
{
const test_case_ntowf1_t* cur = &ntofw1tests[x];

View File

@@ -1,196 +0,0 @@
# Copyright 2011-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake flag-o-matic
if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
case ${PV} in
2.*) EGIT_BRANCH="stable-2.0";;
esac
else
inherit verify-sig
MY_P=${P/_/-}
S="${WORKDIR}/${MY_P}"
SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
verify-sig? ( https://pub.freerdp.com/releases/${MY_P}.tar.gz.asc )"
KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-akallabeth )"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/akallabeth.asc"
fi
DESCRIPTION="Free implementation of the Remote Desktop Protocol"
HOMEPAGE="https://www.freerdp.com/"
LICENSE="Apache-2.0"
SLOT="3"
IUSE="aad alsa camera cpu_flags_arm_neon +client cups debug +ffmpeg +fuse gstreamer +icu jpeg kerberos openh264 pulseaudio sdl server smartcard systemd test usb valgrind wayland X xinerama xv"
RESTRICT="!test? ( test )"
BDEPEND+="
virtual/pkgconfig
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
"
COMMON_DEPEND="
dev-libs/openssl:0=
virtual/zlib:=
aad? ( dev-libs/cJSON )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups )
usb? (
virtual/libudev:0=
sys-apps/util-linux:0=
dev-libs/dbus-glib:0=
virtual/libusb:1=
)
X? (
x11-libs/libXcursor
x11-libs/libXext
x11-libs/libXi
x11-libs/libXrender
xinerama? ( x11-libs/libXinerama )
xv? ( x11-libs/libXv )
)
ffmpeg? ( media-video/ffmpeg:0= )
!ffmpeg? (
x11-libs/cairo:0=
)
fuse? ( sys-fs/fuse:3= )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
X? ( x11-libs/libXrandr )
)
icu? ( dev-libs/icu:0= )
jpeg? ( media-libs/libjpeg-turbo:0= )
kerberos? ( virtual/krb5 )
openh264? ( media-libs/openh264:0= )
pulseaudio? ( media-libs/libpulse )
server? (
X? (
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libXtst
xinerama? ( x11-libs/libXinerama )
)
)
smartcard? ( sys-apps/pcsc-lite )
systemd? ( sys-apps/systemd:0= )
client? (
camera? ( media-libs/libv4l )
sdl? (
media-libs/libsdl3
media-libs/sdl3-ttf
)
wayland? (
dev-libs/wayland
x11-libs/libxkbcommon
)
)
X? (
x11-libs/libX11
x11-libs/libxkbfile
)
"
DEPEND="${COMMON_DEPEND}
test? (
ffmpeg? ( media-video/ffmpeg:0[x264(-)] )
)
valgrind? ( dev-debug/valgrind )
"
RDEPEND="${COMMON_DEPEND}
!net-misc/freerdp:0
client? ( !net-misc/freerdp:2[client] )
server? ( !net-misc/freerdp:2[server] )
smartcard? ( app-crypt/p11-kit )
"
PATCHES=(
"${FILESDIR}/freerdp-3.26.0-TestNTLM.patch"
)
option() {
usex "$1" ON OFF
}
option_client() {
if use client; then
option "$1"
else
echo OFF
fi
}
src_configure() {
use debug || append-cppflags -DNDEBUG
local mycmakeargs=(
-Wno-dev
-DBUILD_TESTING=$(option test)
# https://bugs.gentoo.org/927037
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
-DCHANNEL_URBDRC=$(option usb)
-DCHANNEL_RDPECAM_CLIENT=$(option_client camera)
-DWITH_AAD=$(option aad)
-DWITH_ALSA=$(option alsa)
-DWITH_CCACHE=OFF
-DWITH_CLIENT=$(option client)
-DWITH_CLIENT_SDL2=OFF
-DWITH_CLIENT_SDL3=$(option_client sdl)
-DWITH_SAMPLE=OFF
-DWITH_CUPS=$(option cups)
-DWITH_DEBUG_ALL=$(option debug)
-DWITH_VERBOSE_WINPR_ASSERT=$(option debug)
-DWITH_MANPAGES=ON
-DWITH_FFMPEG=$(option ffmpeg)
-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON
-DWITH_SWSCALE=$(option ffmpeg)
-DWITH_CAIRO=$(option !ffmpeg)
-DWITH_DSP_FFMPEG=$(option ffmpeg)
-DWITH_FUSE=$(option fuse)
-DWITH_GSTREAMER_1_0=$(option gstreamer)
-DWITH_JPEG=$(option jpeg)
-DWITH_KRB5=$(option kerberos)
-DWITH_NEON=$(option cpu_flags_arm_neon)
-DWITH_OPENH264=$(option openh264)
-DWITH_OSS=OFF
-DWITH_PCSC=$(option smartcard)
-DWITH_PKCS11=$(option smartcard)
-DWITH_PULSE=$(option pulseaudio)
-DWITH_SERVER=$(option server)
-DWITH_LIBSYSTEMD=$(option systemd)
-DWITH_UNICODE_BUILTIN=$(option !icu)
-DWITH_VALGRIND_MEMCHECK=$(option valgrind)
-DWITH_X11=$(option X)
-DWITH_XINERAMA=$(option xinerama)
-DWITH_XV=$(option xv)
-DWITH_WAYLAND=$(option_client wayland)
-DWITH_WEBVIEW=OFF
-DWITH_WINPR_TOOLS=$(option server)
)
cmake_src_configure
}
src_test() {
# TestBacktrace: bug 930636
# TestSynchCritical, TestSynchMultipleThreads: bug 951301
local CMAKE_SKIP_TESTS=( TestBacktrace TestSynchCritical TestSynchMultipleThreads )
if has network-sandbox ${FEATURES}; then
CMAKE_SKIP_TESTS+=( TestConnect )
fi
cmake_src_test
}
src_install() {
cmake_src_install
mv "${ED}"/usr/share/man/man7/wlog{,3}.7 || die
}