diff --git a/common/build-helper/python3.sh b/common/build-helper/python3.sh index 4707599ef0e068..1a38f32d1d80bb 100644 --- a/common/build-helper/python3.sh +++ b/common/build-helper/python3.sh @@ -2,8 +2,10 @@ if [ -n "$CROSS_BUILD" ]; then export PYPREFIX="$XBPS_CROSS_BASE" export CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" + export CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" export LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" export CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" + export CXX="${XBPS_CROSS_TRIPLET}-g++ -pthread $CXXFLAGS $LDFLAGS" export LDSHARED="${CC} -shared $LDFLAGS" export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" export PYTHONPATH="${XBPS_CROSS_BASE}/${py3_lib}" diff --git a/common/environment/setup/python.sh b/common/environment/setup/python.sh index ab5c47d52847b1..75b3399c109e30 100644 --- a/common/environment/setup/python.sh +++ b/common/environment/setup/python.sh @@ -7,7 +7,7 @@ py2_lib="usr/lib/python${py2_ver}" py2_sitelib="${py2_lib}/site-packages" py2_inc="usr/include/python${py2_ver}" -py3_ver="3.12" +py3_ver="3.13" py3_abiver="" py3_lib="usr/lib/python${py3_ver}" py3_sitelib="${py3_lib}/site-packages" diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index 02f3965be7effb..3d5d6c2ab3b8f3 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -251,7 +251,7 @@ hook() { generic_wrapper3 libetpan-config generic_wrapper3 giblib-config python_wrapper python-config 2.7 - python_wrapper python3-config 3.12 + python_wrapper python3-config 3.13 apr_apu_wrapper apu-1-config qemu_wrapper llvm-config } diff --git a/common/shlibs b/common/shlibs index 5e8f45495580ef..e2742f96a693e0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -673,8 +673,8 @@ libboost_stacktrace_noop.so.1.83.0 libboost_stacktrace_noop-1.83.0_1 libboost_stacktrace_addr2line.so.1.83.0 libboost_stacktrace_addr2line-1.83.0_1 libboost_stacktrace_basic.so.1.83.0 libboost_stacktrace_basic-1.83.0_1 libboost_mpi.so.1.83.0 libboost_mpi-1.83.0_1 -libboost_mpi_python311.so.1.83.0 libboost_mpi-python3-1.83.0_1 -libboost_python312.so.1.83.0 boost-python3-1.83.0_1 +libboost_mpi_python313.so.1.83.0 libboost_mpi-python3-1.83.0_5 +libboost_python313.so.1.83.0 boost-python3-1.83.0_5 libexempi.so.8 exempi-2.5.0_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2-1.45.so.2 libsgutils-1.45_1 @@ -1730,8 +1730,8 @@ libportaudio.so.2 portaudio-19.20140130_1 libportaudiocpp.so.0 portaudio-cpp-19.20140130_1 libdar.so.6000 libdar-2.6.6_1 libdar64.so.6000 libdar-2.6.6_1 -libpython3.so python3-3.12.0_1 -libpython3.12.so.1.0 python3-3.12.0_1 +libpython3.so python3-3.13.0_1 +libpython3.13.so.1.0 python3-3.13.0_1 libbrscandec2.so.1 brother-brscan3-0.2.11_2 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2 libxmlrpc++.so.8 xmlrpc-c-1.51.06_2 @@ -2328,8 +2328,8 @@ libetpan.so.20 libetpan-1.9.3_4 libxmp.so.4 libxmp-4.3.7_1 libKF6ThreadWeaver.so.6 kf6-threadweaver-6.0.0_1 libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1 -libOpenImageIO_Util.so.2.4 openimageio-2.4.9.0_1 -libOpenImageIO.so.2.4 openimageio-2.4.9.0_1 +libOpenImageIO_Util.so.2.5 openimageio-2.5.17.0_1 +libOpenImageIO.so.2.5 openimageio-2.5.17.0_1 libOpenColorIO.so.2.1 opencolorio-2.1.2_1 libpystring.so.1 pystring-1.1.3_1 libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1 @@ -3980,13 +3980,13 @@ librdkafka.so.1 librdkafka-1.4.4_3 librdkafka++.so.1 librdkafka-1.4.4_3 libraft.so.0 raft-0.18.2_1 libmdnsd.so.1 libmdnsd-0.9_1 -libosdGPU.so.3.4.3 OpenSubdiv-3.4.3_1 -libosdCPU.so.3.4.3 OpenSubdiv-3.4.3_1 +libosdGPU.so.3.6.0 OpenSubdiv-3.6.0_1 +libosdCPU.so.3.6.0 OpenSubdiv-3.6.0_1 libcaribou.so.0 libcaribou-0.4.21_3 libtinyclipboard.so.1 tinyclipboard-16.01_1 libcbor.so.0.11 libcbor-0.11.0_1 libfido2.so.1 libfido2-1.6.0_2 -libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1 +libOpenImageDenoise.so.2 openimagedenoise-2.3.0_1 libcbang0.so cbang-1.6.0_3 libblosc.so.1 c-blosc-1.17.1_1 libopenvdb.so.9.0 openvdb-9.0.0_1 diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index e672a58ceaea7a..0a48174b7cb559 100755 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -1,7 +1,7 @@ # Template file for 'Carla' pkgname=Carla version=2.5.8 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" build_style=gnu-makefile pycompile_dirs="usr/share/carla" diff --git a/srcpkgs/DSView/template b/srcpkgs/DSView/template index b261627b4598da..0624fd407448e4 100644 --- a/srcpkgs/DSView/template +++ b/srcpkgs/DSView/template @@ -1,7 +1,7 @@ # Template file for 'DSView' pkgname=DSView version=1.3.2 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="boost-devel fftw-devel libglib-devel libusb-devel python3-devel qt5-devel" diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template index 1665d713bdf344..b2c5d6bc3901d1 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -1,7 +1,7 @@ # Template file for 'DarkRadiant' pkgname=DarkRadiant version=3.9.0 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 hostmakedepends="pkg-config ruby-asciidoctor" diff --git a/srcpkgs/DisplayCAL/template b/srcpkgs/DisplayCAL/template index 4c4da7e57e0b6e..1f3023f5006023 100644 --- a/srcpkgs/DisplayCAL/template +++ b/srcpkgs/DisplayCAL/template @@ -1,7 +1,7 @@ # Template file for 'DisplayCAL' pkgname=DisplayCAL version=3.9.12 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel libXxf86vm-devel libXinerama-devel libXrandr-devel" diff --git a/srcpkgs/GCP-Guest-Environment/template b/srcpkgs/GCP-Guest-Environment/template index 8cb51827d34a82..0827b04d99da06 100644 --- a/srcpkgs/GCP-Guest-Environment/template +++ b/srcpkgs/GCP-Guest-Environment/template @@ -1,7 +1,7 @@ # Template file for 'GCP-Guest-Environment' pkgname=GCP-Guest-Environment version=20191210 -revision=5 +revision=6 build_wrksrc="packages/python-google-compute-engine" build_style=python3-module hostmakedepends="python3-setuptools python3-distro" diff --git a/srcpkgs/Grammalecte/template b/srcpkgs/Grammalecte/template index 8218bbdef04370..a82a6bed8e0eb7 100644 --- a/srcpkgs/Grammalecte/template +++ b/srcpkgs/Grammalecte/template @@ -1,7 +1,7 @@ # Template file for 'Grammalecte' pkgname=Grammalecte version=1.6.0 -revision=6 +revision=7 create_wrksrc=yes build_style=python3-module hostmakedepends="python3-setuptools" diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template index 822fe4b47d681c..cc5d4cc6d24095 100644 --- a/srcpkgs/Komikku/template +++ b/srcpkgs/Komikku/template @@ -1,7 +1,7 @@ # Template file for 'Komikku' pkgname=Komikku version=1.21.1 -revision=2 +revision=3 build_style=meson hostmakedepends="gettext glib-devel gobject-introspection pkg-config desktop-file-utils gtk-update-icon-cache" diff --git a/srcpkgs/LabJackPython/template b/srcpkgs/LabJackPython/template index 17fdd03c4505c9..906117f1d0d694 100644 --- a/srcpkgs/LabJackPython/template +++ b/srcpkgs/LabJackPython/template @@ -1,7 +1,7 @@ # Template file for 'LabJackPython' pkgname=LabJackPython version=2.0.4 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 exodriver" diff --git a/srcpkgs/OpenLP/template b/srcpkgs/OpenLP/template index 99948dd9138698..a05a2b645720de 100644 --- a/srcpkgs/OpenLP/template +++ b/srcpkgs/OpenLP/template @@ -1,7 +1,7 @@ # Template file for 'OpenLP' pkgname=OpenLP version=3.1.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools qt5-host-tools" depends="python3-alembic python3-platformdirs python3-BeautifulSoup4 diff --git a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch b/srcpkgs/OpenSubdiv/patches/tbb-2021.patch deleted file mode 100644 index 5a812c84b21102..00000000000000 --- a/srcpkgs/OpenSubdiv/patches/tbb-2021.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp -index c98db9f..8dec0e1 100644 ---- a/opensubdiv/osd/tbbEvaluator.cpp -+++ b/opensubdiv/osd/tbbEvaluator.cpp -@@ -25,7 +25,7 @@ - #include "../osd/tbbEvaluator.h" - #include "../osd/tbbKernel.h" - --#include -+#include - - namespace OpenSubdiv { - namespace OPENSUBDIV_VERSION { -@@ -215,10 +215,11 @@ TbbEvaluator::Synchronize(void *) { - /* static */ - void - TbbEvaluator::SetNumThreads(int numThreads) { -- if (numThreads == -1) { -- tbb::task_scheduler_init init; -- } else { -- tbb::task_scheduler_init init(numThreads); -+ if (numThreads != -1) { -+ tbb::global_control tbb_global_control( -+ tbb::global_control::max_allowed_parallelism, -+ numThreads -+ ); - } - } - diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template index 76d950301cd01d..7db0f87a638bd5 100644 --- a/srcpkgs/OpenSubdiv/template +++ b/srcpkgs/OpenSubdiv/template @@ -1,7 +1,7 @@ # Template file for 'OpenSubdiv' pkgname=OpenSubdiv -version=3.4.3 -revision=4 +version=3.6.0 +revision=1 build_style=cmake # TODO: CUDA/OpenCL support # NO_GLTESTS: skip tests which require X11 & $DISPLAY environment variable @@ -13,7 +13,7 @@ maintainer="John " license="Apache-2.0" homepage="http://graphics.pixar.com/opensubdiv/docs/intro.html" distfiles="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${version//./_}.tar.gz" -checksum=7b22eb27d636ab0c1e03722c7a5a5bd4f11664ee65c9b48f341a6d0ce7f36745 +checksum=bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" OpenSubdiv" diff --git a/srcpkgs/PackageKit/template b/srcpkgs/PackageKit/template index 228ef3cedf1ac6..798eea87ba3d3f 100644 --- a/srcpkgs/PackageKit/template +++ b/srcpkgs/PackageKit/template @@ -1,7 +1,7 @@ # Template file for 'PackageKit' pkgname=PackageKit version=1.2.4 -revision=3 +revision=4 build_style=meson build_helper="gir" configure_args="-Dgstreamer_plugin=false -Dgtk_module=false diff --git a/srcpkgs/PhotoCollage/template b/srcpkgs/PhotoCollage/template index a563aa6b5e0737..b2f73f003c3475 100644 --- a/srcpkgs/PhotoCollage/template +++ b/srcpkgs/PhotoCollage/template @@ -1,7 +1,7 @@ # Template file for 'PhotoCollage' pkgname=PhotoCollage -version=1.4.5 -revision=2 +version=1.4.8 +revision=1 build_style=python3-module hostmakedepends="gettext python3-setuptools" depends="python3-Pillow python3-gobject" @@ -10,4 +10,4 @@ maintainer="SolitudeSF " license="GPL-2.0-or-later" homepage="https://github.com/adrienverge/PhotoCollage" distfiles="https://github.com/adrienverge/PhotoCollage/archive/v${version}.tar.gz" -checksum=7dab2de4a098cb68369221bd634591dc768f10df2064a55bb8d6430cf5be5b36 +checksum=7dae43d9711b7e5e89d8dd75363d967f3d5911b9db65ed3fbe7c95e567215994 diff --git a/srcpkgs/PyInstaller/template b/srcpkgs/PyInstaller/template index baebb65246ac8a..f2ee5eaa3fdbfb 100644 --- a/srcpkgs/PyInstaller/template +++ b/srcpkgs/PyInstaller/template @@ -1,7 +1,7 @@ # Template file for 'PyInstaller' pkgname=PyInstaller version=4.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="zlib-devel" diff --git a/srcpkgs/ReText/template b/srcpkgs/ReText/template index 8a28ff8170de85..aaecedf0883d50 100644 --- a/srcpkgs/ReText/template +++ b/srcpkgs/ReText/template @@ -1,7 +1,7 @@ # Template file for 'ReText' pkgname=ReText version=7.2.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="ImageMagick python3 qt5-host-tools qt5-tools python3-setuptools" makedepends="python3-Markdown python3-Markups python3-PyQt5-webkit qt5-tools" diff --git a/srcpkgs/SoapySDR/template b/srcpkgs/SoapySDR/template index 61bdbce1827bec..d2c71c9ce6f3cf 100644 --- a/srcpkgs/SoapySDR/template +++ b/srcpkgs/SoapySDR/template @@ -1,7 +1,7 @@ # Template file for 'SoapySDR' pkgname=SoapySDR version=0.8.1 -revision=3 +revision=4 build_style=cmake configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3" hostmakedepends="doxygen swig python3 python3-setuptools" diff --git a/srcpkgs/Solaar/template b/srcpkgs/Solaar/template index a970ae06f33395..f8661e50de3a48 100644 --- a/srcpkgs/Solaar/template +++ b/srcpkgs/Solaar/template @@ -1,7 +1,7 @@ # Template file for 'Solaar' pkgname=Solaar version=1.1.13 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-evdev python3-pyudev python3-psutil python3-yaml python3-dbus diff --git a/srcpkgs/Trimage/template b/srcpkgs/Trimage/template index 27df5e141fcb72..8e1bee95269a1a 100644 --- a/srcpkgs/Trimage/template +++ b/srcpkgs/Trimage/template @@ -1,7 +1,7 @@ # Template file for 'Trimage' pkgname=Trimage version=1.0.6 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 jpegoptim optipng advancecomp pngcrush python3-PyQt5" diff --git a/srcpkgs/TwitchNotifier/template b/srcpkgs/TwitchNotifier/template index 67297ac166071d..eb4ac2bd50f705 100644 --- a/srcpkgs/TwitchNotifier/template +++ b/srcpkgs/TwitchNotifier/template @@ -1,7 +1,7 @@ # Template file for 'TwitchNotifier' pkgname=TwitchNotifier version=0.5 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/activityrelay/template b/srcpkgs/activityrelay/template index fac56f895c1d64..12fec9fd2977db 100644 --- a/srcpkgs/activityrelay/template +++ b/srcpkgs/activityrelay/template @@ -1,7 +1,7 @@ # Template file for 'activityrelay' pkgname=activityrelay version=0.2.4 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-aiohttp python3-aputils python3-cachetools python3-click diff --git a/srcpkgs/afew/template b/srcpkgs/afew/template index c3bf26e3609061..49ceb4a9734dfd 100644 --- a/srcpkgs/afew/template +++ b/srcpkgs/afew/template @@ -1,7 +1,7 @@ # Template file for 'afew' pkgname=afew version=3.0.1 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools_scm python3-Sphinx pkg-config" depends="notmuch-python3 python3-dkimpy python3-chardet notmuch" diff --git a/srcpkgs/afl++/template b/srcpkgs/afl++/template index c92bd1bd7682c5..0287ebcdae0919 100644 --- a/srcpkgs/afl++/template +++ b/srcpkgs/afl++/template @@ -1,7 +1,7 @@ # Template file for 'afl++' pkgname=afl++ version=4.21c -revision=2 +revision=3 archs="i686* x86_64* aarch64*" build_helper="qemu" build_style=gnu-makefile diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template index e9910100c99037..a440b9af54a547 100644 --- a/srcpkgs/aircrack-ng/template +++ b/srcpkgs/aircrack-ng/template @@ -1,7 +1,7 @@ # Template file for 'aircrack-ng' pkgname=aircrack-ng version=1.7 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="automake ethtool libtool pkg-config python3 python3-setuptools" makedepends="libhwloc-devel libnl3-devel libpcap-devel libpciaccess-devel diff --git a/srcpkgs/alienfx/template b/srcpkgs/alienfx/template index 9ccf0708842ee6..39580df96caaad 100644 --- a/srcpkgs/alienfx/template +++ b/srcpkgs/alienfx/template @@ -1,7 +1,7 @@ # Template file for 'alienfx' pkgname=alienfx version=2.4.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-usb python3-cairo python3-gobject python3-setuptools diff --git a/srcpkgs/alot/template b/srcpkgs/alot/template index 1eb596387e3260..4fccd6bd99a116 100644 --- a/srcpkgs/alot/template +++ b/srcpkgs/alot/template @@ -1,7 +1,7 @@ # Template file for 'alot' pkgname=alot version=0.10 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-Sphinx python3-notmuch2 python3-cffi" depends="python3-setuptools python3-Twisted python3-notmuch2 python3-configobj diff --git a/srcpkgs/angrysearch/template b/srcpkgs/angrysearch/template index 149ba8580e2e2f..b7e4f84348070e 100644 --- a/srcpkgs/angrysearch/template +++ b/srcpkgs/angrysearch/template @@ -1,7 +1,7 @@ # Template file for 'angrysearch' pkgname=angrysearch version=1.0.3 -revision=2 +revision=3 pycompile_dirs="usr/share/angrysearch" hostmakedepends="python3" depends="python3-PyQt5 xdg-utils" diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template index 90390483d86687..ea81c7a11a2c2c 100644 --- a/srcpkgs/ansible-core/template +++ b/srcpkgs/ansible-core/template @@ -1,7 +1,7 @@ # Template file for 'ansible-core' pkgname=ansible-core version=2.17.5 -revision=1 +revision=2 hostmakedepends="python3-setuptools python3-wheel python3-packaging python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml" depends="python3-cryptography python3-Jinja2 python3-paramiko python3-yaml diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 0972275964ed5e..274f21e513245f 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,7 +1,7 @@ # Template file for 'ansible' pkgname=ansible version=10.5.0 -revision=1 +revision=2 build_style="python3-pep517" hostmakedepends="python3-setuptools python3-wheel" depends="ansible-core" diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template index acd19ae1a7572f..b10705acfcc936 100644 --- a/srcpkgs/apostrophe/template +++ b/srcpkgs/apostrophe/template @@ -1,7 +1,7 @@ # Template file for 'apostrophe' pkgname=apostrophe version=2.6.3 -revision=4 +revision=5 build_style=meson build_helper=gir hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc" diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 51afdea88b2356..4da6d6a59f866c 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -2,7 +2,7 @@ pkgname=apparmor reverts="4.0.2_1" version=3.1.7 -revision=3 +revision=4 build_wrksrc=libraries/libapparmor build_style=gnu-configure conf_files="/etc/apparmor.d/local/* /etc/apparmor/*" diff --git a/srcpkgs/arandr/template b/srcpkgs/arandr/template index dec79ddade2f6c..899a16b047c937 100644 --- a/srcpkgs/arandr/template +++ b/srcpkgs/arandr/template @@ -1,7 +1,7 @@ # Template file for 'arandr' pkgname=arandr version=0.1.11 -revision=2 +revision=3 build_style=python3-module hostmakedepends="gettext python3-setuptools python3-docutils" depends="python3-gobject gtk+3 xrandr" diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template index 8a9b94778e607c..b1b95fe05a6943 100644 --- a/srcpkgs/asciidoc/template +++ b/srcpkgs/asciidoc/template @@ -1,7 +1,7 @@ # Template file for 'asciidoc' pkgname=asciidoc version=10.2.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="docbook-xsl libxslt python3-setuptools" depends="docbook-xsl libxslt python3" diff --git a/srcpkgs/asciinema/template b/srcpkgs/asciinema/template index 1797b49d419687..8b70c8a55186a1 100644 --- a/srcpkgs/asciinema/template +++ b/srcpkgs/asciinema/template @@ -1,7 +1,7 @@ # Template file for 'asciinema' pkgname=asciinema version=2.4.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template index e7645d6f155c7a..dcb3cfd0ca9598 100644 --- a/srcpkgs/attic/template +++ b/srcpkgs/attic/template @@ -1,7 +1,7 @@ # Template file for 'attic' pkgname=attic version=0.16 -revision=24 +revision=25 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython python3-Sphinx python3-pytz" makedepends="python3-devel openssl-devel acl-devel" diff --git a/srcpkgs/audit/template b/srcpkgs/audit/template index c57cdd0812dfc1..3f6c65a84f8fa5 100644 --- a/srcpkgs/audit/template +++ b/srcpkgs/audit/template @@ -1,7 +1,7 @@ # Template file for 'audit' pkgname=audit version=3.1.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--libdir=/usr/lib --enable-shared=audit --enable-gssapi-krb5 --with-apparmor --with-libcap-ng --with-python3" diff --git a/srcpkgs/autopep8/template b/srcpkgs/autopep8/template index e98017abd8f0bd..d49a262c36edfa 100644 --- a/srcpkgs/autopep8/template +++ b/srcpkgs/autopep8/template @@ -1,7 +1,7 @@ # Template file for 'autopep8' pkgname=autopep8 version=2.3.1 -revision=1 +revision=2 build_style=python3-pep517 # fails in CI due to readonly check make_check_args="-k not(io_error)" diff --git a/srcpkgs/autorandr/template b/srcpkgs/autorandr/template index e35e6ce69d156a..46aa5398a15da9 100644 --- a/srcpkgs/autorandr/template +++ b/srcpkgs/autorandr/template @@ -1,7 +1,7 @@ # Template file for 'autorandr' pkgname=autorandr version=1.15 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools pkg-config desktop-file-utils" depends="python3-setuptools xrandr" diff --git a/srcpkgs/autotiling/template b/srcpkgs/autotiling/template index 198d01849a18c2..88cedeaa2cbd79 100644 --- a/srcpkgs/autotiling/template +++ b/srcpkgs/autotiling/template @@ -1,7 +1,7 @@ # Template file for 'autotiling' pkgname=autotiling version=1.9.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-wheel" depends="python3-i3ipc" diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template index 769296f689a88e..767332ec8ebaab 100644 --- a/srcpkgs/avahi-discover/template +++ b/srcpkgs/avahi-discover/template @@ -5,7 +5,7 @@ # pkgname=avahi-discover version=0.8 -revision=7 +revision=8 build_style=gnu-configure build_helper="gir" configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc @@ -53,6 +53,19 @@ pre_configure() { autoreconf -fi } +pre_build() { + [ -n "${CROSS_BUILD}" ] || return 0 + + # TODO: fix this hack! + # + # GIR_EXTRA_LIBS_PATH in g-ir-scanner-qemuwrapper is not being honored, + # and the linker cannot find libavahi-glib.so.1 when scanning. Linking + # the missing library alongside the scanner targets is sufficient. + local d=avahi-gobject/.libs + mkdir -p "${d}" + ln -Tsf "../../avahi-glib/.libs/libavahi-glib.so.1" "${d}/libavahi-glib.so.1" +} + do_install() { mkdir -p ${wrksrc}/tmpinstall/usr/lib ln -s lib ${wrksrc}/tmpinstall/usr/lib${XBPS_TARGET_WORDSIZE} diff --git a/srcpkgs/avideo/template b/srcpkgs/avideo/template index 5e098845dcf65e..d229094ce0e2d4 100644 --- a/srcpkgs/avideo/template +++ b/srcpkgs/avideo/template @@ -1,7 +1,7 @@ # Template file for 'avideo' pkgname=avideo version=2017.9.27 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/avr-gdb/patches/constness.patch b/srcpkgs/avr-gdb/patches/constness.patch deleted file mode 100644 index cc7fe451e46178..00000000000000 --- a/srcpkgs/avr-gdb/patches/constness.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./gdb/completer.c.orig 2023-09-29 16:16:06.344069450 -0400 -+++ ./gdb/completer.c 2023-09-29 16:16:21.522162391 -0400 -@@ -2011,7 +2011,7 @@ - rl_basic_quote_characters = NULL; - } - -- return rl_completer_word_break_characters; -+ return (char *)rl_completer_word_break_characters; - } - - char * diff --git a/srcpkgs/avr-gdb/template b/srcpkgs/avr-gdb/template index 43799838c10e84..3bfd5e27422116 100644 --- a/srcpkgs/avr-gdb/template +++ b/srcpkgs/avr-gdb/template @@ -1,14 +1,14 @@ # Template file for 'avr-gdb' pkgname=avr-gdb -version=12.1 -revision=2 +version=15.2 +revision=1 build_style=gnu-configure configure_args="--target=avr --disable-werror --disable-nls --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)" hostmakedepends="pkg-config texinfo $(vopt_if guile guile) $(vopt_if python "python3-setuptools python3-devel")" -makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel +makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel mpfr-devel $(vopt_if guile guile-devel) $(vopt_if python 'gettext-devel python3-devel')" depends="gdb-common" short_desc="GNU Debugger for AVR" @@ -16,7 +16,7 @@ maintainer="Artur Sinila " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/gdb" distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz" -checksum=0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed +checksum=83350ccd35b5b5a0cba6b334c41294ea968158c573940904f00b92f76345314d make_check=no # See gdb/template. replaces="cross-avr-gdb>=0" diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template index 894be2668d72a2..1bfdf13c59c2c0 100644 --- a/srcpkgs/aws-cli/template +++ b/srcpkgs/aws-cli/template @@ -1,7 +1,7 @@ # Template file for 'aws-cli' pkgname=aws-cli version=1.22.88 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="groff python3-botocore python3-s3transfer python3-colorama diff --git a/srcpkgs/awsume/template b/srcpkgs/awsume/template index 7c2e7cbf13b4d4..aa8ef36b01d0fd 100644 --- a/srcpkgs/awsume/template +++ b/srcpkgs/awsume/template @@ -1,7 +1,7 @@ # Template file for 'awsume' pkgname=awsume version=4.5.5 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3 python3-setuptools" makedepends="python3-boto3 python3-botocore python3-colorama python3-pluggy python3-psutil python3-xmltodict python3-yaml python3-dateutil" diff --git a/srcpkgs/azote/template b/srcpkgs/azote/template index ee359faeeb3587..1ce31a207931d4 100644 --- a/srcpkgs/azote/template +++ b/srcpkgs/azote/template @@ -1,7 +1,7 @@ # Template file for 'azote' pkgname=azote version=1.13.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="gtk+3 libayatana-appindicator python3 python3-cairo python3-gobject diff --git a/srcpkgs/bCNC/template b/srcpkgs/bCNC/template index 1704de365a7c96..2d91cc04a6dadd 100644 --- a/srcpkgs/bCNC/template +++ b/srcpkgs/bCNC/template @@ -1,7 +1,7 @@ # Template file for 'bCNC' pkgname=bCNC version=0.9.15 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pyserial python3-Pillow python3-tkinter python3-numpy python3-scipy diff --git a/srcpkgs/backblaze-b2/template b/srcpkgs/backblaze-b2/template index be0b87b5502834..e9ad155f20698c 100644 --- a/srcpkgs/backblaze-b2/template +++ b/srcpkgs/backblaze-b2/template @@ -1,7 +1,7 @@ # Template file for 'backblaze-b2' pkgname=backblaze-b2 version=4.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3 python3-build python3-packaging python3-pdm-backend python3-pip python3-setuptools_scm python3-wheel" depends="python3-Arrow python3-b2sdk python3-docutils diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template index a502c09f64d596..e38ae43fde91f9 100644 --- a/srcpkgs/backintime/template +++ b/srcpkgs/backintime/template @@ -1,7 +1,7 @@ # Template file for 'backintime' pkgname=backintime version=1.5.3 -revision=1 +revision=2 configure_args="--python3" pycompile_dirs="/usr/share/backintime" hostmakedepends="gettext python3" diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template index 0ea88bbe23ba6f..f163113f8cd138 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -1,14 +1,14 @@ # Template file for 'bcc' pkgname=bcc version=0.32.0 -revision=1 +revision=2 _llvmver=19 build_style=cmake configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1 -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr/lib/llvm/${_llvmver}" hostmakedepends="flex python3-setuptools" -makedepends="clang${_llvmver} clang-tools-extra${_llvmver} elfutils-devel flex lld${_llvmver}-devel llvm${_llvmver}-devel - ncurses-devel python3-devel zlib-devel" +makedepends="clang${_llvmver} clang-tools-extra${_llvmver} elfutils-devel flex + lld${_llvmver}-devel llvm${_llvmver}-devel ncurses-devel python3-devel zlib-devel" short_desc="BPF-based Linux IO analysis, networking, monitoring, and more" maintainer="Leah Neukirchen " license="Apache-2.0" diff --git a/srcpkgs/beancount/template b/srcpkgs/beancount/template index dc665645d9b157..354485b68ec606 100644 --- a/srcpkgs/beancount/template +++ b/srcpkgs/beancount/template @@ -1,7 +1,7 @@ # Template file for 'beancount' pkgname=beancount version=2.3.6 -revision=3 +revision=4 build_style=python3-module make_check_args="--pyargs beancount --ignore beancount/web/web_test.py --deselect beancount/scripts/bake_test.py::TestScriptBake::test_bake_directory diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template index ffac0e9ddac4db..f45ef6487d9051 100644 --- a/srcpkgs/beets/template +++ b/srcpkgs/beets/template @@ -1,7 +1,7 @@ # Template file for 'beets' pkgname=beets version=2.0.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template index f4e69b040075b2..391fdf2dd9fee6 100644 --- a/srcpkgs/binwalk/template +++ b/srcpkgs/binwalk/template @@ -1,7 +1,7 @@ # Template file for 'binwalk' pkgname=binwalk version=2.4.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 tar" diff --git a/srcpkgs/black/template b/srcpkgs/black/template index f88493bbc9abe5..d62a33c8d7f45f 100644 --- a/srcpkgs/black/template +++ b/srcpkgs/black/template @@ -1,7 +1,7 @@ # Template file for 'black' pkgname=black version=24.10.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme" depends="python3-click python3-platformdirs python3-pathspec python3-packaging diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch index a32821172cba34..4e0af6c4619da2 100644 --- a/srcpkgs/blender/patches/0001-musl-fixes.patch +++ b/srcpkgs/blender/patches/0001-musl-fixes.patch @@ -14,11 +14,65 @@ Subject: [PATCH 1/2] musl fixes +++ b/extern/glog/src/config_linux.h @@ -14,7 +14,9 @@ #define HAVE_DLFCN_H - + /* Define to 1 if you have the header file. */ +#ifdef __GLIBC__ #define HAVE_EXECINFO_H +#endif - + /* Define if you have the `fcntl' function */ #define HAVE_FCNTL +--- a/source/blender/blenlib/BLI_index_range.hh ++++ b/source/blender/blenlib/BLI_index_range.hh +@@ -38,6 +38,7 @@ + */ + + #include ++#include + #include + + #include "BLI_assert.h" + +--- a/source/blender/blenkernel/BKE_volume_enums.hh ++++ b/source/blender/blenkernel/BKE_volume_enums.hh +@@ -8,7 +8,11 @@ + * \ingroup bli + */ + +-enum VolumeGridType : int8_t { ++enum VolumeGridType ++#ifdef __GLIBC__ ++: int8_t ++#endif ++{ + VOLUME_GRID_UNKNOWN = 0, + VOLUME_GRID_BOOLEAN, + VOLUME_GRID_FLOAT, + +--- a/extern/lzma/Threads.h ++++ b/extern/lzma/Threads.h +@@ -82,7 +82,12 @@ + + #ifdef Z7_AFFINITY_SUPPORTED + ++#ifndef __GLIBC__ ++typedef struct CCpuSet { unsigned long __bits[128/sizeof(long)]; } CCpuSet; ++// because including sched.h doesn't work ++#else + typedef cpu_set_t CCpuSet; ++#endif + #define CpuSet_Zero(p) CPU_ZERO(p) + #define CpuSet_Set(p, cpu) CPU_SET(cpu, p) + #define CpuSet_IsSet(p, cpu) CPU_ISSET(cpu, p) + +--- a/extern/lzma/Threads.c ++++ b/extern/lzma/Threads.c +@@ -265,7 +265,7 @@ + */ + + // ret2 = +- pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet); ++ pthread_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet); + // if (ret2) ret = ret2; + #endif + } diff --git a/srcpkgs/blender/patches/altivec-all.patch b/srcpkgs/blender/patches/altivec-all.patch deleted file mode 100644 index 115e1ea6fd033d..00000000000000 --- a/srcpkgs/blender/patches/altivec-all.patch +++ /dev/null @@ -1,32 +0,0 @@ -This applies a better workaround for C++ type conflicts -in AltiVec/C++, allowing it to build on BE ppc(64). - ---- a/extern/clew/include/clew.h -+++ b/extern/clew/include/clew.h -@@ -370,15 +370,18 @@ typedef unsigned int cl_GLenum; - - /* Define basic vector types */ - /* Workaround for ppc64el platform: conflicts with bool from C++. */ --#if defined( __VEC__ ) && !(defined(__PPC64__) && defined(__LITTLE_ENDIAN__)) -+#if defined(__VEC__) - #include /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ -- typedef vector unsigned char __cl_uchar16; -- typedef vector signed char __cl_char16; -- typedef vector unsigned short __cl_ushort8; -- typedef vector signed short __cl_short8; -- typedef vector unsigned int __cl_uint4; -- typedef vector signed int __cl_int4; -- typedef vector float __cl_float4; -+ #undef vector -+ #undef bool -+ #undef pixel -+ typedef __vector unsigned char __cl_uchar16; -+ typedef __vector signed char __cl_char16; -+ typedef __vector unsigned short __cl_ushort8; -+ typedef __vector signed short __cl_short8; -+ typedef __vector unsigned int __cl_uint4; -+ typedef __vector signed int __cl_int4; -+ typedef __vector float __cl_float4; - #define __CL_UCHAR16__ 1 - #define __CL_CHAR16__ 1 - #define __CL_USHORT8__ 1 diff --git a/srcpkgs/blender/patches/python-3.12-regex.patch b/srcpkgs/blender/patches/python-3.12-regex.patch deleted file mode 100644 index daba4a859fd157..00000000000000 --- a/srcpkgs/blender/patches/python-3.12-regex.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py -+++ b/scripts/addons/io_import_dxf/dxfgrabber/dxfentities.py -@@ -852,7 +852,7 @@ class MText(DXFEntity): - self.set_default_extrusion() - - def lines(self): -- return self.raw_text.split('\P') -+ return self.raw_text.split(r'\P') - - def plain_text(self, split=False): - chars = [] ---- a/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py -+++ b/scripts/addons/io_scene_gltf2/io/exp/gltf2_io_image_data.py -@@ -22,9 +22,9 @@ class ImageData: - return hash(self._data) - - def adjusted_name(self): -- regex_dot = re.compile("\.") -+ regex_dot = re.compile(r"\.") - adjusted_name = re.sub(regex_dot, "_", self.name) -- new_name = "".join([char for char in adjusted_name if char not in "!#$&'()*+,/:;<>?@[\]^`{|}~"]) -+ new_name = "".join([char for char in adjusted_name if char not in r"!#$&'()*+,/:;<>?@[\]^`{|}~"]) - return new_name - - @property ---- a/scripts/modules/bl_i18n_utils/settings.py -+++ b/scripts/modules/bl_i18n_utils/settings.py -@@ -302,7 +302,7 @@ PYGETTEXT_KEYWORDS = (() + - # becomes extremely slow to process some (unrelated) source files. - ((r"\{(?:(?:\s*\"[^\",]+\"\s*,)|(?:\s*\"\\\"\",)|(?:\s*nullptr\s*,)){4}\s*" + - _msg_re + r"\s*,(?:(?:\s*\"[^\"',]+\"\s*,)|(?:\s*nullptr\s*,))(?:[^,]+,){2}" -- + "(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) + -+ + r"(?:\|?\s*B_UNIT_DEF_[_A-Z]+\s*)+\}"),) + - - tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" + - r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*\)").format(it) diff --git a/srcpkgs/blender/patches/python-3.13.patch b/srcpkgs/blender/patches/python-3.13.patch new file mode 100644 index 00000000000000..0dd6f4b95b4d84 --- /dev/null +++ b/srcpkgs/blender/patches/python-3.13.patch @@ -0,0 +1,626 @@ +From d9f38fca5ffe29136cd6f390e318ad8455864582 Mon Sep 17 00:00:00 2001 +From: Campbell Barton +Date: Fri, 18 Oct 2024 12:23:34 +1100 +Subject: [PATCH] PyAPI: support Python 3.13 + +- `_PySet_NextEntry` has been removed, use generic iterator access + which will has some additional overhead as it needs to create + an iterator to access the values. + +- Add v3.13 compatibility defines to account for renaming: + _PyObject_LookupAttr -> PyObject_GetOptionalAttr + _PyLong_AsInt -> PyLong_AsInt + +- Unfortunately use of Python's internal API needs to be used to + inspect op-codes in `bpy_driver.cc`. + +Testing GLTF/FBX IO there isn't any significant performance impact +from these changes. + +Resolves #123871. +--- + .../blender/python/bmesh/bmesh_py_ops_call.cc | 16 +- + source/blender/python/generic/py_capi_rna.cc | 140 ++++++++++-------- + .../blender/python/generic/py_capi_utils.cc | 56 ++++--- + .../blender/python/generic/py_capi_utils.hh | 4 + + .../blender/python/generic/python_compat.hh | 10 +- + .../blender/python/gpu/gpu_py_framebuffer.cc | 6 +- + source/blender/python/intern/bpy.cc | 48 +++--- + source/blender/python/intern/bpy_driver.cc | 37 ++++- + .../python/intern/bpy_library_write.cc | 27 ++-- + source/blender/python/intern/bpy_rna.cc | 6 +- + 10 files changed, 218 insertions(+), 132 deletions(-) + +diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.cc b/source/blender/python/bmesh/bmesh_py_ops_call.cc +index d5a2e6b02ad..624e4d02e98 100644 +--- a/source/blender/python/bmesh/bmesh_py_ops_call.cc ++++ b/source/blender/python/bmesh/bmesh_py_ops_call.cc +@@ -548,11 +548,12 @@ static int bpy_slot_from_py(BMesh *bm, + break; + } + case BMO_OP_SLOT_SUBTYPE_MAP_EMPTY: { +- if (PySet_Size(value) > 0) { ++ if (PySet_GET_SIZE(value) > 0) { ++ PyObject *it = PyObject_GetIter(value); + PyObject *arg_key; +- Py_ssize_t arg_pos = 0; +- Py_ssize_t arg_hash = 0; +- while (_PySet_NextEntry(value, &arg_pos, &arg_key, &arg_hash)) { ++ while ((arg_key = PyIter_Next(it))) { ++ /* Borrow from the set. */ ++ Py_DECREF(arg_key); + + if (bpy_slot_from_py_elem_check((BPy_BMElem *)arg_key, + bm, +@@ -561,11 +562,16 @@ static int bpy_slot_from_py(BMesh *bm, + slot_name, + "invalid key in set") == -1) + { +- return -1; /* error is set in bpy_slot_from_py_elem_check() */ ++ /* Error is set in #bpy_slot_from_py_elem_check(). */ ++ break; + } + + BMO_slot_map_empty_insert(bmop, slot, ((BPy_BMElem *)arg_key)->ele); + } ++ Py_DECREF(it); ++ if (arg_key) { ++ return -1; ++ } + } + break; + } +diff --git a/source/blender/python/generic/py_capi_rna.cc b/source/blender/python/generic/py_capi_rna.cc +index 11827fa0836..a41e474f619 100644 +--- a/source/blender/python/generic/py_capi_rna.cc ++++ b/source/blender/python/generic/py_capi_rna.cc +@@ -75,60 +75,66 @@ BLI_bitmap *pyrna_enum_bitmap_from_set(const EnumPropertyItem *items, + int bitmap_size, + const char *error_prefix) + { +- /* Set looping. */ +- Py_ssize_t pos = 0; +- Py_ssize_t hash = 0; +- PyObject *key; +- ++ BLI_assert(PySet_Check(value)); + BLI_bitmap *bitmap = BLI_BITMAP_NEW(bitmap_size, __func__); + +- while (_PySet_NextEntry(value, &pos, &key, &hash)) { +- const char *param = PyUnicode_AsUTF8(key); +- if (param == nullptr) { +- PyErr_Format(PyExc_TypeError, +- "%.200s expected a string, not %.200s", +- error_prefix, +- Py_TYPE(key)->tp_name); +- goto error; +- } ++ if (PySet_GET_SIZE(value) > 0) { ++ /* Set looping. */ ++ PyObject *it = PyObject_GetIter(value); ++ PyObject *key; ++ while ((key = PyIter_Next(it))) { ++ /* Borrow from the set. */ ++ Py_DECREF(key); + +- int ret; +- if (pyrna_enum_value_from_id(items, param, &ret, error_prefix) == -1) { +- goto error; +- } ++ const char *param = PyUnicode_AsUTF8(key); ++ if (param == nullptr) { ++ PyErr_Format(PyExc_TypeError, ++ "%.200s expected a string, not %.200s", ++ error_prefix, ++ Py_TYPE(key)->tp_name); ++ break; ++ } + +- int index = ret; ++ int ret; ++ if (pyrna_enum_value_from_id(items, param, &ret, error_prefix) == -1) { ++ break; ++ } + +- if (type_convert_sign) { +- if (type_size == 2) { +- union { +- signed short as_signed; +- ushort as_unsigned; +- } ret_convert; +- ret_convert.as_signed = (signed short)ret; +- index = int(ret_convert.as_unsigned); +- } +- else if (type_size == 1) { +- union { +- signed char as_signed; +- uchar as_unsigned; +- } ret_convert; +- ret_convert.as_signed = (signed char)ret; +- index = int(ret_convert.as_unsigned); +- } +- else { +- BLI_assert_unreachable(); ++ int index = ret; ++ ++ if (type_convert_sign) { ++ if (type_size == 2) { ++ union { ++ signed short as_signed; ++ ushort as_unsigned; ++ } ret_convert; ++ ret_convert.as_signed = (signed short)ret; ++ index = int(ret_convert.as_unsigned); ++ } ++ else if (type_size == 1) { ++ union { ++ signed char as_signed; ++ uchar as_unsigned; ++ } ret_convert; ++ ret_convert.as_signed = (signed char)ret; ++ index = int(ret_convert.as_unsigned); ++ } ++ else { ++ BLI_assert_unreachable(); ++ } + } ++ BLI_assert(index < bitmap_size); ++ BLI_BITMAP_ENABLE(bitmap, index); ++ } ++ Py_DECREF(it); ++ ++ if (key) { ++ MEM_freeN(bitmap); ++ bitmap = nullptr; + } +- BLI_assert(index < bitmap_size); +- BLI_BITMAP_ENABLE(bitmap, index); + } + + return bitmap; +- +-error: +- MEM_freeN(bitmap); +- return nullptr; + } + + int pyrna_enum_bitfield_from_set(const EnumPropertyItem *items, +@@ -136,32 +142,40 @@ int pyrna_enum_bitfield_from_set(const EnumPropertyItem *items, + int *r_value, + const char *error_prefix) + { ++ BLI_assert(PySet_Check(value)); + /* Set of enum items, concatenate all values with OR. */ +- int ret, flag = 0; +- +- /* Set looping. */ +- Py_ssize_t pos = 0; +- Py_ssize_t hash = 0; +- PyObject *key; ++ int flag = 0; + + *r_value = 0; + +- while (_PySet_NextEntry(value, &pos, &key, &hash)) { +- const char *param = PyUnicode_AsUTF8(key); ++ PyObject *key = nullptr; ++ if (PySet_GET_SIZE(value) > 0) { ++ /* Set looping. */ ++ PyObject *it = PyObject_GetIter(value); ++ while ((key = PyIter_Next(it))) { ++ /* Borrow from the set. */ ++ Py_DECREF(key); + +- if (param == nullptr) { +- PyErr_Format(PyExc_TypeError, +- "%.200s expected a string, not %.200s", +- error_prefix, +- Py_TYPE(key)->tp_name); ++ const char *param = PyUnicode_AsUTF8(key); ++ if (param == nullptr) { ++ PyErr_Format(PyExc_TypeError, ++ "%.200s expected a string, not %.200s", ++ error_prefix, ++ Py_TYPE(key)->tp_name); ++ break; ++ } ++ ++ int ret; ++ if (pyrna_enum_value_from_id(items, param, &ret, error_prefix) == -1) { ++ break; ++ } ++ ++ flag |= ret; ++ } ++ Py_DECREF(it); ++ if (key) { + return -1; + } +- +- if (pyrna_enum_value_from_id(items, param, &ret, error_prefix) == -1) { +- return -1; +- } +- +- flag |= ret; + } + + *r_value = flag; +diff --git a/source/blender/python/generic/py_capi_utils.cc b/source/blender/python/generic/py_capi_utils.cc +index 3311064e7c5..74c829d717e 100644 +--- a/source/blender/python/generic/py_capi_utils.cc ++++ b/source/blender/python/generic/py_capi_utils.cc +@@ -39,6 +39,11 @@ + # include "BLI_math_base.h" /* isfinite() */ + #endif + ++#if PY_VERSION_HEX <= 0x030c0000 /* <=3.12 */ ++# define PyLong_AsInt _PyLong_AsInt ++# define PyUnicode_CompareWithASCIIString _PyUnicode_EqualToASCIIString ++#endif ++ + /* -------------------------------------------------------------------- */ + /** \name Fast Python to C Array Conversion for Primitive Types + * \{ */ +@@ -874,10 +879,12 @@ static void pyc_exception_buffer_handle_system_exit() + if (!PyErr_ExceptionMatches(PyExc_SystemExit)) { + return; + } +- /* Inspecting, follow Python's logic in #_Py_HandleSystemExit & treat as a regular exception. */ ++/* Inspecting, follow Python's logic in #_Py_HandleSystemExit & treat as a regular exception. */ ++# if 0 /* FIXME: */ + if (_Py_GetConfig()->inspect) { + return; + } ++# endif + + /* NOTE(@ideasman42): A `SystemExit` exception will exit immediately (unless inspecting). + * So print the error and exit now. Without this #PyErr_Display shows the error stack-trace +@@ -1424,11 +1431,6 @@ int PyC_FlagSet_ToBitfield(const PyC_FlagSet *items, + /* set of enum items, concatenate all values with OR */ + int ret, flag = 0; + +- /* set looping */ +- Py_ssize_t pos = 0; +- Py_ssize_t hash = 0; +- PyObject *key; +- + if (!PySet_Check(value)) { + PyErr_Format(PyExc_TypeError, + "%.200s expected a set, not %.200s", +@@ -1439,22 +1441,32 @@ int PyC_FlagSet_ToBitfield(const PyC_FlagSet *items, + + *r_value = 0; + +- while (_PySet_NextEntry(value, &pos, &key, &hash)) { +- const char *param = PyUnicode_AsUTF8(key); ++ if (PySet_GET_SIZE(value) > 0) { ++ PyObject *it = PyObject_GetIter(value); ++ PyObject *key; ++ while ((key = PyIter_Next(it))) { ++ /* Borrow from the set. */ ++ Py_DECREF(key); + +- if (param == nullptr) { +- PyErr_Format(PyExc_TypeError, +- "%.200s set must contain strings, not %.200s", +- error_prefix, +- Py_TYPE(key)->tp_name); ++ const char *param = PyUnicode_AsUTF8(key); ++ if (param == nullptr) { ++ PyErr_Format(PyExc_TypeError, ++ "%.200s set must contain strings, not %.200s", ++ error_prefix, ++ Py_TYPE(key)->tp_name); ++ break; ++ } ++ ++ if (PyC_FlagSet_ValueFromID(items, param, &ret, error_prefix) < 0) { ++ break; ++ } ++ ++ flag |= ret; ++ } ++ Py_DECREF(it); ++ if (key != nullptr) { + return -1; + } +- +- if (PyC_FlagSet_ValueFromID(items, param, &ret, error_prefix) < 0) { +- return -1; +- } +- +- flag |= ret; + } + + *r_value = flag; +@@ -1724,7 +1736,7 @@ static ulong pyc_Long_AsUnsignedLong(PyObject *value) + + int PyC_Long_AsBool(PyObject *value) + { +- const int test = _PyLong_AsInt(value); ++ const int test = PyLong_AsInt(value); + if (UNLIKELY(test == -1 && PyErr_Occurred())) { + return -1; + } +@@ -1737,7 +1749,7 @@ int PyC_Long_AsBool(PyObject *value) + + int8_t PyC_Long_AsI8(PyObject *value) + { +- const int test = _PyLong_AsInt(value); ++ const int test = PyLong_AsInt(value); + if (UNLIKELY(test == -1 && PyErr_Occurred())) { + return -1; + } +@@ -1750,7 +1762,7 @@ int8_t PyC_Long_AsI8(PyObject *value) + + int16_t PyC_Long_AsI16(PyObject *value) + { +- const int test = _PyLong_AsInt(value); ++ const int test = PyLong_AsInt(value); + if (UNLIKELY(test == -1 && PyErr_Occurred())) { + return -1; + } +diff --git a/source/blender/python/generic/py_capi_utils.hh b/source/blender/python/generic/py_capi_utils.hh +index 4a641f78471..81740e0d0ad 100644 +--- a/source/blender/python/generic/py_capi_utils.hh ++++ b/source/blender/python/generic/py_capi_utils.hh +@@ -339,7 +339,11 @@ uint64_t PyC_Long_AsU64(PyObject *value); + /* inline so type signatures match as expected */ + Py_LOCAL_INLINE(int32_t) PyC_Long_AsI32(PyObject *value) + { ++#if PY_VERSION_HEX <= 0x030c0000 /* <=3.12 */ + return (int32_t)_PyLong_AsInt(value); ++#else ++ return (int32_t)PyLong_AsInt(value); ++#endif + } + Py_LOCAL_INLINE(int64_t) PyC_Long_AsI64(PyObject *value) + { +diff --git a/source/blender/python/generic/python_compat.hh b/source/blender/python/generic/python_compat.hh +index f18d0fb59b3..e2799aeeb46 100644 +--- a/source/blender/python/generic/python_compat.hh ++++ b/source/blender/python/generic/python_compat.hh +@@ -9,9 +9,17 @@ + + #pragma once + ++/* Removes `intialized` member from Python 3.13+. */ ++#if PY_VERSION_HEX >= 0x030d0000 ++# define PY_ARG_PARSER_HEAD_COMPAT() ++#elif PY_VERSION_HEX >= 0x030c0000 + /* Add `intialized` member for Python 3.12+. */ +-#if PY_VERSION_HEX >= 0x030c0000 + # define PY_ARG_PARSER_HEAD_COMPAT() 0, + #else + # define PY_ARG_PARSER_HEAD_COMPAT() + #endif ++ ++/* Python 3.13 made some changes, use the "new" names. */ ++#if PY_VERSION_HEX < 0x030d0000 ++# define PyObject_GetOptionalAttr _PyObject_LookupAttr ++#endif +diff --git a/source/blender/python/gpu/gpu_py_framebuffer.cc b/source/blender/python/gpu/gpu_py_framebuffer.cc +index 899ad21f770..9bef53654df 100644 +--- a/source/blender/python/gpu/gpu_py_framebuffer.cc ++++ b/source/blender/python/gpu/gpu_py_framebuffer.cc +@@ -286,14 +286,14 @@ static bool pygpu_framebuffer_new_parse_arg(PyObject *o, GPUAttachment *r_attach + return false; + } + +- if (c_texture && _PyUnicode_EqualToASCIIString(key, c_texture)) { ++ if (c_texture && PyUnicode_CompareWithASCIIString(key, c_texture)) { + /* Compare only once. */ + c_texture = nullptr; + if (!bpygpu_ParseTexture(value, &tmp_attach.tex)) { + return false; + } + } +- else if (c_layer && _PyUnicode_EqualToASCIIString(key, c_layer)) { ++ else if (c_layer && PyUnicode_CompareWithASCIIString(key, c_layer)) { + /* Compare only once. */ + c_layer = nullptr; + tmp_attach.layer = PyLong_AsLong(value); +@@ -301,7 +301,7 @@ static bool pygpu_framebuffer_new_parse_arg(PyObject *o, GPUAttachment *r_attach + return false; + } + } +- else if (c_mip && _PyUnicode_EqualToASCIIString(key, c_mip)) { ++ else if (c_mip && PyUnicode_CompareWithASCIIString(key, c_mip)) { + /* Compare only once. */ + c_mip = nullptr; + tmp_attach.mip = PyLong_AsLong(value); +diff --git a/source/blender/python/intern/bpy.cc b/source/blender/python/intern/bpy.cc +index 7cdd00fc7a3..42ea76e40ac 100644 +--- a/source/blender/python/intern/bpy.cc ++++ b/source/blender/python/intern/bpy.cc +@@ -610,38 +610,40 @@ PyDoc_STRVAR( + " :rtype: dict\n"); + static PyObject *bpy_wm_capabilities(PyObject *self) + { +- static _Py_Identifier PyId_capabilities = {"_wm_capabilities_", -1}; +- ++ PyObject *py_id_capabilities = PyUnicode_FromString("_wm_capabilities_"); + PyObject *result = nullptr; +- switch (_PyObject_LookupAttrId(self, &PyId_capabilities, &result)) { +- case 1: +- return result; +- case 0: +- break; +- default: +- /* Unlikely, but there may be an error, forward it. */ +- return nullptr; +- } ++ switch (PyObject_GetOptionalAttr(self, py_id_capabilities, &result)) { ++ case 1: { ++ result = PyDict_New(); + +- result = PyDict_New(); +- +- const eWM_CapabilitiesFlag flag = WM_capabilities_flag(); ++ const eWM_CapabilitiesFlag flag = WM_capabilities_flag(); + + #define SetFlagItem(x) \ + PyDict_SetItemString(result, STRINGIFY(x), PyBool_FromLong((WM_CAPABILITY_##x) & flag)); + +- SetFlagItem(CURSOR_WARP); +- SetFlagItem(WINDOW_POSITION); +- SetFlagItem(PRIMARY_CLIPBOARD); +- SetFlagItem(GPU_FRONT_BUFFER_READ); +- SetFlagItem(CLIPBOARD_IMAGES); +- SetFlagItem(DESKTOP_SAMPLE); +- SetFlagItem(INPUT_IME); +- SetFlagItem(TRACKPAD_PHYSICAL_DIRECTION); ++ SetFlagItem(CURSOR_WARP); ++ SetFlagItem(WINDOW_POSITION); ++ SetFlagItem(PRIMARY_CLIPBOARD); ++ SetFlagItem(GPU_FRONT_BUFFER_READ); ++ SetFlagItem(CLIPBOARD_IMAGES); ++ SetFlagItem(DESKTOP_SAMPLE); ++ SetFlagItem(INPUT_IME); ++ SetFlagItem(TRACKPAD_PHYSICAL_DIRECTION); + + #undef SetFlagItem ++ PyObject_SetAttr(self, py_id_capabilities, result); ++ break; ++ } ++ case 0: ++ BLI_assert(result != nullptr); ++ break; ++ default: ++ /* Unlikely, but there may be an error, forward it. */ ++ BLI_assert(result == nullptr); ++ break; ++ } + +- _PyObject_SetAttrId(self, &PyId_capabilities, result); ++ Py_DECREF(py_id_capabilities); + return result; + } + +diff --git a/source/blender/python/intern/bpy_driver.cc b/source/blender/python/intern/bpy_driver.cc +index b32bfbc2a56..e589f0992e1 100644 +--- a/source/blender/python/intern/bpy_driver.cc ++++ b/source/blender/python/intern/bpy_driver.cc +@@ -43,6 +43,13 @@ + # include + #endif + ++#if PY_VERSION_HEX >= 0x030d0000 /* >=3.13 */ ++/* WARNING(@ideasman42): Using `Py_BUILD_CORE` is a last resort, ++ * the alternative would be not to inspect OP-CODES at all. */ ++# define Py_BUILD_CORE ++# include ++#endif ++ + PyObject *bpy_pydriver_Dict = nullptr; + + #ifdef USE_BYTECODE_WHITELIST +@@ -375,7 +382,35 @@ static bool is_opcode_secure(const int opcode) + OK_OP(LOAD_CONST) /* Ok because constants are accepted. */ + OK_OP(LOAD_NAME) /* Ok, because `PyCodeObject.names` is checked. */ + OK_OP(CALL) /* Ok, because we check its "name" before calling. */ +- OK_OP(KW_NAMES) /* Ok, because it's used for calling functions with keyword arguments. */ ++# if PY_VERSION_HEX >= 0x030d0000 ++ OK_OP(CALL_KW) /* Ok, because it's used for calling functions with keyword arguments. */ ++ ++ OK_OP(CALL_FUNCTION_EX); ++ ++ /* OK because the names are checked. */ ++ OK_OP(CALL_ALLOC_AND_ENTER_INIT) ++ OK_OP(CALL_BOUND_METHOD_EXACT_ARGS) ++ OK_OP(CALL_BOUND_METHOD_GENERAL) ++ OK_OP(CALL_BUILTIN_CLASS) ++ OK_OP(CALL_BUILTIN_FAST) ++ OK_OP(CALL_BUILTIN_FAST_WITH_KEYWORDS) ++ OK_OP(CALL_BUILTIN_O) ++ OK_OP(CALL_ISINSTANCE) ++ OK_OP(CALL_LEN) ++ OK_OP(CALL_LIST_APPEND) ++ OK_OP(CALL_METHOD_DESCRIPTOR_FAST) ++ OK_OP(CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS) ++ OK_OP(CALL_METHOD_DESCRIPTOR_NOARGS) ++ OK_OP(CALL_METHOD_DESCRIPTOR_O) ++ OK_OP(CALL_NON_PY_GENERAL) ++ OK_OP(CALL_PY_EXACT_ARGS) ++ OK_OP(CALL_PY_GENERAL) ++ OK_OP(CALL_STR_1) ++ OK_OP(CALL_TUPLE_1) ++ OK_OP(CALL_TYPE_1) ++# else ++ OK_OP(KW_NAMES) /* Ok, because it's used for calling functions with keyword arguments. */ ++# endif + + # if PY_VERSION_HEX < 0x030c0000 + OK_OP(PRECALL) /* Ok, because it's used for calling. */ +diff --git a/source/blender/python/intern/bpy_library_write.cc b/source/blender/python/intern/bpy_library_write.cc +index d1c0b32ac07..59bf476427f 100644 +--- a/source/blender/python/intern/bpy_library_write.cc ++++ b/source/blender/python/intern/bpy_library_write.cc +@@ -136,20 +136,25 @@ static PyObject *bpy_lib_write(BPy_PropertyRNA *self, PyObject *args, PyObject * + PartialWriteContext::IDAddOperations::ADD_DEPENDENCIES | + (use_fake_user ? PartialWriteContext::IDAddOperations::SET_FAKE_USER : 0))}; + +- Py_ssize_t pos, hash; +- PyObject *key; +- ID *id = nullptr; +- +- pos = hash = 0; +- while (_PySet_NextEntry(datablocks, &pos, &key, &hash)) { +- if (!pyrna_id_FromPyObject(key, &id)) { +- PyErr_Format(PyExc_TypeError, "Expected an ID type, not %.200s", Py_TYPE(key)->tp_name); +- return nullptr; +- } +- else { ++ if (PySet_GET_SIZE(datablocks) > 0) { ++ PyObject *it = PyObject_GetIter(datablocks); ++ PyObject *key; ++ while ((key = PyIter_Next(it))) { ++ /* Borrow from the set. */ ++ Py_DECREF(key); ++ ID *id; ++ if (!pyrna_id_FromPyObject(key, &id)) { ++ PyErr_Format(PyExc_TypeError, "Expected an ID type, not %.200s", Py_TYPE(key)->tp_name); ++ break; ++ } + partial_write_ctx.id_add(id, add_options, nullptr); + } ++ Py_DECREF(it); ++ if (key) { ++ return nullptr; ++ } + } ++ + BLI_assert(partial_write_ctx.is_valid()); + + /* write blend */ +diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc +index eb365bf0238..a9cb115f57e 100644 +--- a/source/blender/python/intern/bpy_rna.cc ++++ b/source/blender/python/intern/bpy_rna.cc +@@ -8639,7 +8639,7 @@ static int bpy_class_validate_recursive(PointerRNA *dummy_ptr, + continue; + } + +- /* TODO(@ideasman42): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */ ++ /* TODO(@ideasman42): Use #PyObject_GetOptionalAttr(), also in the macro below. */ + identifier = RNA_property_identifier(prop); + item = PyObject_GetAttrString(py_class, identifier); + +@@ -9263,7 +9263,7 @@ static PyObject *pyrna_register_class(PyObject * /*self*/, PyObject *py_class) + + /* Call classed register method. + * Note that zero falls through, no attribute, no error. */ +- switch (_PyObject_LookupAttr(py_class, bpy_intern_str_register, &py_cls_meth)) { ++ switch (PyObject_GetOptionalAttr(py_class, bpy_intern_str_register, &py_cls_meth)) { + case 1: { + PyObject *ret = PyObject_CallObject(py_cls_meth, nullptr); + Py_DECREF(py_cls_meth); +@@ -9378,7 +9378,7 @@ static PyObject *pyrna_unregister_class(PyObject * /*self*/, PyObject *py_class) + + /* Call classed unregister method. + * Note that zero falls through, no attribute, no error. */ +- switch (_PyObject_LookupAttr(py_class, bpy_intern_str_unregister, &py_cls_meth)) { ++ switch (PyObject_GetOptionalAttr(py_class, bpy_intern_str_unregister, &py_cls_meth)) { + case 1: { + PyObject *ret = PyObject_CallObject(py_cls_meth, nullptr); + Py_DECREF(py_cls_meth); diff --git a/srcpkgs/blender/patches/python3.12-pylongobject.patch b/srcpkgs/blender/patches/python3.12-pylongobject.patch deleted file mode 100644 index 80b326809cc95f..00000000000000 --- a/srcpkgs/blender/patches/python3.12-pylongobject.patch +++ /dev/null @@ -1,134 +0,0 @@ -https://src.fedoraproject.org/rpms/blender/raw/7045717eb5477c40905f6d29dfd3dbf5ed674e4d/f/blender-3.6.1-py312-pylongobject.patch - ---- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp -+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp -@@ -188,6 +188,7 @@ PyTypeObject IntegrationType_Type = { - - /*-----------------------BPy_IntegrationType instance definitions -------------------------*/ - -+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */ - static PyLongObject _IntegrationType_MEAN = { - PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MEAN}}; - static PyLongObject _IntegrationType_MIN = {PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){MIN}}; -@@ -196,6 +197,26 @@ static PyLongObject _IntegrationType_FIR - PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){FIRST}}; - static PyLongObject _IntegrationType_LAST = { - PyVarObject_HEAD_INIT(&IntegrationType_Type, 1){LAST}}; -+#else -+#define NON_SIZE_BITS 3 -+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS)) -+#define _Py_IntegrationTypeType_DIGIT_INIT(val) \ -+ { \ -+ .ob_base = PyObject_HEAD_INIT(&IntegrationType_Type) \ -+ .long_value = { \ -+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \ -+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \ -+ (val) == 0 ? 0 : 1), \ -+ { ((val) >= 0 ? (val) : -(val)) }, \ -+ } \ -+ } -+ -+static PyLongObject _IntegrationType_MEAN = _Py_IntegrationTypeType_DIGIT_INIT(MEAN); -+static PyLongObject _IntegrationType_MIN = _Py_IntegrationTypeType_DIGIT_INIT(MIN); -+static PyLongObject _IntegrationType_MAX = _Py_IntegrationTypeType_DIGIT_INIT(MAX); -+static PyLongObject _IntegrationType_FIRST = _Py_IntegrationTypeType_DIGIT_INIT(FIRST); -+static PyLongObject _IntegrationType_LAST = _Py_IntegrationTypeType_DIGIT_INIT(LAST); -+#endif - - #define BPy_IntegrationType_MEAN ((PyObject *)&_IntegrationType_MEAN) - #define BPy_IntegrationType_MIN ((PyObject *)&_IntegrationType_MIN) ---- a/source/blender/freestyle/intern/python/BPy_MediumType.cpp -+++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp -@@ -73,6 +73,7 @@ PyTypeObject MediumType_Type = { - - /*-----------------------BPy_IntegrationType instance definitions -------------------------*/ - -+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */ - PyLongObject _BPy_MediumType_DRY_MEDIUM = { - PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::DRY_MEDIUM}, - }; -@@ -82,6 +83,24 @@ PyLongObject _BPy_MediumType_HUMID_MEDIU - PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = { - PyVarObject_HEAD_INIT(&MediumType_Type, 1){Stroke::OPAQUE_MEDIUM}, - }; -+#else -+#define NON_SIZE_BITS 3 -+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS)) -+#define _Py_MediumType_DIGIT_INIT(val) \ -+ { \ -+ .ob_base = PyObject_HEAD_INIT(&MediumType_Type) \ -+ .long_value = { \ -+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \ -+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \ -+ (val) == 0 ? 0 : 1), \ -+ { ((val) >= 0 ? (val) : -(val)) }, \ -+ } \ -+ } -+ -+PyLongObject _BPy_MediumType_DRY_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::DRY_MEDIUM); -+PyLongObject _BPy_MediumType_HUMID_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::HUMID_MEDIUM); -+PyLongObject _BPy_MediumType_OPAQUE_MEDIUM = _Py_MediumType_DIGIT_INIT(Stroke::OPAQUE_MEDIUM); -+#endif - - //-------------------MODULE INITIALIZATION-------------------------------- - ---- a/source/blender/freestyle/intern/python/BPy_Nature.cpp -+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp -@@ -137,6 +137,7 @@ PyTypeObject Nature_Type = { - - /*-----------------------BPy_Nature instance definitions ----------------------------------*/ - -+#if PY_VERSION_HEX < 0x030c0000 /* older than Python 3.12 */ - static PyLongObject _Nature_POINT = {PyVarObject_HEAD_INIT(&Nature_Type, 0){Nature::POINT}}; - static PyLongObject _Nature_S_VERTEX = {PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::S_VERTEX}}; - static PyLongObject _Nature_VIEW_VERTEX = { -@@ -159,6 +160,36 @@ static PyLongObject _Nature_MATERIAL_BOU - PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::MATERIAL_BOUNDARY}}; - static PyLongObject _Nature_EDGE_MARK = { - PyVarObject_HEAD_INIT(&Nature_Type, 1){Nature::EDGE_MARK}}; -+#else -+#define NON_SIZE_BITS 3 -+#define TAG_FROM_SIGN_AND_SIZE(sign, size) ((1 - (sign)) | ((size) << NON_SIZE_BITS)) -+#define _Py_Nature_TypeType_DIGIT_INIT(val) \ -+ { \ -+ .ob_base = PyObject_HEAD_INIT(&Nature_Type) \ -+ .long_value = { \ -+ .lv_tag = TAG_FROM_SIGN_AND_SIZE( \ -+ (val) == 0 ? 0 : ((val) < 0 ? -1 : 1), \ -+ (val) == 0 ? 0 : 1), \ -+ { ((val) >= 0 ? (val) : -(val)) }, \ -+ } \ -+ } -+ -+static PyLongObject _Nature_POINT = _Py_Nature_TypeType_DIGIT_INIT(Nature::POINT); -+static PyLongObject _Nature_S_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::S_VERTEX); -+static PyLongObject _Nature_VIEW_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::VIEW_VERTEX); -+static PyLongObject _Nature_NON_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::NON_T_VERTEX); -+static PyLongObject _Nature_T_VERTEX = _Py_Nature_TypeType_DIGIT_INIT(Nature::T_VERTEX); -+static PyLongObject _Nature_CUSP = _Py_Nature_TypeType_DIGIT_INIT(Nature::CUSP); -+static PyLongObject _Nature_NO_FEATURE = _Py_Nature_TypeType_DIGIT_INIT(Nature::NO_FEATURE); -+static PyLongObject _Nature_SILHOUETTE = _Py_Nature_TypeType_DIGIT_INIT(Nature::SILHOUETTE); -+static PyLongObject _Nature_BORDER = _Py_Nature_TypeType_DIGIT_INIT(Nature::BORDER); -+static PyLongObject _Nature_CREASE = _Py_Nature_TypeType_DIGIT_INIT(Nature::CREASE); -+static PyLongObject _Nature_RIDGE = _Py_Nature_TypeType_DIGIT_INIT(Nature::RIDGE); -+static PyLongObject _Nature_VALLEY = _Py_Nature_TypeType_DIGIT_INIT(Nature::VALLEY); -+static PyLongObject _Nature_SUGGESTIVE_CONTOUR = _Py_Nature_TypeType_DIGIT_INIT(Nature::SUGGESTIVE_CONTOUR); -+static PyLongObject _Nature_MATERIAL_BOUNDARY = _Py_Nature_TypeType_DIGIT_INIT(Nature::MATERIAL_BOUNDARY); -+static PyLongObject _Nature_EDGE_MARK = _Py_Nature_TypeType_DIGIT_INIT(Nature::EDGE_MARK); -+#endif - - #define BPy_Nature_POINT ((PyObject *)&_Nature_POINT) - #define BPy_Nature_S_VERTEX ((PyObject *)&_Nature_S_VERTEX) -@@ -249,7 +280,12 @@ static PyObject *BPy_Nature_bitwise(PyOb - else { - result = PyObject_NewVar(BPy_Nature, &Nature_Type, 1); - if (result) { -+#if PY_VERSION_HEX >= 0x030c0000 /* Python 3.12 and newer */ -+ result->i.long_value.lv_tag = TAG_FROM_SIGN_AND_SIZE((v > 0 ? 1 : -1), 1); -+ result->i.long_value.ob_digit[0] = v; -+#else - result->i.ob_digit[0] = v; -+#endif - } - } - return (PyObject *)result; diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 7e321a9ad525cd..668d68647ba7e0 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,7 +1,7 @@ # Template file for 'blender' pkgname=blender -version=4.0.2 -revision=3 +version=4.3.0 +revision=1 archs="x86_64* ppc64*" build_style="cmake" pycompile_dirs="usr/share/blender/${version%.*}/scripts" @@ -24,14 +24,14 @@ makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel pugixml-devel libXxf86vm-devel libepoxy-devel gmp-devel gmpxx-devel wayland-protocols wayland-devel libxkbcommon-devel libdecor-devel libspnav-devel libwebp-devel potrace-devel Haru-devel - pulseaudio-devel eigen lzo-devel" + pulseaudio-devel eigen lzo-devel vulkan-loader-devel shaderc" depends="desktop-file-utils hicolor-icon-theme" short_desc="3D graphics creation suite" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://www.blender.org" distfiles="https://download.blender.org/source/blender-${version}.tar.xz" -checksum=aaa0e729da7591cfbf45772af76345977daaa7b11a0af35d98f9313e246077a3 +checksum=a2c73d338768509be210aeb66730efe6076ec1be36668a1acd0be35a9de12aea python_version=3 LDFLAGS="-Wl,-z,stack-size=2097152" # Blender tests are executed against a system installation of blender. This diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template index bb4115b017bbdb..e078072cc2ce1a 100644 --- a/srcpkgs/bluefish/template +++ b/srcpkgs/bluefish/template @@ -1,7 +1,7 @@ # Template file for 'bluefish' pkgname=bluefish version=2.2.16 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-spell-check --disable-update-databases --disable-xml-catalog-update $(vopt_enable python)" diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template index ddb98862d354e1..fdcba73b29d4db 100644 --- a/srcpkgs/blueman/template +++ b/srcpkgs/blueman/template @@ -1,7 +1,7 @@ # Template file for 'blueman' pkgname=blueman version=2.4.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="intltool iproute2 pkg-config python3-Cython glib-devel diff --git a/srcpkgs/blueprint-compiler/template b/srcpkgs/blueprint-compiler/template index 3e175a97a4201a..4569bf5e8e2003 100644 --- a/srcpkgs/blueprint-compiler/template +++ b/srcpkgs/blueprint-compiler/template @@ -1,7 +1,7 @@ # Template file for 'blueprint-compiler' pkgname=blueprint-compiler version=0.14.0 -revision=1 +revision=2 build_style=meson depends="python3-gobject" checkdepends="${depends} libadwaita-devel xvfb-run" diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index e21c2b3b95971c..369b01bcba867a 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,7 +1,7 @@ # Template file for 'boost' pkgname=boost version=1.83.0 -revision=4 +revision=5 build_style=meta hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config" makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel libzstd-devel" diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template index 60b8d989aa4e0f..3d3cc4cb0dea34 100644 --- a/srcpkgs/bootchart2/template +++ b/srcpkgs/bootchart2/template @@ -1,7 +1,7 @@ # Template file for 'bootchart2' pkgname=bootchart2 version=0.14.9 -revision=4 +revision=5 build_style=gnu-makefile make_install_args="EARLY_PREFIX=/usr DOCDIR=/usr/share/doc/bootchart2" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template index aabf178923d305..5ab97fc7100550 100644 --- a/srcpkgs/borg/template +++ b/srcpkgs/borg/template @@ -1,7 +1,7 @@ # Template file for 'borg' pkgname=borg version=1.4.0 -revision=1 +revision=2 build_style=python3-module make_check_args="-k not((benchmark)or(readonly))" make_check_target="build/lib.*/borg/testsuite" diff --git a/srcpkgs/borgmatic/template b/srcpkgs/borgmatic/template index d584c417c2b487..6ef042f30e7aaa 100644 --- a/srcpkgs/borgmatic/template +++ b/srcpkgs/borgmatic/template @@ -1,7 +1,7 @@ # Template file for 'borgmatic' pkgname=borgmatic version=1.9.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="borg python3-setuptools python3-ruamel.yaml python3-jsonschema diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 43573d95864260..66703f66bcbae6 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,7 +1,7 @@ # Template file for 'botan' pkgname=botan version=2.19.3 -revision=3 +revision=4 build_style=gnu-makefile hostmakedepends="doxygen python3" makedepends="bzip2-devel liblzma-devel sqlite-devel zlib-devel" diff --git a/srcpkgs/brltty/patches/python3-bindings.patch b/srcpkgs/brltty/patches/python3-bindings.patch new file mode 100644 index 00000000000000..ef977ee8e25ccf --- /dev/null +++ b/srcpkgs/brltty/patches/python3-bindings.patch @@ -0,0 +1,28 @@ +Python bindings will be built directly in the xbps-src template. + +--- a/Bindings/Python/Makefile.in ++++ b/Bindings/Python/Makefile.in +@@ -45,10 +45,7 @@ + all: $(PYTHON_API) + + $(PYTHON_API): brlapi.auto.c $(API_HDRS) brlapi +- set -- $(V_setup) build --build-temp .; \ +- [ "@host_os@" != "mingw32" ] || set -- "$${@}" --compiler mingw32; \ +- "$(PYTHON)" ./setup.py "$${@}" +- [ "@host_os@" != "mingw32" ] || "$(PYTHON)" ./setup.py $(V_setup) bdist_wininst --skip-build ++ echo "To be built directly..." + + brlapi.auto.c: $(SRC_DIR)/brlapi.pyx $(SRC_DIR)/c_brlapi.pxd constants.auto.pyx + "$(CYTHON)" -$(PYTHON_VERSION) -I. -o $@ $(SRC_DIR)/brlapi.pyx +@@ -62,10 +59,7 @@ + INSTALLED_FILES = installed-files + + install: all +- set -- $(V_setup) install --skip-build --record "$(INSTALLED_FILES)"; \ +- [ -z "$(PYTHON_DESTDIR)" ] || set -- "$${@}" --root "$(PYTHON_DESTDIR)"; \ +- [ -z "$(PYTHON_PREFIX)" ] || set -- "$${@}" --prefix "$(PYTHON_PREFIX)"; \ +- "$(PYTHON)" ./setup.py "$${@}" ++ echo "To be installed directly..." + + uninstall: + [ ! -f "$(INSTALLED_FILES)" ] || rm -f -- `$(AWK) '{printf "%s%s ", "$(PYTHON_DESTDIR)", $$0}' "$(INSTALLED_FILES)"` diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template index c92b681ea57067..c29190d18a0e0e 100644 --- a/srcpkgs/brltty/template +++ b/srcpkgs/brltty/template @@ -1,9 +1,8 @@ # Template file for 'brltty' pkgname=brltty version=6.4 -revision=11 +revision=12 build_style=gnu-configure -build_helper=python3 configure_args="--enable-gpm --with-screen-driver=lx,sc --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3" hostmakedepends="pkg-config python3-Cython" @@ -29,6 +28,7 @@ pre_configure() { *-musl) # There is no ldconfig in musl libc sed -e "s;/sbin/ldconfig -n;echo;" -i configure ;; esac + export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}" export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" } @@ -40,8 +40,31 @@ post_configure() { esac } +post_build() { + # brltty has two problems with the xbps-src cross environment: + # + # - brltty has a lock.h that will be overshadowed by Python's lock.h + # when the build helper overrides CFLAGS to prefer the cross root + # + # - The brltty build process drops critical environment variables for + # cross compilation of Python exctensions + # + # To work around this, just manually build the Python package. + + cd Bindings/Python + . "${XBPS_BUILDHELPERDIR}/python3.sh" + python3 setup.py build --build-temp . +} + do_install() { - make INSTALL_ROOT=${DESTDIR} install + make INSTALL_ROOT="${DESTDIR}" install + + local _inst_args=( + --skip-build --record=installed-files --root="${DESTDIR}" --prefix=/usr + ) + + ( cd Bindings/Python && python3 ./setup.py install "${_inst_args[@]}" ) + vsv brltty vsconf Documents/brltty.conf vdoc Documents/ChangeLog diff --git a/srcpkgs/btrfs-backup/template b/srcpkgs/btrfs-backup/template index 2fa61f3f215560..d8b582aab8f0a0 100644 --- a/srcpkgs/btrfs-backup/template +++ b/srcpkgs/btrfs-backup/template @@ -1,7 +1,7 @@ # Template file for 'btrfs-backup' pkgname=btrfs-backup version=0.3.1 -revision=6 +revision=7 build_style=python3-module pycompile_module="${pkgname/-/_}" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/bum/template b/srcpkgs/bum/template index fee78f71f8346c..3d47729dd50fcd 100644 --- a/srcpkgs/bum/template +++ b/srcpkgs/bum/template @@ -1,7 +1,7 @@ # Template file for 'bum' pkgname=bum version=0.1.3 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-mpd2 python3-musicbrainzngs python3-mpv" diff --git a/srcpkgs/bumblebee-status/template b/srcpkgs/bumblebee-status/template index ea126cb4331619..0fdec478d798ae 100644 --- a/srcpkgs/bumblebee-status/template +++ b/srcpkgs/bumblebee-status/template @@ -1,7 +1,7 @@ # Template file for 'bumblebee-status' pkgname=bumblebee-status version=2.1.6 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-netifaces python3-psutil python3-requests" diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template index 49203917aea376..2102b619c8c1f5 100644 --- a/srcpkgs/bup/template +++ b/srcpkgs/bup/template @@ -1,7 +1,7 @@ # Template file for 'bup' pkgname=bup version=0.33.4 -revision=1 +revision=2 build_style=configure hostmakedepends="pkg-config python3 perl git pandoc" makedepends="python3-devel readline-devel acl-devel" diff --git a/srcpkgs/cadence/template b/srcpkgs/cadence/template index 1be01775dfb6ec..cfcb1f0865f9f6 100644 --- a/srcpkgs/cadence/template +++ b/srcpkgs/cadence/template @@ -1,7 +1,7 @@ # Template file for 'cadence' pkgname=cadence version=0.9.2 -revision=5 +revision=6 build_style=gnu-makefile pycompile_dirs="usr/share/cadence/src" hostmakedepends="pkg-config qt5-host-tools python3-PyQt5-devel-tools" diff --git a/srcpkgs/caffeine-ng/template b/srcpkgs/caffeine-ng/template index 6f18114aaddd9e..0c4b10a4347343 100644 --- a/srcpkgs/caffeine-ng/template +++ b/srcpkgs/caffeine-ng/template @@ -1,7 +1,7 @@ # Template file for 'caffeine-ng' pkgname=caffeine-ng version=4.0.2 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="desktop-file-utils gtk+3 hicolor-icon-theme libnotify diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template index 67d50e12697e4a..38f29853366ee8 100644 --- a/srcpkgs/cairo-dock-plugins/template +++ b/srcpkgs/cairo-dock-plugins/template @@ -1,7 +1,7 @@ # Template file for 'cairo-dock-plugins' pkgname=cairo-dock-plugins version=3.4.1 -revision=19 +revision=20 build_style=cmake hostmakedepends="gettext pkg-config python3-setuptools python3-devel vala-devel" makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index b5b2724cea9eb2..e4ee8bb72b14e7 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre version=7.21.0 -revision=1 +revision=2 build_helper=python3 pycompile_dirs="/usr/lib/calibre/" hostmakedepends="pkg-config cmake python3-BeautifulSoup4 python3-Pillow diff --git a/srcpkgs/canto-curses/patches/python-3.13.patch b/srcpkgs/canto-curses/patches/python-3.13.patch new file mode 100644 index 00000000000000..bba7bfcc21e8e9 --- /dev/null +++ b/srcpkgs/canto-curses/patches/python-3.13.patch @@ -0,0 +1,20 @@ +Taken from Arch. Cf. + + https://gitlab.archlinux.org/archlinux/packaging/packages/canto-curses + +diff --unified --recursive --text --new-file canto-curses-0.9.9.orig/canto_curses/widecurse.c canto-curses-0.9.9/canto_curses/widecurse.c +--- canto-curses-0.9.9.orig/canto_curses/widecurse.c 2024-11-19 06:55:26.703201292 +0100 ++++ canto-curses-0.9.9/canto_curses/widecurse.c 2024-11-19 06:55:39.423227011 +0100 +@@ -6,9 +6,12 @@ + published by the Free Software Foundation. + */ + ++#define NCURSES_INTERNALS 1 + #include ++#include + #include + #include ++#include + + static PyObject *py_wcwidth(PyObject * self, PyObject * args) + { diff --git a/srcpkgs/canto-curses/template b/srcpkgs/canto-curses/template index ffe8a687fdcbe4..0b3ce4c3c0daec 100644 --- a/srcpkgs/canto-curses/template +++ b/srcpkgs/canto-curses/template @@ -1,7 +1,7 @@ # Template file for 'canto-curses' pkgname=canto-curses version=0.9.9 -revision=10 +revision=11 build_style=python3-module pycompile_dirs="/usr/lib/canto/plugins" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/canto-next/template b/srcpkgs/canto-next/template index 11a2d055da0dcb..f61782a89824fa 100644 --- a/srcpkgs/canto-next/template +++ b/srcpkgs/canto-next/template @@ -1,7 +1,7 @@ # Template file for 'canto-next' pkgname=canto-next version=0.9.8 -revision=3 +revision=4 build_style=python3-module pycompile_dirs="/usr/lib/canto/plugins" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/capstone/template b/srcpkgs/capstone/template index 06ca41eb68b648..86e50c8a401772 100644 --- a/srcpkgs/capstone/template +++ b/srcpkgs/capstone/template @@ -1,7 +1,7 @@ # Template file for 'capstone' pkgname=capstone version=5.0.1 -revision=2 +revision=3 build_style=gnu-makefile make_use_env=yes hostmakedepends="python3-setuptools" diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template index 62a4559e1f9c64..fe0277f2ef12a2 100644 --- a/srcpkgs/caribou/template +++ b/srcpkgs/caribou/template @@ -1,7 +1,7 @@ # Template file for 'caribou' pkgname=caribou version=0.4.21 -revision=8 +revision=9 build_style=gnu-configure build_helper="gir" configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module diff --git a/srcpkgs/castero/template b/srcpkgs/castero/template index b63ab64ee2e48c..84ec67e2b22bdf 100644 --- a/srcpkgs/castero/template +++ b/srcpkgs/castero/template @@ -1,7 +1,7 @@ # Template file for 'castero' pkgname=castero version=0.9.5 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" # taken from https://github.com/xgi/castero/blob/master/requirements.txt, diff --git a/srcpkgs/catfish/template b/srcpkgs/catfish/template index dd4ba0d57ae4d8..3f49732d0a8b3a 100644 --- a/srcpkgs/catfish/template +++ b/srcpkgs/catfish/template @@ -1,7 +1,7 @@ # Template file for 'catfish' pkgname=catfish version=4.18.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="intltool python3-distutils-extra python3-gobject" depends="desktop-file-utils gtk+3 hicolor-icon-theme python3-gobject diff --git a/srcpkgs/ccsm/template b/srcpkgs/ccsm/template index e0d6e453f77260..1b5064ce6a7e8c 100644 --- a/srcpkgs/ccsm/template +++ b/srcpkgs/ccsm/template @@ -1,7 +1,7 @@ # Template file for 'ccsm' pkgname=ccsm version=0.8.18 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools intltool" depends="compizconfig-python python3-xlib python3-gobject" diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template index e2eba12d60275d..eb3af81533d080 100644 --- a/srcpkgs/certbot-apache/template +++ b/srcpkgs/certbot-apache/template @@ -1,7 +1,7 @@ # Template file for 'certbot-apache' pkgname=certbot-apache version=2.10.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-setuptools python3-wheel" depends="certbot python3-acme python3-augeas python3-zope.interface" diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template index dd8172f7f76e15..47b76dbaa1828a 100644 --- a/srcpkgs/certbot-nginx/template +++ b/srcpkgs/certbot-nginx/template @@ -1,7 +1,7 @@ # Template file for 'certbot-nginx' pkgname=certbot-nginx version=2.10.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-setuptools python3-wheel" depends="certbot python3-acme python3-parsing python3-zope.interface" diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template index efa83137bbafea..92650a284532d8 100644 --- a/srcpkgs/certbot/template +++ b/srcpkgs/certbot/template @@ -1,7 +1,7 @@ # Template file for 'certbot' pkgname=certbot version=2.10.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-setuptools python3-wheel" depends="python3-acme python3-ConfigArgParse python3-configobj diff --git a/srcpkgs/chirp/template b/srcpkgs/chirp/template index b5673298dacb9a..bcaf978d39670d 100644 --- a/srcpkgs/chirp/template +++ b/srcpkgs/chirp/template @@ -1,7 +1,7 @@ # Template file for 'chirp' pkgname=chirp version=20241025 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-six wxPython python3-pyserial python3-requests diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index 906f49f861ea5b..8b5a5f26a9f1a7 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon-screensaver' pkgname=cinnamon-screensaver version=5.8.1 -revision=2 +revision=3 build_style=meson build_helper="gir" hostmakedepends="gettext-devel glib-devel pkg-config python3-devel" diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index d4184be444372c..1d4d9b728d0123 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -1,7 +1,7 @@ # Template file for 'cinnamon' pkgname=cinnamon version=5.8.4 -revision=2 +revision=3 build_style=meson build_helper="gir" hostmakedepends="pkg-config gettext gettext-devel glib-devel intltool xmlto diff --git a/srcpkgs/clearine/template b/srcpkgs/clearine/template index 3652abb888a14f..629124d9e0633a 100644 --- a/srcpkgs/clearine/template +++ b/srcpkgs/clearine/template @@ -1,7 +1,7 @@ # Template file for 'clearine' pkgname=clearine version=0.7 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-gobject gtk+3 python3-cairo" diff --git a/srcpkgs/cmakelang/template b/srcpkgs/cmakelang/template index f3888244216889..936f72e358a3c0 100644 --- a/srcpkgs/cmakelang/template +++ b/srcpkgs/cmakelang/template @@ -1,7 +1,7 @@ # Template file for 'cmakelang' pkgname=cmakelang version=0.6.13 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" diff --git a/srcpkgs/coccigrep/template b/srcpkgs/coccigrep/template index b651a489c68da0..6dbe65444ef421 100644 --- a/srcpkgs/coccigrep/template +++ b/srcpkgs/coccigrep/template @@ -1,7 +1,7 @@ # Template file for 'coccigrep' pkgname=coccigrep version=1.20 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="coccinelle python3-Pygments" diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 1b0b1d192ce8cd..68115ac7edc94e 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -1,7 +1,7 @@ # Template file for 'collectd' pkgname=collectd version=5.12.0 -revision=12 +revision=13 build_style=gnu-configure configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable notify notify_desktop) --with-libiptc --enable-virt diff --git a/srcpkgs/compizconfig-python/template b/srcpkgs/compizconfig-python/template index 9f790d0d663b72..32f9ec703770f1 100644 --- a/srcpkgs/compizconfig-python/template +++ b/srcpkgs/compizconfig-python/template @@ -1,7 +1,7 @@ # Template file for 'compizconfig-python' pkgname=compizconfig-python version=0.8.18 -revision=7 +revision=8 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool pkg-config glib-devel gettext-devel diff --git a/srcpkgs/configshell-fb/template b/srcpkgs/configshell-fb/template index f198b1c1ceb1a9..60204d519c0019 100644 --- a/srcpkgs/configshell-fb/template +++ b/srcpkgs/configshell-fb/template @@ -1,7 +1,7 @@ # Template file for 'configshell-fb' pkgname=configshell-fb version=1.1.29 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-urwid python3-parsing" diff --git a/srcpkgs/cookiecutter/template b/srcpkgs/cookiecutter/template index d6afe121113457..441e4479553421 100644 --- a/srcpkgs/cookiecutter/template +++ b/srcpkgs/cookiecutter/template @@ -1,7 +1,7 @@ # Template file for 'cookiecutter' pkgname=cookiecutter version=2.6.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Arrow python3-Jinja2 python3-binaryornot python3-click diff --git a/srcpkgs/coursera-dl/template b/srcpkgs/coursera-dl/template index d84bb642f6de0d..bfce84ede1f827 100644 --- a/srcpkgs/coursera-dl/template +++ b/srcpkgs/coursera-dl/template @@ -1,7 +1,7 @@ # Template file for 'coursera-dl' pkgname=coursera-dl version=0.11.5 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-attrs python3-setuptools python3-pyasn1 python3-ConfigArgParse diff --git a/srcpkgs/cozy/template b/srcpkgs/cozy/template index 73b171ff953cb9..085ac455a3fdd0 100644 --- a/srcpkgs/cozy/template +++ b/srcpkgs/cozy/template @@ -1,7 +1,7 @@ # Template file for 'cozy' pkgname=cozy version=1.3.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config glib-devel python3 python3-distro python3-peewee python3-mutagen python3-gobject-devel gettext desktop-file-utils diff --git a/srcpkgs/cppman/template b/srcpkgs/cppman/template index 65402c167c389b..524733390c853d 100644 --- a/srcpkgs/cppman/template +++ b/srcpkgs/cppman/template @@ -1,7 +1,7 @@ # Template file for 'cppman' pkgname=cppman version=0.5.6 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-BeautifulSoup4 python3-html5lib python3-lxml" diff --git a/srcpkgs/cpuset/template b/srcpkgs/cpuset/template index 8bb7fb9b6b4502..7bdb2d8b63bf9c 100644 --- a/srcpkgs/cpuset/template +++ b/srcpkgs/cpuset/template @@ -1,7 +1,7 @@ # Template file for 'cpuset' pkgname=cpuset version=1.6.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" short_desc="Wrapper to make kernel cpusets facilities easier to use" diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template index ebe79c5ce0d793..4da03cc94d54d9 100644 --- a/srcpkgs/criu/template +++ b/srcpkgs/criu/template @@ -1,7 +1,7 @@ # Template file for 'criu' pkgname=criu version=3.18 -revision=2 +revision=3 # i686 unsupported upstream: https://criu.org/32bit_tasks_C/R#Compatible_applications # ppc64 big endian not supported upstream archs="x86_64* aarch64* ppc64le* armv6l* armv7l*" diff --git a/srcpkgs/cropgui/template b/srcpkgs/cropgui/template index 62f225ee15c46b..c90b5790eb80d3 100644 --- a/srcpkgs/cropgui/template +++ b/srcpkgs/cropgui/template @@ -1,7 +1,7 @@ # Template file for 'cropgui' pkgname=cropgui version=0.9 -revision=1 +revision=2 hostmakedepends="which python3-setuptools" depends="python3-Pillow python3-gobject libjpeg-turbo-tools ImageMagick exiftool gtk+3" short_desc="Gtk frontend for lossless cropping of jpeg images" diff --git a/srcpkgs/cross-arm-none-eabi-gdb/template b/srcpkgs/cross-arm-none-eabi-gdb/template index 0d4b70e59bd29d..65da639ef08cdf 100644 --- a/srcpkgs/cross-arm-none-eabi-gdb/template +++ b/srcpkgs/cross-arm-none-eabi-gdb/template @@ -1,16 +1,17 @@ # Template file for 'cross-arm-none-eabi-gdb' pkgname=cross-arm-none-eabi-gdb -version=13.2 -revision=2 +version=15.2 +revision=1 build_style=gnu-configure -configure_args="--target=arm-none-eabi --disable-werror --disable-nls --with-system-readline - --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib --without-isl - $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)" -hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) $(vopt_if guile guile)" +configure_args="--target=arm-none-eabi --disable-werror --disable-nls + --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit --with-system-zlib + --without-isl $(vopt_with guile) $(vopt_if python --with-python=/usr/bin/python3)" +hostmakedepends="pkg-config texinfo $(vopt_if python python3-devel) + $(vopt_if guile guile)" # mpfr is necessary to emulate target floating point behavior # babeltrace is necessary for Common Trace Format support -makedepends="expat-devel ncurses-devel readline-devel zlib-devel gmp-devel - babeltrace-devel mpfr-devel +makedepends="expat-devel ncurses-devel readline-devel zlib-devel + gmp-devel babeltrace-devel mpfr-devel $(vopt_if guile guile-devel) $(vopt_if python 'gettext-devel python3-devel')" depends="gdb-common" short_desc="GNU Debugger for ARM" @@ -18,7 +19,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/gdb" distfiles="${GNU_SITE}/gdb/gdb-${version}.tar.xz" -checksum=fd5bebb7be1833abdb6e023c2f498a354498281df9d05523d8915babeb893f0a +checksum=83350ccd35b5b5a0cba6b334c41294ea968158c573940904f00b92f76345314d make_check=no # See gdb/template. if [ "${CROSS_BUILD}" ]; then diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template index 199782284f5be8..0b6e8b49da1cf9 100644 --- a/srcpkgs/csound/template +++ b/srcpkgs/csound/template @@ -1,7 +1,7 @@ # Template file for 'csound' pkgname=csound version=6.18.1 -revision=3 +revision=4 build_style=cmake configure_args=" -DLUA_MODULE_INSTALL_DIR=${XBPS_CROSS_BASE}/usr/lib/lua/5.1 diff --git a/srcpkgs/ctop/template b/srcpkgs/ctop/template index 28566c53adcb2d..051daa0116f20a 100644 --- a/srcpkgs/ctop/template +++ b/srcpkgs/ctop/template @@ -1,7 +1,7 @@ # Template file for 'ctop' pkgname=ctop version=1.0.0 -revision=8 +revision=9 build_style=python3-module pycompile_module="cgroup_top.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/curseradio/template b/srcpkgs/curseradio/template index d1e87c73399d41..911d56f3a00216 100644 --- a/srcpkgs/curseradio/template +++ b/srcpkgs/curseradio/template @@ -1,7 +1,7 @@ # Template file for 'curseradio' pkgname=curseradio version=0.0.20171017 -revision=8 +revision=9 _commit=1bd4bd0faeec675e0647bac9a100b526cba19f8d build_style=python3-module pycompile_module="curseradio" diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template index ad842ce190294f..fdc3d7db29ea42 100644 --- a/srcpkgs/cutter/template +++ b/srcpkgs/cutter/template @@ -1,7 +1,7 @@ # Template file for 'cutter' pkgname=cutter version=2.3.4 -revision=2 +revision=3 build_style=cmake configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/cutter/plugins -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF diff --git a/srcpkgs/d-feet/template b/srcpkgs/d-feet/template index 37e65367988b41..17211af6d0443b 100644 --- a/srcpkgs/d-feet/template +++ b/srcpkgs/d-feet/template @@ -1,7 +1,7 @@ # Template file for 'd-feet' pkgname=d-feet version=0.3.16 -revision=4 +revision=5 build_style=meson hostmakedepends="pkg-config gettext itstool python3-pycodestyle" makedepends="gtk+3-devel gobject-introspection" diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template index 0c5c0b111553bd..7c464732902b8c 100644 --- a/srcpkgs/deluge/template +++ b/srcpkgs/deluge/template @@ -1,7 +1,7 @@ # Template file for 'deluge' pkgname=deluge version=2.1.1 -revision=2 +revision=3 build_style=python3-module # TODO package python3-slimit to minify javascript hostmakedepends="intltool python3-setuptools python3-wheel" diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template index 3aff048055456b..5ec41d20554074 100644 --- a/srcpkgs/devedeng/template +++ b/srcpkgs/devedeng/template @@ -1,7 +1,7 @@ # Template file for 'devedeng' pkgname=devedeng version=4.17.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="gettext python3-setuptools" depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3 diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template index e9eb6999478153..a1c0475b7f0dbf 100644 --- a/srcpkgs/diffoscope/template +++ b/srcpkgs/diffoscope/template @@ -1,7 +1,7 @@ # Template file for 'diffoscope' pkgname=diffoscope version=260 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-magic python3-libarchive-c python3-progressbar diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template index f1685d9ac0ff2a..3122b3c83206e1 100644 --- a/srcpkgs/distcc/template +++ b/srcpkgs/distcc/template @@ -1,7 +1,7 @@ # Template file for 'distcc' pkgname=distcc version=3.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-Werror" conf_files=" diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template index d2d48437a6e2e3..eba586c0494a9a 100644 --- a/srcpkgs/downloader-cli/template +++ b/srcpkgs/downloader-cli/template @@ -1,7 +1,7 @@ # Template file for 'downloader-cli' pkgname=downloader-cli version=0.3.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-urllib3 python3-downloader-cli" diff --git a/srcpkgs/dtrx/template b/srcpkgs/dtrx/template index f7299e4174270d..78bb492442bf4f 100644 --- a/srcpkgs/dtrx/template +++ b/srcpkgs/dtrx/template @@ -1,7 +1,7 @@ # Template file for 'dtrx' pkgname=dtrx version=8.5.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/duckdb/template b/srcpkgs/duckdb/template index b72ae8fe58453c..93999411b92024 100644 --- a/srcpkgs/duckdb/template +++ b/srcpkgs/duckdb/template @@ -1,7 +1,7 @@ # Template file for 'duckdb' pkgname=duckdb version=1.1.3 -revision=1 +revision=2 archs="x86_64* aarch64*" # 32-bit FTBFS build_style=cmake build_helper="python3" diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template index 0136439e1e0c8b..1097fcac974fbc 100644 --- a/srcpkgs/duplicity/template +++ b/srcpkgs/duplicity/template @@ -1,6 +1,6 @@ # Template file for 'duplicity' pkgname=duplicity -version=2.2.3 +version=3.0.3.1 revision=1 build_style=python3-module hostmakedepends="gettext python3-setuptools_scm" @@ -14,7 +14,7 @@ license="GPL-2.0-or-later" homepage="https://duplicity.gitlab.io" changelog="https://gitlab.com/duplicity/duplicity/-/raw/main/CHANGELOG.md" distfiles="${PYPI_SITE}/d/duplicity/duplicity-${version}.tar.gz" -checksum=4ad43f93601b1a41fb5f642bdda1706a1fb75f8ef1d6d482dd7f23107eaee87d +checksum=33b5e5f28384ee51dd750f926273903604606bfc08a0c4a5c738064dc5c99c2e duplicity-doc_package() { short_desc+=" - documentation" diff --git a/srcpkgs/eduvpn-common/template b/srcpkgs/eduvpn-common/template index 43ae352e4b8a79..1ec33f0fc22331 100644 --- a/srcpkgs/eduvpn-common/template +++ b/srcpkgs/eduvpn-common/template @@ -1,7 +1,7 @@ # Template file for 'eduvpn-common' pkgname=eduvpn-common version=2.1.0 -revision=2 +revision=3 build_style=go go_import_path=github.com/eduvpn/eduvpn-common hostmakedepends="python3-setuptools python3-wheel" diff --git a/srcpkgs/edx-dl/template b/srcpkgs/edx-dl/template index a2221e54b798a2..50f3338aa60efb 100644 --- a/srcpkgs/edx-dl/template +++ b/srcpkgs/edx-dl/template @@ -1,7 +1,7 @@ # Template file for 'edx-dl' pkgname=edx-dl version=0.1.13 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-BeautifulSoup4 python3-html5lib python3-setuptools diff --git a/srcpkgs/electrum/template b/srcpkgs/electrum/template index 58c07e3b45283e..8f11be9033fea1 100644 --- a/srcpkgs/electrum/template +++ b/srcpkgs/electrum/template @@ -1,7 +1,7 @@ # Template file for 'electrum' pkgname=electrum version=4.5.8 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-pyqt6-devel-tools" depends="python3-aiohttp python3-aiohttp_socks python3-aiorpcx diff --git a/srcpkgs/eog-plugins/template b/srcpkgs/eog-plugins/template index 317b24e4e623b8..3c4f801f00f8fb 100644 --- a/srcpkgs/eog-plugins/template +++ b/srcpkgs/eog-plugins/template @@ -1,7 +1,7 @@ # Template file for 'eog-plugins' pkgname=eog-plugins version=44.0 -revision=1 +revision=2 build_style=meson pycompile_dirs="usr/lib/eog/plugins" hostmakedepends="glib-devel pkg-config gettext" diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template index 3ea105b1295ada..662150a2a110dd 100644 --- a/srcpkgs/eolie/template +++ b/srcpkgs/eolie/template @@ -1,7 +1,7 @@ # Template file for 'eolie' pkgname=eolie version=0.9.101 -revision=2 +revision=3 _eolie_hash=bb4aad19272cc636bd17f2f6602127fe _po=d5aac9503b4af24e3df89f531305cf9a70e26549 build_style=meson diff --git a/srcpkgs/epy/template b/srcpkgs/epy/template index 3eb1b98ff8dc4b..15ed2f1775c243 100644 --- a/srcpkgs/epy/template +++ b/srcpkgs/epy/template @@ -1,7 +1,7 @@ # Template file for 'epy' pkgname=epy version=2023.6.11 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3" diff --git a/srcpkgs/esptool/template b/srcpkgs/esptool/template index 558dd2584aa96d..66d32ee9a2f0c8 100644 --- a/srcpkgs/esptool/template +++ b/srcpkgs/esptool/template @@ -1,7 +1,7 @@ # Template file for 'esptool' pkgname=esptool version=4.5.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-bitstring python3-cryptography python3-ecdsa python3-pyserial diff --git a/srcpkgs/etcetera/template b/srcpkgs/etcetera/template index 786aebc8af17be..e33bba939c3e8f 100644 --- a/srcpkgs/etcetera/template +++ b/srcpkgs/etcetera/template @@ -1,7 +1,7 @@ # Template file for 'etcetera' pkgname=etcetera version=1.0 -revision=5 +revision=6 pycompile_dirs="usr/lib/etcetera" depends="python3" short_desc="Config file management with a touch of wisdom" diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template index 3b165869aeb00f..c455d9ddacba3e 100644 --- a/srcpkgs/etesync-dav/template +++ b/srcpkgs/etesync-dav/template @@ -1,7 +1,7 @@ # Template file for 'etesync-dav' pkgname=etesync-dav version=0.32.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-etesync python3-etebase radicale2 python3-Flask python3-Flask-WTF" diff --git a/srcpkgs/evemu/template b/srcpkgs/evemu/template index 318860f92bd329..6bea4fbf7d0256 100644 --- a/srcpkgs/evemu/template +++ b/srcpkgs/evemu/template @@ -1,7 +1,7 @@ # Template file for 'evemu' pkgname=evemu version=2.7.0 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="pkg-config python3 asciidoc xmlto" makedepends="libevdev-devel" diff --git a/srcpkgs/eyeD3/template b/srcpkgs/eyeD3/template index 469383a78e2240..0815e9122ad9b6 100644 --- a/srcpkgs/eyeD3/template +++ b/srcpkgs/eyeD3/template @@ -1,7 +1,7 @@ # Template file for 'eyeD3' pkgname=eyeD3 version=0.9.6 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pylast python3-setuptools python3-deprecation python3-filetype" diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template index 578193b73a8519..82db4745a2f5d7 100644 --- a/srcpkgs/fail2ban/template +++ b/srcpkgs/fail2ban/template @@ -1,7 +1,7 @@ # Template file for 'fail2ban' pkgname=fail2ban -version=1.0.2 -revision=4 +version=1.1.0 +revision=1 build_style=python3-module hostmakedepends="pkg-config python3-setuptools" depends="python3-pyasynchat" @@ -11,7 +11,7 @@ license="GPL-2.0-only" homepage="https://www.fail2ban.org/" changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog" distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz" -checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23 +checksum=474fcc25afdaf929c74329d1e4d24420caabeea1ef2e041a267ce19269570bae conf_files=" /etc/fail2ban/fail2ban.conf /etc/fail2ban/jail.conf @@ -19,10 +19,6 @@ conf_files=" /etc/fail2ban/filter.d/*.conf" make_dirs="/var/lib/fail2ban 0700 root root" -pre_build() { - ./fail2ban-2to3 -} - post_install() { vman man/jail.conf.5 rm -rf ${DESTDIR}/${py3_sitelib}/fail2ban/tests diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template index c07e969a6dcac7..7f9708f656401f 100644 --- a/srcpkgs/fava/template +++ b/srcpkgs/fava/template @@ -1,7 +1,7 @@ # Template file for 'fava' pkgname=fava version=1.27.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel python3-Babel" depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask diff --git a/srcpkgs/fenrir/template b/srcpkgs/fenrir/template index b99bbbb973aeca..78cf7be05e3853 100644 --- a/srcpkgs/fenrir/template +++ b/srcpkgs/fenrir/template @@ -1,7 +1,7 @@ # Template file for 'fenrir' pkgname=fenrir version=1.9.8 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="python3-evdev python3-daemonize python3-dbus python3-pyudev diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template index 8888f0bcb749ab..fe8c69f4eaf573 100644 --- a/srcpkgs/fetchmail/template +++ b/srcpkgs/fetchmail/template @@ -1,7 +1,7 @@ # Template file for 'fetchmail' pkgname=fetchmail version=6.4.30 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="python3 pkg-config" diff --git a/srcpkgs/fierce/template b/srcpkgs/fierce/template index 17ae6e20ac916e..ca3dc48a4968e0 100644 --- a/srcpkgs/fierce/template +++ b/srcpkgs/fierce/template @@ -1,7 +1,7 @@ # Template file for 'fierce' pkgname=fierce version=1.6.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-dnspython" diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template index 826a1ef87524bf..fc9a6f6b528720 100644 --- a/srcpkgs/fifengine/template +++ b/srcpkgs/fifengine/template @@ -1,7 +1,7 @@ # Template file for 'fifengine' pkgname=fifengine version=0.4.2 -revision=14 +revision=15 build_style=cmake hostmakedepends="swig python3 python3-setuptools" makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel diff --git a/srcpkgs/flake8/template b/srcpkgs/flake8/template index 3708cf9574ca7a..5a69f175c87a0a 100644 --- a/srcpkgs/flake8/template +++ b/srcpkgs/flake8/template @@ -1,7 +1,7 @@ # Template file for 'flake8' pkgname=flake8 version=7.0.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_target="tests/unit" make_check_args="--ignore=tests/unit/plugins/pycodestyle_test.py diff --git a/srcpkgs/flinks/template b/srcpkgs/flinks/template index fdf7d097075d91..f44feaa9985187 100644 --- a/srcpkgs/flinks/template +++ b/srcpkgs/flinks/template @@ -1,7 +1,7 @@ # Template file for 'flinks' pkgname=flinks version=0.5.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="lynx python3" diff --git a/srcpkgs/fontforge/patches/l10n.patch b/srcpkgs/fontforge/patches/l10n.patch new file mode 100644 index 00000000000000..402ac3a21ca41e --- /dev/null +++ b/srcpkgs/fontforge/patches/l10n.patch @@ -0,0 +1,8803 @@ +From 642d8a3db6d4bc0e70b429622fdf01ecb09c4c10 Mon Sep 17 00:00:00 2001 +From: skef <6175836+skef@users.noreply.github.com> +Date: Sun, 31 Dec 2023 02:17:59 -0800 +Subject: [PATCH] Update po files from Croudin sources after fixing problems + +--- + po/ca.po | 17 +- + po/de.po | 25 +- + po/el.po | 4 +- + po/en_GB.po | 8 +- + po/es.po | 76 +++- + po/fr.po | 93 ++-- + po/hr.po | 156 ++++++- + po/it.po | 12 +- + po/ja.po | 217 +++++++-- + po/ka_GE.po | 1231 +++++++++++++++++++++++++++++++++++++++++++-------- + po/ko.po | 43 +- + po/ml.po | 4 +- + po/pl.po | 67 ++- + po/pt.po | 4 +- + po/ru.po | 4 +- + po/tr_TR.po | 4 +- + po/uk.po | 41 +- + po/vi.po | 428 +----------------- + po/zh_CN.po | 1021 +++++++++++++++++++++++++++++++++++------- + po/zh_TW.po | 24 +- + 20 files changed, 2485 insertions(+), 994 deletions(-) + +diff --git a/po/ca.po b/po/ca.po +index e2349b6ef5..d25f08928f 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -15,8 +15,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Catalan\n" + "Language: ca_ES\n" +@@ -11573,8 +11573,8 @@ msgid "SnapToInt" + msgstr "Edita amb enters" + + msgid "" +-"So if you type \"A\" here the first selected glyph would be named \"A.suffix" +-"\".\n" ++"So if you type \"A\" here the first selected glyph would be named \"A." ++"suffix\".\n" + "The second \"B.suffix\", and so on." + msgstr "" + "Si aquí poseu «A», el primer glif seleccionat s'anomenarà «A.sufix».\n" +@@ -12345,7 +12345,6 @@ msgstr "Thaana" + msgid "Thai" + msgstr "Tai" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -16406,16 +16405,16 @@ msgstr "" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" + "«%s» a %s no conté una consulta de posicionament per parelles ∆x=%d ∆y=%d " + "∆x_adv=%d ∆y_adv=%d a %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "" + "«%s» a %s no conté una consulta de posicionament ∆x=%d ∆y=%d ∆x_adv=%d " + "∆y_adv=%d\n" +diff --git a/po/de.po b/po/de.po +index 41430ffaed..8b1a248f88 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -18,8 +18,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: German\n" + "Language: de_DE\n" +@@ -228,8 +228,8 @@ msgid "" + "!!!!! Bad Base Coord format (%d) for '%c%c%c%c' in '%c%c%c%c' script in " + "'BASE' table\n" + msgstr "" +-"!!!!! Ungültiges Format der Koordinaten des Grundzeichens (%d) für '%c%c%c" +-"%c' im Schriftsystem '%c%c%c%c' in der 'BASE' Tabelle\n" ++"!!!!! Ungültiges Format der Koordinaten des Grundzeichens (%d) für " ++"'%c%c%c%c' im Schriftsystem '%c%c%c%c' in der 'BASE' Tabelle\n" + + #, c-format + msgid "" +@@ -14770,8 +14770,8 @@ msgid "SnapToInt" + msgstr "Auf ganze Zahlen einrasten" + + msgid "" +-"So if you type \"A\" here the first selected glyph would be named \"A.suffix" +-"\".\n" ++"So if you type \"A\" here the first selected glyph would be named \"A." ++"suffix\".\n" + "The second \"B.suffix\", and so on." + msgstr "" + "Wenn du hier „A“ eingibst, dann bekommt die erste ausgewählte Glyphe den " +@@ -15763,7 +15763,6 @@ msgstr "" + "nicht denen in %4$.30s (unterschiedliche Anzahl oder unterschiedliche " + "Kriterien für Überlappungen)" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -16909,8 +16908,8 @@ msgstr "" + #, c-format + msgid "" + "The width, height, depth or italic correction of %s is too big. Tfm files " +-"may not contain values bigger than 16 times the em-size of the font. Width=" +-"%g, height=%g, depth=%g, italic correction=%g" ++"may not contain values bigger than 16 times the em-size of the font. " ++"Width=%g, height=%g, depth=%g, italic correction=%g" + msgstr "" + "Die Dickte, Höhe, Tiefe oder Kursiv-Korrektur %s sind zu groß. Tfm-Dateien " + "können nicht Werte größer als 16 mal die Geviertgröße enthalten. Dickte=%g, " +@@ -21512,16 +21511,16 @@ msgstr "" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" + "„%s” in %s enthielt keine Nachschlagetabelle der paarweisen Positionierung " + "∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "" + "„%s” in %s enthielt keine Nachschlagetabelle der Positionierung ∆x=%d ∆y=%d " + "∆x_adv=%d ∆y_adv=%d\n" +diff --git a/po/el.po b/po/el.po +index d942c68c6d..226afbe82c 100644 +--- a/po/el.po ++++ b/po/el.po +@@ -12,8 +12,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Greek\n" + "Language: el_GR\n" +diff --git a/po/en_GB.po b/po/en_GB.po +index 9bd2d62bb6..40ec187cc7 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -12,8 +12,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: English, United Kingdom\n" + "Language: en_GB\n" +@@ -133,6 +133,9 @@ msgstr "" + " Use of GDEF rather than lcar/prop\n" + "If both this and Apple are set, both formats are generated" + ++msgid "Arabic" ++msgstr "Arabic" ++ + msgid "Are you sure you don't want to use the cidmap I found?" + msgstr "Are you sure you do not want to use the cidmap I found?" + +@@ -726,7 +729,6 @@ msgstr "Spiros did not converge" + msgid "Template Color" + msgstr "Template Colour" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +diff --git a/po/es.po b/po/es.po +index 424b0177b6..31603cd120 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -15,8 +15,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Spanish\n" + "Language: es_ES\n" +@@ -453,6 +453,9 @@ msgstr "Argumento" + msgid "Arabic" + msgstr "Árabe" + ++msgid "Arabic Supplement" ++msgstr "Árabe, suplemento" ++ + msgid "Arakanese" + msgstr "Arakanés" + +@@ -1223,6 +1226,9 @@ msgstr "" + "Verificar si una substitución, una clase de interletraje, etc. utiliza un " + "nombre de glifo que no existe en la fuente" + ++msgid "Cherokee" ++msgstr "Cheroqui" ++ + msgid "Chinese (Hong Kong)" + msgstr "Chino (Hong Kong) zh_CN" + +@@ -1283,6 +1289,9 @@ msgstr "Co_piar margen izquierdo" + msgid "Com_binations" + msgstr "Com_binaciones" + ++msgid "Combining Diacritical Marks" ++msgstr "Marcas diacríticas combinables" ++ + msgid "Comment" + msgstr "Comentario" + +@@ -1459,6 +1468,9 @@ msgstr "Cor_tar" + msgid "Cubic" + msgstr "Cúbico" + ++msgid "Cuneiform" ++msgstr "Cuneiforme" ++ + msgid "Current" + msgstr "Actual" + +@@ -2538,6 +2550,9 @@ msgstr "Gallego" + msgid "Gaudeamus Ligature!" + msgstr "¡Alabemos la ligadura!" + ++msgid "General Punctuation" ++msgstr "Puntuación general" ++ + msgid "Generate Mac _Family..." + msgstr "Generar _familia para Mac..." + +@@ -3517,6 +3532,9 @@ msgstr "Diseños maestros" + msgid "Mathematical Greek" + msgstr "Griego para matemáticas" + ++msgid "Mayan Numerals" ++msgstr "Cifras mayas" ++ + msgid "Measure distance, angle between points" + msgstr "Medir distancia, ángulo entre puntos" + +@@ -4099,6 +4117,9 @@ msgstr "Abrir referencia" + msgid "Open failed" + msgstr "Error al abrir" + ++msgid "Optical Character Recognition" ++msgstr "Reconocimiento óptico de caracteres" ++ + msgid "Options" + msgstr "Opciones" + +@@ -4668,6 +4689,9 @@ msgstr "Ajustar a la horizo_ntal/vertical" + msgid "Sa_me Glyph As" + msgstr "Igual carácter que(_M)" + ++msgid "Samaritan" ++msgstr "Samaritano" ++ + msgid "Same as PostScript Names" + msgstr "Igual que los nombres de PostScript" + +@@ -5117,6 +5141,9 @@ msgstr "Espacia_r regiones..." + msgid "Space:" + msgstr "Espaciado:" + ++msgid "Spacing Modifier Letters" ++msgstr "Letras modificadoras con espaciado" ++ + msgid "Spanish" + msgstr "Español" + +@@ -5239,6 +5266,33 @@ msgstr "Trazado..." + msgid "Style Set 1" + msgstr "Estilo 1" + ++msgid "Style Set 10" ++msgstr "Conjunto estilístico 10" ++ ++msgid "Style Set 11" ++msgstr "Conjunto estilístico 11" ++ ++msgid "Style Set 12" ++msgstr "Conjunto estilístico 12" ++ ++msgid "Style Set 13" ++msgstr "Conjunto estilístico 13" ++ ++msgid "Style Set 14" ++msgstr "Conjunto estilístico 14" ++ ++msgid "Style Set 15" ++msgstr "Conjunto estilístico 15" ++ ++msgid "Style Set 16" ++msgstr "Conjunto estilístico 16" ++ ++msgid "Style Set 17" ++msgstr "Conjunto estilístico 17" ++ ++msgid "Style Set 18" ++msgstr "Conjunto estilístico 18" ++ + msgid "Style Set 2" + msgstr "Estilo 2" + +@@ -5251,6 +5305,18 @@ msgstr "Estilo 4" + msgid "Style Set 5" + msgstr "Estilo 5" + ++msgid "Style Set 6" ++msgstr "Conjunto estilístico 6" ++ ++msgid "Style Set 7" ++msgstr "Conjunto estilístico 7" ++ ++msgid "Style Set 8" ++msgstr "Conjunto estilístico 8" ++ ++msgid "Style Set 9" ++msgstr "Conjunto estilístico 9" ++ + msgid "Style _ID:" + msgstr "Estilo _ID:" + +@@ -5269,6 +5335,9 @@ msgstr "Sundanese (romano)" + msgid "Superscript" + msgstr "Supraíndice" + ++msgid "Superscripts and Subscripts" ++msgstr "Superíndices y subíndices" ++ + msgid "Swadaya Aramaic" + msgstr "Arameo swadaya" + +@@ -5309,6 +5378,9 @@ msgstr "La etiqueta debe constar de 4 caracteres" + msgid "Tag too long" + msgstr "Etiqueta demasiado larga" + ++msgid "Tags" ++msgstr "Etiquetas" ++ + msgid "Tahitian" + msgstr "Tahitiano" + +diff --git a/po/fr.po b/po/fr.po +index 26e446b380..d4b2b7eb05 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -14,8 +14,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: French\n" + "Language: fr_FR\n" +@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s" + #. GT: $4 is the changed flag ('*' for the changed items) + #, c-format + msgid "%1$.80s at %2$d from %3$.90s%4$s" +-msgstr "%1$.80s à %2$d de %3$.90hs%4$s" ++msgstr "%1$.80s à %2$d de %3$.90s%4$s" + + #. GT: This is the title for a window showing a bitmap character + #. GT: It will look something like: +@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + #. GT: $4 is the font name + #, c-format + msgid "%1$.80s at %2$d size %3$d from %4$.80s" +-msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" ++msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s" + + #, c-format + msgid "%1$s from lookup subtable %2$.50s" +@@ -3131,16 +3131,16 @@ msgstr "Glyphe de ligature incorrect. GID %d ne peut être moins que %d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "Format de table de lookup incorrect: format=2 (%d/%d), premier=%d dernier=%d " + "total de glyphes dans la fonte=%d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "Format de table de lookup incorrect: format=4 (%d/%d), premier=%d dernier=%d " + "total de glyphes dans la fonte=%d\n" +@@ -7433,7 +7433,7 @@ msgid "" + "Reverting the file will lose those changes.\n" + "Is that what you want?" + msgstr "" +-"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n" ++"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n" + "Revenir vous fera perdre toutes les modifications.\n" + "Voulez vous vraiment revenir ?" + +@@ -17879,8 +17879,8 @@ msgid "SnapToInt" + msgstr "Magnétisme aux entiers" + + msgid "" +-"So if you type \"A\" here the first selected glyph would be named \"A.suffix" +-"\".\n" ++"So if you type \"A\" here the first selected glyph would be named \"A." ++"suffix\".\n" + "The second \"B.suffix\", and so on." + msgstr "" + "Donc, si vous tapiez \"A\" ici, le premier glyphe sélectionné serait nommé " +@@ -19075,7 +19075,6 @@ msgstr "" + "pas à ceux de %4$.30s (nombre différent ou critères de recouvrement " + "différents)" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -19925,7 +19924,7 @@ msgid "" + "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " + "encodings" + msgstr "" +-"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " ++"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des " + "codages différents" + + #, c-format +@@ -19933,7 +19932,7 @@ msgid "" + "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " + "one cubic)" + msgstr "" +-"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres " ++"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres " + "différents (quadratique et cubique)" + + msgid "The generated font won't work with ATM" +@@ -19968,8 +19967,8 @@ msgid "" + "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " + "than in %3$.30s" + msgstr "" +-"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que " +-"dans %3$.30hs" ++"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que " ++"dans %3$.30s" + + #, c-format + msgid "" +@@ -19984,8 +19983,8 @@ msgid "" + "The glyph %1$.30s in font %2$.30s has a different number of references than " + "in %3$.30s" + msgstr "" +-"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent " +-"dans %3$.30hs" ++"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent " ++"dans %3$.30s" + + #, c-format + msgid "" +@@ -20295,8 +20294,8 @@ msgid "" + "Enlarge this to make the autohinter more tolerable to small deviations from " + "straight lines when detecting stem edges." + msgstr "" +-"La différence de pente maximale qui permet encore de considérer deux points" +-"\"parallèle\".\n" ++"La différence de pente maximale qui permet encore de considérer deux " ++"points\"parallèle\".\n" + "Augmenter pour rendre la auto-hinter plus tolérant aux petits écarts entre\n" + "des lignes droites lors de la détection des bords du fut ou de la traverse." + +@@ -20457,7 +20456,7 @@ msgstr "" + #, c-format + msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" + msgstr "" +-"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" ++"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s" + + msgid "The paths that make up this glyph intersect one another" + msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres" +@@ -20805,12 +20804,12 @@ msgstr "La largeur de la ligne utilisée pour dessiner les points sélectionnés + #, c-format + msgid "" + "The width, height, depth or italic correction of %s is too big. Tfm files " +-"may not contain values bigger than 16 times the em-size of the font. Width=" +-"%g, height=%g, depth=%g, italic correction=%g" ++"may not contain values bigger than 16 times the em-size of the font. " ++"Width=%g, height=%g, depth=%g, italic correction=%g" + msgstr "" + "La largeur, hauteur, profondeur ou correction italique de %s est trop " +-"grande. En TFM, on ne peut pas dépasser 16 fois le EM de la fonte.Largeur=" +-"%g, hauteur=%g, profondeur=%g, correction italique=%g" ++"grande. En TFM, on ne peut pas dépasser 16 fois le EM de la fonte." ++"Largeur=%g, hauteur=%g, profondeur=%g, correction italique=%g" + + msgid "The x coord of the selected point is near the specified value" + msgstr "La'abscisse du point sélectionné est proche de la valeur de consigne" +@@ -21042,7 +21041,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP" + + #, c-format + msgid "There is already an anchor point named %1$.40s in %2$.40s." +-msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." ++msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s." + + msgid "There is another glyph in the font with this name" + msgstr "Il y a un autre glyphe dans la fonte avec ce nom" +@@ -21076,8 +21075,8 @@ msgstr "Il n'y a pas de glyphe %s dans cette fonte," + + msgid "There may be at most one reference with the use-my-metrics bit set" + msgstr "" +-"Il ne doit pas y avoir plus d'une référence avec le \"use-my metrics bit set" +-"\"" ++"Il ne doit pas y avoir plus d'une référence avec le \"use-my metrics bit " ++"set\"" + + #, c-format + msgid "" +@@ -21441,8 +21440,8 @@ msgid "" + "been able to find is %1$.20s-%2$.20s-%4$d.\n" + "Shall I use that or let you search?" + msgstr "" +-"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais " +-"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n" ++"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais ce " ++"que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n" + "Devrais-je utiliser cette valeur ou préférez vous chercher ?" + + msgid "" +@@ -21671,8 +21670,8 @@ msgid "" + "FontForge\n" + "does not support. FontForge only supports 'IK' format fonts.\n" + msgstr "" +-"Ceci est probablement une fonte URW valide, mais elle est dans un format (% c" +-"% c) que FontForge\n" ++"Ceci est probablement une fonte URW valide, mais elle est dans un format " ++"(% c% c) que FontForge\n" + "ne supporte pas. FontForge ne prend en charge que les fontes de format " + "'IK'.\n" + +@@ -21770,7 +21769,7 @@ msgid "" + "with a 0 offset for this combination. Would you like to alter this kerning " + "class entry (or create a kerning pair for just these two glyphs)?" + msgstr "" +-"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n" ++"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n" + "avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette " + "partie\n" + "de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 " +@@ -21864,8 +21863,8 @@ msgstr "" + #, c-format + msgid "This name was previously used to identify mark class/set #%d." + msgstr "" +-"Ce nom a précédemment été utilisé pour identifier la classe/jeu de signes #" +-"%d." ++"Ce nom a précédemment été utilisé pour identifier la classe/jeu de signes " ++"#%d." + + #, c-format + msgid "This namelist contains at least one non-ASCII glyph name, namely: %s" +@@ -23657,8 +23656,8 @@ msgid "" + "and %s@0x%02x)\n" + " Only one will be used here.\n" + msgstr "" +-"Attention: Le codage %d (0x%x) correspond à au moins deux emplacements (%s@0x" +-"%02x et %s@0x%02x)\n" ++"Attention: Le codage %d (0x%x) correspond à au moins deux emplacements " ++"(%s@0x%02x et %s@0x%02x)\n" + " Un seul sera utilisé ici.\n" + + msgid "Warning: Font Bucket version 4 treated as 0.\n" +@@ -24161,8 +24160,8 @@ msgstr "" + + msgid "When serifs are removed (as first two in \"m\"), replace with:" + msgstr "" +-"Lors de la suppression des empattements (comme les deux premières dans \"m" +-"\"), remplacer avec:" ++"Lors de la suppression des empattements (comme les deux premières dans " ++"\"m\"), remplacer avec:" + + msgid "" + "When the hint's position is changed\n" +@@ -24551,8 +24550,8 @@ msgid "" + "referred to.\n" + "It will not be copied." + msgstr "" +-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" +-"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le " ++"Vous essayer de coller une référence vers %1$s dans %2$s.\n" ++"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le " + "glyphe auquel il se référait.\n" + "Le glyphe ne sera pas copié." + +@@ -24562,8 +24561,8 @@ msgid "" + "But %1$s does not exist in this font.\n" + "Would you like to copy the original splines (or delete the reference)?" + msgstr "" +-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" +-"Mais %1$hs n'existe pas dans cette fonte.\n" ++"Vous essayer de coller une référence vers %1$s dans %2$s.\n" ++"Mais %1$s n'existe pas dans cette fonte.\n" + "Voulez vous copier le contour d'origine (ou supprimer la référence)?" + + msgid "" +@@ -26385,16 +26384,16 @@ msgstr "" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" + "\"%s\" dans %s ne contenait pas de lookup de positionnement par paire ∆x=%d " + "∆y=%d ∆x_adv=%d ∆y_adv=%d à %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "" + "\"%s\" dans %s ne contenait pas de lookup de positionnement ∆x=%d ∆y=%d " + "∆x_adv=%d ∆y_adv=%d\n" +diff --git a/po/hr.po b/po/hr.po +index d261d4ca76..c10a697102 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -11,16 +11,16 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Croatian\n" + "Language: hr_HR\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " ++"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + "X-Crowdin-Project: fontforge\n" + "X-Crowdin-Project-ID: 368599\n" + "X-Crowdin-Language: hr\n" +@@ -237,8 +237,8 @@ msgid "" + "!!!!! Bad Base Coord format (%d) for '%c%c%c%c' in '%c%c%c%c' script in " + "'BASE' table\n" + msgstr "" +-"!!!!! Neispravni format koordinata osnove (%d) za '%c%c%c%c' u pismu '%c%c%c" +-"%c' u 'BASE' tablici\n" ++"!!!!! Neispravni format koordinata osnove (%d) za '%c%c%c%c' u pismu " ++"'%c%c%c%c' u 'BASE' tablici\n" + + #, c-format + msgid "" +@@ -695,6 +695,15 @@ msgstr "300 Svijetli" + msgid "32x8 cell window" + msgstr "Prozor: 32 × 8 polja" + ++msgid "3D Buttons" ++msgstr "3D gumbovi" ++ ++msgid "3D Dark Edge Color" ++msgstr "3D tamna boja ruba" ++ ++msgid "3D Light Edge Color" ++msgstr "3D svijetla boja ruba" ++ + msgid "4" + msgstr "4" + +@@ -1484,6 +1493,9 @@ msgstr "" + msgid "Adding points at Extrema..." + msgstr "Dodavanje točaka ektrema …" + ++msgid "Adding points of inflection..." ++msgstr "Dodavanje točkaka infleksije …" ++ + msgid "Additional arguments for autotrace program:" + msgstr "Dodatni argumenti za program za automatsko precrtavanje:" + +@@ -2065,6 +2077,9 @@ msgstr "" + "NAPOMENA: 'WinDescent' je POZITIVNI broj, a odnosi se na sve\n" + "što se nalazi ispod osnovne pismovne linije." + ++msgid "Appea_rance Editor..." ++msgstr "U_ređivač prikaza …" ++ + msgid "Append a FONTLOG entry" + msgstr "Dodaj FONTLOG zapis" + +@@ -2244,6 +2259,9 @@ msgstr "Arapsko, prošireno A" + msgid "Arabic Extended-B" + msgstr "Arapsko, prošireno B" + ++msgid "Arabic Extended-C" ++msgstr "Arapsko prošireno-C" ++ + msgid "Arabic Mathematical Alphabetic Symbols" + msgstr "Arapski matematički alfanumerički simboli" + +@@ -2373,6 +2391,9 @@ msgstr "" + "Uzlazni i silazni potezi moraju imati pozitivne vrijednosti, a njihov zbroj " + "manji od 16384" + ++msgid "Ascent/Descent Color" ++msgstr "Boja uzlaznog/silaznog poteza" ++ + msgid "Ask" + msgstr "Pitaj" + +@@ -3291,16 +3312,16 @@ msgstr "Neispravni grafem ligature. ID-oznaka grafema %d ne manja od %d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "Neispravna tablica definicija: format=2 (%d/%d), prvi=%d zadnji=%d ukupno " + "grafema u fontu=%d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "Neispravna tablica definicija: format=4 (%d/%d), prvi=%d zadnji=%d ukupno " + "grafema u fontu=%d\n" +@@ -3797,6 +3818,9 @@ msgstr "Debeli" + msgid "Bold Italic" + msgstr "Debeli Kurziv" + ++msgid "Bold font used in the Tile Path dialog" ++msgstr "Podebljani font za dijalog staza pločica" ++ + msgid "Bone" + msgstr "Kosturni" + +@@ -4111,6 +4135,9 @@ msgstr "KJK sjedinjeni ideogrami, proširenje F" + msgid "CJK Unified Ideographs Extension G" + msgstr "KJK sjedinjeni ideogrami, proširenje G" + ++msgid "CJK Unified Ideographs Extension H" ++msgstr "KJK sjedinjeni ideogrami, proširenje H" ++ + msgid "CS Clarendon" + msgstr "4.1 – Clarendon" + +@@ -5166,12 +5193,24 @@ msgstr "Boja etiketa grafema kad etiketa nedostaje" + msgid "Color of the active entry in the main section of a matrix edit" + msgstr "Boja za aktivne zapise u glavnom odjeljku matrice" + ++msgid "Color of the ascent and descent lines" ++msgstr "Boja za crte veličina uzlaznih i silaznih poteza" ++ + msgid "Color of the font used to display glyph information in the fontview" + msgstr "Boja fonta za prikaz informacija o grafemu u prikazu fonta" + + msgid "Color of the line between label and glyph" + msgstr "Boja linije između etikete i grafema" + ++msgid "Color of the x=0 and y=0 lines" ++msgstr "Boja x=0 i y=0 linija" ++ ++msgid "Color used for (some) glyph names in Show ATT dialog" ++msgstr "Boja za (neka) imena grafema u dijalogu Prikaži ATT" ++ ++msgid "Color used for currently selected entry in Show ATT dialog" ++msgstr "Boja za trenutačno odabrani unos u dijalogu Prikaži ATT" ++ + msgid "Color used to draw the advance width line of a glyph" + msgstr "Boja za crtanje linije, koja označuje širinu stošca" + +@@ -5208,6 +5247,18 @@ msgstr "Boja za onačavanje odabranih grafema" + msgid "Color:" + msgstr "Boja:" + ++msgid "Colors of lines and fills in outline window" ++msgstr "Boje linija i ispuna u prozoru kontura" ++ ++msgid "Colors related to CFF/PostScript hints" ++msgstr "Boje CFF/PostScript kontrola" ++ ++msgid "Colors, etc of points in glyph outline window" ++msgstr "Boje itd. točaka u prozoru kontura grafema" ++ ++msgid "Colors, etc. related to tool use in outline window" ++msgstr "Boje itd. koje se odnose na korištenje alata u prozoru kontura" ++ + msgid "Color|Background" + msgstr "Stražnja boja" + +@@ -5984,6 +6035,9 @@ msgstr "Ćirilica prošireno-B" + msgid "Cyrillic Extended-C" + msgstr "Ćirilica prošireno-C" + ++msgid "Cyrillic Extended-D" ++msgstr "Ćirilica prošireno-D" ++ + msgid "Cyrillic Supplement" + msgstr "Ćirilica, dopuna" + +@@ -6121,6 +6175,9 @@ msgstr "Zadana debljina crte iznad i za nadcrte" + msgid "Default:" + msgstr "Zadano:" + ++msgid "DefaultFont" ++msgstr "Standardni font" ++ + msgid "Define \"Almost Horizontal\"" + msgstr "Definiraj „Zamalo vodoravno”" + +@@ -6262,6 +6319,9 @@ msgstr "Devanagari" + msgid "Devanagari Extended" + msgstr "Devanagari prošireno" + ++msgid "Devanagari Extended-A" ++msgstr "Devanagari prošireno-A" ++ + msgid "Devanagari2" + msgstr "Devanagari2" + +@@ -8098,6 +8158,9 @@ msgstr "Font promijenjen" + msgid "Font file has bad glyph count field. maxp says: %d sizeof(loca)=>%d" + msgstr "Font sadrži neipravno polje brojanja. 'maxp' kaže: %d sizeof(loca)=>%d" + ++msgid "Font for Mac Features in Preferences dialog" ++msgstr "Font za Mac funkcije u dijalogu potavki" ++ + #, c-format + msgid "Font to compare with %.20s" + msgstr "Uspoređivanje fonta s %.20s" +@@ -8106,6 +8169,9 @@ msgstr "Uspoređivanje fonta s %.20s" + msgid "Font to merge into %.20s" + msgstr "Font za sjedinjavanje u %.20s" + ++msgid "Font used in the Glyph Info dialog" ++msgstr "Korišteni font u dijalogu informacija o grafemu" ++ + msgid "Font used to draw titles of a matrix edit" + msgstr "Font za naslove matrice" + +@@ -8909,6 +8975,9 @@ msgstr "Granični okvir grafema uži od" + msgid "Glyph BB Right Of" + msgstr "Granični okvir grafema širi od" + ++msgid "Glyph Color" ++msgstr "Boja grafema" ++ + msgid "Glyph Composition/Decomposition" + msgstr "Sastavljanje/Rastavljanje grafema" + +@@ -10225,6 +10294,9 @@ msgstr "Zanemari spojne dijakritičke znakove" + msgid "Ignore Ligatures" + msgstr "Zanemari ligature" + ++msgid "Ignore invalid substitutions" ++msgstr "Zanemari nevažeće zamjene" ++ + msgid "Ignore this problem in the future" + msgstr "Ubuduće zanemari ovaj problem" + +@@ -10309,6 +10381,9 @@ msgstr "Uvezi tablicu definicija" + msgid "Import Parameters" + msgstr "Uvezi parametre" + ++msgid "Import feature file" ++msgstr "Uvezi datoteku funkcija" ++ + msgid "Imports a lookup (and all its subtables) from another font." + msgstr "Uvozi tablicu definicija (i sve pod-tablice) iz jednog drugog fonta." + +@@ -12737,6 +12812,9 @@ msgstr "Matematički operatori" + msgid "Mathematical centerline" + msgstr "Matematička srednja linija" + ++msgid "Mathematical text layout" ++msgstr "Raspored matematičkog teksta" ++ + msgid "Matrix Edit" + msgstr "Matrica za uređivanje" + +@@ -14332,6 +14410,9 @@ msgstr "Normalni bezserifni" + msgid "Normal Text Color:" + msgstr "Boja za obični tekst:" + ++msgid "Normal font used in the Tile Path dialog" ++msgstr "Normalni font za dijalog staza pločica" ++ + msgid "Normal/Boxed" + msgstr "Normalno/Kutijasto" + +@@ -15216,15 +15297,24 @@ msgstr "Konturni fontovi" + msgid "Outline Glyphs\n" + msgstr "Konturni grafemi\n" + ++msgid "Outline Hints" ++msgstr "Kontrole kontura" ++ + msgid "Outline Inner Border" + msgstr "Unutarnji obrub konture" + ++msgid "Outline Lines/Fills" ++msgstr "Linije/Ispune konture" ++ + msgid "Outline Outer Border" + msgstr "Vanjski obrub konture" + + msgid "Outline Points" + msgstr "Točke konture" + ++msgid "Outline Tools" ++msgstr "Alati za konture" ++ + msgid "Outline View" + msgstr "Prikaz konture" + +@@ -15399,6 +15489,12 @@ msgstr "Pa_lete" + msgid "Palestinian Aramaic" + msgstr "Palestinski aramejski" + ++msgid "Palette Background Color" ++msgstr "Paleta boje pozadine" ++ ++msgid "Palette Foreground Color" ++msgstr "Paleta prednje boje" ++ + msgid "Palettes" + msgstr "Palete" + +@@ -17247,6 +17343,9 @@ msgstr "Boja za razdvojne crte" + msgid "Ruler Big Tick Color" + msgstr "Boja za velike oznake ravnala" + ++msgid "Ruler Font" ++msgstr "Font ravnala" ++ + msgid "Ruler Options" + msgstr "Opcije ravnala" + +@@ -18235,6 +18334,9 @@ msgstr "'Fuzz' visina serifa" + msgid "Serif height:" + msgstr "Visina serifa:" + ++msgid "SerifFont" ++msgstr "Serifni font" ++ + msgid "SerifSlopeError" + msgstr "Greška nagiba serifa" + +@@ -18808,8 +18910,8 @@ msgid "SnapToInt" + msgstr "Privlači na cjelobrojne vrijednosti" + + msgid "" +-"So if you type \"A\" here the first selected glyph would be named \"A.suffix" +-"\".\n" ++"So if you type \"A\" here the first selected glyph would be named \"A." ++"suffix\".\n" + "The second \"B.suffix\", and so on." + msgstr "" + "Prema tome, ako ovdje utipkaš 'A', onda će se prvi odabrani grafem\n" +@@ -20085,6 +20187,9 @@ msgstr "Temne" + msgid "Template Color" + msgstr "Boja za predložak" + ++msgid "Template Outline Color" ++msgstr "Boja konture predloška" ++ + msgid "Terminal Forms" + msgstr "Završni oblici" + +@@ -20154,7 +20259,6 @@ msgstr "" + "'%1$s' kontrole u grafemu \"%2$.30s\" u fontu %3$.30s se ne poklapaju s " + "onima u %4$.30s (različiti broj ili različiti kriteriji preklapanja)" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -21344,9 +21448,9 @@ msgid "" + "\n" + "Would you like to add this script to one of those features?" + msgstr "" +-"Tablica definicija %.30s je aktivan za grafem %.30s koji ima pismo '%c%c%c" +-"%c', međutim tog pisma čini se nema u niti jednoj funkciji koja primijenjuje " +-"tablicu definicija.\n" ++"Tablica definicija %.30s je aktivan za grafem %.30s koji ima pismo " ++"'%c%c%c%c', međutim tog pisma čini se nema u niti jednoj funkciji koja " ++"primijenjuje tablicu definicija.\n" + "\n" + "Želiš li dodati ovo pismo u jednu od tih funkcija?" + +@@ -21960,8 +22064,8 @@ msgstr "Širina linije koja se koristi za crtanje odabranih točaka" + #, c-format + msgid "" + "The width, height, depth or italic correction of %s is too big. Tfm files " +-"may not contain values bigger than 16 times the em-size of the font. Width=" +-"%g, height=%g, depth=%g, italic correction=%g" ++"may not contain values bigger than 16 times the em-size of the font. " ++"Width=%g, height=%g, depth=%g, italic correction=%g" + msgstr "" + "Širina, visina, dubina ili ispravljanje kurziva od %s su preveliki. Tfm " + "datoteke ne smiju sadržati vrijednosti veće od 16 puta veličine četverca " +@@ -24507,6 +24611,12 @@ msgstr "Koristi novo indijsko pismo" + msgid "UsePlugins" + msgstr "Koristi dodatke" + ++msgid "Used for point numbers, hints, etc." ++msgstr "Koristi se za brojeve točaka, kontrole itd." ++ ++msgid "Used for ruler numbers and other ruler notations." ++msgstr "Koristi se za brojeve i druge oznake ravnala." ++ + msgid "User controls the emboldening with the next two fields" + msgstr "Korisnik kontrolira podebljavanje pomoću sljedeća dva polja" + +@@ -24874,7 +24984,6 @@ msgstr "" + "Upozorenje: 'cvar' sadrži međupodatke n-torke.\n" + " FontForge to ne podržava.\n" + +-#, c-format + msgid "Warning: Accuracy target %lf less than minimum %lf, using %lf instead\n" + msgstr "" + "Upozorenje: Ciljana točnost %lf manja je od minimalne %lf, umjesto toga se " +@@ -24893,7 +25002,6 @@ msgstr "Upozorenje: Kraj konture se nije zatvorio\n" + msgid "Warning: Contour start did not close\n" + msgstr "Upozorenje: Početak konture se nije zatvorio\n" + +-#, c-format + msgid "Warning: Coordinate diff %lf greater than margin %lf\n" + msgstr "Upozorenje: Razlika koordinate %lf veća je od margine %lf\n" + +@@ -27962,16 +28070,16 @@ msgstr "" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" + "„%s” u %s ne sadrži tablicu definicija pozicioniranja parova ∆x=%d ∆y=%d " + "∆x_adv=%d ∆y_adv=%d s %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "" + "„%s” u %s ne sadrži tablicu definicija pozicioniranja ∆x=%d ∆y=%d ∆x_adv=%d " + "∆y_adv=%d\n" +diff --git a/po/it.po b/po/it.po +index e13711485c..a3136f7bdf 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -13,8 +13,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-31 08:24\n" + "Last-Translator: \n" + "Language-Team: Italian\n" + "Language: it_IT\n" +@@ -2303,7 +2303,7 @@ msgid "" + "Reverting the file will lose those changes.\n" + "Is that what you want?" + msgstr "" +-"Il font %1$.40s nel file %2$.40hs è stato modificato.\n" ++"Il font %1$.40s nel file %2$.40s è stato modificato.\n" + "Ripristinando il file perderai tutte le modifiche.\n" + "È quello che vuoi fare?" + +@@ -5835,7 +5835,7 @@ msgid "" + "The glyph %1$.30s has a different number of contours in font %2$.30s than in " + "%3$.30s" + msgstr "" +-"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto " ++"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto " + "a %3$.30s" + + #, c-format +@@ -6235,8 +6235,8 @@ msgid "" + "been able to find is %1$.20s-%2$.20s-%4$d.\n" + "Shall I use that or let you search?" + msgstr "" +-"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma " +-"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n" ++"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma il " ++"migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n" + "Devo usare questo valore o preferisci cercare tu stesso?" + + msgid "" +diff --git a/po/ja.po b/po/ja.po +index ed9f5a645b..11825c73d4 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -15,8 +15,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Japanese\n" + "Language: ja_JP\n" +@@ -388,6 +388,36 @@ msgstr "< 前(_P)" + msgid "" + msgstr "<何もしない>" + ++msgid "" ++msgstr "〈保留未使用面10〉" ++ ++msgid "" ++msgstr "〈保留未使用面11〉" ++ ++msgid "" ++msgstr "〈保留未使用面12〉" ++ ++msgid "" ++msgstr "〈保留未使用面13〉" ++ ++msgid "" ++msgstr "〈保留未使用面4〉" ++ ++msgid "" ++msgstr "〈保留未使用面5〉" ++ ++msgid "" ++msgstr "〈保留未使用面6〉" ++ ++msgid "" ++msgstr "〈保留未使用面7〉" ++ ++msgid "" ++msgstr "〈保留未使用面8〉" ++ ++msgid "" ++msgstr "〈保留未使用面9〉" ++ + msgid "" + msgstr "<方向不明>" + +@@ -961,7 +991,7 @@ msgstr "" + "わずかに拡大/縮小します." + + msgid "An outline font editor" +-msgstr "アウトラインフォントエディタ" ++msgstr "アウトラインフォントエディター" + + msgid "Anchor Control" + msgstr "アンカーの制御" +@@ -1023,6 +1053,15 @@ msgstr "" + "追加されます. ほとんどの場合,このフィールドを0にして\n" + "\"[*]オフセットを指定\"にチェックを入れるべきでしょう." + ++msgid "Appea_rance Editor..." ++msgstr "外観エディター(_R)..." ++ ++msgid "Appearance Editor" ++msgstr "外観エディター" ++ ++msgid "Apple" ++msgstr "アップル社" ++ + msgid "Apple Advanced Typography" + msgstr "Apple 高度組版機能" + +@@ -1769,16 +1808,16 @@ msgstr "合字グリフが不正です. GID %d が %d 未満ではありませ + + #, c-format + msgid "" +-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "フォーマット 2 (%d/%d) の照合テーブルが壊れています.最初=%d 最後=%d フォント" + "内の全グリフ数=%d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "フォーマット 4 (%d/%d) の照合テーブルが壊れています.最初=%d 最後=%d フォント" + "内の全グリフ数=%d\n" +@@ -1786,8 +1825,8 @@ msgstr "" + #, c-format + msgid "Bad lookup table: format=6, first=%d total glyphs in font=%d\n" + msgstr "" +-"フォーマット 6 の照合テーブルが壊れています.最初=%d フォント内の全グリフ数=" +-"%d\n" ++"フォーマット 6 の照合テーブルが壊れています.最初=%d フォント内の全グリフ数" ++"=%d\n" + + #, c-format + msgid "Bad lookup table: format=8, first=%d cnt=%d total glyphs in font=%d\n" +@@ -2260,6 +2299,9 @@ msgstr "(裸の) CFF CID" + msgid "CFF version mismatch\n" + msgstr "CFF のバージョンが合っていません\n" + ++msgid "CID" ++msgstr "CID" ++ + msgid "CID findfont Name" + msgstr "CID findfont名" + +@@ -2554,7 +2596,10 @@ msgid "Change _Weight..." + msgstr "ウェイトを変更(_W)..." + + msgid "Change _X-Height..." +-msgstr "_Xハイトを変更..." ++msgstr "Xハイトを変更(_X)..." ++ ++msgid "Change whether spiro is active or not" ++msgstr "螺旋描画モード切り替え" + + msgid "" + "Changing the left side bearing\n" +@@ -2970,6 +3015,9 @@ msgstr "AFMで合成グリフを使用" + msgid "Condensed" + msgstr "コンデンス" + ++msgid "Config_ure Plugins..." ++msgstr "プラグインの設定(_U)..." ++ + msgid "Contextual Alternates" + msgstr "文脈依存の異体字" + +@@ -3023,7 +3071,7 @@ msgstr "" + "役に立たない場合,無意味なものとされます" + + msgid "Convert By C_Map" +-msgstr "C_Mapを指定して変換" ++msgstr "CMapを指定して変換(_M)" + + msgid "Convert Design Vector Function:" + msgstr "デザインベクトル関数を変換:" +@@ -3790,16 +3838,16 @@ msgid "Edges near horizontal/vertical/italic" + msgstr "水平/垂直/イタリック角に近い辺" + + msgid "Edit 'cvt '..." +-msgstr "'cvt 'テーブルを編集..." ++msgstr "'cvt' テーブルを編集..." + + msgid "Edit 'fpgm'..." +-msgstr "'fpgm'テーブルを編集..." ++msgstr "'fpgm' テーブルを編集..." + + msgid "Edit 'maxp'..." +-msgstr "'maxp'テーブルを編集..." ++msgstr "'maxp' テーブルを編集..." + + msgid "Edit 'prep'..." +-msgstr "'prep'テーブルを編集..." ++msgstr "'prep' テーブルを編集..." + + msgid "Edit Chaining Position" + msgstr "文脈連鎖依存の位置指定を編集" +@@ -4359,7 +4407,7 @@ msgid "Fixing up References" + msgstr "リソースの修復中" + + msgid "Fl_attenByCMap" +-msgstr "指定したCM_apで単一化" ++msgstr "指定したCMapで単一化(_A)" + + msgid "Flared" + msgstr "フレア" +@@ -4379,6 +4427,9 @@ msgstr "フラマン語(ベルギーのオランダ語)" + msgid "Flex Hints" + msgstr "Flexヒント" + ++msgid "Flip" ++msgstr "反転" ++ + msgid "Flip Horizontally" + msgstr "水平方向に反転" + +@@ -4494,10 +4545,19 @@ msgid "" + "OpenType, cid-keyed, multi-master, cff, SVG and BitMap (bdf, FON, NFNT) " + "fonts." + msgstr "" +-"FontForge はアウトラインおよびビットマップフォントのフォントエディタです。" +-"フォントの作成、編集、変換を行うことができます。 PostScript, TrueType, " +-"OpenType, Cid-keyed, multi-master, cff, SVG, BitMap (bdf, FON, NFNT) フォント" +-"を扱えます。" ++"FontForge は、アウトラインフォントおよびビットマップフォントの作成、編集、変" ++"換を行うことができるフォントエディターです。扱える形式は PostScript、" ++"TrueType、OpenType、CID-Keyed、Multiple Master、CFF、SVG、ビットマップ (BDF、" ++"FON、NFNT) などです。" ++ ++msgid "" ++"FontForge is free Open Source Software written to run on various computer " ++"operating systems. You can use FontForge Graphically or as a command-line " ++"tool." ++msgstr "" ++"FontForge は、さまざまなコンピュータのオペレーティングシステム上で動作するよ" ++"うに書かれた無料のオープンソースソフトウェアです。FontForge は GUI を用いて、" ++"またはコマンドラインツールとして使用できます。" + + msgid "" + "FontForge loads large images into the background of each glyph\n" +@@ -5380,6 +5440,9 @@ msgstr "ISO 10646-1 (Unicode, 基本多言語面)" + msgid "ISO 10646-1 (Unicode, Full)" + msgstr "ISO 10646-1 (Unicode, 完全)" + ++msgid "ISO 10646:1993" ++msgstr "ISO 10646:1993" ++ + msgid "ISO 8859-1 (Latin1)" + msgstr "ISO 8859-1 (ラテン1/西欧)" + +@@ -6842,6 +6905,9 @@ msgstr "マジャン語" + msgid "Make Background" + msgstr "背景として使用" + ++msgid "Make Foreground" ++msgstr "前面として使用" ++ + msgid "Make Namelist" + msgstr "名前リストを作成" + +@@ -7141,6 +7207,9 @@ msgstr "MFの背景をクリア" + msgid "MfShowErr" + msgstr "MFエラーを表示" + ++msgid "MicroSoft" ++msgstr "マイクロソフト社" ++ + msgid "Min" + msgstr "最小" + +@@ -7898,8 +7967,8 @@ msgstr "" + #, c-format + msgid "Nonsensical class assigned to a glyph-- class=%d is too big. Glyph=%d\n" + msgstr "" +-"無意味なクラスがグリフに割り当てられています―クラス=%dは大きすぎます. グリフ=" +-"%d\n" ++"無意味なクラスがグリフに割り当てられています―クラス=%dは大きすぎます. グリフ" ++"=%d\n" + + msgid "Normal" + msgstr "通常" +@@ -8095,6 +8164,9 @@ msgstr "O/3次元的" + msgid "OEM Charset" + msgstr "OEM 文字セット" + ++msgid "OK" ++msgstr "OK" ++ + msgid "OS2Version|Automatic" + msgstr "自動" + +@@ -8128,6 +8200,12 @@ msgstr "OSS/ベネチアン" + msgid "OT _Glyph Class:" + msgstr "OTFグリフクラス(_G):" + ++msgid "O_ff" ++msgstr "オフ(_F)" ++ ++msgid "O_n" ++msgstr "オン(_N)" ++ + msgid "O_pen Paths" + msgstr "開いたパス(_P)" + +@@ -8370,6 +8448,9 @@ msgstr "フォントを開く" + msgid "Open Reference" + msgstr "参照情報を開く" + ++msgid "Open _Web Page" ++msgstr "Webページへ(_W)" ++ + msgid "OpenType" + msgstr "OpenTypeの仕様" + +@@ -8940,6 +9021,9 @@ msgstr "\"軸の種類\"フィールドを設定してください" + msgid "Please specify a new supplement for %.20s-%.20s" + msgstr "%.20s-%.20sの補遺番号を指定し直してください." + ++msgid "Plugin Configuration" ++msgstr "プラグインの設定" ++ + msgid "Poin_ts too close" + msgstr "近すぎる点(_T)" + +@@ -9260,6 +9344,9 @@ msgstr "無変換" + msgid "Re_move" + msgstr "削除(_M)" + ++msgid "Re_vert List" ++msgstr "リストを反転(_V)" ++ + msgid "Reached end of file when reading composite glyph\n" + msgstr "合成グリフの読み込み中にファイルの終端に到達しました\n" + +@@ -9633,6 +9720,9 @@ msgstr "ルーマニア語(モルドバ)" + msgid "Romany" + msgstr "ロマーニー語" + ++msgid "Rotate" ++msgstr "回転" ++ + msgid "Rotate 180°" + msgstr "180°回転" + +@@ -10232,6 +10322,9 @@ msgstr "常に2番目を選択(_T)" + msgid "Second glyph of %s" + msgstr "%sの2つめのグリフ" + ++msgid "SeekCharacter" ++msgstr "検索文字" ++ + msgid "Segment Separator" + msgstr "セグメント区切り" + +@@ -10575,7 +10668,7 @@ msgid "Size of comb delimiters in non-display styles" + msgstr "非ディスプレイ数式の comb の区切り文字" + + msgid "Skew" +-msgstr "傾き" ++msgstr "傾斜" + + msgid "Skew Angle" + msgstr "傾き角" +@@ -11456,7 +11549,6 @@ msgstr "" + "フォント%3$.30sのグリフ\"%2$.30s\"に含まれるヒント%1$sは,%4$.30sに含まれるも" + "のと一致しません(個数または重なり合い方の特徴が異なります)" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -12403,8 +12495,8 @@ msgid "" + "This font contains a \"UniqueId\" variable, but the correct name for it is\n" + "\t\"UniqueID\" (postscript is case concious)\n" + msgstr "" +-"このフォントには \"UniqueId\" という名の変数がありますが, 正しくは\t" +-"\"UniqueID\" です (PostScriptでは大文字と小文字は区別されます)\n" ++"このフォントには \"UniqueId\" という名の変数がありますが, 正しくは" ++"\t\"UniqueID\" です (PostScriptでは大文字と小文字は区別されます)\n" + + msgid "" + "This font contains at least one translucent layer, but type3 does not " +@@ -13308,6 +13400,15 @@ msgstr "辞書 %d に不正な値が含まれています\n" + msgid "Unicase" + msgstr "大小文字混在形" + ++msgid "Unicode" ++msgstr "Unicode" ++ ++msgid "Unicode 1.0" ++msgstr "Unicode 1.0" ++ ++msgid "Unicode 1.1" ++msgstr "Unicode 1.1" ++ + msgid "Unicode 2.0+, BMP only" + msgstr "Unicode 2.0 以降, BMP のみ" + +@@ -14129,7 +14230,7 @@ msgid "X11 bitmap only sfnt (otb)" + msgstr "X11 ビットマップのみの sfnt (otb)" + + msgid "XHeight:" +-msgstr "xハイト:" ++msgstr "Xハイト:" + + msgid "XUID-Base" + msgstr "XUIDの基底" +@@ -14395,32 +14496,38 @@ msgstr "拡大(_I)" + msgid "Zulu" + msgstr "ズールー語" + ++msgid "_128 pixel outline" ++msgstr "マスの大きさ: 128ピクセル(_1)" ++ + msgid "_16x4 cell window" +-msgstr "_16×4マス表示" ++msgstr "16×4マス表示(_1)" + + msgid "_24 pixel outline" +-msgstr "_24 ピクセル アウトライン" ++msgstr "マスの大きさ: 24ピクセル(_2)" + + msgid "_36 pixel outline" +-msgstr "_36 ピクセル アウトライン" ++msgstr "マスの大きさ: 36ピクセル(_3)" ++ ++msgid "_3D Rotate" ++msgstr "3D 回転" + + msgid "_48 pixel outline" +-msgstr "_48 ピクセル アウトライン" ++msgstr "マスの大きさ: 48ピクセル(_4)" + + msgid "_72 pixel outline" +-msgstr "_72 ピクセル アウトライン" ++msgstr "マスの大きさ: 72ピクセル(_7)" + + msgid "_8x2 cell window" +-msgstr " _8×2マス表示" ++msgstr "8×2マス表示(_8)" + + msgid "_96 pixel outline" +-msgstr "_96 ピクセル アウトライン" ++msgstr "マスの大きさ: 96ピクセル(_9)" + + msgid "_AA" + msgstr "階調表示(_A)" + + msgid "_About..." +-msgstr "…について(_A)..." ++msgstr "このソフトウェアについて(_A)..." + + msgid "_Accept inexact" + msgstr "不正確な一致を許容(_A)" +@@ -14479,6 +14586,9 @@ msgstr "周辺も(_A)" + msgid "_Ascent:" + msgstr "高さ(_A):" + ++msgid "_Ask" ++msgstr "尋ねる(_A)" ++ + msgid "_Aspect" + msgstr "様相(_A)" + +@@ -14521,7 +14631,7 @@ msgid "_Both" + msgstr "両方(_B)" + + msgid "_Bottom" +-msgstr "最後(_B)" ++msgstr "末尾へ(_B)" + + msgid "_Bottom:" + msgstr "下限(_B):" +@@ -14535,6 +14645,9 @@ msgstr "アクセントつきグリフを構築(_B)" + msgid "_Build Syllables" + msgstr "音節を構築する(_B)" + ++msgid "_CID" ++msgstr "CID(_C)" ++ + msgid "_Cancel" + msgstr "キャンセル(_C)" + +@@ -14568,6 +14681,9 @@ msgstr "定義済みのグリフのみ表示(_C)" + msgid "_Condense/Extend..." + msgstr "幅(_C)..." + ++msgid "_Configure" ++msgstr "設定(_C)" ++ + msgid "_Contrast" + msgstr "コントラスト(_C)" + +@@ -14578,7 +14694,7 @@ msgid "_Control Points near horizontal/vertical" + msgstr "水平/垂直に近い制御点(_C)" + + msgid "_Convert to CID" +-msgstr "_CIDに変換" ++msgstr "CIDに変換(_C)" + + msgid "_Copies:" + msgstr "部数(_C):" +@@ -14614,6 +14730,9 @@ msgstr "グリフの切り離し(_D)" + msgid "_Diagonal Hints" + msgstr "斜めのヒント(_D)" + ++msgid "_Disable" ++msgstr "無効化(_D)" ++ + msgid "_Display Compositions..." + msgstr "組合せを表示(_D)..." + +@@ -14659,6 +14778,9 @@ msgstr "EMの大きさ(_E):" + msgid "_Embeddable" + msgstr "埋め込み可能(_E)" + ++msgid "_Enable" ++msgstr "有効化(_E)" ++ + msgid "_Enabled" + msgstr "有効(_E)" + +@@ -14683,6 +14805,9 @@ msgstr "極大点を表示(_E)" + msgid "_FDEF" + msgstr "_FDEF:" + ++msgid "_FF" ++msgstr "FF(_F)" ++ + msgid "_Family Name:" + msgstr "ファミリー名(_F):" + +@@ -14870,6 +14995,9 @@ msgstr "合字(_L)" + msgid "_Lining" + msgstr "線描き(_L)" + ++msgid "_Load" ++msgstr "読み込み(_L)" ++ + msgid "_Load Encoding..." + msgstr "エンコーディングを読み込み(_L)..." + +@@ -14907,6 +15035,9 @@ msgstr "組合せを修正(_M)..." + msgid "_Mono" + msgstr "白黒(_M)" + ++msgid "_More Info" ++msgstr "詳細情報(_M)" ++ + msgid "_More hints than:" + msgstr "ヒントの個数の上限(_M):" + +@@ -14958,6 +15089,9 @@ msgstr "なし(_N)" + msgid "_Normal" + msgstr "通常(_N)" + ++msgid "_OK" ++msgstr "OK(_O)" ++ + msgid "_OS/2 Version" + msgstr "_OS/2バージョン" + +@@ -15030,6 +15164,9 @@ msgstr "プリンタ(_P):" + msgid "_Proportion" + msgstr "幅の比率(_P)" + ++msgid "_Python" ++msgstr "Python(_P)" ++ + msgid "_Quit" + msgstr "終了(_Q)" + +@@ -15184,7 +15321,7 @@ msgid "_Tools" + msgstr "ツール(_T)" + + msgid "_Top" +-msgstr "最初(_T)" ++msgstr "先頭へ(_T)" + + msgid "_Top:" + msgstr "上限(_T):" +@@ -15202,7 +15339,7 @@ msgid "_Transformations" + msgstr "変形(_T)" + + msgid "_TrueType Instructions" +-msgstr "_TrueType命令" ++msgstr "TrueType命令(_T)" + + msgid "_Twilight Pnt Cnt:" + msgstr "トワイライトポイントの個数(_T):" +@@ -15289,7 +15426,7 @@ msgid "_X-Ascent" + msgstr "_xの高さ" + + msgid "_X-Height" +-msgstr "_Xハイト" ++msgstr "Xハイト(_X)" + + msgid "_Yes" + msgstr "はい(_Y)" +diff --git a/po/ka_GE.po b/po/ka_GE.po +index c55108f08c..ee1e9749d6 100644 +--- a/po/ka_GE.po ++++ b/po/ka_GE.po +@@ -8,8 +8,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 11:56\n" + "Last-Translator: \n" + "Language-Team: Georgian\n" + "Language: ka_GE\n" +@@ -23,6 +23,13 @@ msgstr "" + "X-Crowdin-File: FontForge.pot\n" + "X-Crowdin-File-ID: 2\n" + ++msgid "" ++"\n" ++"Layers:" ++msgstr "" ++"\n" ++"შრეები:" ++ + #, c-format + msgid " Ignoring '%c%c%c%c'\n" + msgstr " უგულებელყოფილია „%c%c%c%c“\n" +@@ -39,14 +46,28 @@ msgstr " ზომის დამატებით შეიქმნება + + #. GT: This continues a multi-line error message, hence the leading space + msgid " Bad kerning class table, ignored\n" +-msgstr " წანაცვლების კლასის გაუმართავი ცხრილი, უგულებელყოფილია\n" ++msgstr " შემოკვეცის კლასის უმართებულო ცხრილი, უგულებელყოფილია\n" + + msgid " Bad ligature table, ignored\n" + msgstr " გადაბმების გაუმართავი ცხრილი, უგულებელყოფილია\n" + + #. GT: This continues a multi-line error message, hence the leading space + msgid " Bad pairwise kerning table, ignored\n" +-msgstr " წანაცვლებული წყვილების გაუმართავი ცხრილი, უგულებელყოფილია\n" ++msgstr " შემოკვეცილი წყვილების უმართებულო ცხრილი, უგულებელყოფილია\n" ++ ++#, c-format ++msgid " Curvature: %g" ++msgstr " სიმრუდე: %g" ++ ++#, c-format ++msgid " Curvature: %g Radius: %g" ++msgstr " სიმრუდე: %g რადიუსი: %g" ++ ++msgid " Next CP" ++msgstr " შემდ. მოსაჭიდი" ++ ++msgid " Prev CP" ++msgstr " წინა მოსაჭიდი" + + msgid " Removing a size will delete it." + msgstr " ზომის მოცილების შედეგად წაიშლება." +@@ -60,8 +81,8 @@ msgid "" + "%.100s is not in a known format (or uses features of that format fontforge " + "does not support, or is so badly corrupted as to be unreadable)" + msgstr "" +-"%.100s უცნობი სახისაა (ან იმ სახის თვისებებს შეიცავს, რომელთაც FontForge ვერ " +-"აღიქვამს, ანდაც ისეა დაზიანებული, რომ ვერ იკითხება)" ++"%.100s უცნობი სახისაა (ან იმ სახის თვისებებს იყენებს, რომელთაც FontForge ვერ " ++"აღიქვამს, ანდა ისეა დაზიანებული, რომ ვერ იკითხება)" + + #. GT: This is the title for a window showing an outline character + #. GT: It will look something like: +@@ -72,7 +93,18 @@ msgstr "" + #. GT: $4 is the changed flag ('*' for the changed items) + #, c-format + msgid "%1$.80s at %2$d from %3$.90s%4$s" +-msgstr "%1$.80s უჯრაში %2$d, შრიფტიდან %3$.90s%4$s" ++msgstr "%1$.80s უჯრაში %2$d შრიფტიდან %3$.90s%4$s" ++ ++#. GT: This is the title for a window showing a bitmap character ++#. GT: It will look something like: ++#. GT: exclam at 33 size 12 from Arial ++#. GT: $1 is the name of the glyph ++#. GT: $2 is the glyph's encoding ++#. GT: $3 is the pixel size of the bitmap font ++#. GT: $4 is the font name ++#, c-format ++msgid "%1$.80s at %2$d size %3$d from %4$.80s" ++msgstr "%1$.80s უჯრაში %2$d ზომით%3$d შრიფტიდან %4$.80s" + + #. GT: The user is trying to open a font file which contains multiple fonts and + #. GT: has asked for a font which is not in that file. +@@ -88,6 +120,16 @@ msgstr "" + "%s\n" + "განაგრძობთ მაინც?" + ++#. GT: There are various broad classes of lookups here and the first string ++#. GT: describes those: "Contextual Positioning", Contextual Substitution", etc. ++#. GT: Each of those may be formatted in 3 different ways: by (or perhaps using ++#. GT: would be a better word) glyphs, classes or coverage tables. ++#. GT: So this might look like: ++#. GT: Contextual Positioning by classes ++#, c-format ++msgid "%s by %s" ++msgstr "%s %sს მიხედვით" ++ + #. GT: This string is used to generate a name for each OpenType lookup. + #. GT: The %s will be filled with the user friendly name of the feature used to invoke the lookup + #. GT: The second %s (if present) is the script +@@ -103,7 +145,7 @@ msgstr "%s ფაილს არ შეიცავს %.100s" + + #, c-format + msgid "%s kerning class %d" +-msgstr "%s წანაცვლების კლასი %d" ++msgstr "%s შემოკვეცის კლასი %d" + + #. GT: This string is used to generate a name for an OpenType lookup subtable. + #. GT: %s is the lookup name +@@ -120,7 +162,7 @@ msgid "'%s' is not the name of a currently known plugin" + msgstr "„%s“ არ ემთხვევა ამჟამად ცნობილი მოდულების სახელებს" + + msgid "'kern' Horizontal Kerning Table" +-msgstr "'kern' თარაზული წანაცვლების ცხრილი" ++msgstr "'kern' ცხრილი თარაზული შემოკვეცისთვის" + + msgid "(Adobe now considers XUID/UniqueID unnecessary)" + msgstr "(Adobe მიიჩნევს, რომ XUID/UniqueID აღარაა აუცილებელი)" +@@ -225,6 +267,12 @@ msgstr "ჭდე უნდა იყოს 4 ASCII სიმბოლოთი" + msgid "AMS Names" + msgstr "AMS სახელები" + ++msgid "A_dd Extrema" ++msgstr "წვერ_ოს დამატება" ++ ++msgid "Active Hints" ++msgstr "მოქმედი მიმთ." ++ + msgid "Active Layer Color" + msgstr "მოქმედი შრის ფერი" + +@@ -241,12 +289,18 @@ msgstr "მოქმედი ხელსაწყოს ფერი" + msgid "Add" + msgstr "დამატება" + ++msgid "Add All Extrema" ++msgstr "ყველა წვეროს დამატება" ++ + msgid "Add Encoding Name..." + msgstr "დაშიფვრის სახელის დამატება..." + + msgid "Add Encoding Slots..." + msgstr "დასაშიფრი ადგილების დამატება..." + ++msgid "Add Good Extrema" ++msgstr "მართებული წვეროს დამატება" ++ + msgid "Add Language to Script..." + msgstr "ენის დამატება დამწერლობისთვის..." + +@@ -266,10 +320,10 @@ msgid "Add a curve point" + msgstr "მრუდის წერტილის დამატება" + + msgid "Add a curve point always either horizontal or vertical" +-msgstr "მრუდის წერტილის დამატება მხოლოდ თარაზულად, ან შვეულად" ++msgstr "მრუდის წერტილი მხოლოდ თარაზულად ან შვეულად" + + msgid "Add a left \"tangent\" point" +-msgstr "მარცხენა „მხების“ წერტილის დამატება" ++msgstr "მარცხნივ მიმართული „მხების“ წერტილის დამატება" + + msgid "Add a new layer" + msgstr "ახალი შრის დამატება" +@@ -278,7 +332,7 @@ msgid "Add a point, then drag out its control points" + msgstr "წერტილის დამატება, გადაადგილება და მართვა" + + msgid "Add a right \"tangent\" point" +-msgstr "მარჯვენა „მხების“ წერტილის დამატება" ++msgstr "მარჯვნივ მიმართული „მხების“ წერტილის დამატება" + + msgid "Add a subtable to which lookup?" + msgstr "რომეცლ ცნობარს დაემატოს ქვეცხრილი?" +@@ -287,7 +341,10 @@ msgid "Add a tangent point" + msgstr "მხების წერტილის დამატება" + + msgid "Adding points at Extrema..." +-msgstr "ემატება კიდურა წერტილები..." ++msgstr "კიდურა წერტილების დამატება..." ++ ++msgid "Additional arguments for autotrace program:" ++msgstr "დამატებითი არგუმენტები თვითგამომხაზველი პროგრამისთვის:" + + #. GT: "Adjust" here means Device Table based pixel adjustments, an OpenType + #. GT: concept which allows small corrections for small pixel sizes where +@@ -343,8 +400,8 @@ msgid "" + "After rotating or skewing a glyph you should probably apply Element->Add " + "Extrema" + msgstr "" +-"ასონიშნის მობრუნების ან გადახრის შემდგომ, სასურველია გამოიყენოთ „შემადგენელი " +-"→ კიდურა წერტილის დამატება“" ++"ასონიშნის მობრუნების ან გადახრის შემდგომ სასურველია გამოიყენოთ „შემადგენელი " ++"→ წვეროს წერტილის დამატება“" + + msgid "Ahead Classes" + msgstr "მომდევნო კლასები" +@@ -352,6 +409,9 @@ msgstr "მომდევნო კლასები" + msgid "Ahom" + msgstr "აჰომი" + ++msgid "Align Points" ++msgstr "წერტილების სწორება" ++ + msgid "All Files" + msgstr "ყველანაირი ფაილი" + +@@ -364,8 +424,11 @@ msgstr "ყველა ასონიშანი" + msgid "Allow _curve smoothing" + msgstr "_მრუდის დაგლუვების საშუალება" + ++msgid "Allow _removal of extrema" ++msgstr "წვეროს მო_ცილების ნებართვა" ++ + msgid "Allows you to select optional behavior when generating the font" +-msgstr "დამატებითი მოქმედების მითითების საშუალება, შრიფტის შედგენისას" ++msgstr "დამატებითი მოქმედების მითითების საშუალება შრიფტის დამზადებისას" + + msgid "Almost Horizontal/Vertical Curves" + msgstr "თითქმის თარ./შვეულ. მრუდები" +@@ -596,6 +659,15 @@ msgstr "ისრები" + msgid "Arrows & Sup Arrows A/B & Misc Arrows" + msgstr "ისრები, დანართი A/B და სხვადასხვა ნიშნები" + ++msgid "As CFF fonts" ++msgstr "როგორც CFF-შრიფტები" ++ ++msgid "Ascent/Descent Color" ++msgstr "ზედატანის/ქვედატანის ფერი" ++ ++msgid "Ask the user for autotrace arguments each time autotrace is invoked" ++msgstr "არგუმენტების მითითების მოთხოვნა გამოხაზვის ყოველი წამოწყებისას" ++ + msgid "At most 31 glyphs may be specified in an insert list" + msgstr "არაუმეტეს 31 ასონიშანი შეიძლება მიეთითოს ჩასამატებელ სიაში" + +@@ -607,13 +679,13 @@ msgid "Auto Width" + msgstr "სიგანის თვითგანსაზღვრა" + + msgid "AutoHint" +-msgstr "თვითმინიშნება" ++msgstr "თვითმიმთითებელი" + + msgid "AutoHint changed glyphs before generating a font" +-msgstr "თვითმინიშნებით შესწორებულია ასონიშნები შრიფტის შედგენამდე" ++msgstr "თვითმიმთითებლით შესწორებულია ასონიშნები შრიფტის დამზადებამდე" + + msgid "AutoKernDialog" +-msgstr "თვითწანაცვლების სარკმელი" ++msgstr "თვითშემოკვეცის სარკმელი" + + msgid "AutoLBearingSync" + msgstr "მარცხენა საბჯენის თვითშეწყობა" +@@ -629,7 +701,16 @@ msgid "Auto_Instr" + msgstr "თვითმი_თითება" + + msgid "Autokern new entries" +-msgstr "ახლადშეყვანილის თვითწანაცვლება" ++msgstr "ახლად შეტანილის თვითშემოკვეცა" ++ ++msgid "AutotraceArgs" ++msgstr "გამომხაზველის არგუმენტები" ++ ++msgid "AutotraceAsk" ++msgstr "მოთხოვნა გამოხაზვისას" ++ ++msgid "Autotracing..." ++msgstr "თვითგამოხაზვა..." + + msgid "Axerbaijani (Arabic)" + msgstr "აზერბაიჯანული (არაბული)" +@@ -647,6 +728,9 @@ msgstr "აზერი (ლათინური)" + msgid "BBearing:" + msgstr "ქვედა საბჯენი:" + ++msgid "BMP" ++msgstr "BMP" ++ + #. GT: Background, make it short + msgid "Back" + msgstr "უკანა" +@@ -655,7 +739,7 @@ msgid "Back Classes" + msgstr "წინა კლასები" + + msgid "Bad Apple Kern Class\n" +-msgstr "Apple-ის გაუმართავი წანაცვლების კლასი\n" ++msgstr "Apple-ის უმართებულო კლასი შემოკვეცისთვის\n" + + msgid "Bad Class" + msgstr "გაუმართავი კლასი" +@@ -705,6 +789,9 @@ msgstr "გაუმართავი არეები" + msgid "Bad Version" + msgstr "არამართებული ვერსია" + ++msgid "Bad WOFF header, a field which must be 0 is not." ++msgstr "უმართებულო WOFF-თავსართი, ველის მნიშვნელობა უნდა ყოფილიყო 0." ++ + msgid "Bad Weight" + msgstr "არამართებული სისქე" + +@@ -712,7 +799,7 @@ msgid "Bad class name" + msgstr "კლასის გაუმართავი სახელი" + + msgid "Bad default baseline" +-msgstr "გაუმართავი საყრდენი ხაზი" ++msgstr "გაუმართავი ძირითადი ხაზი" + + msgid "Bad encoding file format" + msgstr "გაუმართავი შიფრის მქონე ფაილი" +@@ -733,7 +820,7 @@ msgstr "გაუმართავი გამოსახულება: %.1 + + #, c-format + msgid "Bad kern pair: glyphs %d & %d should have been < %d\n" +-msgstr "გაუმართავი წანაცვლების წყვილი: ასონიშნები %d და %d უნდა იყოს < %d\n" ++msgstr "შემოკვეცის უმართებულო წყვილი: ასონიშნები %d და %d უნდა იყოს < %d\n" + + msgid "Bad language tag" + msgstr "არამართებული ენის ჭდე" +@@ -757,6 +844,9 @@ msgstr "არასწორი რიცხვი, Infinity ან NaN: %s\n" + msgid "Bad rule" + msgstr "გაუმართავი წესი" + ++msgid "Bad signature in WOFF header." ++msgstr "უმართებულო ხელმოწერა WOFF-თავსართში." ++ + #. GT: The words "true" and "false" should be left untranslated. We are restricted + #. GT: here by what PostScript understands, and it only understands the English + #. GT: words. You may, of course, change it to something like ("true" (vrai) ou "false" (faux)) +@@ -785,10 +875,10 @@ msgid "Base Ligatures" + msgstr "ძირითადი გადაბმები" + + msgid "Baseline" +-msgstr "საყრდენი ხაზი" ++msgstr "ძირითადი ხაზი" + + msgid "Baseline used for Latin, Greek, Cyrillic text." +-msgstr "საყრდენი ხაზი ლათინურის, ბერძნულისა და კირილიცისთვის." ++msgstr "ძირითადი ხაზი ლათინურის, ბერძნულისა და კირილიცისთვის." + + msgid "Basic Latin" + msgstr "ძირითადი ლათინური" +@@ -820,6 +910,9 @@ msgstr "რასტრული გადიდება..." + msgid "Bitmap _Magnification..." + msgstr "რასტრული გა_დიდება..." + ++msgid "Bits/Pixel:" ++msgstr "ბიტი/პიქსელზე:" ++ + msgid "Bold font used in the Find/Replace window" + msgstr "მუქი შრიფტი გამოიყენება პოვნა/ძიების ფანჯარაში" + +@@ -925,17 +1018,48 @@ msgstr "" + msgid "Can't Find Glyph" + msgstr "ვერ მოინახა ასონიშანი" + ++msgid "Can't create temporary directory" ++msgstr "ვერ შეიქმნა დროებითი საქაღალდე" ++ ++msgid "Can't find autotrace" ++msgstr "ვერ მოიძებნა გამომხაზველი" ++ ++msgid "" ++"Can't find autotrace program (set AUTOTRACE environment variable) or " ++"download from:\n" ++" http://sf.net/projects/autotrace/" ++msgstr "" ++"ვერ მოიძებნა თვითგამომხაზველი (გამართეთ გარემოს ცვლადი AUTOTRACE) ან " ++"ჩამოტვირთეთ აქედან:\n" ++" http://sf.net/projects/autotrace/" ++ ++msgid "Can't find mf" ++msgstr "ვერ მოიძებნა mf (metafont)" ++ ++msgid "" ++"Can't find mf program -- metafont (set MF environment variable) or download " ++"from:\n" ++" http://www.tug.org/\n" ++" http://www.ctan.org/\n" ++"It's part of the TeX distribution" ++msgstr "" ++"ვერ მოინახა mf-პროგრამა -- metafont (გამართეთ გარემოს ცვლადი MF) ან " ++"ჩამოტვირთეთ აქედან:\n" ++" http://www.tug.org/\n" ++" http://www.ctan.org/\n" ++"TeX-ის შემადგენელი ნაწილია" ++ + msgid "Can't find the file" + msgstr "ვერ მოიძებნა ფაილი" + + msgid "Can't insert 'cvt'" +-msgstr "ვერ ჩაისმება 'cvt'" ++msgstr "ვერ ჩაისმება „cvt“" + + msgid "Can't insert 'fpgm'" +-msgstr "ვერ ჩაისმება 'fpgm'" ++msgstr "ვერ ჩაისმება „fpgm“" + + msgid "Can't insert 'prep'" +-msgstr "ვერ ჩაისმება 'prep'" ++msgstr "ვერ ჩაისმება „prep“" + + #, c-format + msgid "Can't open %s" +@@ -951,6 +1075,9 @@ msgstr "ვერ იხსნება დროებითი ფაილი + msgid "Can't open temporary file for truetype output.\n" + msgstr "ვერ იხსნება დროებითი ფაილი Truetype-გამოტანისთვის.\n" + ++msgid "Can't run mf" ++msgstr "ვერ გაეშვა mf (metafont)" ++ + msgid "Cancel" + msgstr "გაუქმება" + +@@ -1341,9 +1468,15 @@ msgstr "ყველაფრის გასუფთავება" + msgid "Clear Device Table" + msgstr "მოწყობილობის ცხრილის გასუფთავება" + ++msgid "Clear Instructions" ++msgstr "მითითებების გასუფთავება" ++ + msgid "Clear Special Data" + msgstr "საგანგებო მონაცემების წაშლა" + ++msgid "Clear _Background" ++msgstr "_ფონის გასუფთავება" ++ + msgid "" + "Click on a range to select characters in that range.\n" + "Double click on a range to see characters that should be\n" +@@ -1356,11 +1489,14 @@ msgstr "" + msgid "Co_py LBearing" + msgstr "მარცხენა საბჯენის ას_ლი" + ++msgid "Color of the ascent and descent lines" ++msgstr "ზედატანისა და ქვედატანის ხაზების ფერი" ++ + msgid "Color used to draw the advance width line of a glyph" + msgstr "ასონიშნის გაფართოებული სიგანის აღმნიშვნელი ფერი" + + msgid "Color used to draw the kerning line" +-msgstr "წანაცვლების ხაზის აღმნიშვნელი ფერი" ++msgstr "შემოკვეცის ზოლის აღმნიშვნელი ფერი" + + msgid "Color used to draw the left side bearing" + msgstr "მარცხენა საბჯენის ფერი" +@@ -1389,6 +1525,9 @@ msgstr "დასართავი განმასხვავებელ + msgid "Combining Diacritical Marks for Symbols" + msgstr "დასართავი განმასხვავებელი ნიშნები პირობითი ნიშნებისთვის" + ++msgid "Comment" ++msgstr "შენიშვნა" ++ + msgid "Common Indic Number Forms" + msgstr "გავრცელებული ინდური რიცხვითი ჩანაწერები" + +@@ -1401,12 +1540,31 @@ msgstr "შემჭირდოებული გახსნისას" + msgid "Compacted" + msgstr "შემჭიდროებული" + ++msgid "Compare Layers" ++msgstr "შრეების შედარება" ++ ++msgid "Compare Layers..." ++msgstr "შრეების შედარება..." ++ + msgid "Compare _Outlines" + msgstr "_მოხაზულობის შედარება" + ++msgid "Compare two layers" ++msgstr "ორი შრის შედარება" ++ + msgid "Complex" + msgstr "რთული" + ++msgid "Component" ++msgstr "შემადგენელი" ++ ++#, c-format ++msgid "Component %d %.30s (%d,%d)" ++msgstr "შემადგენელი %d %.30s (%d,%d)" ++ ++msgid "Components" ++msgstr "შემადგენლები" ++ + msgid "Config_ure Plugins..." + msgstr "მოდულების გამარ_თვა..." + +@@ -1434,6 +1592,9 @@ msgstr "შრეების ასლი" + msgid "Copy RBearin_g" + msgstr "მარჯვენა სა_ბჯენის ასლი" + ++msgid "Copy _Fg To Bg" ++msgstr "ასლი ფ_ონზე" ++ + msgid "Copy _VWidth" + msgstr "_შვეული სიგანის ასლი" + +@@ -1447,7 +1608,7 @@ msgid "Copy_right:" + msgstr "საავ_ტორო უფლება:" + + msgid "Copyright" +-msgstr "საავტორო უფლება" ++msgstr "საკუთრების უფლება" + + msgid "" + "Copyright text (in the Names pane) must be entirely ASCII. So, use (c) " +@@ -1457,7 +1618,11 @@ msgstr "" + "გამოიყენეთ (c) და არა – ©." + + msgid "Corner" +-msgstr "კუთხე" ++msgstr "კუთხოვანი" ++ ++#, c-format ++msgid "Could not create plugin directory '%s'\n" ++msgstr "ვერ შეიქმნა მოდულის საქაღალდე: „%s“\n" + + msgid "Could not figure out a lookup type" + msgstr "ვერ დადგინდა ცნობარის სახეობა" +@@ -1478,7 +1643,7 @@ msgid "Could not open temporary file." + msgstr "ვერ გაიხსნა დროებითი ფაილი." + + msgid "Could not read (or perhaps find) mf output file" +-msgstr "ვერ იკითხება (ან უფრო იძებნება) mf-გამოტანის ფაილი" ++msgstr "ვერ იკითხება (ანდა ვერ იძებნება) mf-გამოტანის ფაილი" + + msgid "Couldn't Load" + msgstr "ვერ ჩაიტვირთა" +@@ -1518,6 +1683,9 @@ msgstr "ვერ გაიხსნა ფაილი %.200s" + msgid "Couldn't open font" + msgstr "ვერ გაიხსნა შრიფტი" + ++msgid "Cr_eate" ++msgstr "შე_ქმნა" ++ + msgid "Cre_ate Named Glyphs..." + msgstr "სახელიანი ასონიშნების შ_ექმნა..." + +@@ -1527,6 +1695,12 @@ msgstr "მცირე მთავრულის შექმნა" + msgid "Create Subscript/Superscript" + msgstr "ხაზზედა/ხაზქვედა ნიშნის შექმნა" + ++msgid "Create directory" ++msgstr "საქაღალდის შექმნა" ++ ++msgid "Create directory..." ++msgstr "საქაღალდის შექმნა..." ++ + msgid "Create small caps variants for symbols as well as letters" + msgstr "მცირე მთავრულის შექმნა სიმბოლოებისა და ასოებისთვის" + +@@ -1547,6 +1721,19 @@ msgstr "" + "ჯერჯერობით, FontForge-ში მხარდაჭერილია მხოლოდ ბიტური (და არა ბაიტური) სახის " + "type3-გამოტანა" + ++#, c-format ++msgid "Curvature: %g" ++msgstr "სიმრუდე: %g" ++ ++msgid "Curvature: -0.00000000" ++msgstr "სიმრუდე: -0.00000000" ++ ++msgid "Curvature: ?" ++msgstr "სიმრუდე: ?" ++ ++msgid "Curve" ++msgstr "მრუდი" ++ + msgid "Curve Type" + msgstr "მრუდის სახეობა" + +@@ -1589,8 +1776,11 @@ msgstr "თარიღები" + msgid "De_activate Spiro" + msgstr "ხვეულის გა_უქმება" + ++msgid "Decompressed length did not match expected length for table" ++msgstr "შეუკუმშავი სიგრძე შეუსაბამოა ცხრილისთვის მოსალოდნელ სიგრძესთან" ++ + msgid "Default Baseline" +-msgstr "საყრდენი ხაზი ნაგულისხმევად" ++msgstr "ნაგულისხმევი ძირითადი ხაზი" + + msgid "Define Groups" + msgstr "ჯგუფების განსაზღვრა" +@@ -1649,11 +1839,14 @@ msgstr "საქაღალდეები თავში" + msgid "Directories Separate" + msgstr "საქაღალდეები გამოყოფილად" + ++msgid "Directory name?" ++msgstr "საქაღალდის სახელი?" ++ + msgid "Directory|_New" + msgstr "_ახალი" + + msgid "Discarding a duplicate kerning pair." +-msgstr "ცილდება ერთნაირი წანაცვლებული წყვილები." ++msgstr "ცილდება ერთნაირი შემოკვეცილი წყვილები." + + msgid "Display" + msgstr "ჩვენება" +@@ -1696,6 +1889,12 @@ msgid "" + msgstr "" + "გამოაჩენს ყველა მონიშნულ სიმბოლოს, თითოეულს ცალკე გვერდზე, მეტად დიდი ზომით" + ++msgid "Dist" ++msgstr "სიშორე" ++ ++msgid "Distance" ++msgstr "დაშორება" ++ + msgid "Dives Akuru" + msgstr "დივეჰი აკურუ" + +@@ -1711,7 +1910,7 @@ msgstr "" + "(თუ კი, რომლები)" + + msgid "Doesn't look like a valid pdf file, couldn't find xref section" +-msgstr "არ ჰგავს მართებულ PDF-ფაილს, ვერ მოინახა xref-განყოფილება" ++msgstr "არ ჰგავს მართებულ PDF-ფაილს, ვერ მოინახა xref-არე" + + msgid "Dogra" + msgstr "დოგრი" +@@ -1731,6 +1930,9 @@ msgstr "სახელი მეორდება" + msgid "Duployan" + msgstr "დუპლოი" + ++msgid "EPS" ++msgstr "EPS" ++ + msgid "E_lement" + msgstr "შ_ემადგენელი" + +@@ -1788,7 +1990,7 @@ msgid "Egyptian Hieroglyphs" + msgstr "ეგვიპტური იეროგლიფები" + + msgid "Ellipse" +-msgstr "ოვალი" ++msgstr "კვერცხისებრი" + + msgid "Enclosed Alphanumeric Supplement" + msgstr "შემოსაზღვრული ასოციფრული დანართი" +@@ -1854,12 +2056,33 @@ msgstr "აკლია „{“ განსაზღვრისას %d ხ + msgid "Expor_t..." + msgstr "გა_ტანა..." + ++msgid "Export" ++msgstr "გამოტანა" ++ ++msgid "Export Options" ++msgstr "გამოტანის პარამეტრები" ++ ++msgid "ExportClipboard" ++msgstr "გამოტანის ასლის აღება" ++ + msgid "Extended" + msgstr "გაფართოებული" + + msgid "Extended Collection" + msgstr "გაფართოებული კრებული" + ++#. GT: Extra Space, see below for a full comment ++#. GT: Extra Space ++msgid "Extra Sp:" ++msgstr "დამატ. სივრცე:" ++ ++msgid "" ++"Extra arguments for configuring the autotrace program\n" ++"(either autotrace or potrace)" ++msgstr "" ++"დამატებითი არგუმენტები გამომხაზველი პროგრამის გასამართად\n" ++"(გამოდგება ორივესთვის, Autotrace და Potrace)" ++ + msgid "" + "Extra white space to be added after each\n" + "sub/superscript." +@@ -1871,12 +2094,16 @@ msgstr "ამოკრეფა PDF-ფაილიდან" + msgid "F_ind / Replace..." + msgstr "_პოვნა / ჩანაცვლება..." + ++#. GT: Foreground, make it short ++msgid "F_ore" ++msgstr "_წინა" ++ + msgid "Failed to generate postscript font" +-msgstr "ვერ შეიქმნა PostScript-შრიფტი" ++msgstr "ვერ დამზადდა PostScript-შრიფტი" + + #, c-format + msgid "Failed to generate postscript in file %s" +-msgstr "ვერ შეიქმნა PostScript-შრიფტი ფაილში %s" ++msgstr "ვერ დამზადდა PostScript-შრიფტი ფაილში %s" + + #, c-format + msgid "Failed to open %s for output" +@@ -1913,12 +2140,17 @@ msgstr "თვისების ჭდეები მოცილდება" + msgid "File Exists" + msgstr "ფაილი არსებობს" + ++msgid "" ++"File length as specified in the WOFF header does not match the actual file " ++"length." ++msgstr "ფაილის სიგრძე მითითებული WOFF-თავსართში არ ემთხვევა არსებულ სიგრძეს." ++ + #, c-format + msgid "File, %s, exists. Replace it?" + msgstr "ფაილი %s უკვე არსებობს. ჩანაცვლდეს?" + + msgid "Filled Ellipse" +-msgstr "სავსე ოვალი" ++msgstr "სავსე კვერცხისებრი" + + msgid "Filter" + msgstr "გამორჩევა" +@@ -1964,22 +2196,22 @@ msgid "Flip" + msgstr "გადაკეცვა" + + msgid "Flip Horizontally" +-msgstr "თარაზულად შებრუნება" ++msgstr "თარაზულად გადაკეცვა" + + msgid "Flip Vertically" +-msgstr "შვეულად შებრუნება" ++msgstr "შვეულად გადაკეცვა" + + msgid "Flip _Horizontally" +-msgstr "თარა_ზულად შებრუნება" ++msgstr "თარა_ზულად გადაკეცვა" + + msgid "Flip _Vertically" +-msgstr "შ_ვეულად შებრუნება" ++msgstr "შ_ვეულად გადაკეცვა" + + msgid "Flip the selection" +-msgstr "მონიშნულის სარკისებრი შებრუნება" ++msgstr "მონიშნულის გადაკეცვა" + + msgid "Flip..." +-msgstr "შებრუნება..." ++msgstr "გადაკეცვა..." + + msgid "Fo_ntname:" + msgstr "შრი_ფტის სახელი:" +@@ -1990,7 +2222,7 @@ msgid "" + "Do you want to save it?" + msgstr "" + "შრიფტი %1$.40s შეცვლილია ფაილში %2$.40s.\n" +-"გსურთ შეინახოს?" ++"გსურთ შენახვა?" + + #, c-format + msgid "" +@@ -2041,6 +2273,21 @@ msgstr "" + "სისტემებზე გასაშვებად. FontForge შეგიძლიათ გამოიყენოთ როგორც გამოსახულებითი " + "სახით, აგრეთვე ბრძანებათა ველის მეშვეობით." + ++#, c-format ++msgid "FontForge supports at most %d layers" ++msgstr "FontForge-ში მხარდაჭერილია არაუმეტეს %d შრე" ++ ++msgid "" ++"FontForge supports two different helper applications to do autotracing\n" ++" autotrace and potrace\n" ++"If your system only has one it will use that one, if you have both\n" ++"use this option to tell FontForge which to pick." ++msgstr "" ++"FontForge-თან თავსებადია თვითგამოხაზვის ორი სხვადასხვა დამხმარე პროგრამა\n" ++" Autotrace და Potrace.\n" ++"თუ სისტემაში მხოლოდ ერთია, მას გამოიყენებს, თუ ორივეა,\n" ++"ამ პარამეტრის მეშვეობით მიუთითეთ FontForge-ს, რომელი არჩიოს." ++ + msgid "" + "FontForge was unable to load libspiro, spiros are not available for use." + msgstr "" +@@ -2060,7 +2307,7 @@ msgstr "" + "უდიდესი მნიშვნელობები, თითოეული ნიშნის საბჯენებისთვის." + + msgid "FontForge will guess kerning classes for selected glyphs" +-msgstr "FontForge ივარაუდებს წანაცვლების კლასს შერჩეული ასონიშნებისთვის" ++msgstr "FontForge ივარაუდებს შემოკვეცის კლასს შერჩეული ასონიშნებისთვის" + + msgid "" + "FontForge will look at the glyphs selected in the font view\n" +@@ -2069,7 +2316,7 @@ msgid "" + msgstr "" + "FontForge გადახედავს ასონიშნებს შრიფტის ხედით\n" + "და შეეცდება იპოვოს მსგავსი ასონიშნები, რომელთა\n" +-"მონაცემებითაც მიხედვითაც შექმნის წანაცვლების კლასებს." ++"მონაცემების მიხედვითაც შექმნის შემოკვეცის კლასებს." + + msgid "FontLog Save Failed" + msgstr "FontLog ვერ შეინახა" +@@ -2087,10 +2334,19 @@ msgstr "ასონიშნების იძულებით გადა + msgid "Fore" + msgstr "წინა" + ++msgid "Forget _to All" ++msgstr "ყველას და_ვიწყება" ++ ++msgid "Format:" ++msgstr "სახეობა:" ++ + #. GT: This does not mean the program, but freehand drawing + msgid "Freehand" + msgstr "თავისუფალი" + ++msgid "Friendly Name" ++msgstr "იოლი სახელი" ++ + msgid "From the _other class" + msgstr "ს_ხვა კლასიდან" + +@@ -2109,6 +2365,9 @@ msgstr "75" + msgid "Gasp|_Version" + msgstr "ვე_რსია" + ++msgid "General" ++msgstr "ძირითადი" ++ + msgid "General Punctuation" + msgstr "ძირითადი სასვენი ნიშნები" + +@@ -2116,28 +2375,28 @@ msgid "General/Supplemental Punctuation" + msgstr "ძირითადი/დამატებითი სასვენი ნიშნები" + + msgid "Generate" +-msgstr "შედგენა" ++msgstr "დამზადება" + + msgid "Generate Fonts" +-msgstr "შრიფტების შედგენა" ++msgstr "შრიფტების დამზადება" + + msgid "Generate Mac Family" +-msgstr "შედგენა Mac-კრებულის" ++msgstr "Mac-კრებულის დამზადება" + + msgid "Generate Mac _Family..." +-msgstr "შედგენა Mac-კ_რებულის..." ++msgstr "Mac-კ_რებულის დამზადება..." + + msgid "Generate TTC" +-msgstr "შეიქმნას TTC" ++msgstr "დამზადდეს TTC" + + msgid "Generate TTC..." +-msgstr "შეიქმნას TTC..." ++msgstr "დამზადდეს TTC..." + + msgid "Generating PostScript Font" +-msgstr "იქმნება PostScript-შრიფტი" ++msgstr "მზადდება PostScript-შრიფტი" + + msgid "Generating bitmap font" +-msgstr "იქმნება ბიტური შრიფტი" ++msgstr "მზადდება ბიტური შრიფტი" + + msgid "Generic" + msgstr "მთავარი" +@@ -2169,6 +2428,19 @@ msgstr "გლაგოლიცური" + msgid "Glagolitic Supplement" + msgstr "გლაგოლიცური დანართი" + ++msgid "Glif" ++msgstr "Glif" ++ ++msgid "Glyph Info" ++msgstr "ასონიშნის შესახებ" ++ ++#, c-format ++msgid "Glyph Info for %.40s" ++msgstr "%.40s ასონიშნის შესახებ" ++ ++msgid "Glyph Info..." ++msgstr "ასონიშნის შესახებ..." ++ + msgid "Glyph Insertion" + msgstr "ასონიშნის ჩამატება" + +@@ -2182,7 +2454,7 @@ msgid "Glyph Set by Selection" + msgstr "ასონიშნების კრებული მონიშვნით" + + msgid "Glyph _Info..." +-msgstr "ასო_ნიშნის შესახებ..." ++msgstr "ასო_ნიშნის მონაცემები..." + + msgid "Glyph in two classes" + msgstr "ასონიშანი ორ კლასშია" +@@ -2208,6 +2480,11 @@ msgstr "" + "ასონიშნის სახელში არსებული სიმბოლოები მხოლოდ ASCII-არეს უნდა ეკუთვნოდეს,\n" + "თუმცა სახელთა ამ სიაში, ზოგიერთი შეიცავს სიმბოლოებს, რომლებიც სცდება ამ არეს." + ++#, c-format ++msgid "Glyph, %s, has no hints. FontForge will not produce many instructions." ++msgstr "" ++"ასონიშანი %s მიმთითებლების გარეშეა. FontForge ვერ დაამუშავებს ბევრ მითითებას." ++ + msgid "GlyphName|New" + msgstr "ახალი" + +@@ -2272,6 +2549,9 @@ msgstr "ჯგუფის სახელი:" + msgid "Groups" + msgstr "ჯგუფები" + ++msgid "Guess" ++msgstr "სავარაუდო" ++ + #. GT: Guide layer, make it short + msgid "Guide" + msgstr "მიმმართველი" +@@ -2301,7 +2581,7 @@ msgid "HVCurve" + msgstr "თარ./შვეულ. მრუდი" + + msgid "H_ints" +-msgstr "_მიმნიშნებლები" ++msgstr "_მიმთითებლები" + + msgid "Hangul Jamo" + msgstr "ჰანგილ-ჯამო" +@@ -2315,9 +2595,15 @@ msgstr "ჰანგილ-ჯამო გაფართოებული-B" + msgid "Hanunoo" + msgstr "ჰანუნო" + ++msgid "Harmoni_ze" ++msgstr "შე_ხამება" ++ + msgid "Harmonizing..." + msgstr "შეეხამება..." + ++msgid "Has _Vertical Metrics" ++msgstr "_შვეული აზომვებით" ++ + msgid "Hebrew" + msgstr "ებრაული" + +@@ -2325,7 +2611,7 @@ msgid "Height" + msgstr "სიმაღლე" + + msgid "Height/Kern Data" +-msgstr "სიმაღლის/წანაცვლების მონაცემები" ++msgstr "სიმაღლის/შემოკვეცის მონაცემები" + + msgid "Hidden" + msgstr "დამალული" +@@ -2333,6 +2619,9 @@ msgstr "დამალული" + msgid "Hide when _Moving" + msgstr "დამალვა მ_ოძრაობისას" + ++msgid "Hint Mask" ++msgstr "მიმთ. ნიღაბი" ++ + msgid "Hiragana" + msgstr "ჰირაგანა" + +@@ -2362,16 +2651,16 @@ msgid "Horizontal" + msgstr "თარაზული" + + msgid "Horizontal Baselines" +-msgstr "თარაზული საყრდენები" ++msgstr "ძირითადი თარაზული ხაზები" + + msgid "Horizontal Kerning" +-msgstr "თარაზული წანაცვლება" ++msgstr "თარაზული შემოკვეცა" + + #, c-format + msgid "Horizontal: %d baseline" + msgid_plural "Horizontal: %d baselines" +-msgstr[0] "თარაზული: %d საყრდენი" +-msgstr[1] "თარაზული: %d საყრდენი" ++msgstr[0] "თარაზული: %d ძირითადი ხაზი" ++msgstr[1] "თარაზული: %d ძირითადი ხაზი" + + msgid "How many unencoded glyph slots do you wish to add?" + msgstr "რამდენი დაუშიფრავი ასონიშნის ადგილის დამატება გსურთ?" +@@ -2381,8 +2670,8 @@ msgid "" + "I miscalculated the size of subtable %s, this means the kerning output is " + "wrong." + msgstr "" +-"შეცდომა, %s ქვეცხრილის ზომის გამოთვლისას, რაც ნიშნავს, რომ წანაცვლების " +-"გამოტანა არამართებულია." ++"შეცდომა %s ქვეცხრილის ზომის გამოთვლისას, რაც ნიშნავს, რომ შემოკვეცის " ++"გამოტანა უმართებულოა." + + msgid "" + "I'm sorry this file is too complex for me to understand (or is erroneous, or " +@@ -2454,10 +2743,10 @@ msgid "" + "in the font, and specify how to position glyphs in this\n" + "script relative to all active baselines" + msgstr "" +-"თუ ზემოთ მოცემული საყრდენებიდან რომელიმე მაინც მოქმედია,\n" ++"თუ ზემოთ მოცემული ძირითადი ხაზებიდან რომელიმე მაინც მოქმედია,\n" + "უნდა მიუთითოთ ნაგულისხმევი თითოეული დამწერლობისთვის\n" + "ამ შრიფტში და ისიც, თუ როგორ განთავსდება ასონიშნები ყველა\n" +-"მოქმედი საყრდენი ხაზების მიმართ" ++"მოქმედი ძირითადი ხაზის მიმართ" + + msgid "" + "If the old-style 'kern' table contains unencoded glyphs\n" +@@ -2466,9 +2755,9 @@ msgid "" + "problematic glyphs from the old-style 'kern' table." + msgstr "" + "თუ ძველი სახის „kern“ ცხრილი შეიცავს დაუშიფრავ ასონიშნებს\n" +-"(ან ასოებს BMP-ადგილების მიღმა), ბევრი პროგრამა Windows-ში\n" +-"საერთოდ არ გამოიყენებს წანაცვლებას. ამის მითითებით კი გამოირიცხება\n" +-"ამგვარი ასონიშნებს ძველებური „kern“ ცხრილიდან." ++"(ან ასოებს BMP-სივრცის გარეთ), ბევრი პროგრამა Windows-ში\n" ++"საერთოდ არ გამოიყენებს შემოკვეცას. ამის მითითებით კი გამოირიცხება\n" ++"ამგვარი ასონიშნები ძველებური „kern“ ცხრილიდან." + + msgid "" + "If the start point of a contour is not an extremum, find a new start point " +@@ -2499,7 +2788,7 @@ msgid "" + "If you leave this field blank FontForge will use a default based on\n" + "either the version string above, or one in the 'name' table." + msgstr "" +-"თუ ცარიელს დატოვებთ, FontForge თავად შეავსებს ან ვერსიი, ან „სახელის“ " ++"თუ ცარიელს დატოვებთ, FontForge თავად შეავსებს ან ვერსიის, ან „სახელის“ " + "ცხრილის მიხედვით." + + msgid "Ignore Ligatures" +@@ -2509,8 +2798,8 @@ msgid "" + "In the 'kern' table, a subtable's length does not match the number of " + "kerning pairs." + msgstr "" +-"„kern“ ცხრილში, ქვეცხრილების სიგრძე არ ემთხვევა წანაცვლებული წყვილების " +-"რაოდენობას." ++"შემოკვეცის „kern“ ცხრილში, ქვეცხრილების სიგრძე არ ემთხვევა შემოკვეცილი " ++"წყვილების რაოდენობას." + + msgid "" + "In the saved font, force all glyph names to match those in the specified " +@@ -2537,7 +2826,7 @@ msgid "Increment RBearing By:" + msgstr "მარჯვენა საბჯენს დაემატოს:" + + msgid "Indic (& Tibetan) hanging baseline" +-msgstr "ინდური (და ტიბეტური) კიდული საყრდენით" ++msgstr "ინდური (და ტიბეტური) ძირითადი კიდული ხაზით" + + msgid "Insert Before Current Glyph" + msgstr "მიმდინარე ასონიშნის შემდგომ ჩამატება" +@@ -2560,9 +2849,26 @@ msgstr "ტექსტის მოხაზულობის ჩამატ + msgid "Insert random text in the specified script" + msgstr "ცალკეული დამწერლობის შემთხვევითი ტექსტის ჩამატება" + ++msgid "Instructions out of date" ++msgstr "მითითებები ვადაგასულია" ++ + msgid "Interface" + msgstr "გარსი" + ++msgid "InterpolateCPsOnMotion" ++msgstr "ჩამატება მოსაჭიდის მოძრაობისას" ++ ++#. GT: See the long comment at "Property|New" ++#. GT: The msgstr should contain a translation of "None", ignore "Interpretation|" ++#. GT: In french this could be "Aucun" or "Aucune" depending on the gender ++#. GT: of "Interpretation" ++msgid "Interpretation|None" ++msgstr "არა" ++ ++#, c-format ++msgid "Invalid compressed table length for '%c%c%c%c'." ++msgstr "უმართებული სიგრძე შეკუმშული ცხრილისთვის „%c%c%c%c“." ++ + msgid "Invalid guideline.\n" + msgstr "გაუმართავი მიმმართველი ხაზი.\n" + +@@ -2575,7 +2881,13 @@ msgid "Invalid or unsupported version (0x%x) for 'kern' table" + msgstr "არასწორი ან მხარდაუჭერელი ვერსია (0x%x) „kern“ ცხრილისთვის" + + msgid "Is this horizontal or vertical kerning data?" +-msgstr "ეს თარაზული წანაცვლების მონაცემია თუ შვეულის?" ++msgstr "ეს თარაზული შემოკვეცის მონაცემია თუ შვეულისა?" ++ ++msgid "Italic Angle" ++msgstr "დახრის კუთხე" ++ ++msgid "Italic Angle:" ++msgstr "დახრის კუთხე:" + + msgid "KOI8-R (Cyrillic)" + msgstr "KOI8-R (კირილიცა)" +@@ -2611,61 +2923,61 @@ msgid "Ker_n By Classes..." + msgstr "წანა_ცვლება კლასებით..." + + msgid "Kern" +-msgstr "წანაცვლება" ++msgstr "შემოკვეცა" + + msgid "Kern Adjusts" +-msgstr "წანაცვლების დაყენება" ++msgstr "შემოკვეცის მორგება" + + msgid "Kern By Classes" +-msgstr "წანაცვლება კლასებით" ++msgstr "შემოკვეცა კლასებით" + + msgid "Kern Line Color" +-msgstr "წანაცვლების ხაზის ფერი" ++msgstr "შემოკვეცის ზოლის ფერი" + + msgid "Kern Pair Closeup" +-msgstr "წანაცვლებული წყვილის გადახედვა" ++msgstr "შემოკვეცის წყვილის დათვალიერება" + + msgid "Kern Pair Closeup..." +-msgstr "წანაცვლებული წყვილის გადახედვა..." ++msgstr "შემოკვეცის წყვილის შეთვალიერება..." + + msgid "Kern Pairs" + msgstr "Წანაცვლებული წყვილები" + + msgid "Kern Values:" +-msgstr "წანაცვლების მნიშვნელობები:" ++msgstr "შემოკვეცის მნიშვნ.:" + + msgid "Kern:" +-msgstr "წანაცვლება:" ++msgstr "შემოკვეცა:" + + msgid "KernClass|_New Lookup..." + msgstr "_ახალი ცნობარი..." + + msgid "Kerning & such" +-msgstr "წანაცვლება და სხვა დანარჩენი" ++msgstr "შემოკვეცა და სხვა" + + msgid "Kerning Class" +-msgstr "წანაცვლების კლასი" ++msgstr "შემოკვეცის კლასი" + + #, c-format + msgid "Kerning Metrics For %.50s" +-msgstr "წანაცვლების აზომვები – %.50s" ++msgstr "შემოკვეცის აზომვები – %.50s" + + #. GT: The %s is the name of the lookup subtable containing this kerning class + #, c-format + msgid "Kerning by Classes: %s" +-msgstr "წანაცვლება კლასებით: %s" ++msgstr "შემოკვეცა კლასებით: %s" + + msgid "Kerning direction" +-msgstr "წანაცვლების მიმართულება" ++msgstr "შემოკვეცის მიმართულება" + + msgid "" + "Kerning may be specified either by classes of glyphs\n" + "or by pairwise combinations of individual glyphs.\n" + "Which do you want for this subtable?" + msgstr "" +-"წანაცვლები მითითება შეიძლება ან ასონიშნების კლასებით,\n" +-"ან ცალკეული ასონიშნების შეწყვილებით.\n" +-"რომელი გსურთ ამ ქვეცხრილისთვის?" ++"შემოკვეცის მითითება შეიძლება ან ასონიშნების კლასებით,\n" ++"ანდა ცალკეული ასონიშნების შეწყვილებით.\n" ++"რომელს აირჩევთ ამ ქვეცხრილისთვის?" + + msgid "Khmer" + msgstr "ქმერული" +@@ -2781,7 +3093,13 @@ msgid "Layer" + msgstr "შრე" + + msgid "Layer Info..." +-msgstr "შრის შესახებ..." ++msgstr "შრის მონაცემები..." ++ ++msgid "Layer Name" ++msgstr "შრის სახელი" ++ ++msgid "Layers" ++msgstr "შრეები" + + msgid "Left Side Bearing" + msgstr "მარცხენა საბჯენი" +@@ -2875,6 +3193,9 @@ msgstr "იტვირთება ფონტი წყაროდან %.1 + msgid "Loading..." + msgstr "იტვირთება..." + ++msgid "Location" ++msgstr "მდებარეობა" ++ + msgid "Lookup Name:" + msgstr "ცნობარის სახელი:" + +@@ -2981,7 +3302,7 @@ msgid "" + "It may not be set in conjunction with the Apple checkbox.\n" + "This may confuse other applications though." + msgstr "" +-"ბევრ პროგრამაში ჯერ კიდევ მხარდაუჭერელია „GPOS“ წანაცვლება.\n" ++"ბევრ პროგრამაში ჯერ კიდევ მხარდაუჭერელია „GPOS“ შემოკვეცა.\n" + "თუ გსურთ დაურთოთ ორივე, „GPOS“ და ძველი სახის „kern“\n" + "ცხრილები, მიუთითეთ ამ უჯრის მონიშვნით.\n" + "ჯობია, არ მოინიშნოს Apple-ის უჯრასთან ერთად.\n" +@@ -3000,7 +3321,7 @@ msgid "Mass Glyph _Rename..." + msgstr "ასონიშნების ერთბაშად გადარ_ქმევა..." + + msgid "Math Kern" +-msgstr "მათემატიკური წანაცვლება" ++msgstr "მათემატიკური შემოკვეცა" + + msgid "Mathematical Alphanumeric Symbols" + msgstr "მათემატიკური ასოციფრული ნიშნები" +@@ -3018,7 +3339,7 @@ msgid "Max Bearing" + msgstr "საბჯენი არაუმეტეს" + + msgid "Measure distance, angle between points" +-msgstr "წერტილებს შორის დაშორების, კუთხის გაზომვა" ++msgstr "წერტილთა დაშორების, კუთხის გაზომვა" + + msgid "Mende Kikakui" + msgstr "მენდე" +@@ -3029,11 +3350,36 @@ msgstr "მენიუს ზოლი" + msgid "Menu Name" + msgstr "მენიუს სახელი" + ++msgid "Merge" ++msgstr "გაერთიანება" ++ ++msgid "Merge Fonts" ++msgstr "შრიფტების გაერთიანება" ++ ++msgid "Merge Results" ++msgstr "შედეგების გაერთიანება" ++ ++msgid "Merge into selection" ++msgstr "გაერთიანება მონიშნულში" ++ ++msgid "Merge to Line" ++msgstr "გაერთიანება ხაზით" ++ ++msgid "" ++"Merges two selected (and compatible) lookups into one,\n" ++"or merges two selected subtables of a lookup into one" ++msgstr "" ++"გააერთიანებს ორ შერჩეულ (და თავსებად) ცნობარს,\n" ++"ან გააერთიანებს ცნობარის ორ შერჩეულ ქვეცხრილს" ++ ++msgid "MetaFont exited with an error" ++msgstr "MetaFont დაიხურა შეცდომით" ++ + msgid "Metrics" + msgstr "აზომვები" + + msgid "Metrics Baseline Color" +-msgstr "აზომვების საყრდენი ხაზის ფერი" ++msgstr "აზომვების ძირითადი ხაზის ფერი" + + #, c-format + msgid "Metrics For %.50s" +@@ -3157,17 +3503,29 @@ msgstr "მიანმარული გაფართოებული-B" + msgid "NKo" + msgstr "ნკო" + ++msgid "N_ever Interpolate" ++msgstr "ა_რასდროს ჩაემატოს" ++ + msgid "N_umber Points" + msgstr "წერტილების გადა_ნომვრა" + + msgid "Name" + msgstr "სახელი" + ++msgid "Name Contour" ++msgstr "მოხაზულობის სახელი" ++ + msgid "Name For Human_s:" + msgstr "ად_ვილად წასაკითხი:" + ++msgid "Name Point" ++msgstr "წერტილის სახელი" ++ ++msgid "Name Point..." ++msgstr "წერტილის სახელი..." ++ + msgid "Name this guideline or cancel to create it without a name" +-msgstr "დაარქვით რამე მიმმართველ ხაზს ან გააუქმეთ უსახელოდ შექმნისთვის" ++msgstr "დაარქვით რამე ან გააუქმეთ უსახელოდ დატოვებისთვის" + + msgid "" + "Name used for Vendor ID field in\n" +@@ -3175,7 +3533,7 @@ msgid "" + "Must be no more than 4 characters" + msgstr "" + "სახელი მწარმოებლის ID-ველისთვის\n" +-"ttf-შრიფტის (OS/2-ცხრილი) შესადგენად.\n" ++"ttf-შრიფტის (OS/2-ცხრილი) დასამზადებლად.\n" + "არ უნდა აღემატებოდეს 4 სიმბოლოს" + + msgid "Name:" +@@ -3242,6 +3600,31 @@ msgstr "_აზომვების ახალი ფანჯარა" + msgid "NewCharset" + msgstr "ასოთა ახალი ნაკრები" + ++msgid "Next CP Angle" ++msgstr "შემდ. მოსაჭიდის დახრილობა" ++ ++msgid "Next CP Color" ++msgstr "შემდეგი მოსაჭიდის ფერი" ++ ++msgid "Next CP Dist" ++msgstr "შემდ. მოსაჭიდის სიშორე" ++ ++msgid "Next CP X" ++msgstr "შემდ. მოსაჭიდი X" ++ ++msgid "Next CP Y" ++msgstr "შემდ. მოსაჭიდი Y" ++ ++msgid "Next CP:" ++msgstr "შემდ. მოსაჭიდი:" ++ ++#, c-format ++msgid "Next CP: (%f,%f)" ++msgstr "შემდ. მოსაჭიდი: (%f,%f)" ++ ++msgid "Next On Contour" ++msgstr "ნახაზზე შემდეგ" ++ + msgid "Next _Defined Glyph" + msgstr "მომდევნო _განსაზღვრული ასონიშანი" + +@@ -3255,6 +3638,9 @@ msgstr "არ მოიძებნა (გამოსადეგი) ცხ + msgid "No Bitmap Fonts" + msgstr "ცხრილური შრიფტები არაა" + ++msgid "No Curvature" ++msgstr "სიმრუდის გარეშე" ++ + msgid "No Glyph" + msgstr "ასონიშანი არაა" + +@@ -3264,8 +3650,14 @@ msgstr "გამეორებული ასონიშნები არ + msgid "No Groups" + msgstr "ჯგუფები არაა" + ++msgid "No Instructions" ++msgstr "მითითებები არაა" ++ ++msgid "No Intersections" ++msgstr "არა თანაკვეთები" ++ + msgid "No Kern Pairs" +-msgstr "არაა წანაცვლებული წყვილები" ++msgstr "არაა შემოკვეცილი წყვილები" + + msgid "No Lookup Type Selected" + msgstr "არაა შერჩეული ცნობარის სახეობა" +@@ -3294,9 +3686,15 @@ msgstr "შვეული აზომვების გარეშე" + msgid "No _to All" + msgstr "არა ყ_ველას" + ++msgid "No components" ++msgstr "არაა შემადგენლები" ++ ++msgid "No curvature info" ++msgstr "სიმრუდის შესახებ უცნობია" ++ + #, c-format + msgid "No kerning pairs found in %.200s" +-msgstr "წანაცვლებულ წყვილებს არ შეიცავს %.200s" ++msgstr "შემოკვეცილ წყვილებს არ შეიცავს %.200s" + + msgid "No languages" + msgstr "ენები არაა" +@@ -3336,6 +3734,13 @@ msgstr "" + msgid "Normal font used in the Find/Replace window" + msgstr "ჩვეულებრივი შრიფტი გამოიყენება პოვნა/ძიების ფანჯარაში" + ++msgid "" ++"Normally simplify will not remove points at the extrema of curves\n" ++"(both PostScript and TrueType suggest you retain these points)" ++msgstr "" ++"როგორც წესი, გამარტივებით არ იშლება მრუდის კიდურა წერტილები\n" ++"(ორივე, PostScript და TrueType გთავაზობთ მათი შენარჩუნების საშუალებას)" ++ + msgid "Not Guides" + msgstr "მიმმართველის გარეშე" + +@@ -3352,10 +3757,10 @@ msgid "" + "pairs (eg, they have a Unicode value of -1) To avoid this, go to Generate, " + "Options, and check the \"Windows-compatible 'kern'\" option." + msgstr "" +-"შენიშვნა: Windows-ზე ბევრი პროგრამა შეიძლება წააწყდეს სიძნელეს შრიფტის " +-"წანაცვლებული წყვილების გამოყენებისას, ვინაიდან მისი წანაცვლებული ასონიშნების " +-"წყვილების %d ვერ აისახება BMP-უნიკოდის წანაცვლების წყვილებზე (მაგ. მათ " +-"ექნებათ უნიკოდის მნიშვნელობად -1) ამის ასარიდებლად, აირჩიეთ „შედგენა“, " ++"შენიშვნა: Windows-ზე ბევრი პროგრამა შეიძლება წააწყდეს სიძნელეს ამ შრიფტის " ++"წყვილების შემოკვეცისას, ვინაიდან %d მისი ასონიშნების შემოკვეცილი წყვილებით " ++"ვერ აისახება BMP-უნიკოდის შემოკვეცილ წყვილებზე (ანუ მათ ექნებათ უნიკოდის " ++"მნიშვნელობად -1) ამის ასარიდებლად გადადით მენიუში, აირჩიეთ „დამზადება“, " + "„პარამეტრები“ და მონიშნეთ „Windows-სთან თავსებადი „kern“." + + msgid "Nothing Loaded" +@@ -3367,6 +3772,9 @@ msgstr "არაფერია შერჩეული" + msgid "Nothing on stack to print\n" + msgstr "არაფერია მითითებული ამოსაბეჭდად\n" + ++msgid "Nothing to trace" ++msgstr "არაფერია გამოსახაზი" ++ + msgid "Number Forms" + msgstr "რიცხვითი ჩანაწერები" + +@@ -3389,12 +3797,21 @@ msgstr "OS/2 → ასოთა ნაკრებები" + msgid "OS/2 and Windows specific metrics table" + msgstr "OS/2 და Windows-ის შესაბამისი აზომვების ცხრილი" + ++msgid "OTF 'CFF '" ++msgstr "OTF 'CFF '" ++ + msgid "O_ff" + msgstr "გამო_რთ." + + msgid "O_n" + msgstr "ჩ_ართ." + ++msgid "Offset" ++msgstr "წანაცვლება" ++ ++msgid "Offset %" ++msgstr "წანაცვლება %" ++ + msgid "Ofm Save Failed" + msgstr "Ofm ვერ შეინახა" + +@@ -3456,7 +3873,7 @@ msgid "Only upper case" + msgstr "მხოლოდ მთავრული" + + msgid "Open AutoKern dialog for new kerning subtables" +-msgstr "თვითწანაცვლების არის გახსნა ახალი ქვეცხრილებისთვის" ++msgstr "თვითშემოკვეცის სარკმლის გახსნა ახალი ქვეცხრილებისთვის" + + msgid "Open Font" + msgstr "შრიფტის გახსნა" +@@ -3470,6 +3887,9 @@ msgstr "_ვებგვერდის გახსნა" + msgid "OpenType" + msgstr "OpenType" + ++msgid "OpenType (CFF)" ++msgstr "OpenType (CFF)" ++ + msgid "OpenTypeFeature|New" + msgstr "ახალი" + +@@ -3539,6 +3959,9 @@ msgstr "გამოიტანოს TFM და ENC" + msgid "Output error" + msgstr "გამოტანის შეცდომა" + ++msgid "Oval" ++msgstr "კვერცხისებრი" ++ + msgid "PDF" + msgstr "PDF" + +@@ -3551,6 +3974,9 @@ msgstr "ასონიშნის PS-სახელი" + msgid "PS Names" + msgstr "PS-სახელი" + ++msgid "PS Private" ++msgstr "PS-კერძო" ++ + msgid "PSPrivateDictKey|New" + msgstr "ახალი" + +@@ -3570,10 +3996,10 @@ msgid "Pahawh Hmong" + msgstr "ფაჰაუ-მონი" + + msgid "Pair Position (kerning)" +-msgstr "წყვილთა ურთიერთგანლაგება (წანაცვლება)" ++msgstr "წყვილთა ურთიერთგანლაგება (შემოკვეცა)" + + msgid "Pairwise Positioning (kerning)" +-msgstr "წყვილთა ურთიერთგანლაგება (წანაცვლება)" ++msgstr "წყვილთა ურთიერთგანლაგება (შემოკვეცა)" + + msgid "PanoseWeight|Any" + msgstr "ნებისმიერი" +@@ -3626,6 +4052,12 @@ msgstr "გვერდის არჩევა" + msgid "Pixel Sizes:" + msgstr "პიქსელის ზომები:" + ++msgid "Pixel size:" ++msgstr "პიქსელის ზომა:" ++ ++msgid "Pixel size?" ++msgstr "პიქსელის ზომა?" ++ + msgid "Please choose File/Generate Fonts to save to other formats." + msgstr "გთხოვთ, იხილოთ ფაილი/შრიფტების წარმოქმნა, სხვა სახით შენახვისთვის." + +@@ -3639,6 +4071,9 @@ msgstr "დაარქვით სახელი %d დაშიფვრა + msgid "Please name this encoding" + msgstr "დაარქვით დაშიფვრას სახელი" + ++msgid "Please name this point" ++msgstr "დაარქვით რამე წერტილს" ++ + msgid "Please specify a bitmap magnification factor." + msgstr "გთხოვთ, მიუთითოთ რასტრული გადიდების მამრავლი." + +@@ -3689,18 +4124,49 @@ msgstr "მრავალკუთხედი ან ვარსკვლა + msgid "Pr_eferences..." + msgstr "_პარამეტრები..." + ++msgid "PreferPotrace" ++msgstr "უპირატესია Potrace" ++ + msgid "Preferences" + msgstr "პარამეტრები" + + msgid "Preferred Family" + msgstr "უპირატესი კრებული" + ++msgid "Prefs_App|FontForge recognizes BROWSER, MF and AUTOTRACE." ++msgstr "Prefs_App|FontForge-ს შეუძლია ამოიცნოს BROWSER, MF და AUTOTRACE." ++ + msgid "Preserve the names of the GPOS/GSUB lookups and subtables" + msgstr "GPOS/GSUB-ცნობარებისა და ქვეცხრილების სახელების შენარჩუნება" + ++msgid "Prev CP Angle" ++msgstr "წინა მოსაჭიდის დახრილობა" ++ ++msgid "Prev CP Color" ++msgstr "წინა მოსაჭიდის ფერი" ++ ++msgid "Prev CP Dist" ++msgstr "წინა მოსაჭიდის სიშორე" ++ ++msgid "Prev CP X" ++msgstr "წინა მოსაჭიდი X" ++ ++msgid "Prev CP Y" ++msgstr "წინა მოსაჭიდი Y" ++ ++msgid "Prev CP:" ++msgstr "წინა მოსაჭიდი:" ++ ++#, c-format ++msgid "Prev CP: (%f,%f)" ++msgstr "წინა მოსაჭიდი: (%f,%f)" ++ + msgid "Prev Defined Gl_yph" + msgstr "წინა განსაზღვრული ას_ონიშანი" + ++msgid "Prev On Contour" ++msgstr "ნახაზზე წინ" ++ + msgid "Previe_w" + msgstr "შეთვა_ლიერება" + +@@ -3722,9 +4188,18 @@ msgstr "ამოსაბეჭდი დოკუმენტი" + msgid "Printing Font" + msgstr "შრიფტი იბეჭდება" + ++#. GT: "Private" is a keyword (sort of) in PostScript. Perhaps it ++#. GT: should remain untranslated? ++msgid "Private Dictionary" ++msgstr "კერძო ლექსიკონი" ++ + msgid "Private Use Area" + msgstr "კერძო გამოყენების არე" + ++#, c-format ++msgid "Problem decompressing '%c%c%c%c' table." ++msgstr "ხარვეზი შეკუმშული „%c%c%c%c“ ცხრილის გახსნისას." ++ + #. GT: I am told that the use of "|" to provide contextual information in a + #. GT: gettext string is non-standard. However it is documented in section + #. GT: 10.2.6 of http://www.gnu.org/software/gettext/manual/html_mono/gettext.html +@@ -3744,9 +4219,21 @@ msgstr "კერძო გამოყენების არე" + msgid "Property|New..." + msgstr "ახალი..." + ++msgid "" ++"Put CFF fonts into the ttc rather than TTF.\n" ++" These seem to work on the mac and linux\n" ++" but are documented not to work on Windows." ++msgstr "" ++"განათავსებს CFF-შრიფტებს TTC-ფაილში ნაცვლად TTF-ფაილისა.\n" ++" სავარაუდოდ, იმუშავებს Mac-სა და Linux-სისტემებში,\n" ++" მაგრამ დადასტურებულია, რომ არ გამოდგება Windows-ისთვის." ++ + msgid "RBearing:" + msgstr "მარჯვენა საბჯენი:" + ++msgid "Re_move" ++msgstr "მო_ცილება" ++ + msgid "Re_vert List" + msgstr "სიის ა_ღდგენა" + +@@ -3756,23 +4243,32 @@ msgstr "ბიტური გამოსახულების ახლი + msgid "Recen_t" + msgstr "_ბოლოდროინდელი" + ++msgid "Recover old edit" ++msgstr "წინათ ჩასწორებულის აღდგენა" ++ + msgid "Rectangle" + msgstr "მართკუთხედი" + + msgid "Rectangle or Ellipse" +-msgstr "მართკუთხედი ან ოვალი" ++msgstr "მართკუთხა ან კვერცხისებრი" + + msgid "Refresh File List" + msgstr "ფაილების სიის განახლება" + + msgid "Regenerate _Bitmap Glyphs..." +-msgstr "ახლიდან შეიქმნას _ბიტური ასონიშნები..." ++msgstr "ახლიდან დამზადდეს _ბიტური ასონიშნები..." ++ ++msgid "Remo_ve Undoes" ++msgstr "დასაბრუნებლების მო_ცილება" ++ ++msgid "Remo_ve Undoes..." ++msgstr "დასაბრუნებლების მო_ცილება..." + + msgid "Remove All Kern _Pairs" +-msgstr "ყველა წანაცვლებული წ_ყვილის მოცილება" ++msgstr "შემოკვეცის ყველა წ_ყვილის მოცილება" + + msgid "Remove All VKern Pairs" +-msgstr "ყველა შვეულად წანაცვლებული წ_ყვილის მოცილება" ++msgstr "შვეულად შემოკვეცის ყველა წ_ყვილის მოცილება" + + msgid "Remove Bitmap Glyphs..." + msgstr "ბიტური ასონიშნების მოცილება..." +@@ -3784,7 +4280,7 @@ msgid "Remove Encoding" + msgstr "დაშიფვრის მოცილება" + + msgid "Remove Kern _Pairs" +-msgstr "წანაცვლებული წ_ყვილის მოცილება" ++msgstr "შემოკვეცის წ_ყვილის მოცილება" + + msgid "Remove Language from Script..." + msgstr "ენის მოცილება დამწერლობიდან..." +@@ -3802,11 +4298,14 @@ msgid "Remove This Glyph" + msgstr "ამ ასონიშნის მოცილება" + + msgid "Remove VKern Pairs" +-msgstr "შვეულად წანაცვლებული წყვილის მოცილება" ++msgstr "შვეული შემოკვეცის წყვილების მოცილება" + + msgid "Remove _Unused Slots" + msgstr "გამოუ_ყენებელი ადგილების მოცილება" + ++msgid "Removing instructions cannot be UNDONE!" ++msgstr "მითითებების მოცილება ᲨᲔᲣᲥᲪᲔᲕᲐᲓᲘᲐ!" ++ + msgid "Removing overlaps..." + msgstr "ცილდება გადაფარვები..." + +@@ -3860,6 +4359,12 @@ msgstr "დაბრუნება საწყისზე" + msgid "Revert To _Backup" + msgstr "აღდგენა მა_რქაფიდან" + ++msgid "Review Hints" ++msgstr "მიმთითებლების შეთვალიერება" ++ ++msgid "RevisionsToRetain" ++msgstr "შესანახი ვერსიები" ++ + msgid "Right Side Bearing" + msgstr "მარჯვენა საბჯენი" + +@@ -3876,24 +4381,24 @@ msgid "Rotate" + msgstr "მობრუნება" + + msgid "Rotate 180°" +-msgstr "შებრუნება 180°" ++msgstr "მობრუნება 180°" + + msgid "Rotate 3D Around..." + msgstr "სივრცული მობრუნება..." + + #. GT: "CW" means Counter-Clockwise + msgid "Rotate 90° CCW" +-msgstr "შებრუნება 90° საათის საწ." ++msgstr "მობრუნება 90° საათ. საწ." + + #. GT: "CW" means Clockwise + msgid "Rotate 90° CW" +-msgstr "შებრუნება 90° საათის მიმართ." ++msgstr "მობრუნება 90° საათ. მიმართ." + + msgid "Rotate _180°" +-msgstr "შებრუნება _180°" ++msgstr "მობრუნება _180°" + + msgid "Rotate _90° CCW" +-msgstr "შებრუნება _90° საათის საწ." ++msgstr "მობრუნება _90° საათ. საწ." + + msgid "Rotate by Ruler..." + msgstr "მოტრიალება სახაზავით..." +@@ -3908,7 +4413,7 @@ msgid "Rotate..." + msgstr "მობრუნება..." + + msgid "Rotate:" +-msgstr "შებრუნება:" ++msgstr "მობრუნება:" + + msgid "Round To _Int" + msgstr "დამრგვალება მთე_ლამდე" +@@ -3925,6 +4430,9 @@ msgstr "სახაზავის პარამეტრები" + msgid "Runic" + msgstr "რუნული" + ++msgid "SVG" ++msgstr "SVG" ++ + msgid "S_ave Feature File..." + msgstr "თვისებების ფაილად შენა_ხვა..." + +@@ -4026,8 +4534,8 @@ msgid "" + "Script '%c%c%c%c' claims baseline '%c%c%c%c' as its default, but that " + "baseline is not currently active." + msgstr "" +-"დამწერლობა „%c%c%c%c“ მიუთითებს, რომ ნაგულისხმევი საყრდენია „%c%c%c%c“, " +-"თუმცა ეს ხაზი არაა ამჟამად მოქმედი." ++"დამწერლობა „%c%c%c%c“ მიუთითებს, რომ ნაგულისხმევი ძირითადი ხაზია „%c%c%c%c“, " ++"მაგრამ ეს ხაზი არაა ამჟამად მოქმედი." + + msgid "Script File" + msgstr "სკრიპტის ფაილი" +@@ -4149,6 +4657,9 @@ msgstr "" + msgid "Select the class containing the named glyph" + msgstr "დასახელებული ასონიშნის შემცველი კლასის მონიშვნა" + ++msgid "Selected CP Color" ++msgstr "შერჩეული მოსაჭიდის ფერი" ++ + msgid "Selected Glyphs" + msgstr "შერჩეული ასონიშნები" + +@@ -4176,6 +4687,15 @@ msgstr "ორივე საბჯენის მითითება..." + msgid "Set Both Side Bearings..." + msgstr "ორივე მხარეს საბჯენის მითითება..." + ++msgid "Set From N_ame" ++msgstr "მითითება სა_ხელიდან" ++ ++msgid "Set From Selection" ++msgstr "მითითება მონიშნულიდან" ++ ++msgid "Set From Val_ue" ++msgstr "მითითება მ_ნიშვნელობიდან" ++ + msgid "Set LBearing To:" + msgstr "მარცხენა საბჯენად მიეთითოს:" + +@@ -4212,15 +4732,6 @@ msgstr "სი_განის მითითება..." + msgid "Set as Default" + msgstr "ნაგულისხმევად მითითება" + +-msgid "" +-"Set the minimum and maximum values by which\n" +-"the glyphs in this script extend below and\n" +-"above the baseline when modified by a feature." +-msgstr "" +-"იმ უკიდურესი მნიშვნელობების მითითება,\n" +-"რომლითაც ამ დამწერლობის ასონიშანი ასცდება და\n" +-"ჩამოსცდება საყრდენ ხაზს გარდაქმნისას." +- + msgid "" + "Set the minimum and maximum values by which\n" + "the glyphs in this script extend below and\n" +@@ -4228,7 +4739,7 @@ msgid "" + msgstr "" + "იმ უკიდურესი მნიშვნელობების მითითება,\n" + "რომლითაც ამ დამწერლობის ასონიშანი ასცდება და\n" +-"ჩამოსცდება საყრდენ ხაზს. განსხვავდება ენების მიხედვით" ++"ჩამოსცდება ძირითადი ხაზს. განსხვავდება ენების მიხედვით" + + #, c-format + msgid "" +@@ -4254,7 +4765,7 @@ msgid "Show Hidden Files" + msgstr "დამალული ფაილების გამოჩენა" + + msgid "Show Kerning" +-msgstr "წანაცვლების გამოჩენა" ++msgstr "შემოკვეცის გამოჩენა" + + msgid "Show V. Metrics" + msgstr "გამოჩნდეს შვეული აზომვები" +@@ -4308,7 +4819,7 @@ msgid "Skew by Ruler..." + msgstr "გადახრა სახაზავით..." + + msgid "Skew the selection" +-msgstr "მონიშნულის გადახრა" ++msgstr "მონიშნულის დახრა" + + msgid "Skew..." + msgstr "გადახრა..." +@@ -4316,6 +4827,9 @@ msgstr "გადახრა..." + msgid "Skew:" + msgstr "გადახრა:" + ++msgid "Skip" ++msgstr "გამოტოვება" ++ + #, c-format + msgid "Skipping duplicate group %s.\n" + msgstr "გამეორებული ჯგუფი %s უგულებელყოფილია.\n" +@@ -4488,6 +5002,13 @@ msgstr "ზედა საბჯენი:" + msgid "TT" + msgstr "TrueType" + ++msgid "TTF Names" ++msgstr "TTF-სახელები" ++ ++#, c-format ++msgid "Table length stretches beyond end of file for '%c%c%c%c'." ++msgstr "ცხრილის სიგრძე სცდება ზღვარს ფაილისთვის „%c%c%c%c“." ++ + msgid "Tag must be 4 characters long" + msgstr "ჭდე უნდა იყოს 4 სიმბოლოიანი" + +@@ -4515,6 +5036,9 @@ msgstr "ტამილური" + msgid "Tamil Supplement" + msgstr "ტამილური დანართი" + ++msgid "Tangent" ++msgstr "მხები" ++ + msgid "Tangsa" + msgstr "ტასე-ნაგა" + +@@ -4545,7 +5069,8 @@ msgstr "ტაილანდური" + + msgid "The 'kern' table supports at most 10920 kern pairs in a subtable" + msgstr "" +-"„kern“ ცხრილში მხარდაჭერილია არაუმეტეს 10920 წანაცვლების წყვილი ქვეცხრილში" ++"„kern“ ცხრილში მხარდაჭერილია შემოკვეცის არაუმეტეს 10920 წყვილის შემცველი " ++"ქვეცხრილი" + + msgid "" + "The Merge operation cannot be reverted.\n" +@@ -4632,7 +5157,7 @@ msgid "The color of the outline" + msgstr "ფერი მოხაზულობისთვის" + + msgid "The color of the preview for drawing lines, rectangles, and ellipses" +-msgstr "ფერი შესათვალიერებელი ხაზების, მართკუთხედისა და ოვალებისა" ++msgstr "ფერი შესათვალიერებლად წრფივი, მართკუთხა და კვერცხისებრი მოხაზულობისა" + + msgid "The color of the selected region" + msgstr "მონიშნული ნაწილის ფერი" +@@ -4646,6 +5171,20 @@ msgstr "მსხვილი გარემოხაზულობის ფ + msgid "The color used to display a new guide line dragged from the ruler." + msgstr "სახაზავიდან გადაჩოჩებული ახალი მიმმართველი ხაზის ფერი." + ++msgid "" ++"The color used to draw the active horizontal hint which the Review Hints " ++"dialog is examining" ++msgstr "" ++"მოქმედი თარაზული მიმთითებლის აღმნიშვნელი ფერი შეთვალიერების ფანჯრით " ++"სარგებლობისას" ++ ++msgid "" ++"The color used to draw the active vertical hint which the Review Hints " ++"dialog is examining" ++msgstr "" ++"მოქმედი შვეული მიმთითებლის აღმნიშვნელი ფერი შეთვალიერების ფანჯრით " ++"სარგებლობისას" ++ + #, c-format + msgid "" + "The feature '%c%c%c%c' is named twice in language %s\n" +@@ -4672,6 +5211,13 @@ msgstr "თვისების ჭდე ხაზზე %d (%s) უნდა + msgid "The following error occurred on the selected glyphs: %.100s" + msgstr "მოცემული შეცდომა წარმოიშვა მონიშნულ ასონიშნებზე: %.100s" + ++msgid "" ++"The following options influence how glyphs are exported.\n" ++"Most are specific to one or more formats." ++msgstr "" ++"მოცემული პარამეტრები გავლენას ახდენს ასონიშნების გამოტანაზე.\n" ++"უმეტესობა თავსებადია ერთ ან რამდენიმე ცალკეულ სახეობასთან." ++ + msgid "The following table(s) in the font have been ignored by FontForge\n" + msgstr "მოცემულ ცხრილ(ებ)ს შრიფტში არ გაითვალისწინებს FontForge\n" + +@@ -4680,6 +5226,9 @@ msgid "" + "The font %s is one of the standard fonts. It isn't actually in the file." + msgstr "შრიფტი %s ერთ-ერთია სტანდარტული შრიფტებიდან. უშუალოდ ფაილში არაა." + ++msgid "The font comment can contain whatever you feel it should" ++msgstr "შრიფტის შენიშვნაში შეგიძლიათ დაურთოთ რაც მოგესურვებათ" ++ + #, c-format + msgid "The font does not contain a glyph named %s." + msgstr "შრიფტი არ შეიცავს ასონიშანს დასახელებით %s." +@@ -4700,9 +5249,9 @@ msgid "" + "continue font generation (and omit this character)?" + msgstr "" + "ასონიშანს შიფრით %d დასახელებად აქვს „.notdef“, მაგრამ შეიცავს მოხაზულობას. " +-"ვინაიდან ჰქვია „.notdef“, იგი ვერ მოხვდება შექმნილ შრიფტში. ახალი სახელის " ++"ვინაიდან ჰქვია „.notdef“, იგი ვერ მოხვდება დამზადებულ შრიფტში. ახალი სახელის " + "მისანიჭებლად იხილეთ „შემადგენელი → ასონიშნის შესახებ“. გსურთ, განაგრძოთ " +-"შრიფტის წარმოქმნა (ამ ასოს გამოკლებით)?" ++"შრიფტის დამზადება (ამ ასოს გამოკლებით)?" + + #, c-format + msgid "The glyph name \"%1$.30s\" occurs in groups %2$.30s and %3$.30s" +@@ -4723,7 +5272,7 @@ msgid "" + "You must remove it from one of them." + msgstr "" + "ასონიშანი %s აგრეთვე ჩანს ამ კლასის %d რიგში, რომლის საწყისია %.20s...\n" +-"უნდა მოაცილოთ ერთერთიდან." ++"უნდა მოაცილოთ ერთ-ერთიდან." + + msgid "" + "The human-readable fontname text (in the Names pane) must be entirely ASCII." +@@ -4736,6 +5285,19 @@ msgid "" + "The language, '%s', is not in the list of known languages and will be omitted" + msgstr "ენა „%s“ არაა ცნობილი ენების სიაში და გამოტოვებული იქნება" + ++msgid "The layers do not match" ++msgstr "შრეები არ ემთხვევა" ++ ++msgid "" ++"The maximum number of Undoes/Redoes stored in a glyph. Use -1 for infinite " ++"Undoes\n" ++"(but watch RAM consumption and use the Edit menu's Remove Undoes as needed)" ++msgstr "" ++"უდიდესი რიცხვი დასაბრუნებელი/გასამეორებელი მოქმედებების დასამახსოვრებლად " ++"ასონიშნიშთვის. გამოიყენეთ -1 უსასრულო რაოდენობისთვის.\n" ++"(ოღონდ გაითვალისწინეთ მეხიერების დატვირთვა და საჭიროების შემთხვევაში " ++"ჩასწორების მენიუდან მოაცილეთ დამახსოვრებული მოქმედებები)" ++ + #, c-format + msgid "" + "The name of glyph %.40s has changed. This is what I use to find the glyph in " +@@ -4746,6 +5308,9 @@ msgstr "" + "ასე რომ ეს ასონიშანი ვეღარ დაბრუნდება.\n" + "(ამ გაფრთხილებას აღარ იხილავთ მომდევნო ასონიშნებზე.)" + ++msgid "The only valid values for bits/pixel are 1, 2, 4 or 8" ++msgstr "ბიტ/პიქსელის მართებული მნიშვნელობებია მხოლოდ 1, 2, 4 ან 8" ++ + msgid "The pattern size (width & height) must be a positive number" + msgstr "ნიმუშის ზომა (სიგრძე და სიგანე) დადებითი რიცხვი უნდა იყოს" + +@@ -4765,12 +5330,31 @@ msgstr "მოსაძიებელი ნიმუში კვლავ ვ + msgid "The search pattern was not found in the font %.100s" + msgstr "მოსაძიებელი ნიმუში ვერ მოინახა შრიფტში %.100s" + ++msgid "" ++"The selected glyphs have no hints. FontForge will not produce many " ++"instructions." ++msgstr "" ++"შერჩეულ ასონიშნებს არ გააჩნია მიმთითებლები. FontForge ვერ დაამუშავებს ბევრ " ++"მითითებას." ++ + msgid "The version text (in the Names pane) must be entirely ASCII." + msgstr "ვერსიის დასახელება (სახელთა არეში) უნდა იყოს სრულად ლათინური ASCII." + + msgid "The weight text (in the Names pane) must be entirely ASCII." + msgstr "სისქის დასახელება (სახელთა არეში) უნდა იყოს სრულად ლათინური ASCII." + ++msgid "" ++"There already exists a 'cvt' table, perhaps legacy. FontForge can use it, " ++"but can't make any assumptions on values stored there, so generated " ++"instructions will be of lower quality. If legacy hinting is to be scrapped, " ++"it is suggested to clear the `cvt` and repeat autoinstructing. " ++msgstr "" ++"უკვე არსებობს „cvt“ ცხრილი, სავარაუდოდ, მოძველებული. FontForge შეძლებს მის " ++"გამოყენებას, მაგრამ პასუხს ვერ აგებს იქ შენახულ მნიშვნელობებზე, ასე რომ, " ++"მომზადებული მითითებები შეიძლება დაბალი ხარისხის აღმოჩნდეს. თუ მოძველებული " ++"მიმთითებლები უვარგისი იქნება, უმჯობესია გასუფთავდეს `cvt` და კვლავ " ++"განმეორდეს თვითმითითება. " ++ + #, c-format + msgid "There are %d pages in this file, which do you want?" + msgstr "ფაილში %d გვერდია, რომელი გნებავთ?" +@@ -4781,6 +5365,30 @@ msgstr "რამდენიმე ფაილია არქივში, + msgid "There are multiple fonts in this file, pick one" + msgstr "რამდენიმე შრიფტია ფაილში, მიუთითეთ ერთი" + ++msgid "" ++"There exists a 'fpgm' code that seems incompatible with FontForge's. " ++"Instructions generated will be of lower quality. If legacy hinting is to be " ++"scrapped, it is suggested to clear the `fpgm` and repeat autoinstructing. It " ++"will be then possible to append user's code to FontForge's 'fpgm', but due " ++"to possible future updates, it is extremely advised to use high numbers for " ++"user's functions." ++msgstr "" ++"უკვე არსებობს „fpgm“ კოდი და როგორც ჩანს, მასთან შეუთავსებელია FontForge. " ++"მომზადებული მითითებები შეიძლება დაბალი ხარისხის აღმოჩნდეს. თუ მოძველებული " ++"მიმთითებლები უვარგისი იქნება, უმჯობესია გასუფთავდეს `fpgm` და კვლავ " ++"განმეორდეს თვითმითითება. შემდეგ უკვე FontForge შეძლებს, მომხმარებლის კოდიც " ++"შემატოს „fpgm-ს“, მაგრამ მოსალოდნელი განახლებებიდან გამომდინარე მეტად " ++"სასურველია მაღალი რიცხვების გამოყენება მომხმარებლის ფუნქციებისთვის." ++ ++msgid "" ++"There exists a 'prep' code incompatible with FontForge's. It can't be " ++"guaranteed it will work well. It is suggested to allow FontForge to insert " ++"its code and then append user's own." ++msgstr "" ++"უკვე არსებობს „prep“ კოდი, რომელთანაც შეუთავსებელია FontForge. გამართულად " ++"მუშაობის საწინდარი არ არსებობს. სასურველი იქნება, თუ FontForge თავის კოდს " ++"ჩასვამს და შემდეგ მიამატებს მომხმარებლისას." ++ + #, c-format + msgid "There is no glyph named %s (used in %s)" + msgstr "ასონიშანი დასახელებით %s არაა (ფონტში %s)" +@@ -4789,6 +5397,9 @@ msgstr "ასონიშანი დასახელებით %s არ + msgid "There is no glyph named %s in the font" + msgstr "ასონიშანი დასახელებით %s არ მოიპოვება ამ შრიფტში" + ++msgid "Things could be better..." ++msgstr "სულ არაფერს სჯობია..." ++ + msgid "This feature code is already used" + msgstr "ამ თვისების კოდი უკვე გამოყენებულია" + +@@ -4840,22 +5451,33 @@ msgstr "" + "შედეგად გაიხსნება 10-ზე მეტი ფანჯარა.\n" + "ნამდვილად გსურთ, ასე მოხდეს?" + ++msgid "" ++"This italic conversion will be incomplete!\n" ++"You will probably want to do manual fixups on e, g, k, and v-z\n" ++"And on в, г, д, е, ж, л, м, ц, щ, ъ, ђ\n" ++"And on all Greek lower case letters. And maybe everything else." ++msgstr "" ++"დახრილად გარდაქმნა არასრულყოფილადაა შესრულებული!\n" ++"სასურველი იქნება, ხელით გაასწოროთ e, g, k და v-z\n" ++"აგრეთვე в, г, д, е, ж, л, м, ц, щ, ъ, ђ\n" ++"და ყველა ბერძნული პატარა ასონიშანი. შესაძლოა – სხვა დანარჩენიც." ++ + #, c-format + msgid "" + "This kerning pair (%.20s and %.20s) is currently part of a kerning class " + "with a 0 offset for this combination. Would you like to alter this kerning " + "class entry (or create a kerning pair for just these two glyphs)?" + msgstr "" +-"წანაცვლებული წყვილი (%.20s და %.20s), ამჟამად კლასის ნაწილია 0 " +-"ურთიერთდაშორებით. გსურთ ამ კლასის ჩანაწერის გადაკეთება (თუ შეიქმნას " +-"წანაცვლების წყვილი მხოლოდ ამ ორი ასონიშნისთვის)?" ++"შემოკვეცის წყვილი (%.20s და %.20s) ამჟამად 0 წანაცვლების მქონე შემოკვეცის " ++"კლასს ეკუთვნის. გსურთ ამ კლასის ჩანაწერის გადაკეთება (თუ ცალკე შეიქმნას " ++"შემოკვეცის წყვილი მხოლოდ ამ ორი ასონიშნისთვის)?" + + msgid "" + "This must be ASCII, so you may not use the copyright symbol (use (c) " + "instead)." + msgstr "" + "უნდა იყოს ლათინური ASCII, ამიტომ ვერ გამოიყენებთ საავტორო უფლების ნიშანს " +-"(სანაცვლოდ (c) შეიძლება)." ++"(სანაცვლოდ (c) გამოდგება)." + + msgid "This operation cannot be undone, do it anyway?" + msgstr "ეს ქმედება შეუქცევადია, მაინც განაგრძობთ?" +@@ -4915,7 +5537,7 @@ msgid "To _File" + msgstr "ფ_აილში" + + msgid "Too Many Kerns" +-msgstr "ზედმეტად ბევრი წანაცვლება" ++msgstr "ზედმეტად ბევრი შემოკვეცა" + + #, c-format + msgid "Too many dashes (at most %d allowed)" +@@ -4926,7 +5548,10 @@ msgid "Too many features %d\n" + msgstr "ზედმეტად ბევრი თვისება %d\n" + + msgid "Too many kern pairs" +-msgstr "ზედმეტად ბევრი წანაცვლებული წყვილი" ++msgstr "ზედმეტად ბევრი შემოკვეცილი წყვილი" ++ ++msgid "Too many layers" ++msgstr "ზედმეტად ბევრი შრე" + + #, c-format + msgid "Too many lookups %d\n" +@@ -4941,6 +5566,9 @@ msgstr "ზედა საბჯენი არ იცვლება." + msgid "Toto" + msgstr "ტოტო" + ++msgid "Trace Color" ++msgstr "ფერის გამოხაზვა" ++ + msgid "Trademark" + msgstr "სავაჭრო ნიშანი" + +@@ -4960,7 +5588,7 @@ msgid "Transform _Width Too" + msgstr "გარდაქმნა სიგა_ნიანად" + + msgid "Transform kerning _classes too" +-msgstr "გარდაქმნა _წანაცვლების კლასებიანად" ++msgstr "გარდაქმნა _შემოკვეცის კლასებიანად" + + msgid "Transform:" + msgstr "გარდაქმნა:" +@@ -4987,6 +5615,9 @@ msgstr "უგარითული" + msgid "Unable to parse the pdf objects that make up %s" + msgstr "ვერ ხერხდება იმ PDF-ობიექტების გარჩევა, რომლებითაც შექმნილია %s" + ++msgid "Underline _Position:" ++msgstr "ხაზგასმის _მდებარეობა:" ++ + msgid "Undo Fontlevel" + msgstr "დაბრუნება შრიფტის დონეზე" + +@@ -5018,7 +5649,7 @@ msgid "Uniform scaling for horizontal counters and side bearings" + msgstr "ზომის ერთგვაროვანი ცვლა თარაზული არეებისა და გვერდითი საბჯენების" + + msgid "UniqueID" +-msgstr "ამოსაცნობი ID" ++msgstr "საცნობი ID" + + msgid "Unknown Language" + msgstr "უცნობი ენა" +@@ -5038,9 +5669,9 @@ msgid "" + "to the original name, and it will copy a modified version of\n" + "the original glyph into the new one." + msgstr "" +-"უმეტესი ბრძანებებისგან განსხვავებით, ეს პირდაპირ არ ზემოქმედებს მითითებულ " +-"ასონიშნებზე. სანაცვლოდ, FontForge შექმნის (ან კვლავ გამოიყენებს) ცალკე " +-"ასონიშანს, თავდაპირველის სახელის გაფართოებით და გადაკეთებული ვარიანტის " ++"უმეტესი ბრძანებებისგან განსხვავებით ეს პირდაპირ არ ზემოქმედებს მითითებულ " ++"ასონიშნებზე. სანაცვლოდ FontForge შექმნის (ან კვლავ გამოიყენებს) ცალკე " ++"ასონიშანს თავდაპირველის სახელის გაფართოებით და გადაკეთებულ ვარიანტს " + "განათავსებს იქ." + + msgid "" +@@ -5049,7 +5680,7 @@ msgid "" + "FontForge will create (or reuse) a glyph named \"a.sc\", and\n" + "it will copy a modified version of the \"A\" glyph into \"a.sc\"." + msgstr "" +-"უმეტესი ბრძანებებისგან განსხვავებით, ეს პირდაპირ არ ზემოქმედებს მითითებულ " ++"უმეტესი ბრძანებებისგან განსხვავებით ეს პირდაპირ არ ზემოქმედებს მითითებულ " + "ასონიშნებზე. სანაცვლოდ, როცა მოინიშნება „A“ (ან „a“), FontForge შექმნის (ან " + "კვლავ გამოიყენებს) ცალკე ასონიშანს დასახელებით „a.sc“ და გადაკეთებული „A“ " + "განთავსდება „a.sc“ ადგილას." +@@ -5063,6 +5694,27 @@ msgstr "ყველას ჩახსნა" + msgid "Unspecified Language" + msgstr "განუსაზღვრელი ენა" + ++#, c-format ++msgid "Unsupported decode filter parameters : %s" ++msgstr "მხარდაუჭერელი პარამეტრები გამშირავი ფილტრისთვის: %s" ++ ++#, c-format ++msgid "Unsupported filter: %s" ++msgstr "მხარდაუჭერელი ფილტრი: %s" ++ ++msgid "Unsupported image format" ++msgstr "მხარდაუჭერელი სახის გამოსახულება" ++ ++msgid "Unsupported image format must be bmp" ++msgstr "მხარდაუჭერელი სურათის სახეობა უნდა იყოს bpm" ++ ++msgid "Unsupported image format must be bmp or png" ++msgstr "მხარდაუჭერელი სურათის სახეობა უნდა იყოს bpm ან png" ++ ++#, c-format ++msgid "Unsupported mime type in data URI: %s\n" ++msgstr "მხარდაუჭერელი MIME-სახეობა მონაცემთა URI-ში : %s\n" ++ + msgid "UntitledGroup" + msgstr "უსათაურო ჯგუფი" + +@@ -5070,10 +5722,23 @@ msgid "Use FreeType" + msgstr "გამოიყენოს FreeType" + + msgid "Use Kerning Class?" +-msgstr "გამოიყენოს წანაცვლების კლასი?" ++msgstr "გამოიყენოს შემოკვეცის კლასი?" ++ ++msgid "Use UniqueID" ++msgstr "გამოიყენოს UniqueID" ++ ++msgid "Use XUID" ++msgstr "გამოიყენოს XUID" ++ ++msgid "" ++"Use this as the default base for the filename\n" ++"when generating a font." ++msgstr "" ++"გამოიყენება ძირეულ დასახელებად\n" ++"შრიფტის ფაილის შექმნისას." + + msgid "Used for point numbers, hints, etc." +-msgstr "გამოიყენება წერტილთა გადასანომრად, მიმნიშნებლებისთვის და სხვ." ++msgstr "გამოიყენება წერტილთა გადასანომრად, მიმთითებლებისა და სხვ." + + msgid "Uzbek (Cyrillic)" + msgstr "უზბეკური (კირილიცა)" +@@ -5082,16 +5747,16 @@ msgid "Uzbek (Latin)" + msgstr "უზბეკური (ლათინური)" + + msgid "VKern By Classes" +-msgstr "შვეული წანაცვლება კლასებით" ++msgstr "შვეული შემოკვეცა კლასებით" + + msgid "VKern By Classes..." +-msgstr "შვეული წანაცვლება კლასებით..." ++msgstr "შვეული შემოკვეცა კლასებით..." + + msgid "VKern From HKern" +-msgstr "შვეული წანაცვლება თარაზულიდან" ++msgstr "შვეული შემოკვეცა თარაზულიდან" + + msgid "VKern:" +-msgstr "შვეული წანაცვლება:" ++msgstr "შვეული შემოკვეცა:" + + msgid "Vai" + msgstr "ვაი" +@@ -5115,17 +5780,21 @@ msgstr "მწარმოებლის ბმული" + msgid "Version" + msgstr "ვერსია" + ++#. GT: "Vert." is an abbreviation for Vertical ++msgid "Vert. Variants" ++msgstr "შვეულ. სახესხვაობები" ++ + msgid "Vertical" + msgstr "შვეული" + + msgid "Vertical Baselines" +-msgstr "შვეული საყრდენები" ++msgstr "ძირითადი შვეული ხაზები" + + msgid "Vertical Kerning" +-msgstr "შვეული წანაცვლება" ++msgstr "შვეული შემოკვეცა" + + msgid "Vertical Kerning Class" +-msgstr "შვეული წანაცვლების კლასი" ++msgstr "შვეული შემოკვეცის კლასი" + + msgid "Vertical Only" + msgstr "შვეული მხოლოდ" +@@ -5142,8 +5811,8 @@ msgstr "შვეული _აზომვის ხაზები" + #, c-format + msgid "Vertical: %d baseline" + msgid_plural "Vertical: %d baselines" +-msgstr[0] "შვეული: %d საყრდენი" +-msgstr[1] "შვეული: %d საყრდენი" ++msgstr[0] "შვეული: %d ძირითადი ხაზი" ++msgstr[1] "შვეული: %d ძირითადი ხაზი" + + msgid "Very Extended" + msgstr "მეტად გაფართოებული" +@@ -5151,6 +5820,15 @@ msgstr "მეტად გაფართოებული" + msgid "Vietnamese" + msgstr "ვიეტნამური" + ++msgid "WOFF" ++msgstr "WOFF" ++ ++msgid "WOFF compressed metadata section too large.\n" ++msgstr "WOFF-ს დართული შეკუმშული მონაცემები ზედმეტად დიდია.\n" ++ ++msgid "WOFF uncompressed metadata section too large.\n" ++msgstr "WOFF-ს დართული შეუკუმშავი მონაცემები ზედმეტად დიდია.\n" ++ + msgid "WWS Subfamily" + msgstr "WWS-ქვეჯგუფი" + +@@ -5166,16 +5844,48 @@ msgstr "გაფრთხილება" + msgid "Warning: Font contained no glyphs" + msgstr "გაფრთხილება: შრიფტი არ შეიცავს ასონიშნებს" + ++#, c-format ++msgid "" ++"Warning: Mac and Windows entries in the 'name' table differ for the\n" ++" %s string in the language %s\n" ++" Mac String: %s\n" ++"Windows String: %s\n" ++msgstr "" ++"გაფრთხილება: Mac-ისა და Windows-ის ჩანაწერები „name“ ცხრილში განსხვავდება\n" ++" %s ველში ენისთვის %s\n" ++" Mac-ჩანაწერია: %s\n" ++"Windows-ჩანაწერია: %s\n" ++ + #, c-format + msgid "Warning: Unlikely number of subtables (%d) for 'kern' table" + msgstr "გაფრთხილება: შეუსაბამო რაოდენობის ქვეცხრილები (%d) „kern“ ცხრილისთვის" + ++msgid "Warning: Unrecognized or unsupported join type, defaulting to 'nib'.\n" ++msgstr "" ++"გაფრთხილება: დაუდგენელი ან მხარდაუჭერელი სახის შეერთება, ნაგულისხმევად " ++"დაბრუნდება 'nib'.\n" ++ + msgid "Warnings" + msgstr "გაფრთხილებები" + + msgid "Warnings.Font" + msgstr "გაფრთხილებების.შრიფტი" + ++msgid "Web Open Font (WOFF)" ++msgstr "Web Open Font (WOFF)" ++ ++msgid "Web Open Font (WOFF2)" ++msgstr "Web Open Font (WOFF2)" ++ ++msgid "" ++"When Saving, keep this number of previous versions of the file. file.sfd-01 " ++"will be the last saved file, file.sfd-02 will be the file saved before that, " ++"and so on. If you set this to 0 then no revisions will be retained." ++msgstr "" ++"შენახვისას დაიტოვებს მითითებული რაოდენობის გადამუშავებულ ვერსიებს. file." ++"sfd-01 იქნება ბოლოს შენახული ფაილი, file.sfd-02 იქნება წინა და ა.შ. თუ " ++"მიუთითებთ 0-ს, მაშინ წინა ვერსიები არ შენარჩუნდება." ++ + msgid "When a font is opened, should it be made compact?" + msgstr "შრიფტის გახსნისას, იყოს თუ არა შემჭიდროებული?" + +@@ -5232,24 +5942,67 @@ msgstr "Win" + msgid "Windows Latin (\"ANSI\")" + msgstr "Windows ლათინური (\"ANSI\")" + ++msgid "Windows will reject fonts with an OS/2 version number of 0\n" ++msgstr "Windows უარყოფს შრიფტებს OS/2 ვერსიის ნომრით 0\n" ++ ++msgid "Windows will reject otf (cff) fonts with an OS/2 version number of 1\n" ++msgstr "Windows უარყოფს otf (cff) შრიფტებს OS/2 ვერსიის ნომრით 1\n" ++ + msgid "Windows-compatible 'kern'" + msgstr "Windows-სთან თავსებადი „kern“" + ++msgid "Woff Major Version:" ++msgstr "Woff ძირითადი ვერსია:" ++ ++msgid "Woff Minor Version:" ++msgstr "Woff დამატებითი ვერსია:" ++ + #. GT: X is a coordinate + msgid "X" + msgstr "X" + ++msgid "XFig" ++msgstr "XFig" ++ + #. GT: Y is a coordinate + #. GT: Y is a coordinate, the leading spaces help to align it + msgid "Y" + msgstr "Y" + ++msgid "Yes" ++msgstr "დიახ" ++ + msgid "Yes to _All" + msgstr "დიახ _ყველას" + + msgid "Yes, and don't _remind me again" + msgstr "დიახ, მომავალში _კითხვის გარეშე" + ++#, c-format ++msgid "" ++"You appear to have an old editing session on %s.\n" ++"Would you like to recover it?" ++msgstr "" ++"ჩანს, დაუსრულებელი გაქვთ ადრინდელი ნამუშევარი %s.\n" ++"გსურთ მისი აღდგენა?" ++ ++msgid "" ++"You are about to change the last quadratic\n" ++"layer to cubic. When this happens FontForge\n" ++"will remove all truetype instructions.\n" ++"\n" ++"This cannot be undone.\n" ++"\n" ++"Is this really your intent?" ++msgstr "" ++"აპირებთ გადაიყვანოთ ბოლო კვადრატული\n" ++"შრე კუბურში. შედეგად FontForge\n" ++"მოაცილებას ყველა truetype-მითითებას.\n" ++"\n" ++"ეს ქმედება შეუქცცევადია.\n" ++"\n" ++"ნამდვილად გსურთ, განაგრძოთ?" ++ + msgid "" + "You are about to delete a layer.\n" + "This will lose all contours in that layer.\n" +@@ -5366,18 +6119,38 @@ msgstr "_დასაშიფრი ადგილების დამატ + msgid "_Advance Width only" + msgstr "მხოლოდ გა_ფართოებული სიგანე" + ++#. GT: Align these points to their average position ++msgid "_Align Points" ++msgstr "წერტილების ურთიერთს_წორება" ++ + msgid "_Alphabetic" + msgstr "_ანბანური" + ++msgid "_Always raise this dialog when exporting" ++msgstr "ამ ფანჯრის _ყოველ ჯერზე ამოგდება გამოტანისას" ++ + msgid "_Around" + msgstr "_მიახლოებით" + ++msgid "_Ascent:" ++msgstr "_ზედატანი:" ++ + msgid "_Ask" + msgstr "კით_ხვა" + + msgid "_Auto Width..." + msgstr "_სიგანის თვითგანსაზღვრა..." + ++#. GT: Background, make it short ++msgid "_Back" ++msgstr "_უკანა" ++ ++msgid "_Base Filename:" ++msgstr "_ძირეული სახელი:" ++ ++msgid "_Base:" ++msgstr "_საყრდენი:" ++ + msgid "_Bigger Pixel Size" + msgstr "მო_ზრდილი ზომა პიქსელის" + +@@ -5403,10 +6176,10 @@ msgid "_Changed Glyphs" + msgstr "შე_ცვლილი ასონიშნები" + + msgid "_Circular (Elliptical)" +-msgstr "_წრიული (ოვალური)" ++msgstr "_წრიული (კვერცხისებრი)" + + msgid "_Clear Hints" +-msgstr "მიმნიშნებლების გას_უფთავება" ++msgstr "მიმთითებლების გას_უფთავება" + + msgid "_Close" + msgstr "_დახურვა" +@@ -5435,6 +6208,9 @@ msgstr "_ნაგულისხმევი გამოცალკევე + msgid "_Delete" + msgstr "_წაშლა" + ++msgid "_Descent:" ++msgstr "_ქვედატანი:" ++ + msgid "_Deselect All" + msgstr "ყველა მონიშვნის მო_ხსნა" + +@@ -5447,8 +6223,11 @@ msgstr "_ჩახსნა ასონიშნების" + msgid "_Disable" + msgstr "გამ_ორთვა" + ++msgid "_Docked Palettes" ++msgstr "ჩამაგ_რებული" ++ + msgid "_Don't AutoHint" +-msgstr "თვითმინიშნების _გარეშე" ++msgstr "თვითმიმთითებლის _გარეშე" + + msgid "_Don't Save" + msgstr "შენახვის _გარეშე" +@@ -5480,6 +6259,12 @@ msgstr "ში_ფრი თექვსმეტობითში" + msgid "_Exact" + msgstr "_ზუსტად" + ++msgid "_Exclude" ++msgstr "გამორი_ცხვა" ++ ++msgid "_Extrema" ++msgstr "_წვერო" ++ + msgid "_Family Name:" + msgstr "_კრებულის სახელი:" + +@@ -5492,6 +6277,9 @@ msgstr "შევ_სება" + msgid "_Filter" + msgstr "გამორ_ჩევა" + ++msgid "_Find Intersections" ++msgstr "თანაკვეთის _პოვნა" ++ + msgid "_Fit" + msgstr "მ_ორგება" + +@@ -5499,11 +6287,14 @@ msgid "_Flatten bumps on lines" + msgstr "ბორცვების დაბრტ_ყელება ხაზებზე" + + msgid "_Font Info..." +-msgstr "შრიფ_ტის შესახებ..." ++msgstr "შრიფ_ტის მონაცემები..." + + msgid "_Force Encoding" + msgstr "_იძულებით დაშიფვრა" + ++msgid "_Forget about it" ++msgstr "ამის დავი_წყება" ++ + msgid "_Freehand" + msgstr "თა_ვისუფალი" + +@@ -5511,16 +6302,16 @@ msgid "_Full Font Display" + msgstr "_სრული შრიფტის გამოჩენა" + + msgid "_Generate" +-msgstr "შედ_გენა" ++msgstr "დამ_ზადება" + + msgid "_Generate Fonts..." +-msgstr "შრიფტების _შედგენა..." ++msgstr "შრიფტების _დამზადება..." + + msgid "_Glyph Image" + msgstr "ას_ონიშნის გამოსახულება" + + msgid "_Glyph Info..." +-msgstr "ას_ონიშნის შესახებ..." ++msgstr "ას_ონიშნის მონაცემები..." + + msgid "_Glyph Tabs" + msgstr "ას_ონიშნის ჩანართები" +@@ -5528,6 +6319,9 @@ msgstr "ას_ონიშნის ჩანართები" + msgid "_Goto" + msgstr "გადა_სვლა" + ++msgid "_Guess" ++msgstr "სავარა_უდო" ++ + #. GT: Guide layer, make it short + msgid "_Guide" + msgstr "_მიმმართველი" +@@ -5551,10 +6345,10 @@ msgid "_Horizontal" + msgstr "თარა_ზული" + + msgid "_Horizontal Baselines..." +-msgstr "_თარაზული საყრდენები..." ++msgstr "ძირითადი _თარაზული ხაზები..." + + msgid "_Horizontal Hints" +-msgstr "_თარაზული მიმნიშნებლები" ++msgstr "_თარაზული მიმთითებლები" + + msgid "_IBM Family:" + msgstr "_IBM-კრებული:" +@@ -5571,14 +6365,20 @@ msgstr "ჩამა_ტება" + msgid "_Insert Random Text..." + msgstr "შემთხვევითი ტექსტის ჩამა_ტება..." + ++msgid "_Interpolated" ++msgstr "_ჩამატებული" ++ ++msgid "_Intersect" ++msgstr "თანა_კვეთა" ++ + msgid "_Invert Selection" + msgstr "შებრ_უნებული მონიშვნა" + + msgid "_Kern Pairs" +-msgstr "_წანაცვლებული წყვილები" ++msgstr "_შემოკვეცილი წყვილები" + + msgid "_Kerning only" +-msgstr "მხოლოდ _წანაცვლება" ++msgstr "მხოლოდ _შემოკვეცა" + + msgid "_Knife" + msgstr "_მოსაჭრელი" +@@ -5610,14 +6410,20 @@ msgstr "მოა_ხლოება" + msgid "_Maximum distance between points in a region" + msgstr "უ_დიდესი დაშორება წერტილებს შორის არეში" + ++msgid "_Merge" ++msgstr "გა_ერთიანება" ++ + msgid "_Merge Feature Info..." + msgstr "_თვისებების მონაცემთა გაერთიანება..." + ++msgid "_Merge Fonts..." ++msgstr "შრიფტების გა_ერთიანება..." ++ + msgid "_Metrics" + msgstr "_აზომვები" + + msgid "_Min Kern:" +-msgstr "უ_მცირესი წანაცვლება:" ++msgstr "უ_მცირესი შემოკვეცა:" + + msgid "_Min:" + msgstr "უ_მცირესი:" +@@ -5625,6 +6431,9 @@ msgstr "უ_მცირესი:" + msgid "_More Info" + msgstr "ვრ_ცლად" + ++msgid "_Move Points" ++msgstr "წერტილების გადა_ტანა" ++ + msgid "_Multi Size Glyph" + msgstr "_რამდენიმე ზომით" + +@@ -5667,6 +6476,9 @@ msgstr "_კარგი" + msgid "_Open" + msgstr "_გახსნა" + ++msgid "_Options" ++msgstr "პარამე_ტრები" ++ + msgid "_Other" + msgstr "ს_ხვა" + +@@ -5682,6 +6494,9 @@ msgstr "_მოხაზულობა..." + msgid "_Overview" + msgstr "_გადახედვა" + ++msgid "_Palettes" ++msgstr "ხელსაწ_ყოთა არეები" ++ + msgid "_Partial" + msgstr "_ნაწილობრივ" + +@@ -5754,8 +6569,11 @@ msgstr "ყველას ა_ღდგენა" + msgid "_Revert File" + msgstr "ა_ღდგენა" + ++msgid "_Review Hints..." ++msgstr "_მიმთითებლების შეთვალიერება..." ++ + msgid "_Rotate 90° CW" +-msgstr "_შებრუნება 90° საათის მიმართ." ++msgstr "_მობრუნება 90° საათ. მიმართ." + + msgid "_Ruler" + msgstr "_სახაზავი" +@@ -5775,6 +6593,9 @@ msgstr "შრიფტის სახელთა სიის შენა_ + msgid "_Save in UTF8" + msgstr "შენახ_ვა UTF8-სახით" + ++msgid "_Scale Outlines" ++msgstr "მოხაზულობის _ზომის ცვლილება" ++ + msgid "_Scroll" + msgstr "_გადასაადგილებელი" + +@@ -5802,12 +6623,21 @@ msgstr "_ზომა:" + msgid "_Skew..." + msgstr "გა_დახრა..." + ++msgid "_Skip" ++msgstr "გამ_ოტოვება" ++ ++msgid "_Skip for now" ++msgstr "ამჟამად _არიდება" ++ + msgid "_Smaller Pixel Size" + msgstr "მომ_ცრო ზომა პიქსელის" + + msgid "_Tag:" + msgstr "_ჭდე:" + ++msgid "_Tangent" ++msgstr "_მხები" ++ + msgid "_Thirds in Width" + msgstr "სიგანის მ_ესამედში" + +@@ -5826,12 +6656,18 @@ msgstr "გა_რდაქმნა..." + msgid "_Transformations" + msgstr "_გარდაქმნები" + ++msgid "_Type3 Multi Layered Font" ++msgstr "მრავალშრიანი შრიფტი _Type3" ++ + msgid "_Undo" + msgstr "_დაბრუნება" + + msgid "_Unicode" + msgstr "_უნიკოდი" + ++msgid "_UniqueID:" ++msgstr "_UniqueID:" ++ + msgid "_Unlink All" + msgstr "_ჩაიხსნას ყველა" + +@@ -5841,6 +6677,9 @@ msgstr "აწ_ევა" + msgid "_Use My Metrics" + msgstr "_საკუთარი აზომვების გამოყენება" + ++msgid "_Use Transform (SVG)" ++msgstr "„გარდაქმნის“ გამ_ოყენება (SVG)" ++ + msgid "_Validate..." + msgstr "შემო_წმება..." + +@@ -5857,10 +6696,10 @@ msgid "_Vertical" + msgstr "შ_ვეული" + + msgid "_Vertical Baselines..." +-msgstr "_შვეული საყრდენები..." ++msgstr "ძირითადი _შვეული ხაზები..." + + msgid "_Vertical Hints" +-msgstr "_შვეული მიმნიშნებლები" ++msgstr "_შვეული მიმთითებლები" + + msgid "_View" + msgstr "_ხედი" +@@ -5880,12 +6719,23 @@ msgstr "_ფანჯრის სახეობა" + msgid "_X:" + msgstr "_X:" + ++msgid "_XUID:" ++msgstr "_XUID:" ++ + msgid "_Y:" + msgstr "_Y:" + + msgid "_Yes" + msgstr "_დიახ" + ++#. GT: The dialog looks like: ++#. GT: Interpolating between and: ++#. GT: ++#. GT: by <50>% ++#. GT: So "by" means how much to interpolate. ++msgid "by" ++msgstr "მნიშვნ." ++ + msgid "color bitmap data table" + msgstr "ფერის ცხრილურ მონაცემთა ნუსხა" + +@@ -5922,6 +6772,9 @@ msgstr "კრებულის სახელი" + msgid "gaspTableEntry|New" + msgstr "ახალი" + ++msgid "glyph location table" ++msgstr "ასონიშნის მდებარეობის ცხრილი" ++ + msgid "glyph outline table" + msgstr "ასონიშნის მოხაზულობის ცხრილი" + +@@ -5929,10 +6782,10 @@ msgid "if smaller than" + msgstr "თუ მოკლეა, ვიდრე" + + msgid "kern pair" +-msgstr "წანაცვლებული წყვილი" ++msgstr "შემოკვეცილი წყვილი" + + msgid "kerning table" +-msgstr "წანაცვლების ცხრილი" ++msgstr "შემოკვეცის ცხრილი" + + msgid "language tag table" + msgstr "ენის ჭდეების ცხრილი" +@@ -5946,6 +6799,24 @@ msgstr "გრძელი, ვიდრე" + msgid "metrics variations table" + msgstr "აზომვის გადახრების ცხრილი" + ++msgid "png" ++msgstr "png" ++ ++msgid "points|Merge to Line" ++msgstr "points|გაერთიანება ხაზით" ++ ++msgid "points|_Merge" ++msgstr "points|გა_ერთიანება" ++ ++msgid "problfixup|Missing Extrema" ++msgstr "problfixup|აკლია წვერო" ++ ++msgid "sfnt Revision:" ++msgstr "sfnt-გადამუშავება:" ++ ++msgid "sfnt _Revision:" ++msgstr "sfnt-გადამ_უშავება:" ++ + msgid "version" + msgstr "ვერსია" + +@@ -6009,3 +6880,7 @@ msgstr "ბიტური შრიფტები ΤεΧ" + + msgid "ΤεΧ Names" + msgstr "ΤεΧ სახელები" ++ ++#, c-format ++msgid "∆Curvature: %g" ++msgstr "∆სიმრუდე: %g" +diff --git a/po/ko.po b/po/ko.po +index 971b4db03b..c74d554846 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -19,8 +19,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Korean\n" + "Language: ko_KR\n" +@@ -3308,16 +3308,16 @@ msgstr "합음자글리프가 부적절합니다. GID %d가 %d 미만이 아닙 + + #, c-format + msgid "" +-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "포맷 2 (%d/%d) 의 참조테이블이 손상되어 있습니다.최초=%d 마지막=%d 폰트내의 " + "모든 글리프수=%d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "포맷 4 (%d/%d) 의 참조테이블이 손상되어 있습니다.최초=%d 마지막=%d 폰트내의 " + "모든 글리프수=%d\n" +@@ -7563,8 +7563,8 @@ msgstr "%2$s의 %1$d행에서 예상되는 콤마 또는 세미콜론" + msgid "" + "Expected either \"HorizAxis\" or \"VertAxis\" in BASE table on line %d of %s" + msgstr "" +-"%2$s의 %1$d행에 있는 베이스 테이블에서 예상되는 \"HorizAxis\" 또는 \"VertAxis" +-"\"" ++"%2$s의 %1$d행에 있는 베이스 테이블에서 예상되는 \"HorizAxis\" 또는 " ++"\"VertAxis\"" + + msgid "Expected glyph file with format==1 or 2" + msgstr "형식이==1 또는 2인 예상 글리프 파일" +@@ -9134,8 +9134,8 @@ msgid "" + " with platform=%d, specific=%d (in 'cmap')\n" + msgstr "" + "글리프인덱스가 범위 외의 %d 값으로 되어 있습니다만, %d 미만이어야 합니다.\n" +-" 인코딩 %x 이라는 글리프 (('cmap' 의)세그멘트 %d 의 중에 있음. 이 플랫폼ID=" +-"%d, 고유ID=%d) 를 맵핑할 때에 검색합니다.\n" ++" 인코딩 %x 이라는 글리프 (('cmap' 의)세그멘트 %d 의 중에 있음. 이 플랫폼" ++"ID=%d, 고유ID=%d) 를 맵핑할 때에 검색합니다.\n" + + msgid "" + "Glyph names (or unicode code points) may occur at most once in this group " +@@ -14704,8 +14704,8 @@ msgstr "없음/열림 루프" + #, c-format + msgid "Nonsensical class assigned to a glyph-- class=%d is too big. Glyph=%d\n" + msgstr "" +-"무의미한 클래스가 글리프에 부여되어 있습니다―클래스=%d는 너무 큽니다. 글리프=" +-"%d\n" ++"무의미한 클래스가 글리프에 부여되어 있습니다―클래스=%d는 너무 큽니다. 글리프" ++"=%d\n" + + msgid "Normal" + msgstr "보통" +@@ -19572,8 +19572,8 @@ msgid "SnapToInt" + msgstr "정수로 스냅" + + msgid "" +-"So if you type \"A\" here the first selected glyph would be named \"A.suffix" +-"\".\n" ++"So if you type \"A\" here the first selected glyph would be named \"A." ++"suffix\".\n" + "The second \"B.suffix\", and so on." + msgstr "" + "그래서 여기서 \"A\"를 입력하면 첫 번째로 선택된 글리프 이름이 \"A.suffix\"가 " +@@ -20918,7 +20918,6 @@ msgstr "" + "폰트%3$.30s 글리프\"%2$.30s\"에 포함되는 힌트%1$s는, %4$.30s에 포함되는 것과 " + "일치하지 않습니다(개수 또는 겹치기 특징이 다릅니다)" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -22659,8 +22658,8 @@ msgstr "선택한 점을 그리는 데 사용되는 선의 폭" + #, c-format + msgid "" + "The width, height, depth or italic correction of %s is too big. Tfm files " +-"may not contain values bigger than 16 times the em-size of the font. Width=" +-"%g, height=%g, depth=%g, italic correction=%g" ++"may not contain values bigger than 16 times the em-size of the font. " ++"Width=%g, height=%g, depth=%g, italic correction=%g" + msgstr "" + "%s 너비, 높이, 깊이 또는 기울임 꼴 보정이 너무 큽니다. Tfm 파일에 포함 된 em " + "크기는 글꼴 크기의 16 배를 초과 할 수 없습니다. 폭 = %g, 높이 = %g, 깊이 = " +@@ -25551,7 +25550,6 @@ msgstr "" + "경고: 'cvar' 에 중간tuple데이터가 포함되어 있습니다.\n" + " FontForge는 이것을 지원하지 않습니다\n" + +-#, c-format + msgid "Warning: Accuracy target %lf less than minimum %lf, using %lf instead\n" + msgstr "경고: 정확도 목표 %lf는 최소 %lf 미만입니다. 대신 %lf를 사용합니다\n" + +@@ -25570,7 +25568,6 @@ msgstr "경고 : 등고선 엔드가 닫히지 않았습니다\n" + msgid "Warning: Contour start did not close\n" + msgstr "경고 : 등고선 시작이 닫 없습니다\n" + +-#, c-format + msgid "Warning: Coordinate diff %lf greater than margin %lf\n" + msgstr "경고: 좌표 차이 %lf이 여백 %lf를 초과합니다\n" + +@@ -28641,8 +28638,8 @@ msgstr "" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" + "%2$s의 “%1$s”에서 짝단위 위치지정 ∆x=%3$d ∆y=%4$d ∆x_adv=%5$d ∆y_adv=%6$d(다" + "음의 글리프%7$s에서 ∆x=%8$d ∆y=%9$d ∆x_adv=%10$d ∆y_adv=%11$d)를 수행하는 참" +@@ -28650,8 +28647,8 @@ msgstr "" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "" + "%2$s의 “%1$s”에서 위치지정 ∆x=%3$d ∆y=%4$d ∆x_adv=%5$d ∆y_adv=%6$d를 수행하" + "는 참조는 없습니다\n" +diff --git a/po/ml.po b/po/ml.po +index a611e01b03..095d50e346 100644 +--- a/po/ml.po ++++ b/po/ml.po +@@ -11,8 +11,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Malayalam\n" + "Language: ml_IN\n" +diff --git a/po/pl.po b/po/pl.po +index 2bbbf00be6..f6697c2d9c 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -12,17 +12,17 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Polish\n" + "Language: pl_PL\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n" +-"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n" +-"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" ++"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && " ++"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && " ++"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" + "X-Crowdin-Project: fontforge\n" + "X-Crowdin-Project-ID: 368599\n" + "X-Crowdin-Language: pl\n" +@@ -221,8 +221,8 @@ msgid "" + "!!!!! Bad Base Coord format (%d) for '%c%c%c%c' in '%c%c%c%c' script in " + "'BASE' table\n" + msgstr "" +-"!!!!! Nieznany format współrzędnej linii podstawowej pisma (%d) w funkcji „%c" +-"%c%c%c” dla pisma „%c%c%c%c” w talicy „BASE”\n" ++"!!!!! Nieznany format współrzędnej linii podstawowej pisma (%d) w funkcji " ++"„%c%c%c%c” dla pisma „%c%c%c%c” w talicy „BASE”\n" + + #, c-format + msgid "" +@@ -3101,19 +3101,19 @@ msgstr "Błędny glif ligatury: numer znaku %d nie jest mniejszy od %d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" +-"Błędna tablica funkcji zecerskich: format=2 (%d/%d), pierwszy=%d, ostatni=" +-"%d, liczba glifów w foncie=%d\n" ++"Błędna tablica funkcji zecerskich: format=2 (%d/%d), pierwszy=%d, " ++"ostatni=%d, liczba glifów w foncie=%d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" +-"Błędna tablica funkcji zecerskich: format=4 (%d/%d), pierwszy=%d, ostatni=" +-"%d, liczba glifów w foncie=%d\n" ++"Błędna tablica funkcji zecerskich: format=4 (%d/%d), pierwszy=%d, " ++"ostatni=%d, liczba glifów w foncie=%d\n" + + #, c-format + msgid "Bad lookup table: format=6, first=%d total glyphs in font=%d\n" +@@ -10384,8 +10384,8 @@ msgstr "Formy JIS90" + #, c-format + msgid "JSTF extension max at priority %d #%d for %c%c%c%c in %c%c%c%c" + msgstr "" +-"'jstf' graniczne rozbicie wiersza: waga %d #%d, język %c%c%c%c, pismo %c%c%c" +-"%c" ++"'jstf' graniczne rozbicie wiersza: waga %d #%d, język %c%c%c%c, pismo " ++"%c%c%c%c" + + #. GT: This string is used to generate a name for an OpenType lookup. + #. GT: the %c%c... is the language followed by the script (OT tags) +@@ -16972,8 +16972,8 @@ msgid "" + "Script '%c%c%c%c' claims baseline '%c%c%c%c' as its default, but that " + "baseline is not currently active." + msgstr "" +-"Pismo „%c%c%c%c” ma mieć ustawioną domyślą linię podstawową systemu „%c%c%c" +-"%c”. Jednakże ten system linii podstawowych nie został wybrany jako " ++"Pismo „%c%c%c%c” ma mieć ustawioną domyślą linię podstawową systemu " ++"„%c%c%c%c”. Jednakże ten system linii podstawowych nie został wybrany jako " + "obsługiwany w foncie." + + #, c-format +@@ -18281,8 +18281,8 @@ msgid "SnapToInt" + msgstr "Przyciągaj do całkowitych" + + msgid "" +-"So if you type \"A\" here the first selected glyph would be named \"A.suffix" +-"\".\n" ++"So if you type \"A\" here the first selected glyph would be named \"A." ++"suffix\".\n" + "The second \"B.suffix\", and so on." + msgstr "" + "Jeśli wpisane zostanie tu „A”, to nazwa pierwszego zaznaczonego glifu " +@@ -19550,7 +19550,6 @@ msgstr "" + "Hinty %1$s w glifie „%2$.30s” w foncie „%3$.30s” nie pasują do tych z " + "„%4$.30s” (inna liczba lub inne maski hintów)" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -20649,8 +20648,8 @@ msgid "" + "\n" + "Would you like to add this script to one of those features?" + msgstr "" +-"Tablica funkcji zecerskich %.30s jest aktywna dla glifu %.30s z pisma „%c%c%c" +-"%c”, ale to pismo nie występuje w żadnej funkcji korzystającej z tej " ++"Tablica funkcji zecerskich %.30s jest aktywna dla glifu %.30s z pisma " ++"„%c%c%c%c”, ale to pismo nie występuje w żadnej funkcji korzystającej z tej " + "tablicy.\n" + "Czy dodać to pismo do którejś z wymienionych funkcji?" + +@@ -21196,8 +21195,8 @@ msgstr "Grubość obwódki używanej do rysowania zaznaczonych punktów na krzyw + #, c-format + msgid "" + "The width, height, depth or italic correction of %s is too big. Tfm files " +-"may not contain values bigger than 16 times the em-size of the font. Width=" +-"%g, height=%g, depth=%g, italic correction=%g" ++"may not contain values bigger than 16 times the em-size of the font. " ++"Width=%g, height=%g, depth=%g, italic correction=%g" + msgstr "" + "Szerokość, wysokość, głębokość lub kompensata pochylenia dla %s jest zbyt " + "duża. Pliki tfm nie mogą zawierać wartości większych niż 16 × wysokość pola " +@@ -24978,8 +24977,8 @@ msgstr "" + #, c-format + msgid "You have just changed the point numbering of glyph %s.%s%s%s" + msgstr "" +-"Właśnie uległy zmianie numery poszczególnych punktów tworzących glif %s.%s%s" +-"%s" ++"Właśnie uległy zmianie numery poszczególnych punktów tworzących glif %s." ++"%s%s%s" + + msgid "You may change the default instance of this font" + msgstr "Można zmienić domyślny wariant w tym foncie" +@@ -26839,19 +26838,19 @@ msgstr "" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" + "Glif “%s” w %s nie zawiera pozycjonowania ∆x=%d ∆y=%d ∆szer=%d ∆wys=%dw " + "parze z %s ∆x=%d ∆y=%d ∆szer=%d ∆wys=%d\n" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "" +-"Glif „%s” w %s nie zawiera pozycjonowania prostego ∆x=%d ∆y=%d ∆szer=%d ∆wys=" +-"%d.\n" ++"Glif „%s” w %s nie zawiera pozycjonowania prostego ∆x=%d ∆y=%d ∆szer=%d " ++"∆wys=%d.\n" + + #, c-format + msgid "“%s” in %s did not contain a substitution lookup to %s\n" +diff --git a/po/pt.po b/po/pt.po +index 62ec090e75..76ac806be7 100644 +--- a/po/pt.po ++++ b/po/pt.po +@@ -14,8 +14,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Portuguese\n" + "Language: pt_PT\n" +diff --git a/po/ru.po b/po/ru.po +index 77b8f11baf..a6dd423420 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -12,8 +12,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Russian\n" + "Language: ru_RU\n" +diff --git a/po/tr_TR.po b/po/tr_TR.po +index f251a13300..4aa28e9761 100644 +--- a/po/tr_TR.po ++++ b/po/tr_TR.po +@@ -9,8 +9,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Turkish\n" + "Language: tr_TR\n" +diff --git a/po/uk.po b/po/uk.po +index e3768acc3c..8dd79a1c24 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -6,8 +6,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Ukrainian\n" + "Language: uk_UA\n" +@@ -3150,16 +3150,16 @@ msgstr "Помилковий гліф лігатури. GID %d не менше + + #, c-format + msgid "" +-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "Помилкова таблиця фільтрування: формат=2 (%d/%d), перший=%d останній=%d " + "загалом гліфів у шрифті=%d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "Помилкова таблиця фільтрування: формат=4 (%d/%d), перший=%d останній=%d " + "загалом гліфів у шрифті=%d\n" +@@ -3167,8 +3167,8 @@ msgstr "" + #, c-format + msgid "Bad lookup table: format=6, first=%d total glyphs in font=%d\n" + msgstr "" +-"Помилкова таблиця фільтрування: формат=6, перший=%d загалом гліфів у шрифті=" +-"%d\n" ++"Помилкова таблиця фільтрування: формат=6, перший=%d загалом гліфів у " ++"шрифті=%d\n" + + #, c-format + msgid "Bad lookup table: format=8, first=%d cnt=%d total glyphs in font=%d\n" +@@ -8621,8 +8621,8 @@ msgstr "" + #, c-format + msgid "Glyph “%s” has vertical advance width %d in %s but %d in %s at %d@%d\n" + msgstr "" +-"Гліф «%s» має значення вертикальної додаткової ширини %d у %s і %d у %s, %d@" +-"%d\n" ++"Гліф «%s» має значення вертикальної додаткової ширини %d у %s і %d у %s, " ++"%d@%d\n" + + #, c-format + msgid "Glyph “%s” in %s has no truetype instructions\n" +@@ -18580,8 +18580,8 @@ msgid "SnapToInt" + msgstr "Округляти до цілого" + + msgid "" +-"So if you type \"A\" here the first selected glyph would be named \"A.suffix" +-"\".\n" ++"So if you type \"A\" here the first selected glyph would be named \"A." ++"suffix\".\n" + "The second \"B.suffix\", and so on." + msgstr "" + "Отже, якщо ви введете тут «A», перший позначений гліф буде названо «A." +@@ -19858,7 +19858,6 @@ msgstr "" + "Гінти %1$s у гліфі «%2$.30s» у шрифті %3$.30s не відповідають гінтам у " + "%4$.30s (інша кількість або інші критерії перекриття)" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -21581,8 +21580,8 @@ msgstr "Ширина лінії, яку буде використано для + #, c-format + msgid "" + "The width, height, depth or italic correction of %s is too big. Tfm files " +-"may not contain values bigger than 16 times the em-size of the font. Width=" +-"%g, height=%g, depth=%g, italic correction=%g" ++"may not contain values bigger than 16 times the em-size of the font. " ++"Width=%g, height=%g, depth=%g, italic correction=%g" + msgstr "" + "Велична ширини, висоти, глибини або виправлення курсиву %s є надто великою. " + "У файлах tfm не можна використовувати значення, що перевищують em більше ніж " +@@ -27293,19 +27292,19 @@ msgstr "" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" + "«%s» у %s не містив попарного фільтрування розташувань ∆x=%d ∆y=%d ∆x_дод=%d " + "∆y_дод=%d до %s ∆x=%d ∆y=%d ∆x_дод=%d ∆y_дод=%d\n" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "" +-"«%s» у %s не містила фільтрування розташування ∆x=%d ∆y=%d ∆x_дод=%d ∆y_дод=" +-"%d\n" ++"«%s» у %s не містила фільтрування розташування ∆x=%d ∆y=%d ∆x_дод=%d " ++"∆y_дод=%d\n" + + #, c-format + msgid "“%s” in %s did not contain a substitution lookup to %s\n" +diff --git a/po/vi.po b/po/vi.po +index 6aee8bb3fa..7034fc284b 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -1,18 +1,10 @@ +-# Vietnamese translation for FontForge. +-# Copyright (C) 2000-2010 by George Williams +-# Clytie Siddall , 2007, 2008, 2009, 2010. +-# +-# Translators: +-# Clytie Siddall , 2007, 2008, 2009, 2010. +-# Clytie Siddall , 2010-03-15 20:46+0930 +-# +-# ++ + msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 02:46\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Vietnamese\n" + "Language: vi_VN\n" +@@ -610,14 +602,6 @@ msgstr "Một hộp được vẽ chung quanh ô điều khiển khác" + msgid "A canvas (sub-window) wrapped up in a gadget, for drawing" + msgstr "Một vùng vẽ (cửa sổ phụ) được bao bọc trong một ô điều khiển, để vẽ" + +-msgid "" +-"A comma separated list of font family names used to display small example " +-"images of glyphs over the user designed glyphs" +-msgstr "" +-"Danh sách định giới bằng dấu phẩy mà chứa các tên nhóm phông chữ dùng để " +-"hiển thị ảnh thí dụ nhỏ của hình tượng ở trên hình tượng được người dùng " +-"thiết kế" +- + msgid "" + "A contour in this glyph contains a different number of points in different " + "instances" +@@ -1170,9 +1154,6 @@ msgstr "Bề rộng tiến tới của hình tượng %.30s phải nhỏ hơn 12 + msgid "Adyghe" + msgstr "TIếng A-di-ghe" + +-msgid "Aegean scripts" +-msgstr "Chữ viết Ægean" +- + msgid "Afar" + msgstr "TIếng A-pha" + +@@ -1367,21 +1348,9 @@ msgstr "Đường gần nằm ngang/dọc" + msgid "Almost stem_3 hint" + msgstr "Gần là lời gợi ý stem_3" + +-msgid "Alphabetic" +-msgstr "Chữ cái" +- +-msgid "Alphabetic Extended" +-msgstr "Chữ cái đã mở rộng" +- + msgid "Alphabetic Presentation Forms" + msgstr "Hình đại diện chữ cái" + +-msgid "Alphabetic and syllabic LTR scripts" +-msgstr "Chữ viết bên trái-qua-phải kiểu chữ cái và âm tiết" +- +-msgid "Alphabetic and syllabic RTL scripts" +-msgstr "Chữ viết bên phải-qua-trái kiểu chữ cái và âm tiết" +- + msgid "Alsatian" + msgstr "Tiếng An-xa-ti" + +@@ -1752,9 +1721,6 @@ msgstr "Bên Phải qua Trái ngôn ngữ A Rập" + msgid "Arabic Supplement" + msgstr "Phần bổ sung tiếng A Rập" + +-msgid "Arakanese" +-msgstr "Tiếng A-ra-ka-ni" +- + msgid "Archives" + msgstr "Kho" + +@@ -1816,9 +1782,6 @@ msgstr "" + msgid "Armenian" + msgstr "Tiếng Ác-mê-ni" + +-msgid "Armenian Ligatures" +-msgstr "Chữ ghép tiếng Ác-mê-ni" +- + msgid "ArrowAccelFactor" + msgstr "Tăng Tốc Mũi Tên" + +@@ -1902,9 +1865,6 @@ msgstr "" + "Bảng thiết bị cho phép bạn ghi rõ giá trị\n" + "điều chỉnh cho mỗi kích cỡ theo điểm ảnh." + +-msgid "Athapaskan" +-msgstr "Tiếng A-ta-pa-x-ca" +- + #, c-format + msgid "" + "Attempt to apply a lookup to a location out of the range of this contextual\n" +@@ -2120,9 +2080,6 @@ msgstr "Tiếng Ay-ma-ra" + msgid "Azebaijani (roman)" + msgstr "Tiếng A-xơ-bai-gianh (La-tinh)" + +-msgid "Azeri" +-msgstr "Tiếng A-de-ri" +- + msgid "Azeri (Cyrillic)" + msgstr "Tiếng A-xê-ri (Ki-rin)" + +@@ -2498,9 +2455,6 @@ msgstr "Có hàm phụ flex sai trong %s\n" + msgid "Bad font" + msgstr "Phông sai" + +-msgid "Bad font specification" +-msgstr "Đặc tả phông sai" +- + msgid "Bad font, offset out of bounds.\n" + msgstr "Phông sai : giá trị bù ở ngoại phạm vi.\n" + +@@ -2598,8 +2552,8 @@ msgstr "Hình tượng chữ ghép sai : GID %d không phải nhỏ hơn %d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "Bảng tra tìm sai:\n" + " • định dạng=2 (%d/%d)\n" +@@ -2609,8 +2563,8 @@ msgstr "" + + #, c-format + msgid "" +-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "Bảng tra tìm sai:\n" + " • định dạng=4 (%d/%d)\n" +@@ -2815,9 +2769,6 @@ msgstr "Tiếng Ba-li" + msgid "Balkar" + msgstr "Tiếng Ban-khă" + +-msgid "Balochi" +-msgstr "Tiếng Ba-lô-khi" +- + msgid "Balti" + msgstr "Tiếng Ban-thi" + +@@ -2887,9 +2838,6 @@ msgstr "Mặt Phẳng Đa Ngôn Ngữ Cơ Bản" + msgid "Basque" + msgstr "Tiếng Bax-quợ" + +-msgid "Baule" +-msgstr "Tiếng Bau-le" +- + msgid "Be_vel" + msgstr "Cạnh _xiên" + +@@ -3215,21 +3163,12 @@ msgstr "Bạn có muốn làm phông xiên theo góc nào?" + msgid "Byelorussian" + msgstr "Tiếng Bie-lo-ru-xi" + +-msgid "Byte Order Mark" +-msgstr "Dấu thứ tự byte" +- + msgid "Byzantine Music" + msgstr "Âm nhạc La Mã phương Đông" + + msgid "Byzantine Musical Symbols" + msgstr "Ký hiệu âm nhạc La Mã phương Đông" + +-msgid "C0 Control Character" +-msgstr "Ký tự điều khiển C0" +- +-msgid "C1 Control Character" +-msgstr "Ký tự điều khiển C1" +- + msgid "" + "CALL function\n" + "Pops a value, calls the function represented by it" +@@ -3282,15 +3221,9 @@ msgstr "Chữ viết ghi ý tương thích với tiếng Trung/Nhật/Hàn" + msgid "CJK Compatibility Ideographs Supplement" + msgstr "Phần bổ sung Chữ viết Ghi ý Tương thích tiếng Trung/Nhật/Hàn" + +-msgid "CJK Enclosed Letters and Months" +-msgstr "Chữ và tháng đã bao bọc tiếng Trung/Nhật/Hàn" +- + msgid "CJK Ideographic" + msgstr "Chữ viết ghi ý tiếng Trung/Nhật/Hàn" + +-msgid "CJK Phonetics and Symbols" +-msgstr "Ngữ âm và ký hiệu tiếng Trung/Nhật/Hàn" +- + msgid "CJK Strokes" + msgstr "Nét tiếng Trung/Nhật/Hàn" + +@@ -3803,18 +3736,6 @@ msgstr "Tiếng Hoa (Xin-ga-po)" + msgid "Chinese (Taiwan)" + msgstr "Tiếng Trung (Đài-loan)" + +-msgid "Chinese Hong Kong" +-msgstr "Tiếng Trung (Hông Kồng))" +- +-msgid "Chinese Phonetic" +-msgstr "Tiếng Trung ngữ âm" +- +-msgid "Chinese Simplified" +-msgstr "Tiếng Trung phổ thông" +- +-msgid "Chinese Traditional" +-msgstr "Tiếng Trung truyền thống" +- + msgid "Chipewyan" + msgstr "Tiếng Chi-pe-ouianh" + +@@ -4273,9 +4194,6 @@ msgstr "Sửa:" + msgid "Corner" + msgstr "Đỉnh" + +-msgid "Corporate Use" +-msgstr "Dùng bởi công ty" +- + msgid "Correct Direction" + msgstr "Sửa hướng" + +@@ -4347,10 +4265,6 @@ msgstr "Không thể mở" + msgid "Could not open %.100s" + msgstr "Không thể mở %.100s" + +-#, c-format +-msgid "Could not open %s" +-msgstr "Không thể mở %s" +- + msgid "Could not open file" + msgstr "Không thể mở tập tin" + +@@ -4394,16 +4308,6 @@ msgstr "Không thể ghi %s." + msgid "Couldn't create directory" + msgstr "Không thể tạo thư mục" + +-#, c-format +-msgid "" +-"Couldn't create directory: %1$s\n" +-"%2$s\n" +-"%3$s" +-msgstr "" +-"Không thể tạo thư mục: %1$s\n" +-"%2$s\n" +-"%3$s" +- + #, c-format + msgid "Couldn't create directory: %s" + msgstr "Không thể tạo thư mục: %s" +@@ -4542,9 +4446,6 @@ msgstr "Lập phương" + msgid "Cuneiform" + msgstr "Chữ hình nêm" + +-msgid "Cuneiform Numbers" +-msgstr "Chữ số hình nêm" +- + msgid "Currency Symbols" + msgstr "Ký hiệu tiền tệ" + +@@ -4867,9 +4768,6 @@ msgstr "Khoảng thời gian (theo mili-giây) trước khi cửa sổ tự mở + msgid "Delete" + msgstr "Xoá" + +-msgid "Delete Character" +-msgstr "Xoá ký tự" +- + msgid "" + "Deletes any selected lookups and their subtables, or deletes any selected " + "subtables.\n" +@@ -4988,12 +4886,6 @@ msgstr "Tiếng Đe-va-na-ga-ri 2" + msgid "Device Table Adjustments" + msgstr "Điều chỉnh bảng thiết bị" + +-msgid "Dhivehi" +-msgstr "Tiếng Đi-ve-hi" +- +-msgid "Dhivehi (Obsolete)" +-msgstr "Đi-vê-hi (Cũ)" +- + msgid "Diagonal Fractions" + msgstr "Phân số chéo" + +@@ -5159,9 +5051,6 @@ msgstr "Khoảng cách tới mặt phẳng hiện hình:" + msgid "Divehi" + msgstr "Tiếng Đi-ve-hi" + +-msgid "Djerma" +-msgstr "Tiếng Chơ-ma" +- + msgid "Do Nothing" + msgstr "Đừng làm gì" + +@@ -5225,9 +5114,6 @@ msgstr "Không kế thừa từ gì" + msgid "Doesn't look like a valid pdf file, couldn't find xref section" + msgstr "Không hình như một tập tin PDF hợp lệ vì không tìm thấy phần xref" + +-msgid "Dogri" +-msgstr "Tiếng Đo-gợ-ri" +- + msgid "Domino Tiles" + msgstr "Ngói đôminô" + +@@ -6522,9 +6408,6 @@ msgstr "" + msgid "Font Compare" + msgstr "So sánh phông" + +-msgid "Font Family" +-msgstr "Nhóm phông" +- + msgid "Font Info" + msgstr "Thông tin phông" + +@@ -6532,9 +6415,6 @@ msgstr "Thông tin phông" + msgid "Font Information for %.90s" + msgstr "Thông tin phông về %.90s" + +-msgid "Font Size" +-msgstr "Cỡ phông chữ" +- + msgid "Font Type:" + msgstr "Kiểu phông:" + +@@ -6656,27 +6536,6 @@ msgstr "" + msgid "FontForge time stamp table" + msgstr "bảng nhãn thời gian FontForge" + +-#, c-format +-msgid "" +-"FontForge was unable to find a cidmap file for this font. It is not " +-"essential to have one, but some things will work better if you do. If you " +-"have not done so you might want to download the cidmaps from:\n" +-" http://FontForge.sourceforge.net/cidmaps.tgz\n" +-"and then gunzip and untar them and move them to:\n" +-" %.80s\n" +-"\n" +-"Would you like to search your local disk for an appropriate file?" +-msgstr "" +-"Trình FontForge không tìm thấy tập tin sơ đồ CID thích hợp với phông này.\n" +-"Không ép buộc phải dùng tập tin kiểu này, nhưng một số thứ sẽ hoạt động\n" +-"tốt hơn với nó. Nếu bạn chưa tài về các tập tin sơ đồ CID, vẫn có thể tải " +-"xuống:\n" +-" http://FontForge.sourceforge.net/cidmaps.tgz\n" +-"rồi giải nén và di chuyển vào\n" +-" %.80s\n" +-"\n" +-"Bạn có muốn tìm kiếm một tập tin thích hợp trên đĩa cục bộ không?" +- + msgid "" + "FontForge was unable to load libspiro, spiros are not available for use." + msgstr "" +@@ -6748,9 +6607,6 @@ msgstr "Buộc tên hình tượng thành:" + msgid "Fore" + msgstr "Gần" + +-msgid "Forest Nenets" +-msgstr "Tiếng Ne-net-x rừng" +- + msgid "Forget _to All" + msgstr "Quên _tất cả" + +@@ -6900,9 +6756,6 @@ msgstr "Từ :" + msgid "Frozen Color" + msgstr "Màu đông cứng" + +-msgid "Fulani" +-msgstr "Tiếng Phu-la-ni" +- + msgid "Fulfulde" + msgstr "Tiếng Phun-phun-đe" + +@@ -7367,8 +7220,8 @@ msgstr "Hình tượng « %s » có chiều rộng sớm %d trong %s còn là %d + #, c-format + msgid "Glyph “%s” has advance width %d in %s but %d in %s at %d@%d\n" + msgstr "" +-"Hình tượng « %s » có chiều rộng sớm %d trong %s còn là %d trong %s tại %d@" +-"%d\n" ++"Hình tượng « %s » có chiều rộng sớm %d trong %s còn là %d trong %s tại " ++"%d@%d\n" + + #, c-format + msgid "Glyph “%s” has different truetype instructions\n" +@@ -7518,9 +7371,6 @@ msgstr "" + "Lớn hơn hay bằng (GTEQ)\n" + "Bỏ hai giá trị, đẩy (0/1) nếu cái dưới ≥ cái trên" + +-msgid "Greek" +-msgstr "Tiếng Hy Lạp" +- + msgid "Greek (polytonic)" + msgstr "Tiếng Hy Lạp (đa giọng)" + +@@ -7660,9 +7510,6 @@ msgstr "Nửa hình" + msgid "Half Widths" + msgstr "Nửa rộng" + +-msgid "Half and Full Width Forms" +-msgstr "Hình nửa và toàn rộng" +- + msgid "Halfwidth and Fullwidth Forms" + msgstr "Hình nửa/toàn rộng" + +@@ -7672,9 +7519,6 @@ msgstr "Tiếng Ha-mơ-Ba-na" + msgid "Hangul Compatibility Jamo" + msgstr "Hangul tương thích với Jamo" + +-msgid "Hangul Jamo Half Width Forms" +-msgstr "Hình nửa rộng Hangul Jamo" +- + msgid "Hangul Syllables" + msgstr "Âm tiết Hangul" + +@@ -7699,9 +7543,6 @@ msgstr "Nặng" + msgid "Hebrew" + msgstr "Tiếng Do Thái" + +-msgid "Hebrew Ligatures/Pointed Letters" +-msgstr "Chữ ghép/chữ nhọn tiếng Do Thái" +- + msgid "Height" + msgstr "Cao" + +@@ -7737,9 +7578,6 @@ msgstr "Ẩn khi di chu_yển" + msgid "High Mari" + msgstr "Tiếng Ma-ri cao" + +-msgid "High Surrogate" +-msgstr "Thay thế cao" +- + msgid "High-Density Font" + msgstr "Phông mật độ cao" + +@@ -8259,9 +8097,6 @@ msgstr "Đang bỏ qua mục nhập /CharStrings (chuỗi ký tự) trùng\n" + msgid "Ignoring duplicate /Subrs entry\n" + msgstr "Đang bỏ qua mục nhập /Subrs trùng\n" + +-msgid "Ijo" +-msgstr "Tiếng I-chô" +- + msgid "Ilokano" + msgstr "Tiếng I-lô-ca-nô" + +@@ -8294,10 +8129,6 @@ msgstr "Ảnh dùng cho dấu liệt kê đã bật (ghi đè lên hộp)" + msgid "Image used instead of the Check Box Off Mark" + msgstr "Ảnh dùng thay cho Dấu Hộp Chọn bị Tắt" + +-msgid "" +-"Image used instead of the Check Box Off Mark (when the radio is disabled)" +-msgstr "Ảnh dùng thay cho Dấu Hộp Chọn bị Tắt (khi nút chọn một bị tắt)" +- + msgid "Image used instead of the Radio Off Mark" + msgstr "Ảnh dùng thay cho Dấu Hộp Chọn Một bị Tắt" + +@@ -8632,29 +8463,6 @@ msgstr "" + msgid "Instruction Gloss (TrueType)" + msgstr "Chú giải chỉ dẫn (TrueType)" + +-msgid "" +-"Instructions in a TrueType font refer to\n" +-"points by number, so if you edit a glyph\n" +-"in such a way that some points have different\n" +-"numbers (add points, remove them, etc.) then\n" +-"the instructions will be applied to the wrong\n" +-"points with disasterous results.\n" +-" Normally FontForge will remove the instructions\n" +-"if it detects that the points have been renumbered\n" +-"in order to avoid the above problem. You may turn\n" +-"this behavior off -- but be careful!" +-msgstr "" +-"Chỉ dẫn trong phông TrueType tham chiếu\n" +-"đến mỗi điểm theo con số. Vậy nếu bạn chỉnh\n" +-"sửa hình tượng bằng cách mà các điểm có số bị đổi\n" +-"(thêm/bỏ điểm v.v.) thì các chỉ dẫn sẽ được\n" +-"áp dụng cho điểm không đúng, làm kết quả rất xấu.\n" +-"\n" +-"Bình thường, trình FontForge sẽ gỡ bỏ các chỉ dẫn\n" +-"nếu nó phát hiện rằng các điểm đã được đánh số lại,\n" +-"để tránh vấn đề trên. Bạn vẫn có khả năng tắt\n" +-"ưng xử này, nhưng hãy rất cẩn thận." +- + msgid "Instructions out of date" + msgstr "Chỉ dẫn quá cũ" + +@@ -8954,9 +8762,6 @@ msgstr "" + "JuMP Relative\n" + "Bỏ hiệu (theo byte) để di chuyển con trỏ chỉ lệnh" + +-msgid "Judezmo" +-msgstr "Tiếng Giu-đex-mô" +- + msgid "Jula" + msgstr "Tiếng Giu-la" + +@@ -9459,12 +9264,6 @@ msgstr "La-tinh đã mở rộng C" + msgid "Latin Extended-D" + msgstr "La-tinh đã mở rộng D" + +-msgid "Latin Full Width Forms" +-msgstr "Hình toàn rộng La-tinh" +- +-msgid "Latin Ligatures" +-msgstr "Chữ ghép La-tinh" +- + msgid "Latin-1 Supplement" + msgstr "Phần bổ sung Latin-1" + +@@ -9937,12 +9736,6 @@ msgstr "Chữ thường sang chữ hoa rất nhỏ" + msgid "Lowercase to Small Capitals" + msgstr "Chữ thường sang chữ hoa nhỏ" + +-msgid "Luganda" +-msgstr "Tiếng Lu-gan-đa" +- +-msgid "Luhya" +-msgstr "Tiếng Lu-hia" +- + msgid "Lule Sami" + msgstr "Tiếng Lu-le Xa-mi" + +@@ -10170,9 +9963,6 @@ msgstr "" + msgid "Make the counters narrower" + msgstr "Làm cho bộ đếm hẹp hơn" + +-msgid "Makua" +-msgstr "Tiếng Ma-khua" +- + msgid "Malagasy" + msgstr "Tiếng Ma-la-ga-xi" + +@@ -10544,9 +10334,6 @@ msgstr "Tên trình đơn" + msgid "Menu name with no associated script" + msgstr "Tên trình đơn không có văn lệnh tương ứng" + +-msgid "Merge Feature Info" +-msgstr "Trộn thông tin tính năng" +- + msgid "Merge Fonts" + msgstr "Trộn phông" + +@@ -10592,9 +10379,6 @@ msgstr "Đơn vị đo %.50s" + msgid "Metrics Label Color" + msgstr "Màu nhãn đơn vị đo" + +-msgid "MetricsView" +-msgstr "ÔXemĐơnVịĐo" +- + msgid "MfArgs" + msgstr "Đối Số MF" + +@@ -10745,21 +10529,12 @@ msgstr "Trục _phụ :" + msgid "Misc." + msgstr "Linh tinh" + +-msgid "Miscellaneous Math Symbols-A" +-msgstr "Ký hiệu Toán học Linh tinh (A)" +- +-msgid "Miscellaneous Math Symbols-B" +-msgstr "Ký hiệu Toán học Linh tinh (B)" +- + msgid "Miscellaneous Symbols" + msgstr "Ký hiệu lặt vặt" + + msgid "Miscellaneous Technical" + msgstr "Kỹ thuật linh tinh" + +-msgid "Miscellaneous Technical Symbols" +-msgstr "Ký hiệu Kỹ thuật Linh tinh" +- + msgid "Mismatch lookup types inside a parsed lookup" + msgstr "Sai khớp kiểu sự tra tìm bên trong sự tra tìm đã phân tích" + +@@ -11233,9 +11008,6 @@ msgstr "NFNT (MacBinary)" + msgid "NFNT (Resource)" + msgstr "NFNT (tài nguyên)" + +-msgid "NUL, Default Character" +-msgstr "Ký tự mặc định NUL" +- + msgid "N_ever Interpolate" + msgstr "Không _bao giờ nội suy" + +@@ -11518,9 +11290,6 @@ msgstr "Tiếng Ni-xi" + msgid "Niuean" + msgstr "Tiếng Ni-u-e" + +-msgid "Nkole" +-msgstr "Tiếng N-cô-le" +- + #, c-format + msgid "No (useable) bitmap strikes in this TTF font: %s" + msgstr "Không có gạch mảng ảnh có ích trong phông TTF này: %s" +@@ -12009,9 +11778,6 @@ msgstr "Không phải là định dạng CID" + msgid "Not a CID-keyed font" + msgstr "Không phải là phông đã khoá CID" + +-msgid "Not a Unicode Character" +-msgstr "Không phải ký tự Unicode" +- + msgid "Not a bdf file" + msgstr "Không phải là tập tin bdf." + +@@ -12139,9 +11905,6 @@ msgstr "Dạng số" + msgid "Nyanja/Chewa" + msgstr "Tiếng Nai-an-gia" + +-msgid "Nynorsk" +-msgstr "Tiếng Ny-noa-x-kh" +- + msgid "O Black Letter" + msgstr "TH Chữ đen" + +@@ -12539,9 +12302,6 @@ msgstr "Gốc" + msgid "Origin:" + msgstr "Gốc:" + +-msgid "Original Color" +-msgstr "Màu gốc" +- + msgid "Original Y Position" + msgstr "Vị trí Y gốc" + +@@ -12605,12 +12365,6 @@ msgstr "Viền bên trong nét ngoài" + msgid "Outline Outer Border" + msgstr "Viền bên ngoài nét ngoài" + +-msgid "Outline View" +-msgstr "Ô xem nét ngoài" +- +-msgid "Outline View 2" +-msgstr "Ô xem nét ngoài 2" +- + msgid "Outline Width" + msgstr "Bề rộng nét ngoài" + +@@ -13021,26 +12775,6 @@ msgstr "Phần mở rộng ngữ âm" + msgid "Phonetic Extensions Supplement" + msgstr "Phần bổ sung phần mở rộng ngữ âm" + +-msgid "" +-"Physical screen width, measured in centimeters\n" +-"For this to take effect you must save the resource data (press the [Save] " +-"button)\n" +-"and restart fontforge" +-msgstr "" +-"Chiều rộng vật lý của màn hình, đo theo xen-ti-mét\n" +-"Để thiết lập này có tác động thì bạn cần phải lưu dữ liệu tài nguyên\n" +-"(bấm nút [Lưu]), sau đó khởi chạy lại FontForge." +- +-msgid "" +-"Physical screen width, measured in inches\n" +-"For this to take effect you must save the resource data (press the [Save] " +-"button)\n" +-"and restart fontforge" +-msgstr "" +-"Chiều rộng vật lý của màn hình, đo theo insơ\n" +-"Để thiết lập này có tác động thì bạn cần phải lưu dữ liệu tài nguyên\n" +-"(bấm nút [Lưu]), sau đó khởi chạy lại FontForge." +- + msgid "Pick a CMap subtable" + msgstr "Chọn một bảng phụ CMap" + +@@ -13056,9 +12790,6 @@ msgstr "Chọn một trang" + msgid "Pick a substitution to display in the window." + msgstr "Chọn một sự thay thế cần hiển thị trong cửa sổ." + +-msgid "Pilipino (Filipino)" +-msgstr "Tiếng Phi-li-pi-nô" +- + msgid "Pixel List" + msgstr "Danh sách điểm ảnh" + +@@ -13225,9 +12956,6 @@ msgstr "Hình đa g_iác" + msgid "Polish" + msgstr "Tiếng Ba Lan" + +-msgid "Pollard Phonetic" +-msgstr "Ngữ âm Po-lat" +- + msgid "Polygon" + msgstr "Đa giác" + +@@ -13438,9 +13166,6 @@ msgstr "Ưu tiên: %d" + msgid "Private Dictionary" + msgstr "Từ điển Riêng" + +-msgid "Private Use" +-msgstr "Dùng riêng" +- + msgid "Private Use Area" + msgstr "Vùng dùng riêng" + +@@ -13487,9 +13212,6 @@ msgstr "Chữ số tỷ lệ" + msgid "Proportional Width" + msgstr "Bề rộng tỷ lệ" + +-msgid "Provencal" +-msgstr "Tiếng Pợ-ro-ven-xan" +- + msgid "Provide a glyph name" + msgstr "Cung cấp tên hình tượng" + +@@ -14321,9 +14043,6 @@ msgstr "Đang làm tròn thành số nguyên..." + msgid "Row|New" + msgstr "Mới" + +-msgid "Ruanda" +-msgstr "Tiếng Ru-oanh-đa" +- + msgid "Ruby Notational Forms" + msgstr "Hình phụ chú Ruby" + +@@ -14763,12 +14482,6 @@ msgstr "Ký hiệu khoa học in thấp" + msgid "Scottish Gaelic" + msgstr "Tiếng Xen-tơ (Ê-cốt)" + +-msgid "Screen Width in Centimeters" +-msgstr "Độ rộng màn hình (theo xen-ti-mét)" +- +-msgid "Screen Width in Inches" +-msgstr "Độ rộng màn hình (theo insơ)" +- + #, c-format + msgid "Script '%c%c%c%c' " + msgstr "Chữ viết '%c%c%c%c' " +@@ -15769,9 +15482,6 @@ msgstr "Hệ số mở rộng vị trí phương hướng bên" + msgid "Side Bearings:" + msgstr "Vị trí phương hướng bên:" + +-msgid "Signature Mark" +-msgstr "Dấu chữ ký" +- + msgid "Silte Gurage" + msgstr "Tiếng Gu-ra-ge Xin-te" + +@@ -15955,8 +15665,8 @@ msgid "SnapToInt" + msgstr "Đính Số Nguyên" + + msgid "" +-"So if you type \"A\" here the first selected glyph would be named \"A.suffix" +-"\".\n" ++"So if you type \"A\" here the first selected glyph would be named \"A." ++"suffix\".\n" + "The second \"B.suffix\", and so on." + msgstr "" + "Vì vậy, nếu bạn gõ vào đây chữ « A », hình tượng đã chọn đầu tiên\n" +@@ -16059,13 +15769,6 @@ msgstr "Tiếng Nam Xla-vê" + msgid "Southern Sami" + msgstr "Tiếng Nam Xă-mi" + +-msgid "" +-"Space (in points) left between images and text in labels, buttons, menu " +-"items, etc. which have both" +-msgstr "" +-"Khoảng cách (theo điểm) nên còn lại giửa ảnh và chuỗi chữ trong nhãn, nút, " +-"mục trình đơn v.v. chứa cả hai" +- + msgid "Space Regions" + msgstr "Vùng khoảng cách" + +@@ -16758,9 +16461,6 @@ msgstr "" + "Super ROUND\n" + "Quá phức tạp. Hãy tra tìm" + +-msgid "Super and Sub scripts" +-msgstr "Chữ in cao/thấp" +- + msgid "Superscript" + msgstr "Chữ cao" + +@@ -16785,15 +16485,9 @@ msgstr "Mũi tên bổ sung A" + msgid "Supplemental Arrows-B" + msgstr "Mũi tên bổ sung B" + +-msgid "Supplemental Math Operators" +-msgstr "Toán từ Toán học Bổ sung" +- + msgid "Supplemental Punctuation" + msgstr "Dấu chấm câu bổ sung" + +-msgid "Supplemental Symbols and Arrows" +-msgstr "Ký hiệu và Mũi tên Bổ sung" +- + msgid "Supplementary Ideographic Plane" + msgstr "Mặt phẳng Chữ viết Ghi ý Bổ sung" + +@@ -16812,15 +16506,6 @@ msgstr "Mặt phẳng Mục đích Đặc biệt Bổ sung" + msgid "Suri" + msgstr "Tiếng Xu-ri" + +-msgid "Surrogate High" +-msgstr "Thay thế cao" +- +-msgid "Surrogate High, Non Private Use" +-msgstr "Thay thế cao, không dùng riêng" +- +-msgid "Surrogate High, Private Use" +-msgstr "Thay thế cao, dùng riêng" +- + msgid "Sutu" + msgstr "Tiếng Xu-tu" + +@@ -16839,9 +16524,6 @@ msgstr "Tiếng Xouă-hi-li (Ken-ya)" + msgid "Swash" + msgstr "Đuôi tu từ" + +-msgid "Swazi" +-msgstr "Tiếng Xouă-xi" +- + msgid "Swedish" + msgstr "Tiếng Thuỵ Điển" + +@@ -16875,9 +16557,6 @@ msgstr "Bộ ký tự ký hiệu" + msgid "Symbolic" + msgstr "Tượng Trưng" + +-msgid "Symbols" +-msgstr "Ký hiệu" +- + msgid "Symbols:" + msgstr "Ký hiệu:" + +@@ -17044,9 +16723,6 @@ msgstr "Tiếng Te-lu-gu" + msgid "Temne" + msgstr "Tiếng Tem-ne" + +-msgid "Template Color" +-msgstr "Màu mẫu" +- + msgid "Terminal Forms" + msgstr "Hình cuối" + +@@ -17107,7 +16783,6 @@ msgstr "" + "Những lời gợi ý %1$s trong hình tượng « %2$.30s » trong phông %3$.30s không " + "tương ứng với những lời trong %4$.30s (số khác hay tiêu chuẩn chồng lấp khác)" + +-#, c-format + msgid "" + "The %1$s in the search dialog contains a reference to %2$.20hs which does " + "not exist in the new font.\n" +@@ -18515,8 +18190,8 @@ msgstr "Chiều rộng của đường được dùng để vẽ các điểm đ + #, c-format + msgid "" + "The width, height, depth or italic correction of %s is too big. Tfm files " +-"may not contain values bigger than 16 times the em-size of the font. Width=" +-"%g, height=%g, depth=%g, italic correction=%g" ++"may not contain values bigger than 16 times the em-size of the font. " ++"Width=%g, height=%g, depth=%g, italic correction=%g" + msgstr "" + "%s có bề rộng, bề cao, bề sâu hay hệ số sửa in nghiêng mà quá lớn.\n" + "Tập tin TFM không thể chứa giá trị lớn hơn 16× kích cỡ em của phông.\n" +@@ -19234,16 +18909,6 @@ msgstr "" + "Việc này mở hơn 10 cửa sổ.\n" + "Có hợp với ý muốn không?" + +-msgid "" +-"This is an abstract class which defines common features of the\n" +-"FontView, CharView, BitmapView and MetricsView" +-msgstr "" +-"Đây là một hạng trừu tượng mà xác định các tính năng chung của:\n" +-" • FontView — khung xem phông chữ\n" +-" • CharView — khung xem ký tự\n" +-" • BitmapView — khung xem ảnh mảng\n" +-" • MetricsView — khung xem đơn vị đo" +- + msgid "" + "This is an identifying number shared by all members of\n" + "this font family with the same style (I.e. 10pt Bold and\n" +@@ -19566,12 +19231,6 @@ msgstr "" + "Phiên bản Fontforge này đã không liên kết với thư viện spiro, do đó không " + "dùng được." + +-msgid "This window displays a single outline glyph" +-msgstr " Cửa sổ này hiển thị một hình tượng nét ngoài riêng lẻ" +- +-msgid "This window displays a single outline glyph (more data)" +-msgstr " Cửa sổ này hiển thị một hình tượng nét ngoài riêng lẻ (dữ liệu thêm)" +- + msgid "This window displays metrics information about a font" + msgstr "Cửa sổ này hiển thị thông tin đơn vị đo về một phông chữ nào đó" + +@@ -20009,9 +19668,6 @@ msgstr "Tiếng T-xouă-na" + msgid "Tulu" + msgstr "Tiếng Tu-lu" + +-msgid "Tundra Nenets" +-msgstr "Tiếng Ne-net-x lãnh nguyên" +- + msgid "Turkish" + msgstr "Tiếng Thổ Nhĩ Kỳ" + +@@ -20332,9 +19988,6 @@ msgstr "Unicode 2.0+, chỉ BMP" + msgid "Unicode 2.0+, all planes" + msgstr "Unicode 2.0+, mọi mặt phẳng" + +-msgid "Unicode Basic Multilingual Plane" +-msgstr "Mặt Phẳng Đa Ngôn Ngữ Cơ Bản Unicode" +- + msgid "Unicode C_har:" + msgstr "_Ký tự Unicode:" + +@@ -20344,15 +19997,6 @@ msgstr "Phạm vi Unicode" + msgid "Unicode Ranges:" + msgstr "Phạm vi Unicode:" + +-msgid "Unicode Supplementary Ideographic Plane" +-msgstr "Mặt phẳng Chữ viết Ghi ý Bổ sung Unicode" +- +-msgid "Unicode Supplementary Multilingual Plane" +-msgstr "Mặt phẳng Đa ngôn ngữ Bổ sung Unicode" +- +-msgid "Unicode Supplementary Special-purpose Plane" +-msgstr "Mặt phẳng Mục đích Đặc biệt Bổ sung Unicode" +- + msgid "Unicode _Value:" + msgstr "_Giá trị Unicode:" + +@@ -20793,9 +20437,6 @@ msgstr "Dấu chọn biến đổi (hay 0)" + msgid "Variation Selectors" + msgstr "Dấu chọn biến đổi" + +-msgid "Variation Selectors B" +-msgstr "Dấu chọn biến đổi B" +- + #, c-format + msgid "" + "Variation selectors are normally between\n" +@@ -21382,15 +21023,6 @@ msgstr "" + msgid "When serifs are removed (as first two in \"m\"), replace with:" + msgstr "Khi bỏ chân (như hai chân thứ nhất của « m ») thì thay thế bằng:" + +-msgid "" +-"When the hint's position is changed\n" +-"adjust the postion of any points\n" +-"which lie on that hint" +-msgstr "" +-"Khi vị trí lời gợi ý đã thay đổi,\n" +-"điều chỉnh vị trí của điểm nào\n" +-"nằm trên lời gợi ý đó." +- + msgid "" + "When the mouse pointer is within this many pixels\n" + "of one of the various interesting features (baseline,\n" +@@ -21579,9 +21211,6 @@ msgstr "Dời X" + msgid "X Repeat Count" + msgstr "Số đếm X đã lặp lại" + +-msgid "X Resource Editor" +-msgstr "Trình sửa tài nguyên X" +- + msgid "X Scale Factor" + msgstr "Hệ số co giãn X" + +@@ -21622,18 +21251,12 @@ msgstr "Y gần¹ bề c_ao chuẩn" + msgid "Y-Cree" + msgstr "Tiếng Cợ-ri Y" + +-msgid "Yakut" +-msgstr "Tiếng Ya-kut" +- + msgid "Yes" + msgstr "Có" + + msgid "Yes to _All" + msgstr "Đồng ý _với tất cả" + +-msgid "Yi" +-msgstr "Tiếng Yi" +- + msgid "Yi Classic" + msgstr "Tiếng Yi cổ điển" + +@@ -21892,10 +21515,6 @@ msgstr "Bạn cần phải ghi rõ một đá lát ở giữa" + msgid "You must specify a pattern" + msgstr "Phải ghi rõ một mẫu" + +-#, c-format +-msgid "You must specify a replacement glyph for %s" +-msgstr "Bạn phải xác định một hình tượng thay thế cho %s" +- + msgid "You must specify a standard type1 extension (.pfb or .pfa)" + msgstr "Phải xác định một phần mở rộng kiểu 1 tiêu chuẩn (.pfb hay .pfa)." + +@@ -21968,9 +21587,6 @@ msgstr "Th_u nhỏ" + msgid "Zande" + msgstr "Tiếng Xan-đe" + +-msgid "Zapf Dingbats" +-msgstr "Ký tự trang trí Zapf" +- + msgid "Zone:" + msgstr "Vùng:" + +@@ -22171,9 +21787,6 @@ msgstr "Đón_g" + msgid "_Cluster" + msgstr "_Chùm" + +-msgid "_Compact" +-msgstr "Nén _chặt" +- + msgid "_Condense/Extend..." + msgstr "_Co lại/Dãn ra..." + +@@ -22984,9 +22597,6 @@ msgstr "_Lưới thép" + msgid "_Wireframe..." + msgstr "_Lưới thép..." + +-msgid "_X Resource Editor..." +-msgstr "Trình sửa tài nguyên _X..." +- + msgid "_X near¹" + msgstr "_X gần¹" + +@@ -23441,19 +23051,19 @@ msgstr "Phông mảng ảnh ΤεΧ" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" + "Trong %s, « %s » không chứa sự tra tìm định vị theo hướng cặp ∆x=%d ∆y=%d " + "∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "" +-"Trong %s, « %s » không chứa sự tra tìm định vị ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"Trong %s, « %s » không chứa sự tra tìm định vị ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + + #, c-format + msgid "“%s” in %s did not contain a substitution lookup to %s\n" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 8f8e0e60e8..787be30337 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -22,8 +22,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 03:24\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-31 08:24\n" + "Last-Translator: \n" + "Language-Team: Chinese Simplified\n" + "Language: zh_CN\n" +@@ -79,6 +79,10 @@ msgstr " 右边=%d" + msgid " Stroke _Width:" + msgstr " 笔画宽度(_W):" + ++#. GT: X is a coordinate, the leading spaces help to align it ++msgid " X" ++msgstr " X" ++ + #, c-format + msgid " %s: line %d\n" + msgstr " %s: 行 %d\n" +@@ -120,6 +124,9 @@ msgstr "后" + msgid " Next CP" + msgstr "下一控制点" + ++msgid " Perhaps you meant to use the keyword 'sub' rather than 'subs'?" ++msgstr " 也许您打算使用关键字'sub'而不是'subs'？" ++ + msgid " Prev" + msgstr "前" + +@@ -165,6 +172,12 @@ msgstr "符号" + msgid "%.*s is not a valid class name (or number)" + msgstr "%.*s 不是有效的类属名(或数值)" + ++#, c-format ++msgid "" ++"%.50s contains a flipped reference. This cannot be corrected as is. Would " ++"you like me to unlink it and then correct it?" ++msgstr "%.50s 包含一个翻转的引用。此处无法更正。你想要取消链接，然后纠正吗？" ++ + #, c-format + msgid "%1$.30s string for %2$.30s" + msgstr "%1$.30s 字符串向 %2$.30s" +@@ -218,7 +231,7 @@ msgstr "" + + #, c-format + msgid "%s No Slope" +-msgstr "%s没有范围" ++msgstr "%s 无斜率" + + #, c-format + msgid "%s anchor %d" +@@ -391,6 +404,12 @@ msgstr "(未指定) SIL Graphite 规则表" + msgid ") while in %s it is (" + msgstr ") 但在 %s为 (" + ++msgid "* Cap Widt_h" ++msgstr "* 端头宽度(_H)" ++ ++msgid "* Nib _Span" ++msgstr "* 笔尖跨度(_S)" ++ + msgid "100 Thin" + msgstr "100 超细体" + +@@ -568,12 +587,28 @@ msgstr "<无>" + msgid "" + msgstr "<未定义>" + ++msgid "" ++"A Convex nib will also be rotated by this amount\n" ++"although this is not displayed in the dialog." ++msgstr "" ++"尽量该量未显示于对话框内，\n" ++"凸形笔尖亦将按该量旋转。" ++ + msgid "A Font Family name is required" + msgstr "需要字体集名称" + + msgid "A PostScript name may not be a number" + msgstr "PostScript名称不可以用数字" + ++msgid "" ++"A calligraphic pen or an elliptical pen has two widths\n" ++"(which may be the same, giving a circular or square pen,\n" ++"or different giving an elliptical or rectangular pen)." ++msgstr "" ++"书法笔或椭圆笔有两个宽度\n" ++"（可相同，得到圆形或正方形笔；\n" ++"或不同，得到椭圆形或矩形笔）。" ++ + msgid "A coverage table:" + msgstr "范围表：" + +@@ -655,6 +690,9 @@ msgstr "AGL 无 afii" + msgid "AMS Names" + msgstr "AMS名称" + ++msgid "A_dd Extrema" ++msgstr "增添极值点(_D)" ++ + msgid "A_lign" + msgstr "对齐(_L)" + +@@ -710,10 +748,10 @@ msgid "Add" + msgstr "添加" + + msgid "Add 'D_FLT' script" +-msgstr "添加 'D_FLT' 脚本" ++msgstr "添加 'D_FLT' 文字" + + msgid "Add All Extrema" +-msgstr "添加全部极点" ++msgstr "添加全部极值" + + msgid "Add Anchor" + msgstr "增加锚点" +@@ -728,7 +766,7 @@ msgid "Add E_ncoding Name..." + msgstr "增加编码名(_N)…" + + msgid "Add E_xtrema" +-msgstr "增加极点(_X)" ++msgstr "添加极值(_X)" + + msgid "Add Encoding Name..." + msgstr "增加编码…" +@@ -743,7 +781,7 @@ msgid "Add Exit Anchor..." + msgstr "增加已有锚点..." + + msgid "Add Good Extrema" +-msgstr "添加好极点" ++msgstr "增添良极值" + + msgid "Add Language to Script..." + msgstr "添加语言到文字..." +@@ -764,6 +802,9 @@ msgstr "增加标记锚点..." + msgid "Add OFL" + msgstr "添加 OFL" + ++msgid "Add Points Of I_nflection" ++msgstr "添加拐点(_I)" ++ + msgid "Add Sub_table" + msgstr "添加子表(_T)" + +@@ -780,7 +821,7 @@ msgid "Add _Missing Glyphs" + msgstr "添加缺失字形(_M)" + + msgid "Add _Small Capitals..." +-msgstr "添加小大写(_S)..." ++msgstr "添加小型大写(_S)..." + + msgid "Add a corner point" + msgstr "增加拐点" +@@ -824,6 +865,9 @@ msgstr "为选中字形中的各对字形添加字偶距信息" + msgid "Adding points at Extrema..." + msgstr "在极值处增加点..." + ++msgid "Adding points of inflection..." ++msgstr "增添拐点..." ++ + msgid "Additional arguments for autotrace program:" + msgstr "autotrace 附加参数:" + +@@ -846,12 +890,25 @@ msgstr "" + msgid "Adlam" + msgstr "阿德拉姆文" + ++msgid "Adobe" ++msgstr "Adobe" ++ + msgid "Adobe Glyph List" + msgstr "Adobe 字形列表" + + msgid "Adobe Standard" + msgstr "Adobe标准" + ++msgid "" ++"Adobe says that \"big\" splines should not have extrema.\n" ++"But they don't define what big means.\n" ++"If the distance between the spline's end-points is bigger than this value, " ++"then the spline is \"big\" to fontforge." ++msgstr "" ++"Adobe 认为大样条不应有极值。\n" ++"但其未定义上述“大”的意义。\n" ++"若样条端点间距大于此值，Fontforge 即认其为“大”样条。" ++ + msgid "" + "Adobe's fontname spec (5088.FontNames.pdf) says that fontnames should not be " + "longer than 29 characters. Do you want to continue anyway?" +@@ -897,7 +954,7 @@ msgstr "南非语" + msgid "" + "After rotating or skewing a glyph you should probably apply Element->Add " + "Extrema" +-msgstr "旋转或倾斜字形后可能要执行“基础->增加极点”" ++msgstr "旋转或倾斜字形后可能要执行“基础->增加极值”" + + msgid "Ahead Classes" + msgstr "向前类属" +@@ -911,6 +968,9 @@ msgstr "阿尔巴尼亚语" + msgid "Alchemical Symbols" + msgstr "冶金符号" + ++msgid "Align Points" ++msgstr "对齐点" ++ + msgid "Align:" + msgstr "对齐:" + +@@ -929,6 +989,10 @@ msgstr "所有字形" + msgid "All characters in the value must be in ASCII" + msgstr "取值字符均应为ASCII码" + ++#, c-format ++msgid "All entries in a lookup must have the same type on line %d of %s" ++msgstr "查找中的所有条目在 %2$s 的第 %1$d 行中必须具有相同的类型" ++ + msgid "All glyphs" + msgstr "所有字形" + +@@ -948,7 +1012,7 @@ msgid "Allow _curve smoothing" + msgstr "允许曲线平滑(_C)" + + msgid "Allow _removal of extrema" +-msgstr "允许移除极点(_R)" ++msgstr "允许移除极值(_R)" + + msgid "Allow _slopes to change" + msgstr "允许倾斜改变(_S)" +@@ -960,7 +1024,7 @@ msgid "Allow:" + msgstr "允许:" + + msgid "Almost H/V Color" +-msgstr "差不多水平或垂直的颜色" ++msgstr "近水平/近垂直颜色" + + msgid "Almost Horizontal/Vertical Curves" + msgstr "几乎水平或垂直的曲线" +@@ -1092,8 +1156,11 @@ msgstr "角度：" + msgid "Anti-Alias" + msgstr "抗锯齿" + ++msgid "Appea_rance Editor..." ++msgstr "外观选项(_R)..." ++ + msgid "Appearance Editor" +-msgstr "外观选项" ++msgstr "外观编辑器(_R)..." + + msgid "Append a FONTLOG entry" + msgstr "添加FONTLOG信息项" +@@ -1243,14 +1310,27 @@ msgid "Arabic Right to Left" + msgstr "阿拉伯文从右到左" + + msgid "Arabic Supplement" +-msgstr "Arabic增补" ++msgstr "阿拉伯文补充" + + msgid "Archives" + msgstr "包" + ++msgid "Arcs" ++msgstr "圆弧" ++ ++msgid "Arcs Clip:" ++msgstr "圆弧裁剪:" ++ + msgid "Are you sure you don't want to use the cidmap I found?" + msgstr "确定不用我找到的cidmap文件？" + ++msgid "" ++"Are you sure you want to replace Å?\n" ++"The ring will not join to the A." ++msgstr "" ++"您确定要替换 Å 吗？\n" ++"环不会加入 A。" ++ + msgid "" + "Are you sure you wish to remove these glyphs? This operation cannot be " + "undone." +@@ -1414,7 +1494,7 @@ msgid "Automatic" + msgstr "自动" + + msgid "Autot_race" +-msgstr "自动循迹(_R)" ++msgstr "自动描边(_R)" + + msgid "AutotraceArgs" + msgstr "Autotrace参数" +@@ -1456,7 +1536,7 @@ msgid "Axis Type:" + msgstr "轴类型:" + + msgid "Axis height of the font" +-msgstr "字体数轴高" ++msgstr "字体轴高" + + msgid "Axis range not valid" + msgstr "轴域不可用" +@@ -1486,6 +1566,9 @@ msgstr "BDF分辨率" + msgid "BDF bitmap properties table" + msgstr "BDF 位图属性表" + ++msgid "B_evel" ++msgstr "截角(_E)" ++ + msgid "B_uild" + msgstr "生成(_U)" + +@@ -1627,7 +1710,7 @@ msgid "Bad Lig. Caret Count" + msgstr "不良连写位计数" + + msgid "Bad MM Weights" +-msgstr "字体集粗细不良" ++msgstr "多母版字重不良" + + msgid "Bad Mac Family" + msgstr "不良Mac字族" +@@ -1636,7 +1719,7 @@ msgid "Bad Metrics" + msgstr "不良尺寸" + + msgid "Bad Multiple Master Font" +-msgstr "不良的多母版字体" ++msgstr "不良的多重母版字体" + + msgid "Bad Name" + msgstr "不良名称" +@@ -1909,11 +1992,14 @@ msgstr "不良类型" + msgid "Bad xfig file" + msgstr "不良 xfig 文件" + ++msgid "Balancing..." ++msgstr "正在平衡..." ++ + msgid "Balinese" + msgstr "巴厘文" + + msgid "Ball (Round Cap)" +-msgstr "圆球(圆头)" ++msgstr "圆球（圆头）" + + msgid "Bamum" + msgstr "巴姆穆文" +@@ -1982,7 +2068,7 @@ msgid "Batak" + msgstr "巴塔克文" + + msgid "Be_vel" +-msgstr "伞形(_V)" ++msgstr "截角(_V)" + + msgid "Begin:" + msgstr "起点：" +@@ -2055,6 +2141,9 @@ msgstr "位图部件\n" + msgid "Bitmap Strikes Available" + msgstr "可用位图部件" + ++msgid "Bitmap View" ++msgstr "位图视图" ++ + msgid "Bitmap _Magnification..." + msgstr "位图缩放(_M)..." + +@@ -2097,6 +2186,9 @@ msgstr "粗体" + msgid "Bold Italic" + msgstr "粗斜体" + ++msgid "Bold font used in the Find/Replace window" ++msgstr "查找/替换窗口中使用的粗体" ++ + msgid "Bone" + msgstr "骨" + +@@ -2104,7 +2196,7 @@ msgid "Book" + msgstr "书体" + + msgid "Bookmark Current Dir" +-msgstr "标记当前方向" ++msgstr "将当前目录加入书签" + + msgid "Bookmarks" + msgstr "标记" +@@ -2136,6 +2228,9 @@ msgstr "边框" + msgid "Bosnian" + msgstr "爱沙尼亚语" + ++msgid "Both" ++msgstr "两者" ++ + msgid "Both points must be specified, or neither" + msgstr "两点须都指定或都不指定" + +@@ -2230,7 +2325,7 @@ msgid "Building duplicate encodings" + msgstr "生成重复编码" + + msgid "Building small capitals" +-msgstr "生成小大写" ++msgstr "生成小型大写" + + msgid "Building sub/superscripts" + msgstr "生成上下标" +@@ -2253,12 +2348,18 @@ msgstr "按钮" + msgid "By Classes" + msgstr "按类属" + ++msgid "By Con_tour" ++msgstr "按轮廓线(_T)" ++ + msgid "By Coverage" + msgstr "按范围" + + msgid "By Glyphs" + msgstr "按字形" + ++msgid "By La_yer" ++msgstr "按层(_Y)" ++ + msgid "By _Scripts" + msgstr "按手写体(_S)" + +@@ -2294,8 +2395,8 @@ msgstr "CID字符标识名称" + + msgid "CJK (& Ext A/B) & CJK Radicals Sup & Kangxi & IDC & Kanbun" + msgstr "" +-"中日韩表意文字基本区 (& 扩展 A/B) & 中日韩部首补充 & 康熙部首 & 表意文字描述" +-"符 & 汉文训读" ++"中日韩表意文字基本区（及扩展 A/B）、中日韩部首补充、康熙部首、表意文字描述" ++"符、汉文训读" + + msgid "CJK Compatibility" + msgstr "中日韩兼容字符" +@@ -2354,6 +2455,9 @@ msgstr "中日韩统一表意文字扩展 F" + msgid "CJK Unified Ideographs Extension G" + msgstr "中日韩统一表意文字扩展 G" + ++msgid "CJK Unified Ideographs Extension H" ++msgstr "中日韩统一表意文字扩展 H" ++ + msgid "CS Clarendon" + msgstr "CS粗长体" + +@@ -2396,6 +2500,9 @@ msgstr "清除(_L)" + msgid "C_lasses" + msgstr "类属(_L)" + ++msgid "C_lear" ++msgstr "清除(_L)" ++ + msgid "C_lose Tab" + msgstr "关闭(_C)页" + +@@ -2411,6 +2518,9 @@ msgstr "角(_O)" + msgid "C_ustom" + msgstr "自定义(_U)" + ++msgid "Ca_lligraphic (Rectangular)" ++msgstr "书法（矩形）(_L)" ++ + msgid "Call Script" + msgstr "调用脚本" + +@@ -2541,16 +2651,16 @@ msgid "Canonical Start _Point" + msgstr "标准起点(_P)" + + msgid "Canonical _Contours" +-msgstr "正则轮廓(_C)" ++msgstr "正则轮廓线(_C)" + + msgid "Capital Spacing" + msgstr "大写间隔" + + msgid "Capitals to Petite Capitals" +-msgstr "大写到袖珍大写" ++msgstr "大写到微型大写" + + msgid "Capitals to Small Capitals" +-msgstr "大写到小大写" ++msgstr "大写到小型大写" + + msgid "Carian" + msgstr "加里亚文" +@@ -2616,7 +2726,7 @@ msgid "Change UniqueID?" + msgstr "更改UniqueID？" + + msgid "Change Weight" +-msgstr "更改粗细" ++msgstr "更改字重" + + msgid "Change X-Height" + msgstr "更改X高" +@@ -2628,10 +2738,10 @@ msgid "Change _Glyph..." + msgstr "改变字形(_G)..." + + msgid "Change _Weight..." +-msgstr "更改粗细(_W)..." ++msgstr "更改字重(_W)..." + + msgid "Change _X-Height..." +-msgstr "更改X高(_X)..." ++msgstr "更改_x高..." + + msgid "Change whether spiro is active or not" + msgstr "切换spiro" +@@ -2973,7 +3083,7 @@ msgid "Check _flipped references" + msgstr "检查翻转参照(_f)" + + msgid "Check _missing extrema" +-msgstr "检查缺失极点(_M)" ++msgstr "检查缺失极值(_M)" + + msgid "Check _outermost paths clockwise" + msgstr "检查顺时针方向最外边的路径" +@@ -3151,6 +3261,9 @@ msgstr "清除设备表" + msgid "Clear Instructions" + msgstr "清除指令" + ++msgid "Clear Special Data" ++msgstr "清除特殊数据" ++ + msgid "Clear _Background" + msgstr "清除背景(_B)" + +@@ -3192,10 +3305,10 @@ msgid "Cloc_kwise" + msgstr "顺时针(_K)" + + msgid "Close Open Contours" +-msgstr "关闭所有已打开的轮廓" ++msgstr "闭合开放的轮廓线" + + msgid "Co_py LBearing" +-msgstr "复制左边位(_p)" ++msgstr "复制左边位(_P)" + + msgid "Collage" + msgstr "拼贴画" +@@ -3305,7 +3418,7 @@ msgid "Compare Layers" + msgstr "比较层" + + msgid "Compare Layers..." +-msgstr "比较层…" ++msgstr "比较图层…" + + msgid "Compare _Bitmaps" + msgstr "比较位图(_B)" +@@ -3372,6 +3485,12 @@ msgstr "配置" + msgid "Conflict Hint Color" + msgstr "冲突渲调提示颜色" + ++msgid "Conjunct Form After Ro" ++msgstr "Ro 后的连结形式" ++ ++msgid "Conjunct Forms" ++msgstr "连结形式" ++ + msgid "Connectors" + msgstr "连接" + +@@ -3420,6 +3539,9 @@ msgstr "关联替代" + msgid "Continue" + msgstr "继续" + ++msgid "Contours (from closed):" ++msgstr "轮廓线（从闭合的）:" ++ + msgid "Control Pictures" + msgstr "控制图片" + +@@ -3432,6 +3554,9 @@ msgstr "控制点临近水平/垂直/倾斜" + msgid "ControlPoint|Default" + msgstr "默认" + ++msgid "Conve_x (Polygonal)" ++msgstr "凸形（多边形）(_X)" ++ + msgid "Convert By C_Map" + msgstr "由CMap转换(_M)" + +@@ -3469,7 +3594,7 @@ msgid "Copy Loo_kup Data" + msgstr "复制查找数据(_K)" + + msgid "Copy RBearin_g" +-msgstr "复制右边位(_g)" ++msgstr "复制右边位(_G)" + + msgid "Copy _Fg To Bg" + msgstr "复制前景到背景(_F)" +@@ -3512,7 +3637,7 @@ msgid "Corporate Use" + msgstr "企业应用" + + msgid "Correct Direction" +-msgstr "正确方向" ++msgstr "修正方向" + + msgid "Correct References" + msgstr "修正参考" +@@ -3589,7 +3714,7 @@ msgstr "未能打开头文件(%s)于行 %d (%s中)" + + #, c-format + msgid "Could not open output file: %s" +-msgstr "未能打开输出文件: %s" ++msgstr "未能打开输出文件：%s" + + msgid "Could not open temporary file." + msgstr "无法打开临时文件。" +@@ -3603,7 +3728,7 @@ msgid "Could not read %s" + msgstr "不能读 %s" + + msgid "Could not read (or perhaps find) mf output file" +-msgstr "未能读（或未找到）mf输出文件" ++msgstr "无法读取（或找到）mf输出文件" + + msgid "Could not write" + msgstr "未能写入" +@@ -3703,7 +3828,7 @@ msgid "Cr_eate" + msgstr "新建(_E)" + + msgid "Cr_eate VHint..." +-msgstr "创建垂直渲调提示(_T)…" ++msgstr "创建垂直渲调提示(_E)…" + + msgid "Cre_ate Named Glyphs..." + msgstr "创建命名字形(_A)…" +@@ -3718,10 +3843,10 @@ msgid "Create Horizontal Stem Hint" + msgstr "创建水平字干渲调" + + msgid "Create MM" +-msgstr "创建字体集" ++msgstr "创建多母版" + + msgid "Create Small Caps" +-msgstr "创建小大写" ++msgstr "创建小型大写" + + msgid "Create Subscript/Superscript" + msgstr "创建上下标" +@@ -3872,6 +3997,9 @@ msgstr "西里尔文扩展 B" + msgid "Cyrillic Extended-C" + msgstr "西里尔文扩展 C" + ++msgid "Cyrillic Extended-D" ++msgstr "西里尔文扩展 D" ++ + msgid "Cyrillic Supplement" + msgstr "西里尔文补充" + +@@ -4063,13 +4191,13 @@ msgid "Designer URL" + msgstr "设计师网址" + + msgid "Design|_New..." +-msgstr "新建(_N)…" ++msgstr "设计|新建(_N)…" + + msgid "Desired X-Height" + msgstr "预期X高度" + + msgid "Desired x-height:" +-msgstr "期望X高度:" ++msgstr "所需的 x 高度：" + + msgid "Detach & Remo_ve Glyphs..." + msgstr "分离及移除字形(_V)…" +@@ -4092,6 +4220,9 @@ msgstr "天城文(梵文)" + msgid "Devanagari Extended" + msgstr "天城体扩展" + ++msgid "Devanagari Extended-A" ++msgstr "梵文扩展 A" ++ + msgid "Device Table Adjustments" + msgstr "设备表调整" + +@@ -4130,8 +4261,47 @@ msgstr "差异..." + msgid "Different Fonts" + msgstr "不同字体" + ++#, c-format ++msgid "Different fill patterns in layer %d of %s\n" ++msgstr "%2$s 的 %1$d 层中的不同填充图案\n" ++ ++#, c-format ++msgid "Different number of contours in glyph “%s”\n" ++msgstr "字形“%s”中有不同数量的轮廓线\n" ++ ++#, c-format ++msgid "Different settings on whether to fill in layer %d of %s\n" ++msgstr "是否在 %2$s 的 %1$d 层中填充的不同设置\n" ++ ++#, c-format ++msgid "Different settings on whether to inherit fill color in layer %d of %s\n" ++msgstr "是否在 %2$s 的 %1$d 层中继承填充颜色的不同设置\n" ++ ++#, c-format ++msgid "" ++"Different settings on whether to inherit fill opacity in layer %d of %s\n" ++msgstr "是否在 %2$s 的 %1$d 层中继承填充不透明度的不同设置\n" ++ ++#, c-format ++msgid "" ++"Different settings on whether to inherit stroke opacity in layer %d of %s\n" ++msgstr "是否在 %2$s 的 %1$d 层中继承笔划不透明度的不同设置\n" ++ ++#, c-format ++msgid "" ++"Different settings on whether to inherit stroke width in layer %d of %s\n" ++msgstr "是否在 %2$s 的 %1$d 层中继承笔划宽度的不同设置\n" ++ ++#, c-format ++msgid "Different settings on whether to stroke in layer %d of %s\n" ++msgstr "是否在 %2$s 的 %1$d 层中描边的不同设置\n" ++ ++#, c-format ++msgid "Different stroke patterns in layer %d of %s\n" ++msgstr "%2$s 的 %1$d 层中的不同笔划图案\n" ++ + msgid "Dingbats" +-msgstr "Dingbats 英文字符" ++msgstr "装饰符号" + + msgid "Diphthongs (Obsolete)" + msgstr "双元音（已停用）" +@@ -4507,6 +4677,10 @@ msgstr "字形顺序" + msgid "End of file found in JSTF table.\n" + msgstr "JSTF表中找到文件结束符号。\n" + ++#, c-format ++msgid "End of file found in string on line %d of %s" ++msgstr "在 %2$s 的第 %1$d 行的字符串中找到文件结尾" ++ + #, c-format + msgid "End of file in %s table" + msgstr " %s 表中文件结束符号" +@@ -4607,7 +4781,7 @@ msgid "Estonian" + msgstr "爱沙尼亚语" + + msgid "Ethiopic" +-msgstr "埃塞尔比亚文" ++msgstr "埃塞俄比亚文" + + msgid "Ethiopic Extended" + msgstr "埃塞额比亚文扩展" +@@ -4619,7 +4793,7 @@ msgid "Ethiopic Extended-B" + msgstr "吉兹文扩展 B" + + msgid "Ethiopic Supplement" +-msgstr "Ethiopic增补" ++msgstr "埃塞俄比亚文补充" + + msgid "European Number" + msgstr "欧洲数字" +@@ -4674,6 +4848,14 @@ msgstr "加宽" + msgid "Expanded (125%)" + msgstr "加宽至125%" + ++#, c-format ++msgid "Expected %s in lookup definition on line %d of %s" ++msgstr "在 %3$s 的第 %2$d 行的查找定义中需要 %1$s" ++ ++#, c-format ++msgid "Expected '%c%c%c%c' in lookup definition on line %d of %s" ++msgstr "在 %6$s 的第 %5$d 行的查找定义中需要“%1$c%2$c%3$c%4$c”" ++ + #, c-format + msgid "Expected '%c' on line %d of %s" + msgstr "需要'%c' 于行 %d (%s中)" +@@ -4684,15 +4866,15 @@ msgstr "需要'%s' 于行 %d (%s中)" + + #, c-format + msgid "Expected ';' at statement end on line %d of %s" +-msgstr "期望有';'在句末于行%d (%s)" ++msgstr "预期的 ';' 在 %2$s 的第 %1$d 行语句结束" + + #, c-format + msgid "Expected ';' in lookupflags on line %d of %s" +-msgstr "期望有';' 查找标记于行%d (%s)" ++msgstr "预期的 ';' 在 %2$s 的第 %1$d 行的 lookupflags 中" + + #, c-format + msgid "Expected ';' on line %d of %s" +-msgstr "期望';'于行%d (%s)" ++msgstr "预期的 ';' 在第 %d 行，共 %s" + + #, c-format + msgid "Expected '=' in glyph class definition on line %d of %s" +@@ -4700,11 +4882,11 @@ msgstr "在第 %d 行（ %s ）的字图类定义需要有'['" + + #, c-format + msgid "Expected '>' in anchor on line %d of %s" +-msgstr "期望有'>' 于行%d (%s)" ++msgstr "在 %2$s 的第 %1$d 行的锚点中需要“>”" + + #, c-format + msgid "Expected '>' in caret on line %d of %s" +-msgstr "期望有'>' 于行%d (%s)" ++msgstr "在 %2$s 的第 %1$d 行的插入符号中应为“>”" + + #, c-format + msgid "Expected '>' in value record on line %d of %s" +@@ -4732,7 +4914,11 @@ msgstr "%2$s 的第 %1$d 行的特征定义中应为“{”" + + #, c-format + msgid "Expected '}' on line %d of %s" +-msgstr "期望'}'于行%d (%s)" ++msgstr "%2$s 的第 %1$d 行应为“}”" ++ ++#, c-format ++msgid "Expected Attach or LigatureCaret or GlyphClassDef on line %d of %s" ++msgstr "%2$s 的第 %1$d 行需要 Attach 或 LigatureCaret 或 GlyphClassDef" + + #, c-format + msgid "Expected a single glyph name in reverse substitution on line %d of %s" +@@ -4750,10 +4936,20 @@ msgstr "预期在 %2$s 的第 %1$d 行有一个锚点（在基础/标记之后 + msgid "Expected an anchor (after ligature) on line %d of %s" + msgstr "预期在 %2$s 的第 %1$d 行有一个锚点（连字后）" + ++#, c-format ++msgid "" ++"Expected an integer specifying baseline positions in BASE table on line %d " ++"of %s" ++msgstr "需要一个整数，用于指定 BASE 表中第 %d 行（共 %s）的基线位置" ++ + #, c-format + msgid "Expected anchor in mark class definition on line %d of %s" + msgstr "%2$s 的第 %1$d 行上的标记类定义中的预期锚点" + ++#, c-format ++msgid "Expected baseline tag in BASE table on line %d of %s" ++msgstr "%2$s 行 %1$d 上的 BASE 表中的预期基线标记" ++ + msgid "" + "Expected boolean value.\n" + "(\"true\" or \"false\")" +@@ -4763,15 +4959,32 @@ msgstr "" + + #, c-format + msgid "Expected class name in mark class definition on line %d of %s" +-msgstr "期望类属名称于标记类属定义的行%d (%s)" ++msgstr "%2$s 的第 %1$d 行标记类定义中的预期类名" + + #, c-format + msgid "Expected class on line %d of %s" +-msgstr "期望类属于行%d (%s)" ++msgstr "%2$s 行 %1$d 上应为类" ++ ++#, c-format ++msgid "Expected closing curly brace on line %d of %s" ++msgstr "%2$s 的第 %1$d 行需要右大括号" + + #, c-format + msgid "Expected comma in device table on line %d of %s" +-msgstr "期望有设备表中有逗号， 于行%d (%s)" ++msgstr "%2$s 的第 %1$d 行设备表中应有逗号" ++ ++#, c-format ++msgid "Expected comma or semicolon in BASE table on line %d of %s" ++msgstr "%2$s 的第 %1$d 行的 BASE 表中需要逗号或分号" ++ ++#, c-format ++msgid "Expected comma or semicolon on line %d of %s" ++msgstr "%2$s 的第 %1$d 行需要逗号或分号" ++ ++#, c-format ++msgid "" ++"Expected either \"HorizAxis\" or \"VertAxis\" in BASE table on line %d of %s" ++msgstr "在 %2$s 的第 %1$d 行的 BASE 表中应为“HorizAxis”或“VertAxis”" + + #, c-format + msgid "" +@@ -4792,7 +5005,7 @@ msgstr "在第 %d 行( %s)中的锚点需要有整数" + + #, c-format + msgid "Expected integer in caret on line %d of %s" +-msgstr "期望光标为整数于行%d (%s)" ++msgstr "%2$s 的第 %1$d 行插入符号中的预期整数" + + #, c-format + msgid "Expected integer in device table on line %d of %s" +@@ -4800,23 +5013,31 @@ msgstr "在第行%d (%s) 上的设备表中应该有整数" + + #, c-format + msgid "Expected integer on line %d of %s" +-msgstr "期望整数于行%d (%s)" ++msgstr "%2$s 行 %1$d 上的预期整数" ++ ++#, c-format ++msgid "Expected integer or list of integers after %s on line %d of %s" ++msgstr "在 %s 的第 %d 行的 %s 之后需要整数或整数列表" ++ ++#, c-format ++msgid "Expected matching tag in table on line %d of %s" ++msgstr "表中第 %d 行（共 %s）的预期匹配标记" + + #, c-format + msgid "Expected name in anchor definition on line %d of %s" +-msgstr "期望锚点定义名称， 于行%d (%s)" ++msgstr "%2$s 的第 %1$d 行锚点定义中的预期名称" + + #, c-format + msgid "Expected name in lookup on line %d of %s" +-msgstr "期望名称于行%d (%s)" ++msgstr "在 %2$s 的第 %1$d 行查找中需要名称" + + #, c-format + msgid "Expected name in value record definition on line %d of %s" +-msgstr "期望在记录中的第%d行第%s列定义了名称" ++msgstr "%2$s 的第 %1$d 行值记录定义中的预期名称" + + #, c-format + msgid "Expected name or class on line %d of %s" +-msgstr "期望名称或类属于行%d (%s)" ++msgstr "%2$s 的第 %1$d 行需要名称或类" + + msgid "Expected number." + msgstr "需要数字。" +@@ -4824,21 +5045,33 @@ msgstr "需要数字。" + msgid "Expected property list file" + msgstr "需要属性列表文件" + ++#, c-format ++msgid "Expected semicolon in BASE table on line %d of %s" ++msgstr "%2$s 的第 %1$d 行的 BASE 表中需要分号" ++ + #, c-format + msgid "Expected semicolon on line %d of %s" +-msgstr "期望分号于行%d (%s)" ++msgstr "%2$s 的第 %1$d 行需要分号" + + #, c-format + msgid "Expected string on line %d of %s" +-msgstr "期望字符串于行%d (%s)" ++msgstr "%2$s 的第 %1$d 行需要字符串" ++ ++#, c-format ++msgid "Expected tag in feature on line %d of %s" ++msgstr "%2$s 的第 %1$d 行功能中的预期标记" + + #, c-format + msgid "Expected tag in languagesystem on line %d of %s" + msgstr "在第%d行（%s) 的语言系统应有标签" + ++#, c-format ++msgid "Expected tag in table on line %d of %s" ++msgstr "表中第 %d 行（共 %s）的预期标记" ++ + #, c-format + msgid "Expected tag on line %d of %s" +-msgstr "期望标签于行%d (%s)" ++msgstr "%2$s 行 %1$d 上的预期标记" + + #, c-format + msgid "Expected two anchors (after cursive) on line %d of %s" +@@ -4863,6 +5096,9 @@ msgstr "导出" + msgid "Exten Shapes" + msgstr "扩展形状" + ++msgid "Extend Cap:" ++msgstr "延伸端头:" ++ + msgid "Extend Lookups Off" + msgstr "扩展查找关" + +@@ -4896,10 +5132,13 @@ msgstr "扩展" + msgid "Extent" + msgstr "扩展" + ++msgid "External Only" ++msgstr "仅外部" ++ + #. GT: Extra Space, see below for a full comment + #. GT: Extra Space + msgid "Extra Sp:" +-msgstr "空位:" ++msgstr "额外空位:" + + msgid "Extra-Condensed (62.5%)" + msgstr "压缩至62.5%" +@@ -4929,7 +5168,7 @@ msgid "FS Modern" + msgstr "FS现代" + + msgid "F_ind / Replace..." +-msgstr "查找(_I) / 替换…" ++msgstr "查找/替换(_I)…" + + #. GT: Foreground, make it short + msgid "F_ore" +@@ -4954,7 +5193,7 @@ msgstr "从%s载入压缩数据失败" + + #, c-format + msgid "Failed to open %s for output" +-msgstr "未能打开 %s 作输出" ++msgstr "未能打开用于输出的%s" + + #, c-format + msgid "Failed to open file %s for output" +@@ -4991,7 +5230,7 @@ msgid "FamilyBl_ues" + msgstr "字族蓝值(_U)" + + msgid "Faroese (Icelandic)" +-msgstr "Faroese(冰岛语)" ++msgstr "法罗语（冰岛语）" + + msgid "Feature" + msgstr "特性" +@@ -5023,6 +5262,12 @@ msgstr "特性标签将被删除" + msgid "Features" + msgstr "特征" + ++#, c-format ++msgid "" ++"Features inside of other features are only permitted for 'aalt' features on " ++"line %d of %s" ++msgstr "其他功能中的功能仅允许用于 %2$s 的第 %1$d 行的“aalt”功能" ++ + msgid "Fi_ll" + msgstr "填充(_L)" + +@@ -5126,7 +5371,7 @@ msgid "First Glyph Name" + msgstr "首字形名称" + + msgid "First P_oint, Next Contour" +-msgstr "第一点，下一曲线(_O)" ++msgstr "第一点，下一轮廓线(_O)" + + msgid "First Point Color" + msgstr "第一点颜色" +@@ -5149,9 +5394,15 @@ msgstr "闪光的" + msgid "Flat" + msgstr "平整" + ++msgid "Flat Nib" ++msgstr "扁平笔尖" ++ + msgid "Flate decompression failed.\n" + msgstr "解压缩失败。\n" + ++msgid "Flemish" ++msgstr "弗拉芒荷兰语" ++ + msgid "Flemish (Belgian Dutch)" + msgstr "弗拉芒语（比利时荷兰）" + +@@ -5197,7 +5448,7 @@ msgid "" + "Do you want to save it?" + msgstr "" + "字体 %1$.40s (文件 %2$.40s) 已改变。\n" +-"要保存么？" ++"要保存吗？" + + #, c-format + msgid "" +@@ -5248,6 +5499,14 @@ msgstr "字体:" + msgid "FontForge" + msgstr "FontForge" + ++#, c-format ++msgid "FontForge does not support anonymous tables on line %d of %s" ++msgstr "FontForge 不支持第 %d 行的匿名表，共 %s" ++ ++#, c-format ++msgid "FontForge does not support this bit depth %d (must be 1,2,4,8,16,32)\n" ++msgstr "FontForge不支持%d位深度(必须为1,2,4,8,16,32)\n" ++ + msgid "FontForge font debugging table" + msgstr "FontForge 字体调试表" + +@@ -5334,7 +5593,7 @@ msgstr "格式：" + + #, c-format + msgid "Found %1$.4g, expected %2$.4g" +-msgstr "发现 %1$.4g, 期望 %2$.4g" ++msgstr "已找到 %1$.4g，预期为 %2$.4g" + + msgid "FoundryName" + msgstr "制作工具" +@@ -5530,7 +5789,7 @@ msgid "Generate Mac Family" + msgstr "生成Mac字族" + + msgid "Generate Mac _Family..." +-msgstr "生成Mac族(_F)…" ++msgstr "生成Mac字体家族(_F)…" + + msgid "Generate TTC..." + msgstr "生成TTC…" +@@ -5757,6 +6016,23 @@ msgstr "字形 “%s” 不同\n" + msgid "Glyph “%s” differs at %d@%d\n" + msgstr "字形 “%s” 不同于 %d@%d\n" + ++#, c-format ++msgid "" ++"Glyph “%s” does not have splines which match exactly, but they are close\n" ++msgstr "字形“%s”没有完全匹配的样条线，但已经接近了\n" ++ ++#, c-format ++msgid "Glyph “%s” has a different fill in layer %d\n" ++msgstr "字形 “%s” 在%d图层中有不同的填充\n" ++ ++#, c-format ++msgid "Glyph “%s” has a different number of layers\n" ++msgstr "字形 “%s” 有不同的图层数量。\n" ++ ++#, c-format ++msgid "Glyph “%s” has a different stroke in layer %d\n" ++msgstr "字形 “%s”在%d图层中有不同的笔划\n" ++ + #, c-format + msgid "Glyph “%s” missing from %s\n" + msgstr "字形“%s” 不在 %s 中\n" +@@ -5811,6 +6087,15 @@ msgstr "" + "字形将由线组成而非可填充的轮廓。\n" + "所有字形的线宽为" + ++msgid "Glyphs with both" ++msgstr "两者皆含的字形" ++ ++msgid "Glyphs with only S_plines" ++msgstr "仅含样条的字形(_P)" ++ ++msgid "Glyphs with only _References" ++msgstr "仅含参照的字形(_R)" ++ + msgid "Glyphs:" + msgstr "字形：" + +@@ -5869,7 +6154,7 @@ msgid "Greek and Coptic" + msgstr "希腊文及科普特文" + + msgid "Greek small caps" +-msgstr "希腊小大写" ++msgstr "希腊小型大写" + + msgid "Green:" + msgstr "绿：" +@@ -5880,6 +6165,9 @@ msgstr "格陵兰语" + msgid "Grid" + msgstr "网格" + ++msgid "Grid Color" ++msgstr "网格颜色" ++ + msgid "Grid Fi_t" + msgstr "网格填充(_T)" + +@@ -5972,6 +6260,9 @@ msgstr "HV分组框" + msgid "H_ints" + msgstr "渲染调整(_I)" + ++msgid "Halant Forms" ++msgstr "Halant 形" ++ + msgid "Half Forms" + msgstr "半形" + +@@ -6017,9 +6308,18 @@ msgstr "谚文音节" + msgid "Hanifi Rohingya" + msgstr "哈尼菲罗兴亚文" + ++msgid "Hanja to Hangul (Deprecated)" ++msgstr "由朝鲜汉字到朝鲜谚文（已弃用）" ++ + msgid "Hanunoo" + msgstr "哈努努奥文" + ++msgid "Harmoni_ze" ++msgstr "协调(_Z)" ++ ++msgid "Harmonizing..." ++msgstr "正在协调..." ++ + msgid "Has _Vertical Metrics" + msgstr "有垂直尺寸(_V)" + +@@ -6142,8 +6442,11 @@ msgstr "点击观察点" + msgid "Hojo (JIS X 0212-1990) Kanji Forms" + msgstr "JIS X 0212-1990 补助汉字表字形" + ++msgid "Hold [Control] key to restrict" ++msgstr "按住 [Control] (Ctrl) 键来限制选择" ++ + msgid "Hold [Shift] key to merge" +-msgstr "按住 [Shift] 键合并" ++msgstr "按住 [Shift] 键合并选择" + + msgid "Home Folder" + msgstr "主文件夹" +@@ -6218,12 +6521,25 @@ msgstr "你想增加多少CID位？" + msgid "How many unencoded glyph slots do you wish to add?" + msgstr "你想增加多少未编码的字形位？" + ++msgid "How to align these points?" ++msgstr "如何对齐这些点？" ++ + msgid "Hue:" + msgstr "色调：" + + msgid "Hungarian" + msgstr "匈牙利语" + ++#, c-format ++msgid "" ++"I can't even imagine how to attempt to interpolate gradients in layer %d of " ++"%s\n" ++msgstr "我甚至无法想象如何尝试在 %2$s 的 %1$d 层中插入渐变\n" ++ ++#, c-format ++msgid "I can't figure out how to compare the subtable, %s, in %s to %s in %s\n" ++msgstr "无法将在%2$s中的替代表%1$s与%4$s中的替代表%3$s进行比较\n" ++ + msgid "" + "I'm sorry this file is too complex for me to understand (or is erroneous)" + msgstr "抱歉，此文件太复杂，我不能理解。 (它可能有点问题)" +@@ -6242,7 +6558,7 @@ msgid "I.C." + msgstr "倾斜修正" + + msgid "IPA Extensions" +-msgstr "国际音标扩展" ++msgstr "IPA 国际音标扩展" + + msgid "IPA usage" + msgstr "IPA 用法" +@@ -6271,6 +6587,11 @@ msgstr "表意文字描述字符" + msgid "Ideographic Symbols and Punctuation" + msgstr "表意符号及标点" + ++msgid "" ++"If the start point of a contour is not an extremum, find a new start point " ++"(on the contour) which is." ++msgstr "如果轮廓线的起点不是极值，（在轮廓线上）寻找极值为新的起点。" ++ + msgid "Ignore" + msgstr "忽略" + +@@ -6329,6 +6650,24 @@ msgstr "导入查找" + msgid "In TTF/OTF" + msgstr "TTF/OTF" + ++#, c-format ++msgid "In character %s, could not find reference to %s\n" ++msgstr "在字符 %s 中，找不到对 %s 的引用\n" ++ ++#, c-format ++msgid "In character %s, there are too few points on a path in the base\n" ++msgstr "字符 %s 中，基础路径上的点数太少\n" ++ ++#, c-format ++msgid "In character %s, there are too many points on a path in the base\n" ++msgstr "字符 %s 中，基础路径上的点数太多\n" ++ ++#, c-format ++msgid "" ++"In lookup subtable %.30s you replace a glyph with itself. Was this " ++"intentional?" ++msgstr "在查找子表 %.30s 中，有个字形自身替换。特地要如此吗？" ++ + #. GT: Spoof on the bible + msgid "In the beginning was the letter..." + msgstr "开头是字母..." +@@ -6488,6 +6827,9 @@ msgstr "指令已改变" + msgid "Intermediate Points:" + msgstr "中间点:" + ++msgid "Internal Only" ++msgstr "仅内部" ++ + msgid "Internal error in creating FNT. File offset wrong\n" + msgstr "创建FNT时发生内部错误。 文件偏移错误\n" + +@@ -6592,7 +6934,7 @@ msgid "Irish" + msgstr "爱尔兰语" + + msgid "Irish Gaelic" +-msgstr "盖尔语(爱尔兰)" ++msgstr "爱尔兰盖尔语" + + msgid "Irish Gaelic (with dot)" + msgstr "爱尔兰盖尔语 (有修饰点)" +@@ -6704,6 +7046,9 @@ msgstr "Javanese (罗马字母)" + msgid "Johab (Korean)" + msgstr "组合式（韩文Johab）" + ++msgid "Join Limit:" ++msgstr "连接范围限制:" ++ + msgid "JoinSnap" + msgstr "联合捕捉" + +@@ -6719,6 +7064,9 @@ msgstr "对齐的文字" + msgid "Kaithi" + msgstr "卡罗须提文" + ++msgid "Kaktovik Numerals" ++msgstr "卡克托维克数字" ++ + msgid "Kana Extended-A" + msgstr "假名扩展 A" + +@@ -6744,11 +7092,14 @@ msgid "Katakana" + msgstr "日文片假名" + + msgid "Katakana (& Phonetic Extensions)" +-msgstr "片假名（& 语音扩展)" ++msgstr "片假名（和音标扩展）" + + msgid "Katakana Phonetic Extensions" + msgstr "片假名音标扩展" + ++msgid "Kawi" ++msgstr "卡维" ++ + msgid "Kayah Li" + msgstr "克耶利文" + +@@ -6809,6 +7160,10 @@ msgstr "字偶距类" + msgid "Kerning State Machine" + msgstr "压缩状态机" + ++#, c-format ++msgid "Kerning between “%s” and %s is %d in %s and %d in %s\n" ++msgstr "“%1$s”和“%2$s”的字偶距在%4$s为%3$d，在%6$s为%5$d\n" ++ + #. GT: The %s is the name of the lookup subtable containing this kerning class + #, c-format + msgid "Kerning by Classes: %s" +@@ -6872,7 +7227,7 @@ msgid "LSB Compression Percent" + msgstr "左边位压缩比例" + + msgid "L_ater" +-msgstr "后来(_A)" ++msgstr "推后(_A)" + + msgid "L_oad Namelist..." + msgstr "载入列表(_O)…" +@@ -6909,7 +7264,7 @@ msgstr "新建语言" + #. GT: See the long comment at "Property|New" + #. GT: The msgstr should contain a translation of "Amharic", ignore "Lang|" + msgid "Lang|Amharic" +-msgstr "Amharic" ++msgstr "语言|阿姆哈拉语" + + msgid "Lang|Arabic" + msgstr "阿拉伯语" +@@ -6943,7 +7298,7 @@ msgstr "波斯语" + #. GT: See the long comment at "Property|New" + #. GT: The msgstr should contain a translation of "Farsi/Persian", ignore "Lang|" + msgid "Lang|Farsi/Persian" +-msgstr "波斯文" ++msgstr "语言|波斯语" + + msgid "Lang|Ge'ez" + msgstr "Ge'ez" +@@ -7061,7 +7416,7 @@ msgid "Latin Ligatures" + msgstr "拉丁组合字" + + msgid "Latin-1 Supplement" +-msgstr "拉丁一补充" ++msgstr "拉丁-1增补" + + msgid "Latin: Decorative" + msgstr "拉丁文：修饰" +@@ -7090,6 +7445,9 @@ msgstr "背景" + msgid "Layer|Foreground" + msgstr "前景" + ++msgid "Leading Jamo Forms" ++msgstr "朝鲜谚文前导形式" ++ + msgid "" + "Learning to use FontForge is easy, and there are various tutorials available " + "beginning with the basics up to more advanced features such as making and " +@@ -7202,11 +7560,17 @@ msgid "Line" + msgstr "线" + + msgid "Line Cap" +-msgstr "线宽" ++msgstr "线端头" ++ ++msgid "Line Cap:" ++msgstr "线端头:" + + msgid "Line Join" + msgstr "线连接" + ++msgid "Line Join:" ++msgstr "线连接:" ++ + msgid "Line length max" + msgstr "最大线长" + +@@ -7424,10 +7788,10 @@ msgid "Lower Case" + msgstr "小写" + + msgid "Lowercase to Petite Capitals" +-msgstr "小写到袖珍大写" ++msgstr "小写到微型大写" + + msgid "Lowercase to Small Capitals" +-msgstr "小写到小大写" ++msgstr "小写到小型大写" + + msgid "Luxembourgish" + msgstr "法语(卢森堡公国)" +@@ -7443,23 +7807,23 @@ msgstr "数学表" + + #. GT: Here (and following) MM means "MultiMaster" + msgid "MM" +-msgstr "字体集" ++msgstr "多母版" + + msgid "MM Change Def Weights" +-msgstr "字体集更改默认粗细" ++msgstr "多母版更改默认字重" + + msgid "MM Change Default _Weights..." +-msgstr "字体集默认粗细(_W)…" ++msgstr "多母版更改默认字重(_W)..." + + msgid "MM _Info" +-msgstr "字体集信息(_I)" ++msgstr "多母版信息(_I)" + + msgid "MM _Info..." + msgstr "字体集信息(_I)…" + + #. GT: Here (and following) MM means "MultiMaster" + msgid "MM _Reblend" +-msgstr "字体集再混合(_R)" ++msgstr "多母版再混合(_R)" + + msgid "MM _Validity Check" + msgstr "字体集校核(_V)" +@@ -7574,6 +7938,9 @@ msgstr "麻将牌面" + msgid "Maithili" + msgstr "米德勒语" + ++msgid "Major Axis (_Width):" ++msgstr "主轴（宽度）(_W)：" ++ + msgid "Makasar" + msgstr "望加锡文" + +@@ -7966,7 +8333,10 @@ msgid "Min Kern" + msgstr "最小压缩(_M)" + + msgid "Minor A_xis:" +-msgstr "次轴线(_X):" ++msgstr "次轴(_X):" ++ ++msgid "Minor Axis (_Height):" ++msgstr "次轴（高度）(_H):" + + msgid "Minor:" + msgstr "次:" +@@ -8025,7 +8395,7 @@ msgid "Missing POST resource %u\n" + msgstr "缺少 POST 资源 %u\n" + + msgid "Missing Points at Extrema" +-msgstr "在极值处缺少点" ++msgstr "在极值处缺点" + + msgid "Missing Script" + msgstr "缺位图" +@@ -8098,6 +8468,9 @@ msgstr "缺规则" + msgid "Missing suffix" + msgstr "遗失后缀" + ++msgid "Miter Cli_p" ++msgstr "尖角裁剪(_P)" ++ + msgid "Mixed contours and references" + msgstr "混合的轮廓及参照" + +@@ -8206,10 +8579,10 @@ msgid "" + msgstr "多个字形映射了同一个码位 U+%04X，只有一个字形会显示\n" + + msgid "Multiple master font with more than 16 instances\n" +-msgstr "多主字体超过16实例\n" ++msgstr "超16实例多重母版字体\n" + + msgid "Multiple master font with more than 4 axes\n" +-msgstr "多主字体超过4轴\n" ++msgstr "超4轴多重母版字体\n" + + msgid "Multiple names for language" + msgstr "语言的多个名称" +@@ -8256,12 +8629,18 @@ msgstr "NUL，默认字符" + msgid "N_ever Interpolate" + msgstr "从不插值(_E)" + ++msgid "N_one (Debug)" ++msgstr "无（调试）(_O)" ++ + msgid "N_umber Points" + msgstr "数值点" + + msgid "Nabataean" + msgstr "那巴泰文" + ++msgid "Nag Mundari" ++msgstr "纳格·蒙达里" ++ + msgid "Name" + msgstr "名称" + +@@ -8275,7 +8654,7 @@ msgid "Name in use" + msgstr "正使用" + + msgid "Name this contour" +-msgstr "命名此轮廓" ++msgstr "命名此轮廓线" + + msgid "Name this guideline or cancel to create it without a name" + msgstr "你可以给这条引导线附加一个文本标签" +@@ -8491,7 +8870,7 @@ msgid "Next Hint." + msgstr "下一个渲染调整。" + + msgid "Next On Contour" +-msgstr "轮廓上下一个" ++msgstr "轮廓线上下一个" + + msgid "Next State:" + msgstr "下一状态:" +@@ -8499,6 +8878,15 @@ msgstr "下一状态:" + msgid "Next _Defined Glyph" + msgstr "下一定义的字形(_D)" + ++msgid "Ni_b" ++msgstr "笔尖(_B)" ++ ++msgid "Ni_b Angle:" ++msgstr "笔尖角度(_B):" ++ ++msgid "Nib Type:" ++msgstr "笔尖类型:" ++ + msgid "Niuean" + msgstr "纽埃语" + +@@ -8603,10 +8991,10 @@ msgid "No References" + msgstr "无参照" + + msgid "No Rename" +-msgstr "无重命名" ++msgstr "不改名" + + msgid "No Script" +-msgstr "无脚本" ++msgstr "无文字" + + msgid "No Script Tag" + msgstr "无文字标签" +@@ -8615,7 +9003,7 @@ msgid "No Sequence/Lookups" + msgstr "无排序/查找 " + + msgid "No Slope" +-msgstr "没有范围" ++msgstr "无斜率" + + msgid "No Start Glyph" + msgstr "无起始字形" +@@ -8691,6 +9079,10 @@ msgstr "字体里未包含 Unicode 编码为 U+%05x 的字形\n" + msgid "No glyphs matched" + msgstr "无匹配字形" + ++#, c-format ++msgid "No kerning between “%s” and %s in %s whilst it is %d in %s\n" ++msgstr "在%3$s中没有“%1$s”和“%2$s”之间的字偶距，但在%5$s中却存在%4$d。\n" ++ + #, c-format + msgid "No kerning pairs found in %.200s" + msgstr "%.200s中未发现字偶距对" +@@ -8722,6 +9114,10 @@ msgstr "无标记于 counttomark\n" + msgid "No marked glyphs allowed in replacement on line %d of %s" + msgstr "%2$s 的第 %1$d 行不允许替换标记的字形" + ++#, c-format ++msgid "No matching AnchorClass for %s" ++msgstr "%s 没有匹配的 AnchorClass" ++ + #, c-format + msgid "No name for CharStrings dictionary \"%s" + msgstr "字符字串字典无名称 \"%s" +@@ -8827,6 +9223,9 @@ msgstr "正常无衬线体" + msgid "Normal Text Color:" + msgstr "普通文本颜色：" + ++msgid "Normal font used in the Find/Replace window" ++msgstr "查找/替换窗口中使用的普通字体" ++ + msgid "Normal/Boxed" + msgstr "外框" + +@@ -8854,6 +9253,17 @@ msgstr "规格化设计矢量函数:" + msgid "Normalized Settings:" + msgstr "规范化设定：" + ++msgid "" ++"Normally simplify will not change the slope of the contour at the points." ++msgstr "简化通常不会改变轮廓线在点处的斜率。" ++ ++msgid "" ++"Normally simplify will not remove points at the extrema of curves\n" ++"(both PostScript and TrueType suggest you retain these points)" ++msgstr "" ++"简化通常不会删除曲线极值处的点\n" ++"(PostScript 和 TrueType 皆建议您保留这些点)" ++ + msgid "Northern Sami" + msgstr "北萨莫斯语" + +@@ -8934,7 +9344,7 @@ msgid "Not quadratic" + msgstr "非二次曲线" + + msgid "Not sure if this is an error..." +-msgstr "不确定这是一个错误..." ++msgstr "不确定这是否为一个错误..." + + msgid "Notdef name" + msgstr "未定义名称" +@@ -9039,7 +9449,7 @@ msgid "OEM Charset" + msgstr "OEM 字符集" + + msgid "OK" +-msgstr "确认" ++msgstr "确定" + + msgid "OS/2 -> Charsets" + msgstr "OS/2 -> 字符集" +@@ -9204,7 +9614,7 @@ msgid "" + "One of the multiple master instances contains quadratic splines. It must be " + "converted to cubic splines before it can be used in a multiple master" + msgstr "" +-"多母版的实例里面有一个包含了二次曲线。它必须转化成三次曲线才能用于多母版" ++"多重母版的实例里面有一个包含了二次曲线。它必须转化成三次曲线才能用于多重母版" + + msgid "Only Embed Bitmaps" + msgstr "仅嵌入位图" +@@ -9241,7 +9651,7 @@ msgid "Open" + msgstr "打开" + + msgid "Open Contour" +-msgstr "轮廓开放" ++msgstr "开放轮廓线" + + msgid "Open Font" + msgstr "打开字体" +@@ -9255,6 +9665,10 @@ msgstr "打开参照" + msgid "Open failed" + msgstr "打开失败" + ++#, c-format ++msgid "Open/Closed contour mismatch in glyph “%s”\n" ++msgstr "字形“%s”中开放/关闭的轮廓线不匹配\n" ++ + msgid "OpenCharsInNewWindow" + msgstr "于新窗口显示字符" + +@@ -9354,6 +9768,9 @@ msgstr "外部阴影" + msgid "Outline" + msgstr "轮廓" + ++msgid "Outline Color" ++msgstr "轮廓颜色" ++ + msgid "Outline Default Button" + msgstr "轮廓默认按钮" + +@@ -9387,17 +9804,20 @@ msgstr "空心字形" + msgid "Output AFM" + msgstr "生成AFM" + ++msgid "Output FONTLOG.txt" ++msgstr "输出FONTLOG.txt" ++ + msgid "Output Glyph Map" +-msgstr "生成字形映射" ++msgstr "输出字形映射" + + msgid "Output OFM & CFG" +-msgstr "生成 OFM 及 CFG" ++msgstr "输出 OFM 及 CFG" + + msgid "Output PFM" + msgstr "生成PFM" + + msgid "Output TFM & ENC" +-msgstr "生成 TFM 及 ENC" ++msgstr "输出 TFM 及 ENC" + + msgid "Output error" + msgstr "输出错误" +@@ -9424,10 +9844,10 @@ msgid "PS Hints" + msgstr "PS渲调提示" + + msgid "PS Multiple Master(A)" +-msgstr "PS 多母版(A)" ++msgstr "PS 多重母版(A)" + + msgid "PS Multiple Master(B)" +-msgstr "PS 多母版(B)" ++msgstr "PS 多重母版(B)" + + msgid "PS Names" + msgstr "PS字体名称" +@@ -9839,7 +10259,7 @@ msgid "Perspecti_ve" + msgstr "透视(_V)" + + msgid "Petite Caps" +-msgstr "小大写" ++msgstr "微型大写" + + msgid "PfaEdit Table" + msgstr "PfaEdit表" +@@ -9923,7 +10343,7 @@ msgid "Please name encoding %d in this file" + msgstr "请给此文件中的编码 %d命名" + + msgid "Please name this contour" +-msgstr "请为此轮廓命名" ++msgstr "请为此轮廓线命名" + + msgid "Please name this encoding" + msgstr "请为此编码命名" +@@ -10003,10 +10423,10 @@ msgid "Points (TrueType)" + msgstr "点(TrueType)" + + msgid "Points of _Inflection" +-msgstr "标记映像点(_I)" ++msgstr "拐点(_I)" + + msgid "Points on Selected _Contours" +-msgstr "曲线上的全部点(_C)" ++msgstr "所选轮廓线上的点(_C)" + + msgid "Points:" + msgstr "点:" +@@ -10112,7 +10532,7 @@ msgid "Preferred Styles" + msgstr "首选样式" + + msgid "Prefs_App| " +-msgstr " " ++msgstr "Prefs_App| " + + msgid "Preserve cross-font kerning" + msgstr "保留交叉字体压缩" +@@ -10149,7 +10569,7 @@ msgid "Prev Defined Gl_yph" + msgstr "上一定义的字形(_Y)" + + msgid "Prev On Contour" +-msgstr "轮廓上上一个" ++msgstr "轮廓线上上一个" + + msgid "Previous Hint." + msgstr "上一个渲染调整。" +@@ -10369,6 +10789,9 @@ msgstr "光栅化尺寸:" + msgid "Rasterizing..." + msgstr "正在光栅化..." + ++msgid "Ratio" ++msgstr "比率" ++ + msgid "Raw" + msgstr "原始" + +@@ -10394,7 +10817,7 @@ msgid "Recalculate Bitmaps" + msgstr "再算位图" + + msgid "Recen_t" +-msgstr "最近的(_T)" ++msgstr "最近(_T)" + + msgid "RecognizePUANames" + msgstr "识别PUA名称" +@@ -10510,6 +10933,9 @@ msgstr "雷姜文" + msgid "Remo_ve Undoes" + msgstr "清除修改历史" + ++msgid "Remo_ve Undoes..." ++msgstr "清除修改历史(_V)..." ++ + msgid "Remove" + msgstr "移除" + +@@ -10558,6 +10984,9 @@ msgstr "移除查找" + msgid "Remove Overlap" + msgstr "移除重叠" + ++msgid "Remove Overlap:" ++msgstr "合并重叠:" ++ + msgid "Remove This Glyph" + msgstr "移除字形(_Y)" + +@@ -10991,6 +11420,9 @@ msgstr "SIL Graphite 规则表" + msgid "SJIS (Kanji)" + msgstr "SJIS (汉字)" + ++msgid "SVG 2" ++msgstr "SVG 2" ++ + msgid "SVG Template" + msgstr "SVG模板" + +@@ -11015,6 +11447,9 @@ msgstr "显示依赖(_H)" + msgid "S_how H. Metrics..." + msgstr "显示水平尺寸(_h)…" + ++msgid "S_implify" ++msgstr "简化(_I)" ++ + msgid "S_nap to horizontal/vertical" + msgstr "定位到水平线/垂直线" + +@@ -11042,6 +11477,9 @@ msgstr "同匹配类属" + msgid "Same as PostScript Names" + msgstr "与 PostScript 名称相同" + ++msgid "Sami (Lappish)" ++msgstr "萨米语（拉普兰语）" ++ + msgid "Samoan" + msgstr "萨摩亚语" + +@@ -11112,7 +11550,7 @@ msgid "Save as _Directory" + msgstr "保存为文件夹(_D)" + + msgid "Save as..." +-msgstr "保存为…" ++msgstr "另存为…" + + msgid "Save glyph colors in the PfEd table" + msgstr "保存字形颜色到PfaEdit表" +@@ -11288,7 +11726,7 @@ msgstr "文字标签为4个字符" + #. GT: See the long comment at "Property|New" + #. GT: The msgstr should contain a translation of "Arabic", ignore "Script|" + msgid "Script|Arabic" +-msgstr "阿拉伯文" ++msgstr "文字|阿拉伯文" + + msgid "Script|Aramaic" + msgstr "亚拉姆文字" +@@ -11561,10 +11999,10 @@ msgid "Segment Separator" + msgstr "段分隔符" + + msgid "Selec_t By Lookup Subtable..." +-msgstr "按查找表选择(_T)…" ++msgstr "按查找子表选择(_T)…" + + msgid "Select All _Points & Refs" +-msgstr "选择全部描点及参照(_P)" ++msgstr "选择全部点及参照(_P)" + + msgid "Select Anc_hors" + msgstr "选择锚点(_H)" +@@ -11589,7 +12027,7 @@ msgid "Select In Font" + msgstr "于字体中选择" + + msgid "Select Open Contours" +-msgstr "选择已打开的轮廓" ++msgstr "选择开放的轮廓线" + + msgid "Select Point(s) at..." + msgstr "选择点…" +@@ -11955,7 +12393,7 @@ msgid "Simplify" + msgstr "简化" + + msgid "Simplify More..." +-msgstr "简化更多…" ++msgstr "高级简化…" + + msgid "Simplifying..." + msgstr "简化…" +@@ -12067,10 +12505,10 @@ msgid "Slovenian" + msgstr "斯洛文尼亚语" + + msgid "Small Capitals" +-msgstr "小大写" ++msgstr "小型大写" + + msgid "Small Caps" +-msgstr "小大写" ++msgstr "小型大写" + + msgid "Small Form Variants" + msgstr "小型形式变体" +@@ -12249,6 +12687,10 @@ msgstr "样条线长度=%.1f" + msgid "Spline Length=%g" + msgstr "样条线长度=%g" + ++#, c-format ++msgid "Spline mismatch in glyph “%s”\n" ++msgstr "字形“%s”的样条线不匹配\n" ++ + msgid "Square" + msgstr "方形" + +@@ -12287,7 +12729,7 @@ msgid "Star" + msgstr "星形" + + msgid "Start contours at e_xtrema" +-msgstr "在极值处开始轮廓" ++msgstr "在极值处开始轮廓线(_X)" + + #. GT: "Len" is an abbreviation for "Length" + msgid "StartLen" +@@ -12392,6 +12834,9 @@ msgstr "笔画变化(_V)" + msgid "Stroke _Width:" + msgstr "笔画宽度(_W):" + ++msgid "Stroke width cannot be zero" ++msgstr "笔划宽度不能为零" ++ + msgid "Stroking..." + msgstr "笔画..." + +@@ -12971,8 +13416,11 @@ msgstr "激活层的轮廓线颜色" + msgid "The color of the clip path" + msgstr "剪切路径的颜色" + ++msgid "The color of the outline" ++msgstr "轮廓的颜色" ++ + msgid "The color of the point which is the start of a contour" +-msgstr "曲线起点的颜色" ++msgstr "轮廓线起点的颜色" + + msgid "The color used to draw a hint which conflicts with another" + msgstr "此颜色用于绘制与其他渲调提示冲突的渲调提示" +@@ -12991,11 +13439,14 @@ msgid "" + "horizontal or vertical at their end-points" + msgstr "当样条线的端点几乎但又不完全水平或垂直时，用此颜色绘制其标记" + ++msgid "The color used to draw points at extrema (if that mode is active)" ++msgstr "用于绘制极值处点的颜色（若模式激活时）" ++ + msgid "The color used to draw points of inflection (if that mode is active)" +-msgstr "绘制映像点的颜色（若激活模式时）" ++msgstr "用于绘制拐弯点的颜色（若模式激活时）" + + msgid "The color used to draw the \"next\" control point of an on-curve point" +-msgstr "此颜色用于绘制曲线上的点的下一个控制点" ++msgstr "用于绘制曲线上的点的下一个控制点的颜色" + + msgid "" + "The color used to draw the \"previous\" control point of an on-curve point" +@@ -13047,6 +13498,19 @@ msgstr "" + "字体有错误。\n" + "%s是否查看错误或继续保存?" + ++#, c-format ++msgid "" ++"The font database already contains a bitmap\n" ++"font with this pixelsize (%d)\n" ++"Do you want to overwrite it?" ++msgstr "" ++"字体数据库已经包含了具有此像素尺寸(%d)\n" ++"的位图字体。\n" ++"您要覆盖它吗？" ++ ++msgid "The generated font won't work with ATM" ++msgstr "生成的字体与ATM不兼容" ++ + #, c-format + msgid "" + "The glyph at CID %d is mapped to more than %d encodings. Only the first %d " +@@ -13088,6 +13552,24 @@ msgstr "当前位图尺寸列表" + msgid "The maximum number of Undoes/Redoes stored in a glyph" + msgstr "保存在字形中的取消/重来的最多数量" + ++msgid "" ++"The maximum number of Undoes/Redoes stored in a glyph. Use -1 for infinite " ++"Undoes\n" ++"(but watch RAM consumption and use the Edit menu's Remove Undoes as needed)" ++msgstr "" ++"撤消/重做的最大值储存于字形内。用 -1 表示无限次撤消\n" ++"（但请注意内存消耗，并在必要时用“编辑”菜单内的“清除修改历史”项）" ++ ++#, c-format ++msgid "" ++"The name of glyph %.40s has changed. This is what I use to find the glyph in " ++"the file, so I cannot revert this glyph.\n" ++"(You will not be warned for subsequent glyphs.)" ++msgstr "" ++"字形 %.40s 的名称已更改。 这是我用来在文件中查找字形的方法，因此我无法还原此" ++"字形。\n" ++" （您不会收到后续字形的警告。）" ++ + msgid "The number of em-units by which an arrow key will move a selected point" + msgstr "方向键按此尺寸移动选定点" + +@@ -13115,6 +13597,10 @@ msgstr "已选字形沒有任何渲调。FontForge 将无法生成许多指令 + msgid "The selected point does not have integral control points" + msgstr "选择的点没有整数控制点" + ++msgid "" ++"The selected spline attains its extrema somewhere other than its endpoints" ++msgstr "所选的样条在其端点外的某处达到其极值" ++ + msgid "The size (in points) for which this face was designed" + msgstr "此面以点为尺寸" + +@@ -13122,12 +13608,32 @@ msgstr "此面以点为尺寸" + msgid "The spline does not reach %g" + msgstr "样条线不到 %g" + ++msgid "" ++"The stroke algorithm will attempt to be (at least)\n" ++"this accurate, but there may be exceptions." ++msgstr "" ++"笔划算法尝试（至少）达到\n" ++"该精度，但仍可能有例外情况。" ++ ++#, c-format ++msgid "" ++"The width of %s is too big to fit in a tfm fix_word, it shall be truncated " ++"to the largest size allowed." ++msgstr "%s 的宽度过大，不匹配 tfm fix_word，该宽度将会被截断到所允许的最大值。" ++ + msgid "The width of one em" + msgstr "M全字宽度" + + msgid "The width of the line used to draw selected points" + msgstr "选中点的线宽" + ++#, c-format ++msgid "There are %d pages in this file, which do you want?" ++msgstr "文件中有%d页，您想要哪些页面？" ++ ++msgid "There are multiple fonts in this file, pick one" ++msgstr "此文件中有多个字体，请选择一个" ++ + #, c-format + msgid "There are two entries for the same glyph (%.80s)" + msgstr "同一字形 (%.80s)有两个入口" +@@ -13187,6 +13693,10 @@ msgstr "已有同名子表，请选择另一个。" + msgid "There is already an anchor point named %1$.40s in %2$.40s." + msgstr "已存在名为 %1$.40s 的 %2$.40s 的锚点。" + ++#, c-format ++msgid "There is no glyph named \"%s\" in the font." ++msgstr "字体中无字形 %s." ++ + #, c-format + msgid "There is no glyph named %s (used in %s)" + msgstr "字体中无字形 %s(用于%s)" +@@ -13198,6 +13708,11 @@ msgstr "字体中无字形 %s" + msgid "There must be at least 2 gradient stops" + msgstr "至少要二项斜度" + ++msgid "" ++"These results are those of the freetype autohinter. They do not reflect the " ++"truetype instructions." ++msgstr "这些结果是 freetype autohinter 的结果。 它们不反映 truetype 指令。" ++ + msgid "These two lines share a common endpoint, I can't make them parallel" + msgstr "两线共点，不能平行" + +@@ -13222,6 +13737,15 @@ msgstr "三分之一宽" + msgid "Third argument of imagemask must be a boolean.\n" + msgstr "蒙板的第三个参数必须为布尔类型.\n" + ++#, c-format ++msgid "" ++"This character (gid=%d) has a following part (%d). I'm not sure what that " ++"means, please send me (gww@silcom.com) a copy of this font so I can test " ++"with it.\n" ++msgstr "" ++"此字符（gid=%d）包含以下部分（%d）。我尚未清楚此为何意，但您是否能将此字体的" ++"副本发给我（gww@silcom.com）用以测试研究呢？\n" ++ + msgid "" + "This does not seem to be a plate file\n" + "Expected left paren" +@@ -13251,7 +13775,7 @@ msgstr "" + "第一行有误" + + msgid "This doesn't look like an ofm file, I don't know how to read it." +-msgstr "这个看来不像ofm文件，不知道怎么打开。" ++msgstr "这个看来不像ofm文件，不知如何读取。" + + msgid "This feature code is already used" + msgstr "此特征代码已使用" +@@ -13324,11 +13848,20 @@ msgid "This glyph is wider than desired" + msgstr "字形比预期的宽" + + msgid "This hint does not control any points" +-msgstr "此渲调提示不控制任何描点" ++msgstr "此渲染调整不控制任何点" + + msgid "This index is much larger than the closest neighbor" + msgstr "此索引相比邻近值过大" + ++#, c-format ++msgid "" ++"This is probably a valid URW font, but it is in a format (%c%c) which " ++"FontForge\n" ++"does not support. FontForge only supports 'IK' format fonts.\n" ++msgstr "" ++"也许此URW字体有效，但FontForge不支持此格式（%c%c）罢了。FontForge仅支持‘IK’格" ++"式的字体。\n" ++ + msgid "" + "This is the difference of the curvature between\n" + "the next and previous splines. Contours often\n" +@@ -13340,9 +13873,21 @@ msgstr "" + msgid "This ligature index is already in use" + msgstr "此连字索引正被使用" + ++msgid "" ++"This looks like an ikarus format which I have seen examples of, but for " ++"which\n" ++"I have no documentation. FontForge does not support it yet.\n" ++msgstr "" ++"我似乎曾经见到过像这样的一些样例，这看上去是 ikarus 格式……但我手头上没有关于" ++"它的文档。而FontForge也还不支持。\n" ++ + msgid "This lookup contains no data" + msgstr "此查找不含数据" + ++#, c-format ++msgid "This lookup has no effect, I can't figure out its type on line %d of %s" ++msgstr "此查找无效，我无法在 %2$s 的第 %1$d 行找出它的类型" ++ + msgid "This may take a while. Please be patient..." + msgstr "这需要一点时间。请稍候..." + +@@ -13352,6 +13897,11 @@ msgstr "这必须是truetype层." + msgid "This operation cannot be undone, do it anyway?" + msgstr "此操作不能取消，是否继续？" + ++msgid "" ++"This option prepends a timestamp in the format YYMMDDHHMM to the filename " ++"and font-family name metadata." ++msgstr "此选项向文件名和字体名称元数据以YYMMDDHHM格式预设一个时间戳。" ++ + msgid "This outline glyph is missing a bitmap version" + msgstr "此轮廓字形缺少相应位图字形" + +@@ -13364,6 +13914,9 @@ msgstr "此pdf文件不含页面" + msgid "This setting is already used" + msgstr "设置已被采用" + ++msgid "This version of FontForge expects freetype 2.3.7 or more." ++msgstr "此版本的 FontForge 需要 freetype 2.3.7 或更高版本。" ++ + msgid "" + "This version of fontforge was not linked with the spiro library, so you may " + "not use them." +@@ -13466,7 +14019,7 @@ msgid "To _Hundredths" + msgstr "到百分点(_H)" + + msgid "To _Int" +-msgstr "到整点(_I)" ++msgstr "到整数(_I)" + + msgid "" + "To generate a Mac family file, the current font must have plain (Normal, " +@@ -13611,6 +14164,16 @@ msgstr "传统形式" + msgid "Traditional Name Forms" + msgstr "传统名称形式" + ++msgid "" ++"Traditionally the x-height of an italic face is slightly less\n" ++"than the x-height of the companion roman" ++msgstr "" ++"传统上，斜体的x高度稍小于\n" ++"相应罗马体的x高度" ++ ++msgid "Trailing Jamo Forms" ++msgstr "朝鲜谚文后缀形式" ++ + msgid "Transform" + msgstr "变换" + +@@ -13823,6 +14386,10 @@ msgstr "未料到的密度数值" + msgid "Unexpected encoding format in cff: %d\n" + msgstr "未预期的编码格式于cff: %d\n" + ++#, c-format ++msgid "Unexpected end of file in feature definition on line %d of %s" ++msgstr "%2$s 的第 %1$d 行的功能定义中出现意外的文件结尾" ++ + #, c-format + msgid "Unexpected end of file in lookup definition on line %d of %s" + msgstr "%2$s 的第 %1$d 行的查找定义中的文件意外结束" +@@ -13833,6 +14400,19 @@ msgstr "意外错误" + msgid "Unexpected number" + msgstr "不良数字" + ++#, c-format ++msgid "" ++"Unexpected size for font info section of URW font (expected 12, got %d)\n" ++msgstr "错误的 URW 字体名称大小（应为 12，实际为 %d）\n" ++ ++#, c-format ++msgid "Unexpected size for name section of URW font (expected 55, got %d)\n" ++msgstr "错误的 URW 字体名称大小（应为 55，实际为 %d）\n" ++ ++#, c-format ++msgid "Unexpected token in GDEF on line %d of %s" ++msgstr "GDEF 中第 %d 行（共 %s）的意外标记" ++ + #, c-format + msgid "Unexpected token in glyph class range on line %d of %s" + msgstr "在 第%d行（%s）上的字形类范围内有不该存在的字符" +@@ -13845,6 +14425,14 @@ msgstr "第%d行(%s) 上的查找标记有未预期的字符" + msgid "Unexpected token in value record on line %d of %s" + msgstr "%2$s 的第 %1$d 行的值记录中出现意外标记" + ++#, c-format ++msgid "Unexpected token, %s, in BASE table on line %d of %s" ++msgstr "BASE 表中的意外标记 %1$s，位于 %3$s 的第 %2$d 行" ++ ++#, c-format ++msgid "Unexpected token, %s, in feature definition on line %d of %s" ++msgstr "%s 行 %d 上的功能定义中的意外标记 %s" ++ + #, c-format + msgid "Unexpected token, %s, in lookup definition on line %d of %s" + msgstr "在 %3$s 的第 %2$d 行的查找定义中出现意外标记 %1$s" +@@ -14022,6 +14610,12 @@ msgstr "无法解析的字形序列在 %2$s 的第 %1$d 行替换" + msgid "Unparseable include on line %d of %s" + msgstr "有不能解析的头文件处于行 %d (%s中)" + ++#, c-format ++msgid "" ++"Unparsed characters found after end of groups file (last line parsed was " ++"%d).\n" ++msgstr "组文件末尾存在未解析的字符（被解析的最后一列为 %d）。\n" ++ + msgid "Unreasonable DPI" + msgstr "不合理的DPI" + +@@ -14109,6 +14703,9 @@ msgstr "" + msgid "UseNewIndicScripts" + msgstr "使用新印地语文字" + ++msgid "UsePlugins" ++msgstr "使用插件" ++ + msgid "Using the OFL for your open fonts" + msgstr "在你的开源字体中使用 OFL" + +@@ -14373,6 +14970,9 @@ msgstr "警告未连接的参照" + msgid "Warning" + msgstr "警告" + ++msgid "Warning: Contour start did not close\n" ++msgstr "警告：轮廓线开头未闭合\n" ++ + #, c-format + msgid "" + "Warning: Encoding %d (0x%x) is mapped to at least two locations (%s@0x%02x " +@@ -14416,7 +15016,7 @@ msgid "We don't understand this font\n" + msgstr "不识别此字体\n" + + msgid "Weight, Width, Slope Only" +-msgstr "仅粗细，宽度，斜度" ++msgstr "仅字重，宽度，斜率" + + msgid "Welsh" + msgstr "威尔士语" +@@ -14452,6 +15052,16 @@ msgstr "" + "若加载的 TrueType/OpenType 字体同时具有 Unicode 码表\n" + "和 CJK 码表，使用此标志来指明使用哪个码表来加载该字体。" + ++msgid "" ++"When merging two CID keyed fonts, they must have the same Registry and " ++"Ordering, and the font being merged into (the mergee) must have a supplement " ++"which is at least as recent as the other's. Furthermore the mergee must have " ++"at least as many subfonts as the merger." ++msgstr "" ++"合并两个 CID 键控字体时，它们必须具有相同的注册表和排序，并且被合并到" ++"（mergee）中的字体必须有一个至少与另一个字体一样新的补充。 此外，合并后的子字" ++"体数量必须至少与合并后的子字体一样多。" ++ + msgid "" + "When the mouse pointer is within this many pixels\n" + "of one of the various interesting features (baseline,\n" +@@ -14555,6 +15165,9 @@ msgstr "回卷位置：" + msgid "Write failed" + msgstr "不能写入" + ++msgid "WritePNGInSFD" ++msgstr "SFD中写入PNG" ++ + msgid "Wrong Direction" + msgstr "错误方向" + +@@ -14599,6 +15212,11 @@ msgstr "X高度:" + msgid "Xhosa" + msgstr "科萨语" + ++#. GT: Y is a coordinate ++#. GT: Y is a coordinate, the leading spaces help to align it ++msgid "Y" ++msgstr "Y" ++ + #. GT: an expression describing the transformation applied to the Y coordinate + msgid "Y Expr:" + msgstr "Y 表达式:" +@@ -14619,11 +15237,14 @@ msgid "Yakut" + msgstr "雅库特语" + + msgid "Yes" +-msgstr "确定" ++msgstr "是" + + msgid "Yes to _All" + msgstr "全是(_A)" + ++msgid "Yes, and don't _remind me again" ++msgstr "是，并且不再提醒(_R)" ++ + msgid "Yezidi" + msgstr "耶西迪文" + +@@ -14648,6 +15269,14 @@ msgstr "易经卦符" + msgid "Yoruba" + msgstr "约鲁巴语" + ++#, c-format ++msgid "" ++"You are attempting to clear %.30s which is referred to by\n" ++"another character. Are you sure you want to clear it?" ++msgstr "" ++"您正尝试删除被其他字符引用的 %.30s 。\n" ++"确定要删除它吗？" ++ + #, c-format + msgid "" + "You are attempting to paste a reference to %1$s into %2$s.\n" +@@ -14774,6 +15403,11 @@ msgstr "需要指定模板" + msgid "You must specify a replacement glyph for %s" + msgstr "应为 %s 指定替换字形" + ++msgid "" ++"You will get better instructions if you fill in the Private dictionary, " ++"Element->Font Info->Private, for the font" ++msgstr "如果您为字体填写私有字典，元素->字体信息->私有，您将获得更好的说明" ++ + msgid "" + "Your font has exactly 65535 glyphs. Encoding 65535 is the limit and is often " + "used as a magic value, so it may cause quirks.\n" +@@ -14781,6 +15415,30 @@ msgstr "" + "您的字体塞满了 65535 个字形，达到了上限。这个值常会作为魔法数字，可能会引起程" + "序崩溃。\n" + ++msgid "" ++"Your font is missing the dotlessi glyph,\n" ++"please add it and remake your accented glyphs" ++msgstr "" ++"您的字体缺少 无上句点i 字形，\n" ++"请添加它并重新制作你的重音字形" ++ ++#. GT: Adobe decided that a dotless j glyph was needed, assigned a code ++#. GT: point to it in the private use area, and named it "dotlessj". Then ++#. GT: years later the Unicode people decided one was needed and assigned ++#. GT: it U+0237, so that's now the official code point and it is named ++#. GT: "uni0237". The name "dotlessj" is deprecated but still present in ++#. GT: many fonts. Neither "dotlessj" nor "uni0237" should be translated ++#. GT: because they are standard PostScript glyph names. ++#. GT: Again you may wish to explain that these refer to a "j" without a dot ++msgid "" ++"Your font is missing the uni0237 glyph,\n" ++"and the deprecated dotlessj glyph,\n" ++"please add the former and remake your accented glyphs" ++msgstr "" ++"您的字体缺少 uni0237 字形，\n" ++"和弃用的 无上句点j 字形，\n" ++"请添加前者并重新制作您的重音字形" ++ + msgid "Z_oom out" + msgstr "缩小(_O)" + +@@ -14805,29 +15463,32 @@ msgstr "放大(_I)" + msgid "Zulu" + msgstr "祖鲁语" + ++msgid "_128 pixel outline" ++msgstr "_128 像素轮廓" ++ + msgid "_16x4 cell window" + msgstr "_16x4单元窗口" + + msgid "_24 pixel outline" +-msgstr "_24点轮廓" ++msgstr "_24 像素轮廓" + + msgid "_36 pixel outline" +-msgstr "_36点轮廓" ++msgstr "_36 像素轮廓" + + msgid "_3D Rotate" + msgstr "3D旋转" + + msgid "_48 pixel outline" +-msgstr "_48点轮廓" ++msgstr "_48 像素轮廓" + + msgid "_72 pixel outline" +-msgstr "_72点轮廓" ++msgstr "_72 像素轮廓" + + msgid "_8x2 cell window" + msgstr "_8x2单元窗口" + + msgid "_96 pixel outline" +-msgstr "_96点轮廓" ++msgstr "_96 像素轮廓" + + msgid "_AA" + msgstr "抗锯齿(_A)" +@@ -14865,6 +15526,10 @@ msgstr "添加选中项(_A)" + msgid "_Advance Width only" + msgstr "仅前导宽度(_A)" + ++#. GT: Align these points to their average position ++msgid "_Align Points" ++msgstr "对齐点(_A)" ++ + msgid "_All Fonts" + msgstr "所有字体(_A)" + +@@ -14929,6 +15594,9 @@ msgstr "BDF信息(_B)…" + msgid "_Back" + msgstr "背景(_B)" + ++msgid "_Balance" ++msgstr "平衡(_B)" ++ + msgid "_Base Filename:" + msgstr "文件名(_B):" + +@@ -14964,7 +15632,7 @@ msgid "_Browse" + msgstr "浏览(_B)" + + msgid "_Build Accented Glyph" +-msgstr "生成首饰字形(_B)" ++msgstr "生成带标字形(_B)" + + msgid "_Build Syllables" + msgstr "生成音节(_B)" +@@ -14993,6 +15661,9 @@ msgstr "改变附件(_C)…" + msgid "_Changed Glyphs" + msgstr "已改变字形(_C)" + ++msgid "_Circular (Elliptical)" ++msgstr "圆（椭圆）(_C)" ++ + msgid "_Class" + msgstr "类属(_C)" + +@@ -15006,7 +15677,7 @@ msgid "_Close" + msgstr "关闭(_C)" + + msgid "_Cluster" +-msgstr "簇(_C)" ++msgstr "簇集(_C)" + + msgid "_Compact" + msgstr "压缩(_C)" +@@ -15036,11 +15707,11 @@ msgid "_Copy" + msgstr "复制(_C)" + + msgid "_Correct Direction" +-msgstr "正确方向(_C)" ++msgstr "修正方向(_C)" + + #. GT: Here (and following) MM means "MultiMaster" + msgid "_Create MM..." +-msgstr "创建字体集(_C)…" ++msgstr "创建多母版(_C)…" + + msgid "_Create Pair" + msgstr "创建配对(_C)" +@@ -15103,7 +15774,7 @@ msgid "_Down" + msgstr "下(_D)" + + msgid "_Earlier" +-msgstr "早先(_E)" ++msgstr "提前(_E)" + + msgid "_Edges near horizontal/vertical" + msgstr "边线临近水平线/垂直线(_E)" +@@ -15142,7 +15813,10 @@ msgid "_Exclude" + msgstr "去除(_E)" + + msgid "_Expand Stroke..." +-msgstr "扩展重音符(_E)…" ++msgstr "扩展笔画(_E)…" ++ ++msgid "_Extend Cap:" ++msgstr "延伸端头(_E):" + + msgid "_Extrema" + msgstr "标记极值(_M)" +@@ -15160,13 +15834,13 @@ msgid "_Fill" + msgstr "填充(_F)" + + msgid "_Filter" +-msgstr "过滤" ++msgstr "过滤(_F)" + + msgid "_Find Intersections" + msgstr "寻找交叠(_F)" + + msgid "_First" +-msgstr "首先(_F)" ++msgstr "最前(_F)" + + msgid "_First Point" + msgstr "第一点(_F)" +@@ -15241,6 +15915,9 @@ msgstr "水平字干(_H)" + msgid "_HVCurve" + msgstr "水平垂直曲线(_H)" + ++msgid "_Hangul" ++msgstr "谚文(_H)" ++ + msgid "_Height:" + msgstr "高度(_H)：" + +@@ -15257,7 +15934,7 @@ msgid "_Hinting Needed" + msgstr "所需的渲调(_H)" + + msgid "_Hints controlling no points" +-msgstr "渲调提示没有控制描点(_H)" ++msgstr "渲调调整未控制点(_H)" + + msgid "_Histogram" + msgstr "直方图(_H)" +@@ -15310,6 +15987,9 @@ msgstr "斜体(_I)..." + msgid "_Join" + msgstr "连接(_J)" + ++msgid "_Join Limit:" ++msgstr "连接范围限制(_J):" ++ + msgid "_Justification..." + msgstr "对齐(_J)..." + +@@ -15414,7 +16094,7 @@ msgid "_More points than:" + msgstr "点数超过(_M):" + + msgid "_Move Points" +-msgstr "移动描点(_M)" ++msgstr "移动点(_M)" + + msgid "_Multi Size Glyph" + msgstr "多尺寸字形(_M)" +@@ -15426,7 +16106,7 @@ msgid "_Name" + msgstr "名称(_N)" + + msgid "_Name Contour" +-msgstr "命名轮廓(_N)" ++msgstr "命名轮廓线(_N)" + + msgid "_Name:" + msgstr "名称(_N):" +@@ -15446,6 +16126,9 @@ msgstr "下一字形(_N)" + msgid "_Next Point" + msgstr "下一点(_N)" + ++msgid "_Nib" ++msgstr "笔尖(_N)" ++ + msgid "_No" + msgstr "否(_N)" + +@@ -15513,7 +16196,7 @@ msgid "_Paste" + msgstr "粘贴(_P)" + + msgid "_Point" +-msgstr "描点(_P)" ++msgstr "点(_P)" + + msgid "_Point of View Projection..." + msgstr "投影视点(_P)…" +@@ -15522,16 +16205,16 @@ msgid "_Pointer" + msgstr "指针(_P)" + + msgid "_Points" +-msgstr "描点(_P)" ++msgstr "点(_P)" + + msgid "_Points near¹ hint edges" +-msgstr "描点靠近¹渲调提示边缘(_P)" ++msgstr "靠近¹渲染调整边缘的点(_P)" + + msgid "_Points too far" + msgstr "点太远" + + msgid "_Pointsize Y:" +-msgstr "网格大小(_P) Y轴：" ++msgstr "点号 Y(_P)：" + + msgid "_Pointsize:" + msgstr "字号(_P)：" +@@ -15840,7 +16523,7 @@ msgid "_Weight" + msgstr "字重(_W)：" + + msgid "_Weight Class" +-msgstr "粗细类属(_W)" ++msgstr "字重类别(_W)" + + msgid "_Width" + msgstr "宽度(_W)" +@@ -15860,6 +16543,9 @@ msgstr "线框(_W)" + msgid "_Wireframe..." + msgstr "线框(_W)..." + ++msgid "_X" ++msgstr "_X" ++ + msgid "_X Resource Editor..." + msgstr "_X 资源编辑器..." + +@@ -15873,7 +16559,10 @@ msgid "_X-Height" + msgstr "_X高度" + + msgid "_X:" +-msgstr "_X轴：" ++msgstr "_X:" ++ ++msgid "_Y" ++msgstr "_Y" + + msgid "_Y near¹" + msgstr "_Y 临近¹" +@@ -15893,6 +16582,12 @@ msgstr "上高属性表" + msgid "alternate subs" + msgstr "交换替代" + ++msgid "as Len_gth" ++msgstr "作为长度(_G)" ++ ++msgid "as _Length" ++msgstr "作为长度(_L)" ++ + msgid "at position" + msgstr "在位置" + +@@ -16143,25 +16838,25 @@ msgid "positioning" + msgstr "定位" + + msgid "problfixup|Bad Directions" +-msgstr "不良方向" ++msgstr "problfixup|不良方向" + + msgid "problfixup|Mark for Overlap fix before Save" +-msgstr "保存前标记未连接的" ++msgstr "problfixup|标记重叠，保存前修复" + + msgid "problfixup|Missing Extrema" +-msgstr "缺少极点" ++msgstr "problfixup|缺少极点" + + msgid "problfixup|Missing Extrema (cautiously)" +-msgstr "缺极值" ++msgstr "problfixup|缺极值（谨慎）" + + msgid "problfixup|Open Contours" +-msgstr "轮廓开放" ++msgstr "problfixup|开放轮廓线" + + msgid "problfixup|Self Intersections" +-msgstr "自身相交" ++msgstr "problfixup|自相交" + + msgid "problfixup|Too Many Points" +-msgstr "过多点" ++msgstr "problfixup|点过多" + + msgid "problselect|Bad Direction" + msgstr "方向错误" +@@ -16170,10 +16865,10 @@ msgid "problselect|Errors" + msgstr "错误" + + msgid "problselect|Missing Extrema" +-msgstr "缺少极点" ++msgstr "problselect|缺极值" + + msgid "problselect|Open Contours" +-msgstr "轮廓开放" ++msgstr "problselect|开放轮廓线" + + msgid "problselect|Self Intersections" + msgstr "自身相交" +@@ -16235,7 +16930,7 @@ msgid "vertical origin table" + msgstr "垂直原点表" + + msgid "weight" +-msgstr "粗细" ++msgstr "字重" + + #. GT: English uses "script" to mean a general writing system (latin, greek, kanji) + #. GT: and the cursive handwriting style. Here we mean the general writing system. +@@ -16248,7 +16943,7 @@ msgstr "粗细" + #. GT: English uses "script" to me a general writing style (latin, greek, kanji) + #. GT: and the cursive handwriting style. Here we mean the general writing system. + msgid "writing system|Script" +-msgstr "文字" ++msgstr "书写系统|文字" + + #. GT: Short form of {Everything Else}, might use universal? U+2200 + msgid "{All}" +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 83139bb833..035bd61b79 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -13,8 +13,8 @@ msgid "" + msgstr "" + "Project-Id-Version: fontforge\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2022-12-31 02:48+0000\n" +-"PO-Revision-Date: 2022-12-31 03:27\n" ++"POT-Creation-Date: 2023-12-30 03:08-0800\n" ++"PO-Revision-Date: 2023-12-30 08:15\n" + "Last-Translator: \n" + "Language-Team: Chinese Traditional\n" + "Language: zh_TW\n" +@@ -2271,15 +2271,15 @@ msgstr "不當的連體字字圖。GID %d 未少於 %d\n" + + #, c-format + msgid "" +-"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=2 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "" + "不當的查找表格：格式=2 (%d/%d), 第一筆=%d 最末筆=%d 總計在字型=%d 中的字圖\n" + + #, c-format + msgid "" +-"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in font=" +-"%d\n" ++"Bad lookup table: format=4 (%d/%d), first=%d last=%d total glyphs in " ++"font=%d\n" + msgstr "不當的查找表：格式=4 (%d/%d)，首筆=%d 末筆=%d 字型中字圖總計=%d\n" + + #, c-format +@@ -19269,16 +19269,16 @@ msgstr "ΤεΧ 名稱" + + #, c-format + msgid "" +-"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d ∆x_adv=" +-"%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” in %s did not contain a pairwise positioning lookup ∆x=%d ∆y=%d " ++"∆x_adv=%d ∆y_adv=%d to %s ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + msgstr "" +-"“%s” 於 %s 中並未包含成對定位查找 ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d to %s ∆x=" +-"%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" ++"“%s” 於 %s 中並未包含成對定位查找 ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d to %s " ++"∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + + #, c-format + msgid "" +-"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=" +-"%d\n" ++"“%s” in %s did not contain a positioning lookup ∆x=%d ∆y=%d ∆x_adv=%d " ++"∆y_adv=%d\n" + msgstr "“%s” 於 %s 中並未包含定位查找 ∆x=%d ∆y=%d ∆x_adv=%d ∆y_adv=%d\n" + + #, c-format diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template index c61bc52cd7d4cc..931b9ea60b2569 100644 --- a/srcpkgs/fontforge/template +++ b/srcpkgs/fontforge/template @@ -1,7 +1,7 @@ # Template file for 'fontforge' pkgname=fontforge version=20230101 -revision=3 +revision=4 build_style=cmake hostmakedepends="automake ca-certificates gettext libltdl-devel libtool m4 pkg-config python3 python3-setuptools" diff --git a/srcpkgs/fonttools/template b/srcpkgs/fonttools/template index 6ed84a15b2efcf..6499bb749cf24b 100644 --- a/srcpkgs/fonttools/template +++ b/srcpkgs/fonttools/template @@ -1,7 +1,7 @@ # Template file for 'fonttools' pkgname=fonttools version=4.54.1 -revision=1 +revision=2 build_style=python3-module make_check_args="--deselect Tests/otlLib/optimize_test.py::test_main --deselect Tests/ttx/ttx_test.py::test_ttcompile_timestamp_calcs diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index d467d968338d85..70436f9257796a 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=1.0.0 -revision=1 +revision=2 _pycxx_ver=7.1.8 _ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c build_style=cmake @@ -14,7 +14,7 @@ configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_GUI=ON -DCMAKE_INSTALL_DATAROOTDIR=/usr/share -DCMAKE_INSTALL_DATADIR=/usr/share/${pkgname} -DMEDFILE_INCLUDE_DIRS=/usr/include/med -DCOIN3D_INCLUDE_DIRS=/usr/include/Coin3" hostmakedepends="pkg-config swig doxygen graphviz python3-setuptools - python3-matplotlib" + python3-matplotlib python3-pivy" makedepends="boost-devel libxerces-c-devel zlib-devel occt-devel vtk-devel hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index a65190bc8c40d1..2f84d73bbde7f1 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -1,7 +1,7 @@ # Template file for 'freeorion' pkgname=freeorion version=0.5.0.1 -revision=2 +revision=3 build_style=cmake hostmakedepends="cppcheck doxygen python3-pycodestyle" makedepends="boost-devel libvorbis-devel diff --git a/srcpkgs/frr/patches/python-3.13.patch b/srcpkgs/frr/patches/python-3.13.patch new file mode 100644 index 00000000000000..519c75786fd043 --- /dev/null +++ b/srcpkgs/frr/patches/python-3.13.patch @@ -0,0 +1,79 @@ +From 9fcc2ae596a1eabfb0b7e663b5d47fa58a124bc2 Mon Sep 17 00:00:00 2001 +From: David Lamparter +Date: Wed, 15 Mar 2023 12:24:36 +0100 +Subject: [PATCH] lib: adapt clippy to Python 3.8+ init API + +The old initialization/config API is deprecated in Python 3.11. Make +clippy use the new one added in 3.8 if it's that version or newer. + +Signed-off-by: David Lamparter +--- + lib/clippy.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) + +diff --git a/lib/clippy.c b/lib/clippy.c +index c3c9f5c4016d..d414053c5538 100644 +--- a/lib/clippy.c ++++ b/lib/clippy.c +@@ -14,6 +14,53 @@ + #include "command_graph.h" + #include "clippy.h" + ++#if PY_VERSION_HEX >= 0x03080000 ++/* new python init/config API added in Python 3.8 */ ++int main(int argc, char **argv) ++{ ++ PyStatus status; ++ PyPreConfig preconfig[1]; ++ PyConfig config[1]; ++ ++ PyPreConfig_InitPythonConfig(preconfig); ++ preconfig->configure_locale = 0; ++ preconfig->coerce_c_locale = 1; ++ preconfig->coerce_c_locale_warn = 0; ++ preconfig->isolated = 0; ++ preconfig->utf8_mode = 1; ++ preconfig->parse_argv = 0; ++ ++ status = Py_PreInitializeFromBytesArgs(preconfig, argc, argv); ++ if (PyStatus_Exception(status)) ++ Py_ExitStatusException(status); ++ ++ PyConfig_InitPythonConfig(config); ++#if PY_VERSION_HEX >= 0x030b0000 /* 3.11 */ ++ config->safe_path = 0; ++#endif ++ ++ status = PyConfig_SetBytesArgv(config, argc, argv); ++ if (PyStatus_Exception(status)) ++ Py_ExitStatusException(status); ++ ++ PyConfig_SetBytesString(config, &config->program_name, ++ argc > 0 ? argv[0] : "clippy"); ++ if (argc > 1) ++ PyConfig_SetBytesString(config, &config->run_filename, argv[1]); ++ ++ PyImport_AppendInittab("_clippy", command_py_init); ++ ++ status = Py_InitializeFromConfig(config); ++ if (PyStatus_Exception(status)) ++ Py_ExitStatusException(status); ++ ++ PyConfig_Clear(config); ++ ++ return Py_RunMain(); ++} ++ ++#else /* Python < 3.8 */ ++/* old python init/config API, deprecated in Python 3.11 */ + #if PY_MAJOR_VERSION >= 3 + #define pychar wchar_t + static wchar_t *wconv(const char *s) +@@ -89,6 +136,7 @@ int main(int argc, char **argv) + free(wargv); + return 0; + } ++#endif /* Python < 3.8 */ + + /* and now for the ugly part... provide simplified logging functions so we + * don't need to link libzebra (which would be a circular build dep) */ diff --git a/srcpkgs/frr/template b/srcpkgs/frr/template index d5520d0a6c2a63..caedf801c89611 100644 --- a/srcpkgs/frr/template +++ b/srcpkgs/frr/template @@ -1,7 +1,7 @@ # Template file for 'frr' pkgname=frr version=7.5 -revision=6 +revision=7 build_style=gnu-configure # chroot-texinfo is not able to build frr's docs configure_args="--disable-doc diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template index 9c64fa60710c18..f7d6be51b58353 100644 --- a/srcpkgs/gajim/template +++ b/srcpkgs/gajim/template @@ -1,7 +1,7 @@ # Template file for 'gajim' pkgname=gajim version=1.9.5 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="gettext python3-wheel" depends="farstream gsound gst-libav gst-plugins-base1 gst-plugins-ugly1 diff --git a/srcpkgs/gallery-dl/template b/srcpkgs/gallery-dl/template index d441a02cf0eb07..1f99f662d972d2 100644 --- a/srcpkgs/gallery-dl/template +++ b/srcpkgs/gallery-dl/template @@ -1,7 +1,7 @@ # Template file for 'gallery-dl' pkgname=gallery-dl version=1.27.5 -revision=1 +revision=2 build_style=python3-module make_check_args="--ignore test/test_results.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template index 42546a2db4d376..f537dd6088d5e9 100644 --- a/srcpkgs/gammastep/template +++ b/srcpkgs/gammastep/template @@ -1,7 +1,7 @@ # Template file for 'gammastep' pkgname=gammastep version=2.0.9 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-gui --enable-drm --enable-vidmode --enable-randr --enable-wayland --enable-apparmor --with-systemduserunitdir=no diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template index 07567d1694c657..25277e914c37ad 100644 --- a/srcpkgs/gbinder-python/template +++ b/srcpkgs/gbinder-python/template @@ -1,7 +1,7 @@ # Template file for 'gbinder-python' pkgname=gbinder-python version=1.1.2 -revision=2 +revision=3 build_style=python3-module make_build_args="--cython" hostmakedepends="python3-Cython pkg-config" diff --git a/srcpkgs/gcalcli/template b/srcpkgs/gcalcli/template index fc19e60f13fa34..30345411faff89 100644 --- a/srcpkgs/gcalcli/template +++ b/srcpkgs/gcalcli/template @@ -1,7 +1,7 @@ # Template file for 'gcalcli' pkgname=gcalcli version=4.3.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-dateutil python3-google-api-python-client diff --git a/srcpkgs/gcovr/template b/srcpkgs/gcovr/template index 378643f400c4e3..cf0245e231cb94 100644 --- a/srcpkgs/gcovr/template +++ b/srcpkgs/gcovr/template @@ -1,7 +1,7 @@ # Template file for 'gcovr' pkgname=gcovr version=7.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-Jinja2 python3-lxml python3-Pygments python3-colorlog" diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index 70a0d0aea0baa0..99b9b77ca7863e 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -1,7 +1,7 @@ # Template file for 'gdb' pkgname=gdb version=15.2 -revision=1 +revision=2 build_style=gnu-configure pycompile_dirs="/usr/share/gdb/python" configure_args="--disable-werror --disable-nls --with-system-readline diff --git a/srcpkgs/gdm-settings/template b/srcpkgs/gdm-settings/template index 13a192fa015e64..e94397d4ea3ce9 100644 --- a/srcpkgs/gdm-settings/template +++ b/srcpkgs/gdm-settings/template @@ -1,7 +1,7 @@ # Template file for 'gdm-settings' pkgname=gdm-settings version=4.1 -revision=1 +revision=2 build_style=meson build_helper=gir hostmakedepends="pkg-config gettext blueprint-compiler desktop-file-utils gtk-update-icon-cache gtk4 libadwaita glib-devel" diff --git a/srcpkgs/gdown/template b/srcpkgs/gdown/template index 1620c3f29ac247..2164246a622574 100644 --- a/srcpkgs/gdown/template +++ b/srcpkgs/gdown/template @@ -1,7 +1,7 @@ # Template file for 'gdown' pkgname=gdown version=5.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme" depends="python3-filelock python3-requests python3-six python3-tqdm diff --git a/srcpkgs/gedit-plugins/template b/srcpkgs/gedit-plugins/template index 443e0f647803a0..bce9e3cdd467a1 100644 --- a/srcpkgs/gedit-plugins/template +++ b/srcpkgs/gedit-plugins/template @@ -2,7 +2,7 @@ # keep major version in sync with gedit pkgname=gedit-plugins version=48.0 -revision=1 +revision=2 build_style=meson pycompile_dirs="usr/lib/gedit/plugins" hostmakedepends="gettext glib-devel itstool pkg-config vala appstream-glib diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index 63020ed5217117..7bae0fb4074abf 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -2,7 +2,7 @@ # keep major version in sync with gedit-plugins pkgname=gedit version=48.0 -revision=1 +revision=2 build_helper="gir" build_style=meson pycompile_dirs="usr/lib/gedit/plugins" diff --git a/srcpkgs/gef/template b/srcpkgs/gef/template index ca8a6fa81c443e..b356aa14c34601 100644 --- a/srcpkgs/gef/template +++ b/srcpkgs/gef/template @@ -1,7 +1,7 @@ # Template file for 'gef' pkgname=gef version=2024.06 -revision=1 +revision=2 pycompile_dirs="usr/lib/gef" depends="keystone-python3 capstone-python3 unicorn-python3 python3-Ropper gdb binutils" diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template index abfa953943423f..39d4402e1cb0db 100644 --- a/srcpkgs/geis/template +++ b/srcpkgs/geis/template @@ -1,7 +1,7 @@ # Template file for 'geis' pkgname=geis version=2.2.17 -revision=12 +revision=13 build_style="gnu-configure" configure_args="--disable-static" hostmakedepends="pkg-config python3-devel" diff --git a/srcpkgs/gfeeds/template b/srcpkgs/gfeeds/template index 6a83e149d5f2f0..8bf1bac3135752 100644 --- a/srcpkgs/gfeeds/template +++ b/srcpkgs/gfeeds/template @@ -1,7 +1,7 @@ # Template file for 'gfeeds' pkgname=gfeeds version=2.2.0 -revision=1 +revision=2 build_style=meson build_helper=gir hostmakedepends="blueprint-compiler gettext glib-devel gtk-update-icon-cache diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template index e292c5641c9833..9cf76819e8d789 100644 --- a/srcpkgs/gi-docgen/template +++ b/srcpkgs/gi-docgen/template @@ -1,7 +1,7 @@ # Template file for 'gi-docgen' pkgname=gi-docgen version=2023.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml diff --git a/srcpkgs/git-cola/template b/srcpkgs/git-cola/template index 38f4cbf51b7724..10258cd7904ae1 100644 --- a/srcpkgs/git-cola/template +++ b/srcpkgs/git-cola/template @@ -1,7 +1,7 @@ # Template file for 'git-cola' pkgname=git-cola version=4.9.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3 python3-build python3-packaging python3-setuptools python3-setuptools_scm python3-wheel" depends="git qt5-svg python3-PyQt5-webkit python3-QtPy python3-packaging" diff --git a/srcpkgs/git-delete-merged-branches/template b/srcpkgs/git-delete-merged-branches/template index b8f9fb3df78fb8..255127a1e02eb5 100644 --- a/srcpkgs/git-delete-merged-branches/template +++ b/srcpkgs/git-delete-merged-branches/template @@ -1,7 +1,7 @@ # Template file for 'git-delete-merged-branches' pkgname=git-delete-merged-branches version=7.4.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-colorama python3-prompt_toolkit" diff --git a/srcpkgs/git-filter-repo/template b/srcpkgs/git-filter-repo/template index c70df8f7359fa5..110ab5f8cd498d 100644 --- a/srcpkgs/git-filter-repo/template +++ b/srcpkgs/git-filter-repo/template @@ -1,7 +1,7 @@ # Template file for 'git-filter-repo' pkgname=git-filter-repo version=2.34.0 -revision=3 +revision=4 depends="git python3" checkdepends="git python3 perl rsync dos2unix" short_desc="Versatile tool for rewriting git history" diff --git a/srcpkgs/git-review/template b/srcpkgs/git-review/template index 7629a48d82a583..f4214de7b45785 100644 --- a/srcpkgs/git-review/template +++ b/srcpkgs/git-review/template @@ -1,7 +1,7 @@ # Template file for 'git-review' pkgname=git-review version=1.28.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools python3-pbr" depends="python3-requests" diff --git a/srcpkgs/git-revise/template b/srcpkgs/git-revise/template index 1569faac0010ba..7bd9dfd3e0661b 100644 --- a/srcpkgs/git-revise/template +++ b/srcpkgs/git-revise/template @@ -1,7 +1,7 @@ # Template file for 'git-revise' pkgname=git-revise version=0.7.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="git python3-setuptools" diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template index 01c21c65309157..131d3b4bdfb78b 100644 --- a/srcpkgs/gitg/template +++ b/srcpkgs/gitg/template @@ -1,7 +1,7 @@ # Template file for 'gitg' pkgname=gitg version=44 -revision=1 +revision=2 build_style=meson build_helper="gir qemu" hostmakedepends="desktop-file-utils gettext glib-devel gtk-update-icon-cache diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index ff8d859648ad2a..65106907a60669 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -1,7 +1,7 @@ # Template file for 'glade3' pkgname=glade3 version=3.40.0 -revision=1 +revision=2 build_style=meson build_helper="gir qemu" configure_args="-Dgtk_doc=true -Dman=true -Dintrospection=true diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template index 9a7e80a0e882aa..f3612aba697a2e 100644 --- a/srcpkgs/glances/template +++ b/srcpkgs/glances/template @@ -1,7 +1,7 @@ # Template file for 'glances' pkgname=glances version=4.1.2.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-psutil python3-defusedxml python3-packaging python3-orjson diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 26071b0ef66164..5c03f91d581efa 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -2,7 +2,7 @@ # keep in sync with glib-bootstrap pkgname=glib version=2.82.1 -revision=1 +revision=2 build_style=meson build_helper="qemu" # static version is necessary for qemu-user diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index eabb5e07397099..c6baa514edc36b 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -1,7 +1,7 @@ # Template file for 'glusterfs' pkgname=glusterfs version=9.6 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --with-mountutildir=/usr/bin diff --git a/srcpkgs/gnome-browser-connector/template b/srcpkgs/gnome-browser-connector/template index c98694b7fd3a1c..c58589d5338e69 100644 --- a/srcpkgs/gnome-browser-connector/template +++ b/srcpkgs/gnome-browser-connector/template @@ -1,7 +1,7 @@ # Template file for 'gnome-browser-connector' pkgname=gnome-browser-connector version=42.1 -revision=3 +revision=4 build_style=meson hostmakedepends="python3-gobject" depends="python3-gobject dbus gnome-shell" diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index 6bad4887fe40ab..cbf018efdc56ea 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder version=46.2 -revision=2 +revision=3 _llvmver=19 build_style=meson build_helper=qemu diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index e62e89ccc0cfd8..b6fd8676e3932d 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,7 +1,7 @@ # Template file for 'gnome-music' pkgname=gnome-music version=46.0 -revision=2 +revision=3 build_helper="gir" build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template index 57617f25a7df07..2f1cbf20611332 100644 --- a/srcpkgs/gnome-passbook/template +++ b/srcpkgs/gnome-passbook/template @@ -1,7 +1,7 @@ # Template file for 'gnome-passbook' pkgname=gnome-passbook version=0.8 -revision=6 +revision=7 _release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9 build_style=meson hostmakedepends="glib-devel pkg-config gettext" diff --git a/srcpkgs/gnome-secrets/template b/srcpkgs/gnome-secrets/template index 7bf63e0ae79295..0c434c0e9ab484 100644 --- a/srcpkgs/gnome-secrets/template +++ b/srcpkgs/gnome-secrets/template @@ -1,7 +1,7 @@ # Template file for 'gnome-secrets' pkgname=gnome-secrets version=8.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config gettext gobject-introspection python3-pykeepass python3-pyotp glib-devel desktop-file-utils gtk-update-icon-cache diff --git a/srcpkgs/gnome-tweaks/template b/srcpkgs/gnome-tweaks/template index 0f26d2e5693c87..e5a371c00d504a 100644 --- a/srcpkgs/gnome-tweaks/template +++ b/srcpkgs/gnome-tweaks/template @@ -1,7 +1,7 @@ # Template file for 'gnome-tweaks' pkgname=gnome-tweaks version=46.1 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config gettext desktop-file-utils gtk4-update-icon-cache" makedepends="gsettings-desktop-schemas-devel libadwaita-devel diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index e6e62422a726ca..700277e1d14cfc 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,7 +1,7 @@ # Template file for 'gns3-gui' pkgname=gns3-gui version=2.2.52 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-psutil python3-jsonschema diff --git a/srcpkgs/gns3-net-converter/template b/srcpkgs/gns3-net-converter/template index b3ea811af6eb5e..fe21c181675c31 100644 --- a/srcpkgs/gns3-net-converter/template +++ b/srcpkgs/gns3-net-converter/template @@ -1,7 +1,7 @@ # Template file for 'gns3-net-converter' pkgname=gns3-net-converter version=1.3.0 -revision=8 +revision=9 build_style=python3-module pycompile_module="gns3converter" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index f1e2c61def3211..9b6b1fffbb65aa 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,7 +1,7 @@ # Template file for 'gns3-server' pkgname=gns3-server version=2.2.52 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-jsonschema python3-aiohttp python3-aiohttp-cors diff --git a/srcpkgs/gnubg/template b/srcpkgs/gnubg/template index cdd2b7dac47c93..4250d7596ab774 100644 --- a/srcpkgs/gnubg/template +++ b/srcpkgs/gnubg/template @@ -1,7 +1,7 @@ # Template file for 'gnubg' pkgname=gnubg version=1.08.003 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-cputest ax_cv_gcc_x86_cpuid_0x00000001=6000000 --with-gtk3" diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 7def2db6e1ad93..3e58db0ee21e12 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -1,7 +1,7 @@ # Template file for 'gnucash' pkgname=gnucash version=5.9 -revision=1 +revision=2 build_style=cmake make_check_target=check configure_args="-DWITH_PYTHON=1 -DCOMPILE_GSCHEMAS=OFF" diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template index ca910e524cabee..16fb6544429e6d 100644 --- a/srcpkgs/gnuradio-nrsc5/template +++ b/srcpkgs/gnuradio-nrsc5/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-nrsc5' pkgname=gnuradio-nrsc5 version=2.0.0 -revision=8 +revision=9 build_style=cmake make_cmd=make configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index fac23dc315cfd6..d74e46572b7977 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.4 -revision=7 +revision=8 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template index d827e26f446ece..d4aafd94f0ab68 100644 --- a/srcpkgs/gnuradio-rds/template +++ b/srcpkgs/gnuradio-rds/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio-rds' pkgname=gnuradio-rds version=3.10 -revision=12 +revision=13 build_style=cmake configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11" hostmakedepends="pkg-config gnuradio python3" diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index 96618ae919df63..d06dacc2c28523 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.10.11.0 -revision=1 +revision=2 build_style=cmake build_helper="python3" conf_files="/etc/gnuradio/conf.d/*" diff --git a/srcpkgs/gobject-introspection-bootstrap/template b/srcpkgs/gobject-introspection-bootstrap/template index 5920810d93b1cc..669e43474c816e 100644 --- a/srcpkgs/gobject-introspection-bootstrap/template +++ b/srcpkgs/gobject-introspection-bootstrap/template @@ -5,7 +5,7 @@ # libgirepository-1.0 to libgirepository-2.0 migration. pkgname=gobject-introspection-bootstrap version=1.82.0 -revision=1 +revision=2 build_style=meson build_helper="qemu" configure_args="-Dbuild_introspection_data=false" diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index ee2d0b59978584..5cbfae9f6d707b 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -2,7 +2,7 @@ # keep in sync with gobject-introspection-bootstrap pkgname=gobject-introspection version=1.82.0 -revision=1 +revision=2 build_style=meson build_helper="qemu" pycompile_dirs="usr/lib/gobject-introspection/giscanner" diff --git a/srcpkgs/gom/template b/srcpkgs/gom/template index 6d8ad20defb02e..38f3a81a417711 100644 --- a/srcpkgs/gom/template +++ b/srcpkgs/gom/template @@ -1,7 +1,7 @@ # Template file for 'gom' pkgname=gom version=0.4 -revision=5 +revision=6 build_style=meson build_helper="gir" configure_args="-Denable-introspection=$(vopt_if gir true false) diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index 1323fece74ecd5..a79d7b21051860 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -3,7 +3,7 @@ # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/gpgme-qt6" pkgname=gpgme version=1.23.2 -revision=4 +revision=5 build_style=gnu-configure build_helper="python3" configure_args="--enable-fd-passing @@ -32,6 +32,12 @@ fi post_build() { cd lang/python + + mkdir build + ln -sf ../../../src/data.h build/data.h + ln -sf ../../../conf/config.h build/config.h + ln -sf src gpg + top_builddir=../.. python3 -m build --wheel --no-isolation } @@ -82,8 +88,7 @@ gpgme-python3_package() { short_desc+=" - Python binding" depends="gpgme" pkg_install() { - vmove $py3_sitelib - rm -r ${PKGDESTDIR}/$py3_sitelib/gpg*.egg + vmove "${py3_sitelib}" } } diff --git a/srcpkgs/gpodder/template b/srcpkgs/gpodder/template index 9cc3b23caa47c9..0ca6b1d271665d 100644 --- a/srcpkgs/gpodder/template +++ b/srcpkgs/gpodder/template @@ -1,7 +1,7 @@ # Template file for 'gpodder' pkgname=gpodder version=3.11.4 -revision=1 +revision=2 hostmakedepends="python3-setuptools intltool" depends="eyeD3 gtk+3 hicolor-icon-theme python3-dbus python3-gobject python3-html5lib python3-mygpoclient python3-podcastparser python3-mutagen diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 77c28ac1978000..62ad6fa8a15d12 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -1,7 +1,7 @@ # Template file for 'gpsd' pkgname=gpsd version=3.24 -revision=3 +revision=4 build_style=scons make_build_args="dbus_export=0 gpsd_user=gpsd gpsd_group=gpsd sbindir=/usr/bin CC=${CC} qt_versioned=5" diff --git a/srcpkgs/gramps/template b/srcpkgs/gramps/template index 25d28d1d7a2f4d..6cc82d6f601f7c 100644 --- a/srcpkgs/gramps/template +++ b/srcpkgs/gramps/template @@ -1,7 +1,7 @@ # Template file for 'gramps' pkgname=gramps version=5.1.6 -revision=2 +revision=3 build_style=python3-module hostmakedepends="pkg-config intltool python3-setuptools" depends="gtk+3 python3-gobject python3-bsddb3 python3-PyICU python3-jsonschema python3-lxml" diff --git a/srcpkgs/greg/template b/srcpkgs/greg/template index c139814b92a976..fc324b54d22143 100644 --- a/srcpkgs/greg/template +++ b/srcpkgs/greg/template @@ -1,7 +1,7 @@ # Template file for 'greg' pkgname=greg version=0.4.7 -revision=10 +revision=11 build_style=python3-module pycompile_module="greg" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/grip/template b/srcpkgs/grip/template index 0cab8751fe84a4..a1fa43ccea43ec 100644 --- a/srcpkgs/grip/template +++ b/srcpkgs/grip/template @@ -1,7 +1,7 @@ # Template file for 'grip' pkgname=grip version=4.6.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-docopt python3-Flask python3-Markdown python3-path-and-address diff --git a/srcpkgs/gscreenshot/template b/srcpkgs/gscreenshot/template index 71b6af109752d7..5e9fe2975147d3 100644 --- a/srcpkgs/gscreenshot/template +++ b/srcpkgs/gscreenshot/template @@ -1,7 +1,7 @@ # Template file for 'gscreenshot' pkgname=gscreenshot version=3.6.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools gettext go-md2man" # refer to https://github.com/thenaterhood/gscreenshot#installation diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index 2f2f8ed71d8410..d8668a6df3ab52 100644 --- a/srcpkgs/gst1-editing-services/template +++ b/srcpkgs/gst1-editing-services/template @@ -1,7 +1,7 @@ # Template file for 'gst1-editing-services' pkgname=gst1-editing-services version=1.24.9 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Ddoc=disabled $(vopt_feature gir introspection)" diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template index 81a83de1d4603f..f78354195f484b 100644 --- a/srcpkgs/gst1-python3/template +++ b/srcpkgs/gst1-python3/template @@ -1,7 +1,7 @@ # Template file for 'gst1-python3' pkgname=gst1-python3 version=1.24.9 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config python3" makedepends="libglib-devel python3-devel python3-gobject-devel gst-plugins-base1-devel" diff --git a/srcpkgs/gtk-doc/template b/srcpkgs/gtk-doc/template index 93fb16d08ff0e7..2cb3769cd17153 100644 --- a/srcpkgs/gtk-doc/template +++ b/srcpkgs/gtk-doc/template @@ -1,7 +1,7 @@ # Template file for 'gtk-doc' pkgname=gtk-doc version=1.33.2 -revision=3 +revision=4 build_style=meson # disable tests to avoid cyclic dependency on glib configure_args="-Dtests=false" diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template index 30501ae9d79baf..ae62cd602a5950 100644 --- a/srcpkgs/guake/template +++ b/srcpkgs/guake/template @@ -1,7 +1,7 @@ # Template file for 'guake' pkgname=guake version=3.10 -revision=1 +revision=2 build_style=python3-module hostmakedepends="gettext python3-setuptools_scm python3-pbr python3-wheel" makedepends="python3-devel python3-pbr" diff --git a/srcpkgs/gufw/template b/srcpkgs/gufw/template index 5d6c9d3bb3e610..b1d0e62cf6809c 100644 --- a/srcpkgs/gufw/template +++ b/srcpkgs/gufw/template @@ -1,7 +1,7 @@ # Template file for 'gufw' pkgname=gufw version=24.04 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-distutils-extra intltool" depends="python3-gobject net-tools ufw gtk+3 libwebkit2gtk41" diff --git a/srcpkgs/gwe/template b/srcpkgs/gwe/template index d8f971032c6fcc..862acee322be22 100644 --- a/srcpkgs/gwe/template +++ b/srcpkgs/gwe/template @@ -1,7 +1,7 @@ # Template file for 'gwe' pkgname=gwe version=0.15.5 -revision=2 +revision=3 build_style=meson hostmakedepends="gobject-introspection pkg-config ninja appstream-glib glib-devel" makedepends="gtk+3-devel python3-devel" diff --git a/srcpkgs/hamlib/template b/srcpkgs/hamlib/template index bae0ca46737858..f70ea498af0262 100644 --- a/srcpkgs/hamlib/template +++ b/srcpkgs/hamlib/template @@ -1,7 +1,7 @@ # Template file for 'hamlib' pkgname=hamlib version=4.5.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --with-perl-binding --with-python-binding --with-tcl-binding --with-xml-support" @@ -19,6 +19,10 @@ checksum=601c89f32ed225e9527ade3d64d0d05d23202c05ae21ffa77e59d70ee4597fcd CFLAGS="-DNO_POSIX_2008_LOCALE -D_GNU_SOURCE" +if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then + makedepends+=" libxcrypt-devel" +fi + pre_configure() { export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}" diff --git a/srcpkgs/hatch-fancy-pypi-readme/template b/srcpkgs/hatch-fancy-pypi-readme/template index 1fcd9bd5f13154..a87bfbac2a2f1c 100644 --- a/srcpkgs/hatch-fancy-pypi-readme/template +++ b/srcpkgs/hatch-fancy-pypi-readme/template @@ -1,7 +1,7 @@ # Template file for 'hatch-fancy-pypi-readme' pkgname=hatch-fancy-pypi-readme version=24.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="hatchling" diff --git a/srcpkgs/hatch-jupyter-builder/template b/srcpkgs/hatch-jupyter-builder/template index af3ea922f75e53..0d6d15ac01c671 100644 --- a/srcpkgs/hatch-jupyter-builder/template +++ b/srcpkgs/hatch-jupyter-builder/template @@ -1,7 +1,7 @@ # Template file for 'hatch-jupyter-builder' pkgname=hatch-jupyter-builder version=0.9.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="hatchling" diff --git a/srcpkgs/hatch-nodejs-version/template b/srcpkgs/hatch-nodejs-version/template index 7285e4796266c2..eff3bdb4f779e4 100644 --- a/srcpkgs/hatch-nodejs-version/template +++ b/srcpkgs/hatch-nodejs-version/template @@ -1,7 +1,7 @@ # Template file for 'hatch-nodejs-version' pkgname=hatch-nodejs-version version=0.3.2 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="hatchling" depends="hatchling" diff --git a/srcpkgs/hatch-vcs/template b/srcpkgs/hatch-vcs/template index 2339aea763422f..3b30053ca23a2d 100644 --- a/srcpkgs/hatch-vcs/template +++ b/srcpkgs/hatch-vcs/template @@ -1,7 +1,7 @@ # Template file for 'hatch-vcs' pkgname=hatch-vcs version=0.4.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--deselect tests/test_build.py::test_basic --deselect tests/test_build.py::test_write diff --git a/srcpkgs/hatch/template b/srcpkgs/hatch/template index f8f9e156ab3a06..46e9e4d1259f73 100644 --- a/srcpkgs/hatch/template +++ b/srcpkgs/hatch/template @@ -1,7 +1,7 @@ # Template file for 'hatch' pkgname=hatch version=1.6.3 -revision=3 +revision=4 build_style=python3-pep517 # ignore backend tests, because updating hatchling when there is no new hatch # version yet breaks these in hatch. diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template index d87caab4422f15..81a777c33bd1f1 100644 --- a/srcpkgs/hatchling/template +++ b/srcpkgs/hatchling/template @@ -1,7 +1,7 @@ # Template file for 'hatchling' pkgname=hatchling version=1.25.0 -revision=1 +revision=2 build_style=python3-pep517 _deps="python3-editables python3-packaging python3-pathspec python3-pluggy python3-trove-classifiers" diff --git a/srcpkgs/heisenbridge/template b/srcpkgs/heisenbridge/template index 32129bc0639472..e3020a360da506 100644 --- a/srcpkgs/heisenbridge/template +++ b/srcpkgs/heisenbridge/template @@ -1,7 +1,7 @@ # Template file for 'heisenbridge' pkgname=heisenbridge version=1.15.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-irc python3-ruamel.yaml python3-mautrix python3-socks python3-aiohttp python3-async-timeout" diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index cc1b03700ec611..d0f84a71e77d5c 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -1,7 +1,7 @@ # Template file for 'hexchat' pkgname=hexchat version=2.16.2 -revision=5 +revision=6 build_style=meson configure_args="-Ddbus=enabled -Dtls=enabled -Dwith-perl=/usr/bin/perl -Dwith-python=python3 diff --git a/srcpkgs/hg-evolve/template b/srcpkgs/hg-evolve/template index 45ded6d575a2e7..19b6c6b3927859 100644 --- a/srcpkgs/hg-evolve/template +++ b/srcpkgs/hg-evolve/template @@ -1,7 +1,7 @@ # Template file for 'hg-evolve' pkgname=hg-evolve version=11.1.4 -revision=1 +revision=2 _hg_version=6.7.4 # sync with mercurial version in void repos build_style=python3-module build_wrksrc="hg-evolve-${version}" diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template index 02b0cb87833f4f..5e8116d90b61c9 100644 --- a/srcpkgs/hg-git/template +++ b/srcpkgs/hg-git/template @@ -1,7 +1,7 @@ # Template file for 'hg-git' pkgname=hg-git version=1.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-dulwich mercurial" diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template index 8ef21bf66f31c3..fc7b8a4ed8fb6d 100644 --- a/srcpkgs/hivex/template +++ b/srcpkgs/hivex/template @@ -1,7 +1,7 @@ # Template file for 'hivex' pkgname=hivex version=1.3.24 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-ocaml" # currently ocaml is broken hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy" diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template index f0edbaa31862ba..76ccc5b198489a 100644 --- a/srcpkgs/hobbits/template +++ b/srcpkgs/hobbits/template @@ -1,7 +1,7 @@ # Template file for 'hobbits' pkgname=hobbits version=0.54.1 -revision=1 +revision=2 _pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215 build_style=cmake configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)" diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 6e27e4d46590d2..aea65d01b05362 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -2,7 +2,7 @@ # When possible, keep this package in sync with hplip-plugin pkgname=hplip version=3.24.4 -revision=1 +revision=2 build_style=gnu-configure pycompile_dirs="usr/share/hplip" configure_args=" diff --git a/srcpkgs/httpie/template b/srcpkgs/httpie/template index 6ab938f01525ba..b3e8c176919dd9 100644 --- a/srcpkgs/httpie/template +++ b/srcpkgs/httpie/template @@ -1,7 +1,7 @@ # Template file for 'httpie' pkgname=httpie version=3.2.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-requests python3-requests-toolbelt diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template index 31f5be4f0d323c..d39b84f5c2078b 100644 --- a/srcpkgs/hugin/template +++ b/srcpkgs/hugin/template @@ -1,7 +1,7 @@ # Template file for 'hugin' pkgname=hugin version=2023.0.0 -revision=1 +revision=2 build_style=cmake build_helper=cmake-wxWidgets-gtk3 configure_args="-DBUILD_WITH_EPOXY=on" diff --git a/srcpkgs/hydrus/template b/srcpkgs/hydrus/template index 1833a26d737db9..2060c3df942717 100644 --- a/srcpkgs/hydrus/template +++ b/srcpkgs/hydrus/template @@ -1,7 +1,7 @@ # Template file for 'hydrus' pkgname=hydrus version=573 -revision=2 +revision=3 pycompile_dirs="usr/lib/hydrus" hostmakedepends="python3" depends="python3 libopencv-python3 python3-BeautifulSoup4 python3-yaml diff --git a/srcpkgs/i2c-tools/template b/srcpkgs/i2c-tools/template index a31e6ee801d8f3..95fe6f3dac3ab3 100644 --- a/srcpkgs/i2c-tools/template +++ b/srcpkgs/i2c-tools/template @@ -1,7 +1,7 @@ # Template file for 'i2c-tools' pkgname=i2c-tools version=4.4 -revision=1 +revision=2 build_style=gnu-makefile build_helper=python3 make_install_args="sbindir=/usr/bin" diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template index e4e922ee9f9630..7a1ae6ec8de7da 100644 --- a/srcpkgs/ibus/template +++ b/srcpkgs/ibus/template @@ -1,7 +1,7 @@ # Template file for 'ibus' pkgname=ibus version=1.5.30 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args="--enable-ui --enable-gtk3 --enable-gtk4 @@ -35,7 +35,20 @@ post_configure() { } pre_build() { - export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/.libs" + [ -n "${CROSS_BUILD}" ] || return 0 + + # TODO: fix this hack! + # + # GIR_EXTRA_LIBS_PATH in g-ir-scanner-qemuwrapper is not being honored, + # and the linker cannot find libibus-1.0.so.5 when scanning. Linking + # the missing library alongside the scanner targets is sufficient. + local s d + + s="${wrksrc}/src/.libs/libibus-1.0.so.5" + for d in tools bindings/vala client/wayland; do + mkdir -p "${d}/.libs" + ln -Tsf "${s}" "${d}/.libs/libibus-1.0.so.5" + done } post_install() { diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template index 69a2e6107adad0..6c5be7c56dcb35 100644 --- a/srcpkgs/icdiff/template +++ b/srcpkgs/icdiff/template @@ -1,7 +1,7 @@ # Template file for 'icdiff' pkgname=icdiff version=2.0.7 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-setuptools" diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template index 54423bd7cb6243..a4aa594a9578d0 100644 --- a/srcpkgs/idjc/template +++ b/srcpkgs/idjc/template @@ -1,7 +1,7 @@ # Template file for 'idjc' pkgname=idjc version=0.9.8 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config git python3 automake gettext-devel libtool" makedepends="libvorbis-devel libogg-devel jack-devel libsamplerate-devel diff --git a/srcpkgs/imath/template b/srcpkgs/imath/template index b4a47b59073b8c..d5ce132cf536f4 100644 --- a/srcpkgs/imath/template +++ b/srcpkgs/imath/template @@ -1,7 +1,7 @@ # Template file for 'imath' pkgname=imath version=3.1.9 -revision=3 +revision=4 build_style=cmake configure_args="-DPYTHON=ON" hostmakedepends="python3-numpy" diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template index ec1d99f8bf90aa..48b7eba811892a 100644 --- a/srcpkgs/img2pdf/template +++ b/srcpkgs/img2pdf/template @@ -1,7 +1,7 @@ # Template file for 'img2pdf' pkgname=img2pdf version=0.4.4 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-pikepdf python3-setuptools" depends="colord python3-pdfrw python3-pikepdf python3-Pillow python3-tkinter" diff --git a/srcpkgs/impacket/template b/srcpkgs/impacket/template index 83c9d8deadfd8a..a09c9849bd5af2 100644 --- a/srcpkgs/impacket/template +++ b/srcpkgs/impacket/template @@ -1,7 +1,7 @@ # Template file for 'impacket' pkgname=impacket version=0.10.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-future python3-six python3-chardet python3-pyasn1 diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template index 4a7c6d5a5a3450..60b495e6d4145a 100644 --- a/srcpkgs/instaloader/template +++ b/srcpkgs/instaloader/template @@ -1,7 +1,7 @@ # Template file for 'instaloader' pkgname=instaloader version=4.14 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests" diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template index 8e9a15fc66f2e2..6ee18376927f43 100644 --- a/srcpkgs/iotop/template +++ b/srcpkgs/iotop/template @@ -1,7 +1,7 @@ # Template file for 'iotop' pkgname=iotop version=0.6 -revision=11 +revision=12 build_style=python3-module hostmakedepends="python3-setuptools" depends="${hostmakedepends}" diff --git a/srcpkgs/ite8291r3-ctl/template b/srcpkgs/ite8291r3-ctl/template index 889f87d3cd5efd..e5d9602ba34379 100644 --- a/srcpkgs/ite8291r3-ctl/template +++ b/srcpkgs/ite8291r3-ctl/template @@ -1,7 +1,7 @@ # Template file for 'ite8291r3-ctl' pkgname=ite8291r3-ctl version=0.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-usb python3-xlib python3-Pillow" diff --git a/srcpkgs/jack_mixer/template b/srcpkgs/jack_mixer/template index 1255d5a6633338..563a580bc16705 100644 --- a/srcpkgs/jack_mixer/template +++ b/srcpkgs/jack_mixer/template @@ -1,10 +1,10 @@ # Template file for 'jack_mixer' pkgname=jack_mixer -version=17 -revision=3 +version=18 +revision=1 build_style=meson configure_args="-Dcheck-py-modules=false" -hostmakedepends="gettext pkg-config python3-Cython0.29" +hostmakedepends="gettext pkg-config python3-Cython" makedepends="glib-devel jack-devel python3-devel" depends="python3-cairo python3-gobject python3-xdg" short_desc="GTK JACK audio mixer with a look similar to its hardware counterpart" @@ -12,7 +12,7 @@ maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://rdio.space/jackmixer/" distfiles="https://github.com/jack-mixer/jack_mixer/releases/download/release-${version}/jack_mixer-${version}.tar.xz" -checksum=6c8c5735bed05b0a0f8ed7d3d582bc1dd346c2530331e226c86faec7d355e086 +checksum=991d3c1442beb40a368da2097c2ddbab56b2108c9c5b2236c0eaa2a6d3981852 post_extract() { rm -f src/_jack_mixer.c diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template index ccd4c56eb7e8ef..4b668977ec03e0 100644 --- a/srcpkgs/jc/template +++ b/srcpkgs/jc/template @@ -1,7 +1,7 @@ # Template file for 'jc' pkgname=jc version=1.25.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Pygments python3-ruamel.yaml python3-xmltodict" diff --git a/srcpkgs/jep/template b/srcpkgs/jep/template index 5a66cbe991486f..6f6350fdd001ea 100644 --- a/srcpkgs/jep/template +++ b/srcpkgs/jep/template @@ -1,7 +1,7 @@ # Template file for 'jep' pkgname=jep version=4.2.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools openjdk17" makedepends="python3-devel openjdk17" diff --git a/srcpkgs/jrnl/template b/srcpkgs/jrnl/template index e5aef8d76c2e9c..4e388f1642b052 100644 --- a/srcpkgs/jrnl/template +++ b/srcpkgs/jrnl/template @@ -1,7 +1,7 @@ # Template file for 'jrnl' pkgname=jrnl version=4.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-colorama python3-cryptography diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template index 3b46476ec61ea1..4782370a75598d 100644 --- a/srcpkgs/jupyterlab/template +++ b/srcpkgs/jupyterlab/template @@ -1,7 +1,7 @@ # Template file for 'jupyterlab' pkgname=jupyterlab version=4.2.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-jupyter-builder" depends="nodejs python3-async-lru python3-httpx python3-ipython_ipykernel diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template index dcd35e3adc8fab..21c7869dcb4239 100644 --- a/srcpkgs/kapidox/template +++ b/srcpkgs/kapidox/template @@ -1,7 +1,7 @@ # Template file for 'kapidox' pkgname=kapidox version=6.7.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3 python3-setuptools" makedepends="python3-Jinja2 python3-yaml" diff --git a/srcpkgs/kdevelop-python/patches/python-3.13.patch b/srcpkgs/kdevelop-python/patches/python-3.13.patch new file mode 100644 index 00000000000000..cb28d72befaece --- /dev/null +++ b/srcpkgs/kdevelop-python/patches/python-3.13.patch @@ -0,0 +1,26 @@ +diff -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2024-08-15 18:29:03.000000000 -0400 ++++ b/CMakeLists.txt 2024-11-23 10:07:32.447444759 -0500 +@@ -42,7 +42,7 @@ + + set(Python3_USE_STATIC_LIBS FALSE) + set(Python3_FIND_STRATEGY VERSION) +-find_package(Python3 3.4.3...<3.13 COMPONENTS Interpreter Development REQUIRED) ++find_package(Python3 3.4.3...<3.14 COMPONENTS Interpreter Development REQUIRED) + + configure_file(kdevpythonversion.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/kdevpythonversion.h" @ONLY) + +diff -ur a/parser/python_header.h b/parser/python_header.h +--- a/parser/python_header.h 2024-11-23 10:06:59.481365933 -0500 ++++ b/parser/python_header.h 2024-11-23 10:07:26.155429709 -0500 +@@ -14,10 +14,6 @@ + #include + + #include /* define ssize_t with musl libc */ +-#include "pyport.h" +-#ifndef _WIN32 +-#include "pyconfig.h" +-#endif + + #include "Python.h" + diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template index a613ce1d407c92..844602d442a0aa 100644 --- a/srcpkgs/kdevelop-python/template +++ b/srcpkgs/kdevelop-python/template @@ -1,7 +1,7 @@ # Template file for 'kdevelop-python' pkgname=kdevelop-python version=24.08.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake" pycompile_dirs="usr/share/kdevpythonsupport" diff --git a/srcpkgs/keystone/template b/srcpkgs/keystone/template index 84bee2c91be4ff..06d55e251c1293 100644 --- a/srcpkgs/keystone/template +++ b/srcpkgs/keystone/template @@ -1,7 +1,7 @@ # Template file for 'keystone' pkgname=keystone version=0.9.2 -revision=5 +revision=6 build_style=cmake configure_args='-DBUILD_SHARED_LIBS=ON -DLLVM_TARGETS_TO_BUILD=all' hostmakedepends="python3-setuptools" diff --git a/srcpkgs/khal/template b/srcpkgs/khal/template index 92569004d9e37b..5526edd35ffea0 100644 --- a/srcpkgs/khal/template +++ b/srcpkgs/khal/template @@ -1,7 +1,7 @@ # Template file for 'khal' pkgname=khal version=0.11.3 -revision=1 +revision=2 build_style=python3-module # Tests get the path to the configuration file wrong in an xbps-src chroot make_check_args=" diff --git a/srcpkgs/khard/template b/srcpkgs/khard/template index 59f614d4b8c383..2418e1e30a6a8d 100644 --- a/srcpkgs/khard/template +++ b/srcpkgs/khard/template @@ -1,7 +1,7 @@ # Template file for 'khard' pkgname=khard version=0.18.0 -revision=2 +revision=3 build_style=python3-module # fails in CI make_check_args="--deselect test/test_command_line_interface.py::MiscCommands" diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index c0d90acaf430ba..9621ae00b52f91 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -2,7 +2,7 @@ # XXX: keep in sync with kicad-doc pkgname=kicad version=8.0.6 -revision=1 +revision=2 build_style=cmake build_helper="cmake-wxWidgets-gtk3" configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_USE_EGL=ON -DKICAD_BUILD_QA_TESTS=OFF diff --git a/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch b/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch deleted file mode 100644 index c7019f985e1bb5..00000000000000 --- a/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 1e8c1476d55d6d3d5651b4ac060960c68f53899e Mon Sep 17 00:00:00 2001 -From: John Zimmermann -Date: Wed, 29 Dec 2021 12:54:31 +0100 -Subject: [PATCH] fix boost python bindung with boost 1.67+ - ---- - CMakeLists.txt | 35 ++++++++++++++++++++++++----------- - 1 file changed, 24 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index beed7bbb..ed94d104 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,7 +51,18 @@ endif() - - include(KigConfigureChecks.cmake) - --find_package(BoostPython) -+find_package(Boost) -+find_package(PythonLibs 3.12) -+ -+if(Boost_FOUND AND PYTHONLIBS_FOUND) -+ if(${Boost_VERSION} GREATER 106699 OR ${Boost_VERSION} VERSION_GREATER_EQUAL 1.67) -+ message("Searching for python boost") -+ find_package(Boost COMPONENTS python312 REQUIRED) -+ set(Boost_PYTHON_LIBRARY ${Boost_PYTHON312_LIBRARY}) -+ else() -+ find_package(Boost COMPONENTS python) -+ endif() -+endif(Boost_FOUND AND PYTHONLIBS_FOUND) - - add_subdirectory( doc ) - add_subdirectory( icons ) -@@ -61,10 +72,10 @@ add_subdirectory( macros ) - add_subdirectory( data ) - add_subdirectory( pykig ) - --if(BoostPython_FOUND) -+if(Boost_PYTHON312_FOUND AND PYTHONLIBS_FOUND) - add_subdirectory( scripting ) - add_definitions(-DKIG_ENABLE_PYTHON_SCRIPTING) --endif(BoostPython_FOUND) -+endif(Boost_PYTHON312_FOUND AND PYTHONLIBS_FOUND) - - set_package_properties( - BoostPython PROPERTIES -@@ -85,9 +96,10 @@ set_package_properties( - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) - - include_directories( ${CMAKE_SOURCE_DIR}/modes ) --if(BoostPython_FOUND) -- include_directories(${BoostPython_INCLUDE_DIRS}) --endif(BoostPython_FOUND) -+if(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND) -+ include_directories(${Boost_INCLUDE_DIRS}) -+ include_directories(${PYTHON_INCLUDE_PATH}) -+endif(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND) - - # kigpart - -@@ -225,7 +237,7 @@ ki18n_wrap_ui(kigpart_PART_SRCS - misc/kigcoordinateprecisiondialog.ui - ) - --if(BoostPython_FOUND) -+if(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND) - set(kigpart_PART_SRCS ${kigpart_PART_SRCS} - modes/popup/scriptactionsprovider.cc - scripting/newscriptwizard.cc -@@ -236,7 +248,7 @@ if(BoostPython_FOUND) - ) - - kde_source_files_enable_exceptions(scripting/python_scripter.cc) --endif(BoostPython_FOUND) -+endif(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND) - - - add_library(kigpart MODULE ${kigpart_PART_SRCS}) -@@ -258,9 +270,10 @@ target_link_libraries(kigpart - ${KDE5_KUTILS_LIBS} - ) - --if(BoostPython_FOUND) -- target_link_libraries(kigpart ${BoostPython_LIBRARIES} ${KDE5_KTEXTEDITOR_LIBS}) --endif(BoostPython_FOUND) -+if(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND) -+ message("testing") -+ target_link_libraries(kigpart ${PYTHON_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${KDE5_KTEXTEDITOR_LIBS}) -+endif(Boost_PYTHON312_FOUND OR Boost_PYTHON_FOUND) - - if (Qt5XmlPatterns_FOUND) - target_link_libraries(kigpart Qt5::XmlPatterns) --- -2.34.1 - diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template index 5eccc67e6d50b5..df4b99db7a4a4c 100644 --- a/srcpkgs/kig/template +++ b/srcpkgs/kig/template @@ -1,7 +1,7 @@ # Template file for 'kig' pkgname=kig version=24.08.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template index 0879165dcf2ab6..57f0e8bb1255ec 100644 --- a/srcpkgs/kitty/template +++ b/srcpkgs/kitty/template @@ -1,7 +1,7 @@ # Template file for 'kitty' pkgname=kitty version=0.37.0 -revision=1 +revision=2 build_helper="python3" pycompile_dirs="usr/lib/kitty" hostmakedepends="go pkg-config python3 wayland-devel wayland-protocols nerd-fonts-symbols-ttf" diff --git a/srcpkgs/kodi/patches/no-werror.patch b/srcpkgs/kodi/patches/no-werror.patch new file mode 100644 index 00000000000000..2ebc40ede53909 --- /dev/null +++ b/srcpkgs/kodi/patches/no-werror.patch @@ -0,0 +1,19 @@ +diff -ur a/cmake/scripts/common/ArchSetup.cmake b/cmake/scripts/common/ArchSetup.cmake +--- a/cmake/scripts/common/ArchSetup.cmake 2024-08-17 03:06:48.000000000 -0400 ++++ b/cmake/scripts/common/ArchSetup.cmake 2024-11-23 18:01:32.568554400 -0500 +@@ -175,15 +175,6 @@ + -g + -D_DEBUG + ) +- +- # these options affect only core code +- if(NOT CORE_COMPILE_OPTIONS) +- set(CORE_COMPILE_OPTIONS +- -Werror=double-promotion +- -Werror=missing-field-initializers +- -Werror=sign-compare +- ) +- endif() + endif() + + # set for compile info to help detect binary addons diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 6e94577ff2cfeb..1086592e0f1196 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,6 +1,6 @@ # Template file for 'kodi' pkgname=kodi -version=21.0 +version=21.1 revision=1 _codename="Omega" _crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681" @@ -53,7 +53,7 @@ distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz https://github.com/xbmc/libdvdread/archive/${_dvdread_ver}.tar.gz>libdvdread-${_dvdread_ver}.tar.gz https://github.com/xbmc/libdvdnav/archive/${_dvdnav_ver}.tar.gz>libdvdnav-${_dvdnav_ver}.tar.gz https://mirrors.kodi.tv/build-deps/sources/libudfread-${_udfread_ver}.tar.gz" -checksum="7f54c1fd8456ac46221fbc85e447362bdc209163c6cb19fca98d106560071b7c +checksum="ad6e40b0912c8318635f0501dc1f7f27ce3a29e671f2ddb608cad34babae80ef 6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 @@ -138,6 +138,11 @@ pre_configure() { fi } +post_install() { + mkdir -p "${DESTDIR}/${py3_sitelib}" + mv "${DESTDIR}/kodi" "${DESTDIR}/${py3_sitelib}" +} + do_check() { ./build/kodi-test --gtest_filter="${_gtest_filter}" } diff --git a/srcpkgs/kore/patches/python-3.13.patch b/srcpkgs/kore/patches/python-3.13.patch new file mode 100644 index 00000000000000..dc401eedefdb40 --- /dev/null +++ b/srcpkgs/kore/patches/python-3.13.patch @@ -0,0 +1,69 @@ +From 4bd456a334bcf9679fe0f4e762d9c3a86915727d Mon Sep 17 00:00:00 2001 +From: Joris Vink +Date: Fri, 8 Nov 2024 20:08:19 +0100 +Subject: [PATCH] Support Python 3.13. + +Since we're using some cpython internals that change from time to time +we have to adjust for the 3.13 release accordingly. +--- + src/python.c | 29 ++++++++++++++++++++++++++--- + 1 file changed, 26 insertions(+), 3 deletions(-) + +diff --git a/src/python.c b/src/python.c +index 48506620..01c094e7 100644 +--- a/src/python.c ++++ b/src/python.c +@@ -55,10 +55,33 @@ + + #include + ++/* ++ * Python 3.13.x requires that Py_BUILD_CORE is defined before we pull ++ * in the pycore_frame header file, and it loves using unnamed unions ++ * so we have to turn off pendatic mode before including it. ++ * ++ * The f_code member was removed from _PyInterpreterFrame and is replaced ++ * with a PyObject called f_executable. There is an _PyFrame_GetCode() ++ * helper function now. ++ */ ++#if PY_VERSION_HEX >= 0x030d0000 ++#define Py_BUILD_CORE 1 ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wpedantic" ++#endif ++ ++#if PY_VERSION_HEX < 0x030d0000 ++#define _PyFrame_GetCode(frame) (frame->f_code) ++#endif ++ + #if PY_VERSION_HEX >= 0x030b0000 + #include + #endif + ++#if PY_VERSION_HEX >= 0x030d0000 ++#pragma GCC diagnostic pop ++#endif ++ + #if PY_VERSION_HEX < 0x030A0000 + typedef enum { + PYGEN_RETURN = 0, +@@ -1201,7 +1224,7 @@ python_resolve_frame_line(void *ptr) + + frame = ptr; + addr = _PyInterpreterFrame_LASTI(frame) * sizeof(_Py_CODEUNIT); +- line = PyCode_Addr2Line(frame->f_code, addr); ++ line = PyCode_Addr2Line(_PyFrame_GetCode(frame), addr); + #else + line = PyFrame_GetLineNumber(ptr); + #endif +@@ -1232,8 +1255,8 @@ python_coro_trace(const char *label, struct python_coro *coro) + #else + frame = obj->cr_frame; + #endif +- if (frame != NULL && frame->f_code != NULL) { +- code = frame->f_code; ++ if (frame != NULL && _PyFrame_GetCode(frame) != NULL) { ++ code = _PyFrame_GetCode(frame); + func = PyUnicode_AsUTF8AndSize(code->co_name, NULL); + file = PyUnicode_AsUTF8AndSize(code->co_filename, NULL); + diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template index e5c244fe7f97f6..502690a8c8e6a3 100644 --- a/srcpkgs/kore/template +++ b/srcpkgs/kore/template @@ -1,7 +1,7 @@ # Template file for 'kore' pkgname=kore version=4.2.3 -revision=5 +revision=6 # arch specific seccomp stuff archs="x86_64* aarch64* ppc64*" build_style=gnu-makefile diff --git a/srcpkgs/krita/patches/python-3.13.patch b/srcpkgs/krita/patches/python-3.13.patch new file mode 100644 index 00000000000000..6714059895d0ff --- /dev/null +++ b/srcpkgs/krita/patches/python-3.13.patch @@ -0,0 +1,120 @@ +From 0f43ec3158225092f6a02422eb90c56421326570 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Tue, 18 Jun 2024 22:05:34 +0200 +Subject: [PATCH] Changes to build pykrita with Python 3.13 + +Python 3.11 deprecated Py_SetPath() in 2022 and Python 3.13 removed it. +Instead one needs to use the new PyConfig API (PEP 587) added to Python +3.8. + +Fix: #488680 +--- + .../extensions/pykrita/plugin/utilities.cpp | 61 +++++++++++++++++-- + plugins/extensions/pykrita/plugin/utilities.h | 4 +- + 2 files changed, 57 insertions(+), 8 deletions(-) + +diff --git a/plugins/extensions/pykrita/plugin/utilities.cpp b/plugins/extensions/pykrita/plugin/utilities.cpp +index 4f58183238..1e497b2681 100644 +--- a/plugins/extensions/pykrita/plugin/utilities.cpp ++++ b/plugins/extensions/pykrita/plugin/utilities.cpp +@@ -19,8 +19,10 @@ + #include + #include + ++#include + #include + #include ++#include + #include + #include + #include +@@ -412,18 +414,65 @@ bool Python::setPath(const QStringList& scriptPaths) + joinedPaths = joinedPaths + pathSeparator + originalPath; + } + dbgScript << "Setting python paths:" << joinedPaths; ++ + #ifdef Q_OS_WIN +- QVector joinedPathsWChars(joinedPaths.size() + 1, 0); +- joinedPaths.toWCharArray(joinedPathsWChars.data()); +- Py_SetPath(joinedPathsWChars.data()); ++ PyStatus status; ++ PyConfig config; ++ PyConfig_InitPythonConfig(&config); ++ ++ for (const QString& path : joinedPaths.split(pathSeparator)) { ++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str()); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg; ++ dbgScript << "Error appending to PyWideStringList"; ++ return false; ++ } ++ } ++ ++ config.module_search_paths_set = true; ++ qDebug() << "Set module_search_paths"; ++ ++ status = Py_InitializeFromConfig(&config); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Cannot initialize Py_InitializeFromConfig:" << status.err_msg; ++ Py_ExitStatusException(status); ++ PyConfig_Clear(&config); ++ dbgScript << "Cannot initialize Py_InitializeFromConfig config"; ++ return false; ++ } ++ ++ PyConfig_Clear(&config); + #else + if (runningInBundle) { +- QVector joinedPathsWChars(joinedPaths.size() + 1, 0); +- joinedPaths.toWCharArray(joinedPathsWChars.data()); +- Py_SetPath(joinedPathsWChars.data()); ++ PyStatus status; ++ PyConfig config; ++ PyConfig_InitPythonConfig(&config); ++ ++ for (const QString& path : joinedPaths.split(pathSeparator)) { ++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str()); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg; ++ dbgScript << "Error appending to PyWideStringList"; ++ return false; ++ } ++ } ++ ++ config.module_search_paths_set = true; ++ ++ status = Py_InitializeFromConfig(&config); ++ if (PyStatus_Exception(status)) { ++ Py_ExitStatusException(status); ++ qDebug() << "Cannot initialize Py_InitializeFromConfig 2:" << status.err_msg; ++ PyConfig_Clear(&config); ++ dbgScript << "Cannot initialize Py_InitializeFromConfig config"; ++ return false; ++ } ++ ++ PyConfig_Clear(&config); + } + else { + qputenv("PYTHONPATH", joinedPaths.toLocal8Bit()); ++ qDebug() << "Set PYTHONPATH environment variable"; + } + #endif + isPythonPathSet = true; +diff --git a/plugins/extensions/pykrita/plugin/utilities.h b/plugins/extensions/pykrita/plugin/utilities.h +index fb309bd0b8..aec47da239 100644 +--- a/plugins/extensions/pykrita/plugin/utilities.h ++++ b/plugins/extensions/pykrita/plugin/utilities.h +@@ -81,8 +81,8 @@ public: + static bool libraryLoad(); + + /** +- * Set the Python paths by calling Py_SetPath. This should be called before +- * initialization to ensure the proper libraries get loaded. ++ * Set the Python paths by calling Py_InitializeFromConfig. This should be ++ * called before initialization to ensure the proper libraries get loaded. + */ + static bool setPath(const QStringList& scriptPaths); + +-- +2.45.2 + diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index bc465fadf1d933..9b69726d67dcaf 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=5.2.6 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF -DENABLE_UPDATERS=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 diff --git a/srcpkgs/ktoblzcheck/template b/srcpkgs/ktoblzcheck/template index 9724e86fe2a78d..cb204f106c6ab7 100644 --- a/srcpkgs/ktoblzcheck/template +++ b/srcpkgs/ktoblzcheck/template @@ -1,7 +1,7 @@ # Template file for 'ktoblzcheck' pkgname=ktoblzcheck version=1.53 -revision=5 +revision=6 build_style=cmake configure_args="-DENABLE_BANKDATA_DOWNLOAD=NO" hostmakedepends="pkg-config python3" diff --git a/srcpkgs/kupfer/template b/srcpkgs/kupfer/template index 22bf163847e7a1..3b1eb69f5fc12a 100644 --- a/srcpkgs/kupfer/template +++ b/srcpkgs/kupfer/template @@ -1,7 +1,7 @@ # Template file for 'kupfer' pkgname=kupfer version=321 -revision=4 +revision=5 build_style=waf3 pycompile_dirs="usr/share/kupfer/kupfer" configure_args="--no-update-mime --no-update-icon-cache" diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template index b400e28511638e..2908dc86a305ba 100644 --- a/srcpkgs/kvirc/template +++ b/srcpkgs/kvirc/template @@ -1,7 +1,7 @@ # Template file for 'kvirc' pkgname=kvirc version=5.0.0 -revision=14 +revision=15 build_style=cmake configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0" hostmakedepends="perl" diff --git a/srcpkgs/ldapdomaindump/template b/srcpkgs/ldapdomaindump/template index 82314c72341119..72d609edc9eef2 100644 --- a/srcpkgs/ldapdomaindump/template +++ b/srcpkgs/ldapdomaindump/template @@ -1,7 +1,7 @@ # Template file for 'ldapdomaindump' pkgname=ldapdomaindump version=0.9.4 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-future python3-ldap3 python3-dnspython" diff --git a/srcpkgs/ldb/template b/srcpkgs/ldb/template index f3dcb95611ceb4..6a697c7822f22c 100644 --- a/srcpkgs/ldb/template +++ b/srcpkgs/ldb/template @@ -1,7 +1,7 @@ # Template file for 'ldb' pkgname=ldb version=2.9.0 -revision=1 +revision=2 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" diff --git a/srcpkgs/legendary/template b/srcpkgs/legendary/template index 83988d537663dd..a707006dca5f80 100644 --- a/srcpkgs/legendary/template +++ b/srcpkgs/legendary/template @@ -1,7 +1,7 @@ # Template file for 'legendary' pkgname=legendary version=0.20.34 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-filelock" diff --git a/srcpkgs/lensfun/template b/srcpkgs/lensfun/template index fb81b5909694b8..60995f17e26ce8 100644 --- a/srcpkgs/lensfun/template +++ b/srcpkgs/lensfun/template @@ -1,7 +1,7 @@ # Template file for 'lensfun' pkgname=lensfun version=0.3.4 -revision=1 +revision=2 build_style=cmake configure_args="-DINSTALL_HELPER_SCRIPTS=0" hostmakedepends="pkg-config python3-setuptools" diff --git a/srcpkgs/lesspass/template b/srcpkgs/lesspass/template index a37595ee00407d..831dc30d2888b0 100644 --- a/srcpkgs/lesspass/template +++ b/srcpkgs/lesspass/template @@ -1,7 +1,7 @@ # Template file for 'lesspass' pkgname=lesspass version=10.2.1 -revision=3 +revision=4 build_wrksrc="cli" build_style=python3-module hostmakedepends="python3-setuptools" diff --git a/srcpkgs/lfm/template b/srcpkgs/lfm/template index 3acfc3624b84cd..622315331528be 100644 --- a/srcpkgs/lfm/template +++ b/srcpkgs/lfm/template @@ -1,7 +1,7 @@ # Template file for 'lfm' pkgname=lfm version=3.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template index a5d7c58dec6b27..0ceb9e3b4c04bc 100644 --- a/srcpkgs/libaccounts-glib/template +++ b/srcpkgs/libaccounts-glib/template @@ -1,7 +1,7 @@ # Template file for 'libaccounts-glib' pkgname=libaccounts-glib version=1.26 -revision=1 +revision=2 build_style=meson build_helper="gir qemu" configure_args="-Dpy-overrides-dir=/${py3_sitelib}/gi/overrides" diff --git a/srcpkgs/libblockdev/template b/srcpkgs/libblockdev/template index 29f9c555bd0779..76ff9d95c422ab 100644 --- a/srcpkgs/libblockdev/template +++ b/srcpkgs/libblockdev/template @@ -1,7 +1,7 @@ # Template file for 'libblockdev' pkgname=libblockdev version=3.1.1 -revision=2 +revision=3 build_style=gnu-configure make_check_target="test" hostmakedepends="pkg-config python3-setuptools" diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template index 173485a41ccc7a..1641d4babbf643 100644 --- a/srcpkgs/libbytesize/template +++ b/srcpkgs/libbytesize/template @@ -1,7 +1,7 @@ # Template file for 'libbytesize' pkgname=libbytesize version=2.10 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config gettext python3" makedepends="mpfr-devel pcre2-devel" diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template index 62666752e06950..186866489e8496 100644 --- a/srcpkgs/libcap-ng/template +++ b/srcpkgs/libcap-ng/template @@ -1,7 +1,7 @@ # Template file for 'libcap-ng' pkgname=libcap-ng version=0.8.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-python --without-python3" short_desc="Alternate POSIX capabilities library" diff --git a/srcpkgs/libcec/patches/python-3.13.patch b/srcpkgs/libcec/patches/python-3.13.patch new file mode 100644 index 00000000000000..e7c351d0ec4e3f --- /dev/null +++ b/srcpkgs/libcec/patches/python-3.13.patch @@ -0,0 +1,12 @@ +diff -ur a/src/libcec/SwigHelper.h b/src/libcec/SwigHelper.h +--- a/src/libcec/SwigHelper.h 2020-07-13 06:18:33.000000000 -0400 ++++ b/src/libcec/SwigHelper.h 2024-11-23 15:00:04.684002606 -0500 +@@ -119,7 +119,7 @@ + if (!!m_callbacks[callback]) + { + /** call the callback */ +- result = PyEval_CallObject(m_callbacks[callback], arglist); ++ result = PyObject_CallObject(m_callbacks[callback], arglist); + + /** unref the argument and result */ + if (!!arglist) diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index b31bc3c3b2cf6a..877a04a15179de 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -1,7 +1,7 @@ # Template file for 'libcec' pkgname=libcec version=6.0.2 -revision=4 +revision=5 build_style=cmake configure_args="Python_ADDITIONAL_VERSIONS=${py3_ver}" hostmakedepends="pkg-config libtool swig" diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index 9574c1d53f0693..e4bc9e1e80163d 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -1,7 +1,7 @@ # Template file for 'libffado' pkgname=libffado version=2.4.9 -revision=1 +revision=2 build_style=scons scons_use_destdir=yes make_build_args="PREFIX=/usr MANDIR=/usr/share/man diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index 89106c53024a3d..9a0628e3d9b26a 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -1,7 +1,7 @@ # Template file for 'libgdal' pkgname=libgdal version=3.8.4 -revision=2 +revision=3 build_style=cmake build_helper=python3 configure_args="-DGDAL_USE_OPENCL=ON diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template index f6739772aa3c77..6fd51561cd2a7c 100644 --- a/srcpkgs/libgexiv2/template +++ b/srcpkgs/libgexiv2/template @@ -1,7 +1,7 @@ # Template file for 'libgexiv2' pkgname=libgexiv2 version=0.14.3 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="$(vopt_bool gir introspection) $(vopt_bool vala vapi)" diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template index 37a02337da3736..4203bf1ad73969 100644 --- a/srcpkgs/libgit2-glib/template +++ b/srcpkgs/libgit2-glib/template @@ -1,7 +1,7 @@ # Template file for 'libgit2-glib' pkgname=libgit2-glib version=1.2.0 -revision=2 +revision=3 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir true false) diff --git a/srcpkgs/libgpiod/template b/srcpkgs/libgpiod/template index 13bf62ca546c6a..47423396da0984 100644 --- a/srcpkgs/libgpiod/template +++ b/srcpkgs/libgpiod/template @@ -1,7 +1,7 @@ # Template file for 'libgpiod' pkgname=libgpiod version=2.2 -revision=2 +revision=3 build_style="gnu-configure" build_helper="python3" configure_args="--prefix=/usr --enable-tools=yes --enable-bindings-cxx diff --git a/srcpkgs/libiio/template b/srcpkgs/libiio/template index a572eabda899f7..acd6a929e42c2e 100644 --- a/srcpkgs/libiio/template +++ b/srcpkgs/libiio/template @@ -1,7 +1,7 @@ # Template file for 'libiio' pkgname=libiio version=0.25 -revision=2 +revision=3 build_style=cmake configure_args="-DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d -DWITH_DOC=YES -DWITH_SERIAL_BACKEND=YES -DHAVE_DNS_SD=YES -DPYTHON_BINDINGS=YES" diff --git a/srcpkgs/libimobiledevice/patches/00.cython3.patch b/srcpkgs/libimobiledevice/patches/00.cython3.patch new file mode 100644 index 00000000000000..ce76f5d8465f42 --- /dev/null +++ b/srcpkgs/libimobiledevice/patches/00.cython3.patch @@ -0,0 +1,24 @@ +From fb1dec7e2cbb2eae14536d8d68db25d3f9384ac1 Mon Sep 17 00:00:00 2001 +From: aymenim +Date: Tue, 15 Mar 2016 23:56:08 +0300 +Subject: [PATCH] cython: fixed notification_proxy callback gil lock + +cython notification proxy bug segmentation fault when callback called +without gil +--- + cython/notification_proxy.pxi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cython/notification_proxy.pxi b/cython/notification_proxy.pxi +index 4ffbf0742..203c7835d 100644 +--- a/cython/notification_proxy.pxi ++++ b/cython/notification_proxy.pxi +@@ -70,7 +70,7 @@ NP_ITDBPREP_DID_END = C_NP_ITDBPREP_DID_END + NP_LANGUAGE_CHANGED = C_NP_LANGUAGE_CHANGED + NP_ADDRESS_BOOK_PREF_CHANGED = C_NP_ADDRESS_BOOK_PREF_CHANGED + +-cdef void np_notify_cb(const_char_ptr notification, void *py_callback): ++cdef void np_notify_cb(const_char_ptr notification, void *py_callback) with gil: + (py_callback)(notification) + + cdef class NotificationProxyError(BaseError): diff --git a/srcpkgs/libimobiledevice/patches/01.cython3.patch b/srcpkgs/libimobiledevice/patches/01.cython3.patch new file mode 100644 index 00000000000000..865e5c02901504 --- /dev/null +++ b/srcpkgs/libimobiledevice/patches/01.cython3.patch @@ -0,0 +1,50 @@ +From 59ec38cb6465f794cf8e2ab204711b9a10dd9eda Mon Sep 17 00:00:00 2001 +From: Andrea Oliveri +Date: Thu, 11 Jan 2024 22:05:00 +0100 +Subject: [PATCH] cython: Fix cython3 noexcept compilation error + +--- + cython/imobiledevice.pyx | 2 +- + cython/installation_proxy.pxi | 2 +- + cython/notification_proxy.pxi | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cython/imobiledevice.pyx b/cython/imobiledevice.pyx +index 2a125aa18..8da229626 100644 +--- a/cython/imobiledevice.pyx ++++ b/cython/imobiledevice.pyx +@@ -94,7 +94,7 @@ cdef class iDeviceEvent: + def __get__(self): + return self._c_event.conn_type + +-cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) with gil: ++cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) noexcept: + cdef iDeviceEvent event = iDeviceEvent.__new__(iDeviceEvent) + event._c_event = c_event + (user_data)(event) +diff --git a/cython/installation_proxy.pxi b/cython/installation_proxy.pxi +index bf2c1da4c..1d3e3234d 100644 +--- a/cython/installation_proxy.pxi ++++ b/cython/installation_proxy.pxi +@@ -27,7 +27,7 @@ cdef extern from "libimobiledevice/installation_proxy.h": + instproxy_error_t instproxy_restore(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data) + instproxy_error_t instproxy_remove_archive(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data) + +-cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) with gil: ++cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) noexcept: + (py_callback)(plist.plist_t_to_node(command, False), plist.plist_t_to_node(status, False)) + + cdef class InstallationProxyError(BaseError): +diff --git a/cython/notification_proxy.pxi b/cython/notification_proxy.pxi +index 203c7835d..261200ef0 100644 +--- a/cython/notification_proxy.pxi ++++ b/cython/notification_proxy.pxi +@@ -70,7 +70,7 @@ NP_ITDBPREP_DID_END = C_NP_ITDBPREP_DID_END + NP_LANGUAGE_CHANGED = C_NP_LANGUAGE_CHANGED + NP_ADDRESS_BOOK_PREF_CHANGED = C_NP_ADDRESS_BOOK_PREF_CHANGED + +-cdef void np_notify_cb(const_char_ptr notification, void *py_callback) with gil: ++cdef void np_notify_cb(const_char_ptr notification, void *py_callback) noexcept: + (py_callback)(notification) + + cdef class NotificationProxyError(BaseError): diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template index d7021ccaaf8e99..0c0262cb2f2a1d 100644 --- a/srcpkgs/libimobiledevice/template +++ b/srcpkgs/libimobiledevice/template @@ -1,9 +1,9 @@ # Template file for 'libimobiledevice' pkgname=libimobiledevice version=1.3.0 -revision=6 +revision=7 build_style=gnu-configure -hostmakedepends="automake libtool pkgconf python3-Cython0.29" +hostmakedepends="automake libtool pkgconf python3-Cython" makedepends="python3-devel libglib-devel openssl-devel libusb-devel libplist-devel libusbmuxd-devel" short_desc="Library to communicate with Apple devices" diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index 74bfc536355bad..f9ca527f3b6e40 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -1,7 +1,7 @@ # Template file for 'libixion' pkgname=libixion version=0.19.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="boost-devel fmt-devel mdds python3-devel spdlog" diff --git a/srcpkgs/libkdumpfile/template b/srcpkgs/libkdumpfile/template index 573f30622ed295..e3de4e047fb54c 100644 --- a/srcpkgs/libkdumpfile/template +++ b/srcpkgs/libkdumpfile/template @@ -1,7 +1,7 @@ # Template file for 'libkdumpfile' pkgname=libkdumpfile version=0.5.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="PYTHON=python3" hostmakedepends="automake pkg-config libtool python3-setuptools" diff --git a/srcpkgs/liblouis/template b/srcpkgs/liblouis/template index fbade9be434c9e..69299629eb8527 100644 --- a/srcpkgs/liblouis/template +++ b/srcpkgs/liblouis/template @@ -1,7 +1,7 @@ # Template file for 'liblouis' pkgname=liblouis version=3.15.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--enable-ucs4" hostmakedepends="pkg-config help2man python3-devel python3-setuptools" diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template index c447667fed4b04..7b3a1f6a8a1471 100644 --- a/srcpkgs/libnvme/template +++ b/srcpkgs/libnvme/template @@ -1,7 +1,7 @@ # Template file for 'libnvme' pkgname=libnvme version=1.10 -revision=1 +revision=2 build_style=meson configure_args="-Ddocs=man" hostmakedepends="pkg-config swig tar xz" diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template index 2da22764f66e9b..44c013d00863bf 100644 --- a/srcpkgs/libopenshot/template +++ b/srcpkgs/libopenshot/template @@ -1,7 +1,7 @@ # Template file for 'libopenshot' pkgname=libopenshot version=0.3.2 -revision=2 +revision=3 build_style=cmake # Builds fail with Ruby-2.4.1 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template index 8615c7ce97a312..bcc151612a1112 100644 --- a/srcpkgs/liborcus/template +++ b/srcpkgs/liborcus/template @@ -1,7 +1,7 @@ # Template file for 'liborcus' pkgname=liborcus version=0.19.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config python3" makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel" diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template index e5cc677ca1cfef..808d788c7cefa0 100644 --- a/srcpkgs/libpeas/template +++ b/srcpkgs/libpeas/template @@ -1,7 +1,7 @@ # Template file for 'libpeas' pkgname=libpeas version=1.36.0 -revision=2 +revision=3 build_style=meson build_helper="gir" configure_args="-Ddemos=false -Dvapi=true" diff --git a/srcpkgs/libpeas2/template b/srcpkgs/libpeas2/template index 84d8b99454c0cd..27c1a5c02cbb32 100644 --- a/srcpkgs/libpeas2/template +++ b/srcpkgs/libpeas2/template @@ -1,7 +1,7 @@ # Template file for 'libpeas2' pkgname=libpeas2 version=2.0.1 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dgtk_doc=true -Dvapi=true" diff --git a/srcpkgs/libpfm4/template b/srcpkgs/libpfm4/template index 800b57d06712e6..1d9694a16dea17 100644 --- a/srcpkgs/libpfm4/template +++ b/srcpkgs/libpfm4/template @@ -1,7 +1,7 @@ # Template file for 'libpfm4' pkgname=libpfm4 version=4.13.0 -revision=2 +revision=3 build_style=gnu-makefile build_helper=python3 make_use_env=yes diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template index e9ea27c2981262..cc04ce12370e0a 100644 --- a/srcpkgs/libplist/template +++ b/srcpkgs/libplist/template @@ -1,7 +1,7 @@ # Template file for 'libplist' pkgname=libplist version=2.2.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool pkgconf python3 python3-Cython" diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template index cbd736031b0ea1..4786711f548baa 100644 --- a/srcpkgs/libproxy/template +++ b/srcpkgs/libproxy/template @@ -1,7 +1,7 @@ # Template file for 'libproxy' pkgname=libproxy version=0.4.18 -revision=3 +revision=4 build_style=cmake configure_args="-DWITH_GNOME=0 -DWITH_KDE4=0 -DWITH_MOZJS=0 -DWITH_NM=0 -DWITH_PERL=0 -DWITH_PYTHON3=1 -DWITH_WEBKIT=0" diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index c7eff1fbe2a537..7c5ecc58faaeb8 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -1,7 +1,7 @@ # Template file for 'libpwquality' pkgname=libpwquality version=1.4.5 -revision=2 +revision=3 build_style=gnu-configure build_helper=python3 configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security" diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 3e74df50125d0f..650b0caa31d62b 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice version=24.8.3.2 -revision=1 +revision=2 build_style=meta build_helper="gir" make_build_target="build" diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 9078c4ed974005..cd65a955a389c7 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -3,7 +3,7 @@ pkgname=libsearpc # floating tag 3.3-latest version=3.3.0.20220902 -revision=2 +revision=3 _gitrev=15f6f0b9f451b9ecf99dedab72e9242e54e124eb build_style=gnu-configure configure_args="--with-python3 --disable-static --disable-compile-demo" diff --git a/srcpkgs/libsigrokdecode/template b/srcpkgs/libsigrokdecode/template index 2376bca73b9a45..86600095dc311a 100644 --- a/srcpkgs/libsigrokdecode/template +++ b/srcpkgs/libsigrokdecode/template @@ -1,7 +1,7 @@ # Template file for 'libsigrokdecode' pkgname=libsigrokdecode version=0.5.3 -revision=10 +revision=11 build_style=gnu-configure hostmakedepends="pkg-config python3 autoconf automake" makedepends="glib-devel python3-devel" diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template index 821dedb78d98d7..43b645988c186a 100644 --- a/srcpkgs/libsmbios/template +++ b/srcpkgs/libsmbios/template @@ -1,7 +1,7 @@ # Template file for 'libsmbios' pkgname=libsmbios version=2.4.3 -revision=5 +revision=6 build_style=gnu-configure configure_args="--sbindir=/usr/bin --disable-static" hostmakedepends="automake doxygen gettext gettext-devel help2man libtool pkg-config" diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 194d2b9022da2d..cd83cd872945a0 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -2,7 +2,7 @@ # Breaks ABI/API without changing soname, revbump all dependants pkgname=libtorrent-rasterbar version=2.0.10 -revision=1 +revision=2 build_style=cmake configure_args="-Dbuild_examples=ON -Dbuild_tools=ON -Dpython-bindings=ON -Dbuild_tests=ON" diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template index 220e7a7d85f542..44af179927829b 100644 --- a/srcpkgs/libvirt-python3/template +++ b/srcpkgs/libvirt-python3/template @@ -1,19 +1,19 @@ # Template file for 'libvirt-python3' pkgname=libvirt-python3 version=10.5.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="pkg-config python3-devel python3-setuptools libvirt-devel libapparmor-devel" makedepends="libvirt-devel python3-devel" depends="python3" -checkdepends="python3-pytest python3-lxml python3-nose" short_desc="Libvirt virtualization API Python3 binding" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://pypi.org/project/libvirt-python/" distfiles="https://libvirt.org/sources/python/libvirt-python-${version}.tar.gz" checksum=785023500f58d3e8e829af98647d43eee97e517aacc9d9e7ded43594ea52d032 +make_check=no # Tests require removed python3-nose do_check() { PYTHONPATH="$(cd build/lib.* && pwd)" pytest diff --git a/srcpkgs/libvoikko/template b/srcpkgs/libvoikko/template index 52581d7a90c080..9d07ae81bc04df 100644 --- a/srcpkgs/libvoikko/template +++ b/srcpkgs/libvoikko/template @@ -1,7 +1,7 @@ # Template file for 'libvoikko' pkgname=libvoikko version=4.3.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-hfst=false --with-dictionary-path=/usr/share/voikko" hostmakedepends="python3" diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 154beba21d50e3..336f0e0b1b7ba6 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,7 +1,7 @@ # Template file for 'libxml2' pkgname=libxml2 version=2.12.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-threads --with-history --with-icu --with-legacy --with-ftp --with-xptr-locs --enable-static" diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template index b4ebb999340d41..df5320911dee6b 100644 --- a/srcpkgs/libxslt/template +++ b/srcpkgs/libxslt/template @@ -1,7 +1,7 @@ # Template file for 'libxslt' pkgname=libxslt version=1.1.39 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-static --disable-dependency-tracking" hostmakedepends="docbook-xml docbook-xsl libtool pkg-config python3" diff --git a/srcpkgs/lightdm-gtk-greeter-settings/template b/srcpkgs/lightdm-gtk-greeter-settings/template index 62b42236752d7f..39f2a3c23e1eb6 100644 --- a/srcpkgs/lightdm-gtk-greeter-settings/template +++ b/srcpkgs/lightdm-gtk-greeter-settings/template @@ -1,7 +1,7 @@ # Template file for 'lightdm-gtk-greeter-settings' pkgname=lightdm-gtk-greeter-settings version=1.2.2 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-distutils-extra intltool" depends="lightdm-gtk3-greeter python3-gobject" diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 86f79b5946e9d1..72bfddd261ce6e 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,7 +1,7 @@ # Template file for 'linux-tools' pkgname=linux-tools version=6.5 -revision=3 +revision=4 build_style=meta hostmakedepends="asciidoc automake flex gettext libtool perl python3-setuptools python3-docutils xmlto pkg-config" diff --git a/srcpkgs/litecli/template b/srcpkgs/litecli/template index 3af608e43d3690..889da59a0e2d49 100644 --- a/srcpkgs/litecli/template +++ b/srcpkgs/litecli/template @@ -1,7 +1,7 @@ # Template file for 'litecli' pkgname=litecli version=1.9.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-click python3-Pygments python3-prompt_toolkit python3-sqlparse python3-configobj python3-cli_helpers" diff --git a/srcpkgs/llvm17/template b/srcpkgs/llvm17/template index 68eab0c204b7cc..b042b66904b8cc 100644 --- a/srcpkgs/llvm17/template +++ b/srcpkgs/llvm17/template @@ -1,14 +1,12 @@ # Template file for 'llvm17' pkgname=llvm17 version=17.0.6 -revision=3 +revision=4 build_wrksrc=llvm build_style=cmake -_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so" configure_args=" -DCMAKE_BUILD_TYPE=Release -Wno-dev -DENABLE_LINKER_BUILD_ID=YES - -DLLDB_USE_SYSTEM_SIX=YES -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES -DLIBCXXABI_USE_LLVM_UNWINDER=YES @@ -28,13 +26,13 @@ configure_args=" -DLLVM_ENABLE_FFI=YES -DLLVM_BINUTILS_INCDIR=/usr/include -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO - -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages - -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver} - -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix " -hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx - python3-recommonmark python3-sphinx-automodapi git python3-sphinx-markdown-tables python3-yaml pkg-config " -makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel - libxml2-devel binutils-devel " + -DLLDB_ENABLE_PYTHON=NO +" +hostmakedepends="perl zlib-devel libffi-devel swig python3-Sphinx pkg-config + python3-recommonmark python3-sphinx-automodapi git python3-yaml + python3-sphinx-markdown-tables" +makedepends="zlib-devel elfutils-devel libffi-devel libedit-devel libxml2-devel + binutils-devel" short_desc="LLVM Compiler Infrastructure Project - Version 17" maintainer="Daniel Martinez " license="Apache-2.0" @@ -422,7 +420,6 @@ llvm-bolt17_package() { lldb17_package() { lib32disabled=yes - depends+=" python3-six" short_desc+=" - LLDB debugger" homepage="https://lldb.llvm.org/" conflicts="lldb15>=0" @@ -432,7 +429,6 @@ lldb17_package() { vmove usr/bin/lldb-instr vmove usr/bin/lldb-server vmove usr/bin/lldb-vscode - vmove "usr/lib/python${py3_ver}/site-packages/lldb" if [ -z "$CROSS_BUILD" ]; then vmove /usr/lib/lua/5.3/lldb.so fi diff --git a/srcpkgs/llvm18/template b/srcpkgs/llvm18/template index fd8b92e8d05523..ff68e2693b021b 100644 --- a/srcpkgs/llvm18/template +++ b/srcpkgs/llvm18/template @@ -1,14 +1,12 @@ # Template file for 'llvm18' pkgname=llvm18 version=18.1.8 -revision=2 +revision=3 build_wrksrc=llvm build_style=cmake -_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so" configure_args=" -DCMAKE_BUILD_TYPE=Release -Wno-dev -DENABLE_LINKER_BUILD_ID=YES - -DLLDB_USE_SYSTEM_SIX=YES -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES -DLIBCXXABI_USE_LLVM_UNWINDER=YES @@ -29,14 +27,13 @@ configure_args=" -DLLVM_ENABLE_FFI=YES -DLLVM_BINUTILS_INCDIR=/usr/include -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO - -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages - -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver} - -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix " -hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx - python3-recommonmark python3-sphinx-automodapi git python3-sphinx-markdown-tables python3-yaml pkg-config - python3-mdit-py-plugins python3-MyST-Parser python3-markdown-it $(vopt_if graphviz graphviz)" -makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel - libxml2-devel binutils-devel z3-devel" + -DLLDB_ENABLE_PYTHON=NO" +hostmakedepends="perl python3 zlib-devel libffi-devel swig git pkg-config + python3-Sphinx python3-recommonmark python3-sphinx-automodapi python3-yaml + python3-sphinx-markdown-tables python3-mdit-py-plugins python3-MyST-Parser + python3-markdown-it $(vopt_if graphviz graphviz)" +makedepends="zlib-devel elfutils-devel libffi-devel libedit-devel libxml2-devel + binutils-devel z3-devel" short_desc="LLVM Compiler Infrastructure Project - Version 18" maintainer="Daniel Martinez " license="Apache-2.0" @@ -224,6 +221,8 @@ pre_configure() { arm*-musl|i686-musl) # sanitizer code is broken since it duplicates some libc bits configure_args+=" -DCOMPILER_RT_BUILD_SANITIZERS=OFF" + configure_args+=" -DCOMPILER_RT_BUILD_XRAY=OFF" + configure_args+=" -DCOMPILER_RT_BUILD_MEMPROF=OFF" ;; esac @@ -266,7 +265,6 @@ post_build() { } post_install() { - # Required for multilib. if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then for _header in llvm-config; do @@ -489,7 +487,6 @@ llvm-bolt18_package() { lldb18_package() { lib32disabled=yes - depends+=" python3-six" conflicts="lldb17>=0 lldb15>=0" short_desc+=" - LLDB debugger" homepage="https://lldb.llvm.org/" @@ -499,7 +496,6 @@ lldb18_package() { vmove usr/bin/lldb-instr vmove usr/bin/lldb-server vmove usr/bin/lldb-dap - vmove "usr/lib/python${py3_ver}/site-packages/lldb" if [ -z "$CROSS_BUILD" ]; then vmove /usr/lib/lua/5.3/lldb.so fi diff --git a/srcpkgs/llvm19/template b/srcpkgs/llvm19/template index 7cc8d8fc7374b8..4100e416b6d71c 100644 --- a/srcpkgs/llvm19/template +++ b/srcpkgs/llvm19/template @@ -1,7 +1,7 @@ # Template file for 'llvm19' pkgname=llvm19 version=19.1.4 -revision=1 +revision=2 build_wrksrc=llvm build_style=cmake _llvm_prefix=lib/llvm/19 diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index e5a6857fb08888..4aaa3c46a24c23 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,7 +1,7 @@ # Template file for 'lollypop' pkgname=lollypop version=1.4.40 -revision=1 +revision=2 build_style=meson hostmakedepends="glib-devel gobject-introspection gettext pkg-config" makedepends="gtk+3-devel libsoup3-devel python3-gobject-devel python3-devel diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index 2938f7f75a933e..0773091a2f4152 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,7 +1,7 @@ # Template file for 'lutris' pkgname=lutris version=0.5.17 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel" depends="python3-dbus python3-gobject python3-yaml python3-evdev python3-Pillow diff --git a/srcpkgs/magic-wormhole/template b/srcpkgs/magic-wormhole/template index 7716394cf19d32..44213dec1b13ad 100644 --- a/srcpkgs/magic-wormhole/template +++ b/srcpkgs/magic-wormhole/template @@ -1,7 +1,7 @@ # Template file for 'magic-wormhole' pkgname=magic-wormhole version=0.15.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3 python3-build python3-setuptools python3-wheel" depends="python3-autobahn python3-cffi python3-click python3-humanize diff --git a/srcpkgs/mailnag-goa-plugin/template b/srcpkgs/mailnag-goa-plugin/template index 36f7f9989a8f34..4272778b536ca0 100644 --- a/srcpkgs/mailnag-goa-plugin/template +++ b/srcpkgs/mailnag-goa-plugin/template @@ -1,7 +1,7 @@ # Template file for 'mailnag-goa-plugin' pkgname=mailnag-goa-plugin version=2.0.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="mailnag gnome-online-accounts" diff --git a/srcpkgs/mailnag/template b/srcpkgs/mailnag/template index 9eb83d021341f0..f0cf635cc77ef9 100644 --- a/srcpkgs/mailnag/template +++ b/srcpkgs/mailnag/template @@ -1,7 +1,7 @@ # Template file for 'mailnag' pkgname=mailnag version=2.2.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3 python3-setuptools gettext" depends="python3-gobject python3-dbus python3-xdg libsecret gtk+3" diff --git a/srcpkgs/manuskript/template b/srcpkgs/manuskript/template index 5ab1f838b0e478..93b1e7f3c46b8e 100644 --- a/srcpkgs/manuskript/template +++ b/srcpkgs/manuskript/template @@ -1,7 +1,7 @@ # Template file for 'manuskript' pkgname=manuskript version=0.16.1 -revision=1 +revision=2 pycompile_dirs="usr/share/${pkgname}" hostmakedepends="python3-setuptools" depends="python3-enchant python3-lxml python3-Markdown python3-PyQt5 qt5-svg" diff --git a/srcpkgs/mat2/template b/srcpkgs/mat2/template index 13a0068666e6b1..d4359ed66cdefb 100644 --- a/srcpkgs/mat2/template +++ b/srcpkgs/mat2/template @@ -1,7 +1,7 @@ # Template file for 'mat2' pkgname=mat2 version=0.13.4 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="bubblewrap python3-cairo python3-gobject python3-mutagen poppler-glib diff --git a/srcpkgs/mate-menu/template b/srcpkgs/mate-menu/template index cdab2848f90b38..e8fcd498755658 100644 --- a/srcpkgs/mate-menu/template +++ b/srcpkgs/mate-menu/template @@ -1,7 +1,7 @@ # Template file for 'mate-menu' pkgname=mate-menu version=22.04.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="intltool python3-distutils-extra python3-setuptools" depends="mate-panel python3-gobject python3-setproctitle python3-xdg python3-xlib python3-configobj python3-cairo" diff --git a/srcpkgs/mate-tweak/template b/srcpkgs/mate-tweak/template index cfd72ee18b7593..c59e2d973e421a 100644 --- a/srcpkgs/mate-tweak/template +++ b/srcpkgs/mate-tweak/template @@ -1,7 +1,7 @@ # Template file for 'mate-tweak' pkgname=mate-tweak version=22.10.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="intltool python3-distutils-extra python3-pbr python3-setuptools" depends="mate-panel python3-gobject python3-psutil python3-setproctitle diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 2605e943cc1b22..a9ef7f0aa94ce4 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=1.7.4 +version=1.7.8 revision=1 build_style=python3-pep517 build_helper="qemu rust" @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="Apache-2.0, MIT" homepage="https://github.com/PyO3/maturin" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=19edb033a7d744dd2b4722218d9db47dadb633948577f957b44d8c9b8eececc8 +checksum=ba17ef703c501613cf561e889ce10aa09f8caa475a34155584fa15a5315b344c # Tests use unstable features and fail to build make_check=no diff --git a/srcpkgs/mcg/template b/srcpkgs/mcg/template index 6c455c99ee3e8d..1ea17266395065 100644 --- a/srcpkgs/mcg/template +++ b/srcpkgs/mcg/template @@ -1,7 +1,7 @@ # Template file for 'mcg' pkgname=mcg version=2.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools glib-devel" makedepends="python3-gobject-devel glib-devel" diff --git a/srcpkgs/mcomix/template b/srcpkgs/mcomix/template index 49f1d6d07e3f80..4e91b7f874305c 100644 --- a/srcpkgs/mcomix/template +++ b/srcpkgs/mcomix/template @@ -1,7 +1,7 @@ # Template file for 'mcomix' pkgname=mcomix version=3.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-gobject python3-cairo python3-Pillow xdg-utils" diff --git a/srcpkgs/med/patches/include-dir.patch b/srcpkgs/med/patches/include-dir.patch new file mode 100644 index 00000000000000..4e124ca849293e --- /dev/null +++ b/srcpkgs/med/patches/include-dir.patch @@ -0,0 +1,13 @@ +This package dumps lots of garbage in /usr/include; contain it in a subdirectory. + +--- a/CMakeLists.txt 2024-11-24 23:56:40.906436392 -0500 ++++ b/CMakeLists.txt 2024-11-24 23:56:46.986447548 -0500 +@@ -103,7 +103,7 @@ + ELSE() + SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION}) + ENDIF() +-SET(INSTALL_INCLUDE_DIR include) ++SET(INSTALL_INCLUDE_DIR include/med) + + ## Pre-requisites detection + # Detect HDF5 first to potentially retrieve MPI automatically: diff --git a/srcpkgs/med/template b/srcpkgs/med/template index 48f8d35c88bd7a..cc553adb493e68 100644 --- a/srcpkgs/med/template +++ b/srcpkgs/med/template @@ -1,18 +1,18 @@ # Template file for 'med' pkgname=med -version=4.1.0 -revision=4 -build_style=gnu-configure -configure_args="--with-swig=yes --includedir=/usr/include/med" -hostmakedepends="gcc-fortran swig python3-setuptools" -makedepends="hdf5-devel python3-devel tk-devel" +version=4.1.1 +revision=1 +build_style=cmake +configure_args="-DMEDFILE_BUILD_PYTHON=OFF -DMEDFILE_BUILD_TESTS=OFF" +hostmakedepends="gcc-fortran" +makedepends="hdf5-devel tk-devel" depends="tk" # xmdump* are wish scripts short_desc="Data Modelization and Exchanges" maintainer="Piraty " license="GPL-3.0-only, LGPL-3.0-only" homepage="https://www.salome-platform.org" -distfiles="http://files.salome-platform.org/Salome/other/med-${version}.tar.gz" -checksum=847db5d6fbc9ce6924cb4aea86362812c9a5ef6b9684377e4dd6879627651fce +distfiles="https://github.com/chennes/med/archive/v${version}.tar.gz" +checksum=ee8b3b6d46bfee25c1d289308b16c7f248d1339161fd5448339382125e6119ad nocross="hdf5 is nocross" @@ -31,7 +31,7 @@ libmed-devel_package() { depends="libmed>=${version}_${revision}" pkg_install() { vmove "usr/include" - vmove "usr/lib/libmed*.a" + vmove "usr/share/cmake" vmove "usr/lib/libmed*.so" } } @@ -46,6 +46,6 @@ libmed_package() { med-doc_package() { short_desc+=" - Documentation" pkg_install() { - vmove usr/share/doc/med + vmove usr/share/doc } } diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template index c43fff43dca5c9..f6407cc385afe5 100644 --- a/srcpkgs/meld/template +++ b/srcpkgs/meld/template @@ -1,7 +1,7 @@ # Template file for 'meld' pkgname=meld version=3.22.2 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config gettext python3-distro itstool gtk-update-icon-cache libxml2-python3 glib-devel" diff --git a/srcpkgs/memray/template b/srcpkgs/memray/template index 0e00fb39e8a583..c79143632a20c6 100644 --- a/srcpkgs/memray/template +++ b/srcpkgs/memray/template @@ -1,7 +1,7 @@ # Template file for 'memray' pkgname=memray version=1.13.4 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="-v -k not((TestTUILooks)or(test_tui))" make_check_target="tests/unit" diff --git a/srcpkgs/menulibre/template b/srcpkgs/menulibre/template index df21a8dbc57fa5..f2d7e82d8a9f9e 100644 --- a/srcpkgs/menulibre/template +++ b/srcpkgs/menulibre/template @@ -1,7 +1,7 @@ # Template file for 'menulibre' pkgname=menulibre version=2.2.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-distutils-extra intltool" depends="gnome-menus gobject-introspection gsettings-desktop-schemas gtk+3 diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template index 44877d23cb4bb1..222699d884dd6f 100644 --- a/srcpkgs/menumaker/template +++ b/srcpkgs/menumaker/template @@ -1,7 +1,7 @@ # Template file for 'menumaker' pkgname=menumaker version=0.99.14 -revision=3 +revision=4 build_style=gnu-configure pycompile_dirs="/usr/share/menumaker" hostmakedepends="python3" diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index bbbfeb03bda036..ba989b80067c84 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -1,7 +1,7 @@ # Template file for 'mercurial' pkgname=mercurial version=6.8.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3 python3-setuptools python3-devel gettext git" makedepends="python3-devel" diff --git a/srcpkgs/meson-cmake-wrapper/template b/srcpkgs/meson-cmake-wrapper/template index cbe3cb950797a2..d6c376812d7c71 100644 --- a/srcpkgs/meson-cmake-wrapper/template +++ b/srcpkgs/meson-cmake-wrapper/template @@ -1,7 +1,7 @@ # Template file for 'meson-cmake-wrapper' pkgname=meson-cmake-wrapper version=0.3.4 -revision=6 +revision=7 build_style=python3-module pycompile_module="mcw" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 82faf4a8371117..32dc1b30feb221 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,7 +1,7 @@ # Template file for 'meson' pkgname=meson version=1.4.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" diff --git a/srcpkgs/mimeo/template b/srcpkgs/mimeo/template index 54e124c95ee191..0da3aa3a1f42b8 100644 --- a/srcpkgs/mimeo/template +++ b/srcpkgs/mimeo/template @@ -1,7 +1,7 @@ # Template file for 'mimeo' pkgname=mimeo version=2023 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="python3-xdg" diff --git a/srcpkgs/minigalaxy/template b/srcpkgs/minigalaxy/template index afa8e879d55ebf..bd18158d47d779 100644 --- a/srcpkgs/minigalaxy/template +++ b/srcpkgs/minigalaxy/template @@ -1,7 +1,7 @@ # Template file for 'minigalaxy' pkgname=minigalaxy version=1.2.5 -revision=2 +revision=3 build_style=python3-module hostmakedepends="gettext python3-setuptools" depends="hicolor-icon-theme libwebkit2gtk41 python3-gobject python3-requests" diff --git a/srcpkgs/mininet/template b/srcpkgs/mininet/template index 35c14a62ee2b3c..4716d279f3ae30 100644 --- a/srcpkgs/mininet/template +++ b/srcpkgs/mininet/template @@ -1,7 +1,7 @@ # Template file for 'mininet' pkgname=mininet version=2.3.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="help2man python3-setuptools" depends="bash ethtool inetutils-telnet iperf iproute2 iputils libcgroup-utils diff --git a/srcpkgs/mirage/template b/srcpkgs/mirage/template index 5324e8ad83bf9c..1f683b9347a6d6 100644 --- a/srcpkgs/mirage/template +++ b/srcpkgs/mirage/template @@ -1,7 +1,7 @@ # Template file for 'mirage' pkgname=mirage version=0.11.1 -revision=3 +revision=4 build_style="python3-module" hostmakedepends="python3-setuptools gettext glib-devel" makedepends="python3-devel libX11-devel" diff --git a/srcpkgs/mitmproxy/template b/srcpkgs/mitmproxy/template index 97c41bb90d5719..8259cb3470e563 100644 --- a/srcpkgs/mitmproxy/template +++ b/srcpkgs/mitmproxy/template @@ -1,7 +1,7 @@ # Template file for 'mitmproxy' pkgname=mitmproxy version=9.0.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Brotli python3-Flask python3-asgiref python3-certifi python3-click diff --git a/srcpkgs/mkchromecast/template b/srcpkgs/mkchromecast/template index f8ee346b4ae24e..83d68c4155b308 100644 --- a/srcpkgs/mkchromecast/template +++ b/srcpkgs/mkchromecast/template @@ -1,7 +1,7 @@ # Template file for 'mkchromecast' pkgname=mkchromecast version=0.3.8.1 -revision=7 +revision=8 pycompile_dirs="/usr/share/mkchromecast/mkchromecast" depends="python3-Flask python3-netifaces python3-setuptools python3-requests python3-mutagen python3-psutil python3-PyQt5 python3-SoCo python3-chromecast diff --git a/srcpkgs/mlt7/template b/srcpkgs/mlt7/template index 06fa2a22cceac4..fac7f22b1aea6a 100644 --- a/srcpkgs/mlt7/template +++ b/srcpkgs/mlt7/template @@ -1,7 +1,7 @@ # Template file for 'mlt7' pkgname=mlt7 version=7.24.0 -revision=3 +revision=4 build_style=cmake configure_args="-DSWIG_PYTHON=ON -DMOD_QT6=ON" hostmakedepends="doxygen pkg-config ladspa-sdk swig python3 which diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template index e6c4700d45c604..163e5cb7b65051 100644 --- a/srcpkgs/mod_wsgi/template +++ b/srcpkgs/mod_wsgi/template @@ -1,7 +1,7 @@ # Template file for 'mod_wsgi' pkgname=mod_wsgi version=4.9.4 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-python=python3" hostmakedepends="python3 perl automake libtool" diff --git a/srcpkgs/mopidy-local/template b/srcpkgs/mopidy-local/template index 02b21bd1701553..10e3949d12504f 100644 --- a/srcpkgs/mopidy-local/template +++ b/srcpkgs/mopidy-local/template @@ -1,7 +1,7 @@ # Template file for 'mopidy-local' pkgname=mopidy-local version=3.1.1 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="mopidy python3-pykka python3-setuptools python3-uritools" diff --git a/srcpkgs/mopidy-mpd/template b/srcpkgs/mopidy-mpd/template index 38a60d30625a72..5ed636eabb8f76 100644 --- a/srcpkgs/mopidy-mpd/template +++ b/srcpkgs/mopidy-mpd/template @@ -1,7 +1,7 @@ # Template file for 'mopidy-mpd' pkgname=mopidy-mpd version=3.0.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="mopidy python3-pykka python3-setuptools" diff --git a/srcpkgs/mopidy-multisonic/template b/srcpkgs/mopidy-multisonic/template index 2d05aa2533a6a6..b2c9986e2f704e 100644 --- a/srcpkgs/mopidy-multisonic/template +++ b/srcpkgs/mopidy-multisonic/template @@ -1,7 +1,7 @@ # Template file for 'mopidy-multisonic' pkgname=mopidy-multisonic version=0.4.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="mopidy" diff --git a/srcpkgs/mopidy-podcast/template b/srcpkgs/mopidy-podcast/template index e2a1cbc8228cde..b33721625ce695 100644 --- a/srcpkgs/mopidy-podcast/template +++ b/srcpkgs/mopidy-podcast/template @@ -1,7 +1,7 @@ # Template file for 'mopidy-podcast' pkgname=mopidy-podcast version=3.0.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="mopidy python3-cachetools python3-pykka python3-setuptools python3-uritools" diff --git a/srcpkgs/mopidy/template b/srcpkgs/mopidy/template index 8f3000288c0978..f0a2bb2a26045f 100644 --- a/srcpkgs/mopidy/template +++ b/srcpkgs/mopidy/template @@ -1,7 +1,7 @@ # Template file for 'mopidy' pkgname=mopidy version=3.4.2 -revision=1 +revision=2 build_style=python3-module make_check_args="--ignore tests/test_help.py" hostmakedepends="python3-setuptools python3-Sphinx python3-sphinx_rtd_theme diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template index 09e2ff28abbdd2..2f8f8144b147e7 100644 --- a/srcpkgs/mozo/template +++ b/srcpkgs/mozo/template @@ -1,7 +1,7 @@ # Template file for 'mozo' pkgname=mozo version=1.28.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config gettext" makedepends="glib-devel mate-menus-devel python3-gobject-devel" diff --git a/srcpkgs/mpd-sima/template b/srcpkgs/mpd-sima/template index 4d00a4237db520..bfaa4bd5034035 100644 --- a/srcpkgs/mpd-sima/template +++ b/srcpkgs/mpd-sima/template @@ -1,7 +1,7 @@ # Template file for 'mpd-sima' pkgname=mpd-sima version=0.15.1 -revision=6 +revision=7 build_style=python3-module pycompile_module="sima" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/mugshot/template b/srcpkgs/mugshot/template index b0bcc5bb44580f..10a66b1f77a18c 100644 --- a/srcpkgs/mugshot/template +++ b/srcpkgs/mugshot/template @@ -1,7 +1,7 @@ # Template file for 'mugshot' pkgname=mugshot version=0.4.3 -revision=4 +revision=5 build_style=python3-module hostmakedepends="intltool python3-distutils-extra" makedepends="python3-pexpect python3-gobject" diff --git a/srcpkgs/multibootusb/template b/srcpkgs/multibootusb/template index ccc89192cb67d2..a583ab5b7981fb 100644 --- a/srcpkgs/multibootusb/template +++ b/srcpkgs/multibootusb/template @@ -1,7 +1,7 @@ # Template file for 'multibootusb' pkgname=multibootusb version=9.2.0 -revision=7 +revision=8 build_style=python3-module pycompile_module="scripts" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/muse/template b/srcpkgs/muse/template index b59cf04d81f8dc..b32a68804a8bd4 100644 --- a/srcpkgs/muse/template +++ b/srcpkgs/muse/template @@ -1,7 +1,7 @@ # Template file for 'muse' pkgname=muse version=4.1.0 -revision=4 +revision=5 build_wrksrc=src build_style=cmake build_helper=qmake @@ -23,3 +23,8 @@ python_version=3 build_options="alsa python" build_options_default="alsa python" + +pre_build() { + # For some reason, this target doesn't automatically build on musl + ninja ${makejobs} -C build muse/mplugins/ui_midifilter.h +} diff --git a/srcpkgs/mymcplus/template b/srcpkgs/mymcplus/template index d09fed3f0ca9a8..b211f5e448b47a 100644 --- a/srcpkgs/mymcplus/template +++ b/srcpkgs/mymcplus/template @@ -1,7 +1,7 @@ # Template file for 'mymcplus' pkgname=mymcplus version=3.0.5 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="wxPython python3-PyOpenGL" diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template index d5fdb8d67cf5ca..72a2d22602e344 100644 --- a/srcpkgs/mypaint/template +++ b/srcpkgs/mypaint/template @@ -1,7 +1,7 @@ # Template file for 'mypaint' pkgname=mypaint version=2.0.1 -revision=6 +revision=7 build_style=python3-module pycompile_dirs="/usr/share/mypaint" hostmakedepends="swig pkg-config gettext python3-setuptools python3-numpy python3" diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template index cf01ade27777b1..35db1d45e29123 100644 --- a/srcpkgs/nagstamon/template +++ b/srcpkgs/nagstamon/template @@ -1,7 +1,7 @@ # Template file for 'nagstamon' pkgname=nagstamon version=3.12.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-keyring python3-psutil" depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml diff --git a/srcpkgs/nautilus-python/template b/srcpkgs/nautilus-python/template index 3bb9d4402d8f28..82de69f18762c3 100644 --- a/srcpkgs/nautilus-python/template +++ b/srcpkgs/nautilus-python/template @@ -1,7 +1,7 @@ # Template file for 'nautilus-python' pkgname=nautilus-python version=4.0 -revision=2 +revision=3 build_style=meson configure_args="$(vopt_feature gtk_doc docs)" hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)" diff --git a/srcpkgs/navit/template b/srcpkgs/navit/template index 2670eddf074142..0bb5e58a336d0a 100644 --- a/srcpkgs/navit/template +++ b/srcpkgs/navit/template @@ -1,7 +1,7 @@ # Template file for 'navit' pkgname=navit version=0.5.6 -revision=5 +revision=6 build_style=cmake configure_args="-DLIBDIR=lib/navit -DSAMPLE_MAP=n -Wno-dev" hostmakedepends="pkg-config qt5-host-tools qt5-qmake" diff --git a/srcpkgs/nemo-audio-tab/template b/srcpkgs/nemo-audio-tab/template index 2d2ec5ac55b003..5982ea202f3c1d 100644 --- a/srcpkgs/nemo-audio-tab/template +++ b/srcpkgs/nemo-audio-tab/template @@ -1,7 +1,7 @@ # Template file for 'nemo-audio-tab' pkgname=nemo-audio-tab version=5.8.0 -revision=2 +revision=3 build_wrksrc=nemo-audio-tab build_style=python3-module hostmakedepends="pkg-config python3-setuptools" diff --git a/srcpkgs/nemo-compare/template b/srcpkgs/nemo-compare/template index ed5163f9fd109d..265153e16b7fb8 100644 --- a/srcpkgs/nemo-compare/template +++ b/srcpkgs/nemo-compare/template @@ -1,7 +1,7 @@ # Template file for 'nemo-compare' pkgname=nemo-compare version=5.8.1 -revision=2 +revision=3 build_wrksrc=nemo-compare build_style=python3-module hostmakedepends="pkg-config python3-setuptools" diff --git a/srcpkgs/nemo-emblems/template b/srcpkgs/nemo-emblems/template index 4e1cb6726d9e34..fd86cf602cecc5 100644 --- a/srcpkgs/nemo-emblems/template +++ b/srcpkgs/nemo-emblems/template @@ -1,7 +1,7 @@ # Template file for 'nemo-emblems' pkgname=nemo-emblems version=5.8.0 -revision=2 +revision=3 build_wrksrc=nemo-emblems build_style=python3-module hostmakedepends="pkg-config python3-setuptools" diff --git a/srcpkgs/nemo-python/template b/srcpkgs/nemo-python/template index 009b05c1fb3b85..3e4c77324187dd 100644 --- a/srcpkgs/nemo-python/template +++ b/srcpkgs/nemo-python/template @@ -1,7 +1,7 @@ # Template file for 'nemo-python' pkgname=nemo-python version=5.8.0 -revision=2 +revision=3 build_wrksrc=nemo-python build_style=meson hostmakedepends="pkg-config" diff --git a/srcpkgs/nemo-terminal/template b/srcpkgs/nemo-terminal/template index 6f863a8aedb917..6494817391aa97 100644 --- a/srcpkgs/nemo-terminal/template +++ b/srcpkgs/nemo-terminal/template @@ -1,7 +1,7 @@ # Template file for 'nemo-terminal' pkgname=nemo-terminal version=5.8.0 -revision=2 +revision=3 build_wrksrc=nemo-terminal build_style=python3-module hostmakedepends="pkg-config python3-setuptools" diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template index af04526a6ac826..97c49fa1fa92bc 100644 --- a/srcpkgs/nemo/template +++ b/srcpkgs/nemo/template @@ -1,7 +1,7 @@ # Template file for 'nemo' pkgname=nemo version=5.8.5 -revision=2 +revision=3 build_style=meson build_helper=gir pycompile_dirs="/usr/share/nemo/actions/myaction.py" diff --git a/srcpkgs/neovim-remote/template b/srcpkgs/neovim-remote/template index 3f769154ec71a8..2437e9f88f20c9 100644 --- a/srcpkgs/neovim-remote/template +++ b/srcpkgs/neovim-remote/template @@ -1,7 +1,7 @@ # Template file for 'neovim-remote' pkgname=neovim-remote version=2.4.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-neovim python3-psutil" diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template index 49d639c3b5201c..aec2e114e30f66 100644 --- a/srcpkgs/network-ups-tools/template +++ b/srcpkgs/network-ups-tools/template @@ -1,7 +1,7 @@ # Template file for 'network-ups-tools' pkgname=network-ups-tools version=2.8.2 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --sysconfdir=/etc/ups --with-doc=man --disable-static diff --git a/srcpkgs/newt/template b/srcpkgs/newt/template index e616a14256ab97..61306f117afdc1 100644 --- a/srcpkgs/newt/template +++ b/srcpkgs/newt/template @@ -1,7 +1,7 @@ # Template file for 'newt' pkgname=newt version=0.52.21 -revision=7 +revision=8 build_style=gnu-configure hostmakedepends="python3-devel" makedepends="slang-devel popt-devel python3-devel" diff --git a/srcpkgs/nftables/template b/srcpkgs/nftables/template index 521901f405e818..30f0eb06e05159 100644 --- a/srcpkgs/nftables/template +++ b/srcpkgs/nftables/template @@ -1,7 +1,7 @@ # Template file for 'nftables' pkgname=nftables version=1.1.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-json --with-python-bin=/bin/python3 --with-cli=readline" diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template index 1730a79c5e4f07..09c21616836526 100644 --- a/srcpkgs/nicotine+/template +++ b/srcpkgs/nicotine+/template @@ -1,7 +1,7 @@ # Template file for 'nicotine+' pkgname=nicotine+ version=3.3.6 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools gettext" depends="gtk4 python3-gobject" diff --git a/srcpkgs/ninja/template b/srcpkgs/ninja/template index 94794b335431be..bda8ef3b0bb835 100644 --- a/srcpkgs/ninja/template +++ b/srcpkgs/ninja/template @@ -1,7 +1,7 @@ # Template file for 'ninja' pkgname=ninja version=1.12.1 -revision=1 +revision=2 build_style=cmake make_cmd=make hostmakedepends="asciidoc" diff --git a/srcpkgs/nitroshare/template b/srcpkgs/nitroshare/template index 0850074b28cfd6..d6023b20df3206 100644 --- a/srcpkgs/nitroshare/template +++ b/srcpkgs/nitroshare/template @@ -1,7 +1,7 @@ # Template file for 'nitroshare' pkgname=nitroshare version=0.3.4 -revision=2 +revision=3 build_style=cmake pycompile_dirs="usr/share/nautilus-python/extensions usr/share/nemo-python/extensions diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template index 7113789d34846d..b1a15b21e682c4 100644 --- a/srcpkgs/nmap/template +++ b/srcpkgs/nmap/template @@ -1,7 +1,7 @@ # Template file for 'nmap' pkgname=nmap version=7.95 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)" hostmakedepends="python3-setuptools automake python3-build python3-pip pkg-config python3-cairo python3-gobject" @@ -27,8 +27,11 @@ alternatives=" post_install() { vlicense LICENSE - # do not use bundled certificates, use only system ones + # Do not use bundled certificates, use only system ones rm -f ${DESTDIR}/usr/share/ncat/ca-bundle.crt + + # Move zenmap data to /usr/share + mv ${DESTDIR}/${py3_sitelib}/zenmapCore/data ${DESTDIR}/usr/share/zenmap } zenmap_package() { @@ -39,11 +42,8 @@ zenmap_package() { vmove usr/bin/xnmap vmove usr/bin/zenmap vmove usr/share/applications - mv ${DESTDIR}/usr/lib/python3.12/site-packages/zenmapCore/data \ - ${DESTDIR}/usr/share/zenmap vmove usr/share/zenmap vmove usr/share/man/man1/zenmap.1 vmove usr/lib - rm -f ${DESTDIR}/usr/bin/uninstall_zenmap } } diff --git a/srcpkgs/nodeenv/patches/python-3.13.patch b/srcpkgs/nodeenv/patches/python-3.13.patch new file mode 100644 index 00000000000000..9bdaa88276df23 --- /dev/null +++ b/srcpkgs/nodeenv/patches/python-3.13.patch @@ -0,0 +1,73 @@ +diff -ur a/nodeenv.py b/nodeenv.py +--- a/nodeenv.py 2024-11-23 14:53:17.860821243 -0500 ++++ b/nodeenv.py 2024-11-23 14:54:52.433087015 -0500 +@@ -23,7 +23,7 @@ + import argparse + import subprocess + import tarfile +-import pipes ++import shlex + import platform + import zipfile + import shutil +@@ -725,7 +725,7 @@ + + conf_cmd = [ + './configure', +- '--prefix=%s' % pipes.quote(env_dir) ++ '--prefix=%s' % shlex.quote(env_dir) + ] + if args.without_ssl: + conf_cmd.append('--without-ssl') +@@ -805,7 +805,7 @@ + ( + 'bash', '-c', + '. {0} && npm install -g npm@{1}'.format( +- pipes.quote(join(env_dir, 'bin', 'activate')), ++ shlex.quote(join(env_dir, 'bin', 'activate')), + args.npm, + ) + ), +@@ -873,10 +873,10 @@ + activate_path = join(env_dir, 'bin', 'activate') + real_npm_ver = args.npm if args.npm.count(".") == 2 else args.npm + ".0" + if args.npm == "latest" or real_npm_ver >= "1.0.0": +- cmd = '. ' + pipes.quote(activate_path) + \ ++ cmd = '. ' + shlex.quote(activate_path) + \ + ' && npm install -g %(pack)s' + else: +- cmd = '. ' + pipes.quote(activate_path) + \ ++ cmd = '. ' + shlex.quote(activate_path) + \ + ' && npm install %(pack)s' + \ + ' && npm activate %(pack)s' + +diff -ur a/tests/nodeenv_test.py b/tests/nodeenv_test.py +--- a/tests/nodeenv_test.py 2024-11-23 14:53:17.859821240 -0500 ++++ b/tests/nodeenv_test.py 2024-11-23 14:54:59.912108032 -0500 +@@ -2,7 +2,7 @@ + from __future__ import unicode_literals + + import os.path +-import pipes ++import shlex + import subprocess + import sys + import sysconfig +@@ -25,7 +25,7 @@ + '-m', 'nodeenv', '--prebuilt', nenv_path, + ]) + assert os.path.exists(nenv_path) +- activate = pipes.quote(os.path.join(nenv_path, 'bin', 'activate')) ++ activate = shlex.quote(os.path.join(nenv_path, 'bin', 'activate')) + subprocess.check_call([ + 'sh', '-c', '. {} && node --version'.format(activate), + ]) +@@ -40,7 +40,7 @@ + '-m', 'nodeenv', '-n', 'system', nenv_path, + )) + assert os.path.exists(nenv_path) +- activate = pipes.quote(os.path.join(nenv_path, 'bin', 'activate')) ++ activate = shlex.quote(os.path.join(nenv_path, 'bin', 'activate')) + subprocess.check_call([ + 'sh', '-c', '. {} && node --version'.format(activate), + ]) diff --git a/srcpkgs/nodeenv/template b/srcpkgs/nodeenv/template index e0b36f468cb85c..ce94d773471459 100644 --- a/srcpkgs/nodeenv/template +++ b/srcpkgs/nodeenv/template @@ -1,7 +1,7 @@ # Template file for 'nodeenv' pkgname=nodeenv version=1.7.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="make python3-setuptools" diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template index 9151a721360278..52648d3305db66 100644 --- a/srcpkgs/notmuch/template +++ b/srcpkgs/notmuch/template @@ -1,7 +1,7 @@ # Template file for 'notmuch' pkgname=notmuch version=0.38 -revision=3 +revision=4 build_style=configure build_helper=python3 configure_args="--prefix=/usr diff --git a/srcpkgs/nyx/template b/srcpkgs/nyx/template index b43da58fc6d2c4..80a0cf48f0e9cb 100644 --- a/srcpkgs/nyx/template +++ b/srcpkgs/nyx/template @@ -1,7 +1,7 @@ # Template file for 'nyx' pkgname=nyx version=2.1.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-stem tor" diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template index c0a57717744bcb..47ea36131b3af5 100644 --- a/srcpkgs/obs/template +++ b/srcpkgs/obs/template @@ -1,7 +1,7 @@ # Template file for 'obs' pkgname=obs version=30.2.3 -revision=2 +revision=3 archs="i686* x86_64* ppc64le* aarch64* riscv64*" build_style=cmake configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template index 2fa738c55971ce..5104288d62e7b3 100644 --- a/srcpkgs/offlineimap/template +++ b/srcpkgs/offlineimap/template @@ -1,7 +1,7 @@ # Template file for 'offlineimap' pkgname=offlineimap version=8.0.0 -revision=4 +revision=5 build_style=python3-module make_check_args="--ignore test/tests/test_00_imaputil.py --ignore test/tests/test_01_basic.py --ignore test/tests/test_02_MappedIMAP.py" diff --git a/srcpkgs/offpunk/template b/srcpkgs/offpunk/template index 49c9fb07910551..87806380fb6c1e 100644 --- a/srcpkgs/offpunk/template +++ b/srcpkgs/offpunk/template @@ -1,7 +1,7 @@ # Template file for 'offpunk' pkgname=offpunk version=2.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="chafa file less python3-BeautifulSoup4 python3-chardet diff --git a/srcpkgs/olm-python3/template b/srcpkgs/olm-python3/template index 8bdc025a243228..c11f441d37f9c3 100644 --- a/srcpkgs/olm-python3/template +++ b/srcpkgs/olm-python3/template @@ -1,7 +1,7 @@ # Template file for 'olm-python3' pkgname=olm-python3 version=3.2.16 -revision=1 +revision=2 build_wrksrc=python build_style=python3-module hostmakedepends="python3-setuptools python3-cffi" diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template index dce61e662d237b..f69ce6749959dc 100644 --- a/srcpkgs/onboard/template +++ b/srcpkgs/onboard/template @@ -1,7 +1,7 @@ # Template file for 'onboard' pkgname=onboard version=1.4.1 -revision=13 +revision=14 build_style=python3-module hostmakedepends="intltool pkg-config python3-distutils-extra python3-setuptools" makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template index 5c4aeb3edd8745..67ad6db24a84ae 100644 --- a/srcpkgs/opencamlib/template +++ b/srcpkgs/opencamlib/template @@ -1,7 +1,7 @@ # Template file for 'opencamlib' pkgname=opencamlib version=2019.07 -revision=11 +revision=12 build_style=cmake configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}" hostmakedepends="python3" diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template index 814b4aadd86c7a..502bdecd663780 100644 --- a/srcpkgs/opencolorio/template +++ b/srcpkgs/opencolorio/template @@ -1,7 +1,7 @@ # Template file for 'opencolorio' pkgname=opencolorio version=2.1.3 -revision=1 +revision=2 build_style=cmake configure_args="-DCMAKE_CONFIGURATION_TYPES=None -DOCIO_INSTALL_EXT_PACKAGES=NONE diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index e267a87f7aee23..66c110edd20847 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -1,7 +1,7 @@ # Template file for 'opencv' pkgname=opencv version=4.7.0 -revision=3 +revision=4 create_wrksrc=yes build_wrksrc=${pkgname}-${version} build_style=cmake diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template index 109deb171c3f75..812355b21e4caf 100644 --- a/srcpkgs/openimagedenoise/template +++ b/srcpkgs/openimagedenoise/template @@ -1,7 +1,7 @@ # Template file for 'openimagedenoise' pkgname=openimagedenoise -version=1.4.3 -revision=2 +version=2.3.0 +revision=1 archs="x86_64*" build_style=cmake hostmakedepends="ispc python3" @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://openimagedenoise.github.io" changelog="https://github.com/OpenImageDenoise/oidn/blob/master/CHANGELOG.md" distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz" -checksum=3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a +checksum=cce3010962ec84e0ba1acd8c9055a3d8de402fedb1b463517cfeb920a276e427 do_check() { build/oidnTest diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 27a3ecd3aa92de..d0409296f1c7f1 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -1,7 +1,7 @@ # Template file for 'openimageio' pkgname=openimageio -version=2.4.9.0 -revision=9 +version=2.5.17.0 +revision=1 build_style=cmake build_helper=qemu configure_args="-DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=0 @@ -18,7 +18,7 @@ license="BSD-3-Clause" homepage="https://sites.google.com/site/openimageio/home" changelog="https://raw.githubusercontent.com/OpenImageIO/oiio/release/CHANGES.md" distfiles="https://github.com/OpenImageIO/oiio/archive/v${version}.tar.gz" -checksum=00381cabc97e164541e9e555420be5fc5af3696d0f815514dc45666f9c5bcef7 +checksum=9cf1b98762ce5aa5f3f7cd34672549034f5716da1eba26eb5173c18aa21e6583 # Runs checks even for features we disabled. make_check=no diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template index d0fc143b0f8b31..93256ebf927621 100644 --- a/srcpkgs/openrazer-meta/template +++ b/srcpkgs/openrazer-meta/template @@ -1,7 +1,7 @@ # Template file for 'openrazer-meta' pkgname=openrazer-meta version=3.9.0 -revision=1 +revision=2 build_style=gnu-makefile make_install_target="setup_dkms udev_install daemon_install xdg_install python_library_install" diff --git a/srcpkgs/openshot/template b/srcpkgs/openshot/template index 13d949bae91048..c2da71db404731 100644 --- a/srcpkgs/openshot/template +++ b/srcpkgs/openshot/template @@ -1,7 +1,7 @@ # Template file for 'openshot' pkgname=openshot version=3.1.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3 python3-setuptools" makedepends="ffmpeg6-devel python3-PyQt5" diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template index 0634593cb6684d..7b9cae1680e7f8 100644 --- a/srcpkgs/openvswitch/template +++ b/srcpkgs/openvswitch/template @@ -1,7 +1,7 @@ # Template file for 'openvswitch' pkgname=openvswitch version=2.17.0 -revision=4 +revision=5 archs="i686* x86_64* ppc64*" build_style=gnu-configure configure_args="--with-rundir=/run/openvswitch" diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index faf9c38b91eab0..d9cedc393c6c19 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,7 +1,7 @@ # Template file for 'orca' pkgname=orca version=46.2 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext itstool pkg-config gtk+3-devel" makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel" diff --git a/srcpkgs/osc/template b/srcpkgs/osc/template index cfd6c4e8bbf79e..13189c272cb2fb 100644 --- a/srcpkgs/osc/template +++ b/srcpkgs/osc/template @@ -1,7 +1,7 @@ # Template file for 'osc' pkgname=osc version=1.8.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-cryptography python3-devel rpm-python3 python3-urllib3" diff --git a/srcpkgs/othman/template b/srcpkgs/othman/template index 277d185f66c757..37d1cd3a8ec8ee 100644 --- a/srcpkgs/othman/template +++ b/srcpkgs/othman/template @@ -1,7 +1,7 @@ # Template file for 'othman' pkgname=othman version=0.6.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3 python3-setuptools ImageMagick sqlite intltool" depends="gtk+3 python3-gobject amiri-font" diff --git a/srcpkgs/pam_wrapper/template b/srcpkgs/pam_wrapper/template index 23753334fb4ee2..b9be231559488a 100644 --- a/srcpkgs/pam_wrapper/template +++ b/srcpkgs/pam_wrapper/template @@ -1,7 +1,7 @@ # Template file for 'pam_wrapper' pkgname=pam_wrapper version=1.1.5 -revision=2 +revision=3 build_style=cmake configure_args="-DUNIT_TESTING=ON" hostmakedepends="cmake python3-setuptools" diff --git a/srcpkgs/pantalaimon/template b/srcpkgs/pantalaimon/template index cb75cea8ccc5a0..ae854a4fbfaeda 100644 --- a/srcpkgs/pantalaimon/template +++ b/srcpkgs/pantalaimon/template @@ -1,7 +1,7 @@ # Template file for 'pantalaimon' pkgname=pantalaimon version=0.10.5 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-attrs python3-aiohttp python3-appdirs python3-click diff --git a/srcpkgs/papis/template b/srcpkgs/papis/template index eccf556c8b5457..9dfe7124af4f73 100644 --- a/srcpkgs/papis/template +++ b/srcpkgs/papis/template @@ -1,7 +1,7 @@ # Template file for 'papis' pkgname=papis version=0.13 -revision=3 +revision=4 build_style=python3-module make_check_target="papis tests" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template index 9abd00b622cbee..f4522653911a8e 100644 --- a/srcpkgs/pass-git-helper/template +++ b/srcpkgs/pass-git-helper/template @@ -1,7 +1,7 @@ # Template file for 'pass-git-helper' pkgname=pass-git-helper version=1.2.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="pass python3-xdg" diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template index eb8126fd1baf92..440bff073b93a0 100644 --- a/srcpkgs/pass-import/template +++ b/srcpkgs/pass-import/template @@ -1,7 +1,7 @@ # Template file for 'pass-import' pkgname=pass-import version=3.5 -revision=1 +revision=2 build_style=python3-module # This test requires gnome-keyring which requires running dbus make_check_args="--deselect=tests/imports/test_parse.py diff --git a/srcpkgs/pdfarranger/template b/srcpkgs/pdfarranger/template index b59af7febdef9f..fffc7f963bb67e 100644 --- a/srcpkgs/pdfarranger/template +++ b/srcpkgs/pdfarranger/template @@ -1,7 +1,7 @@ # Template file for 'pdfarranger' pkgname=pdfarranger version=1.11.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="intltool python3-distutils-extra python3-setuptools" depends="img2pdf poppler-glib python3-dateutil python3-gobject python3-pikepdf" diff --git a/srcpkgs/peframe/template b/srcpkgs/peframe/template index f94cb2f9ccbda0..939f97ae5c0151 100644 --- a/srcpkgs/peframe/template +++ b/srcpkgs/peframe/template @@ -1,7 +1,7 @@ # Template file for 'peframe' pkgname=peframe version=6.0.3 -revision=7 +revision=8 build_style="python3-module" hostmakedepends="python3-setuptools" depends="python3-pefile python3-magic python3-M2Crypto python3-virustotal-api diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template index 01d4140d51a85e..a5ab267d809833 100644 --- a/srcpkgs/pelican/template +++ b/srcpkgs/pelican/template @@ -1,7 +1,7 @@ # Template file for 'pelican' pkgname=pelican version=4.5.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-feedgenerator python3-Jinja2 python3-Pygments diff --git a/srcpkgs/persepolis/template b/srcpkgs/persepolis/template index b6d7da0ccfd2d1..d1072c5f729152 100644 --- a/srcpkgs/persepolis/template +++ b/srcpkgs/persepolis/template @@ -1,7 +1,7 @@ # Template file for 'persepolis' pkgname=persepolis version=3.2.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools python3-setproctitle python3-requests python3-psutil aria2 ffmpeg libnotify pulseaudio-utils youtube-dl diff --git a/srcpkgs/peru/template b/srcpkgs/peru/template index 5820e8563a9bf7..fdbc75600e9e1c 100644 --- a/srcpkgs/peru/template +++ b/srcpkgs/peru/template @@ -1,7 +1,7 @@ # Template file for 'peru' pkgname=peru version=1.3.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling python3-wheel" depends="curl git mercurial python3 python3-docopt python3-yaml" diff --git a/srcpkgs/pex/template b/srcpkgs/pex/template index 40b497c4425310..0677363acf00fb 100644 --- a/srcpkgs/pex/template +++ b/srcpkgs/pex/template @@ -1,7 +1,7 @@ # Template file for 'pex' pkgname=pex version=2.20.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template index 9d213fdc6c0954..52137f353aac97 100644 --- a/srcpkgs/pgcli/template +++ b/srcpkgs/pgcli/template @@ -1,7 +1,7 @@ # Template file for 'pgcli' pkgname=pgcli version=4.1.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pgspecial python3-click python3-Pygments diff --git a/srcpkgs/photofilmstrip/template b/srcpkgs/photofilmstrip/template index 85aae51cd8b912..5a3cb59ff5e86a 100644 --- a/srcpkgs/photofilmstrip/template +++ b/srcpkgs/photofilmstrip/template @@ -1,7 +1,7 @@ # Template file for 'photofilmstrip' pkgname=photofilmstrip version=4.0.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools gst1-python3 python3-Sphinx gettext" depends="python3 gst1-python3 gst1-editing-services python3-Pillow wxPython" diff --git a/srcpkgs/picard/template b/srcpkgs/picard/template index a6cc279038b5f1..cd9e67d8b65ef5 100644 --- a/srcpkgs/picard/template +++ b/srcpkgs/picard/template @@ -1,7 +1,7 @@ # Template file for 'picard' pkgname=picard version=2.12.1 -revision=1 +revision=2 build_style=python3-module make_install_args="--disable-autoupdate" hostmakedepends="gettext python3-setuptools" diff --git a/srcpkgs/pinktrace/template b/srcpkgs/pinktrace/template index 77ca143b270838..b897b896289085 100644 --- a/srcpkgs/pinktrace/template +++ b/srcpkgs/pinktrace/template @@ -1,7 +1,7 @@ # Template file for 'pinktrace' pkgname=pinktrace version=1.0.0 -revision=2 +revision=3 # arch list taken from https://dev.exherbo.org/~alip/pinktrace/#supported_platforms archs="x86_64* aarch64* i686* ppc*" build_style=gnu-configure diff --git a/srcpkgs/piper/template b/srcpkgs/piper/template index 6c9a66a34c190c..5c0ed2b5b8c2ad 100644 --- a/srcpkgs/piper/template +++ b/srcpkgs/piper/template @@ -1,7 +1,7 @@ # Template file for 'piper' pkgname=piper version=0.8 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext libratbag pkg-config glib-devel python3-lxml python3-evdev python3-cairo python3-gobject gtk4-update-icon-cache diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template index 8a6f3f960a484e..89d47f4d5ea47c 100644 --- a/srcpkgs/platformio/template +++ b/srcpkgs/platformio/template @@ -1,7 +1,7 @@ # Template file for 'platformio' pkgname=platformio version=6.1.16 -revision=1 +revision=2 build_style=python3-module # According to https://github.com/platformio/platformio-core/blob/9c20ab81cb68f1ffb7a8cac22ce95c4c797643ec/Makefile#L13 make_check_target="tests/test_examples.py" diff --git a/srcpkgs/playitslowly/template b/srcpkgs/playitslowly/template index 4bc238ef5f257e..a2430ff87cc5d3 100644 --- a/srcpkgs/playitslowly/template +++ b/srcpkgs/playitslowly/template @@ -1,7 +1,7 @@ # Template file for 'playitslowly' pkgname=playitslowly version=1.5.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="python3 python3-gobject gtk+3 gstreamer1 gst-plugins-base1 gst-plugins-good1 diff --git a/srcpkgs/playonlinux/template b/srcpkgs/playonlinux/template index 2f458099994d03..9618bf5c255914 100644 --- a/srcpkgs/playonlinux/template +++ b/srcpkgs/playonlinux/template @@ -1,7 +1,7 @@ # Template file for 'playonlinux' pkgname=playonlinux version=4.4 -revision=3 +revision=4 # contains pre-compiled binaries linked against glibc archs="i686 x86_64" depends="icoutils netcat ImageMagick xterm wxPython cabextract unzip glxinfo diff --git a/srcpkgs/plover/template b/srcpkgs/plover/template index 2ca1d34ed12c6e..6c015aac4b0772 100644 --- a/srcpkgs/plover/template +++ b/srcpkgs/plover/template @@ -2,7 +2,7 @@ pkgname=plover reverts="4.0.0.dev12_1" version=4.0.0rc2 -revision=1 +revision=2 build_style=python3-module # https://github.com/openstenoproject/plover/discussions/1587 make_check_args="-k not(test_readonly_readonly_file)" diff --git a/srcpkgs/plplot/template b/srcpkgs/plplot/template index b17eee96f21240..7c4a5a90f41514 100644 --- a/srcpkgs/plplot/template +++ b/srcpkgs/plplot/template @@ -1,7 +1,7 @@ # Template file for 'plplot' pkgname=plplot version=5.15.0 -revision=6 +revision=7 build_style=cmake build_helper="qemu numpy" configure_args=" diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template index 6a3c237fde663e..158834d159bdfe 100644 --- a/srcpkgs/pluma/template +++ b/srcpkgs/pluma/template @@ -1,7 +1,7 @@ # Template file for 'pluma' pkgname=pluma version=1.28.0 -revision=1 +revision=2 build_style=gnu-configure build_helper=gir pycompile_dirs="usr/lib/pluma/plugins" diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template index 760b8af126d965..63b2ac48c22339 100644 --- a/srcpkgs/pmbootstrap/template +++ b/srcpkgs/pmbootstrap/template @@ -1,7 +1,7 @@ # Template file for 'pmbootstrap' pkgname=pmbootstrap version=3.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="git openssl python3 kpartx util-linux" diff --git a/srcpkgs/pockyt/template b/srcpkgs/pockyt/template index 5326512e83509b..73193b623f1a82 100644 --- a/srcpkgs/pockyt/template +++ b/srcpkgs/pockyt/template @@ -1,7 +1,7 @@ # Template file for 'pockyt' pkgname=pockyt version=1.4.6 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-parse" diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template index dce23ff4df166d..3c31b476a22d25 100644 --- a/srcpkgs/podman-compose/template +++ b/srcpkgs/podman-compose/template @@ -1,7 +1,7 @@ # Template file for 'podman-compose' pkgname=podman-compose version=1.2.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="podman python3-yaml python3-dotenv" diff --git a/srcpkgs/poezio/template b/srcpkgs/poezio/template index 26aa6ebf502359..ed0ca60d45e8cd 100644 --- a/srcpkgs/poezio/template +++ b/srcpkgs/poezio/template @@ -1,7 +1,7 @@ # Template file for 'poezio' pkgname=poezio version=0.14 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools pkg-config" makedepends="python3-devel" diff --git a/srcpkgs/polychromatic/template b/srcpkgs/polychromatic/template index b4d1ef45c7c68d..ac1146a512fdcd 100644 --- a/srcpkgs/polychromatic/template +++ b/srcpkgs/polychromatic/template @@ -1,7 +1,7 @@ # Template file for 'polychromatic' pkgname=polychromatic version=0.9.1 -revision=1 +revision=2 build_style=meson hostmakedepends="ninja sassc which gettext" depends="python3-colorama python3-setproctitle python3-requests python3-colour diff --git a/srcpkgs/polysh/template b/srcpkgs/polysh/template index c91089515bbdd4..e46b112dd8a080 100644 --- a/srcpkgs/polysh/template +++ b/srcpkgs/polysh/template @@ -1,7 +1,7 @@ # Template file for 'polysh' pkgname=polysh version=0.13 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 openssh" diff --git a/srcpkgs/portage/template b/srcpkgs/portage/template index 74eb570e2c995e..06b0308d44c3d4 100644 --- a/srcpkgs/portage/template +++ b/srcpkgs/portage/template @@ -1,7 +1,7 @@ # Template file for 'portage' pkgname=portage version=3.0.44 -revision=2 +revision=3 build_style=python3-module make_install_args="--sbindir=/usr/bin" hostmakedepends="python3 python3-setuptools" diff --git a/srcpkgs/postgresql15/template b/srcpkgs/postgresql15/template index 0c41dc5c49e4b7..bcdb500b536e79 100644 --- a/srcpkgs/postgresql15/template +++ b/srcpkgs/postgresql15/template @@ -1,7 +1,7 @@ # Template file for 'postgresql15' pkgname=postgresql15 version=15.8 -revision=1 +revision=2 build_style=gnu-configure make_build_target=world _major="${version%%.*}" diff --git a/srcpkgs/postgresql16/template b/srcpkgs/postgresql16/template index 7ff69ed08d255d..fcf44a12d8bd70 100644 --- a/srcpkgs/postgresql16/template +++ b/srcpkgs/postgresql16/template @@ -1,7 +1,7 @@ # Template file for 'postgresql16' pkgname=postgresql16 version=16.4 -revision=1 +revision=2 build_style=gnu-configure make_build_target=world _major="${version%%.*}" diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template index 919402637f5626..e332a6cfb09e1f 100644 --- a/srcpkgs/pre-commit/template +++ b/srcpkgs/pre-commit/template @@ -1,7 +1,7 @@ # Template file for 'pre-commit' pkgname=pre-commit version=4.0.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="nodeenv python3-cfgv python3-identify python3-yaml diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template index 9a9127c648f188..ca35f5b31b0337 100644 --- a/srcpkgs/profanity/template +++ b/srcpkgs/profanity/template @@ -1,7 +1,7 @@ # Template file for 'profanity' pkgname=profanity version=0.14.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-notifications --enable-otr --enable-pgp --enable-python-plugins --enable-plugins --with-xscreensaver --enable-omemo diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template index 3ae876d759da42..7725f33d977e25 100644 --- a/srcpkgs/protontricks/template +++ b/srcpkgs/protontricks/template @@ -1,7 +1,7 @@ # Template file for 'protontricks' pkgname=protontricks version=1.12.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3-vdf winetricks python3-setuptools python3-Pillow" diff --git a/srcpkgs/protonvpn-cli/template b/srcpkgs/protonvpn-cli/template index ccb0deb47f53f0..2c50358259f317 100644 --- a/srcpkgs/protonvpn-cli/template +++ b/srcpkgs/protonvpn-cli/template @@ -1,7 +1,7 @@ # Template file for 'protonvpn-cli' pkgname=protonvpn-cli version=2.2.12 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/ps_mem/template b/srcpkgs/ps_mem/template index 5616248b2c79ce..fd6141153c665a 100644 --- a/srcpkgs/ps_mem/template +++ b/srcpkgs/ps_mem/template @@ -1,7 +1,7 @@ # Template file for 'ps_mem' pkgname=ps_mem version=3.14 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/puddletag/template b/srcpkgs/puddletag/template index 2f83d8e9741a42..244ec09a347169 100644 --- a/srcpkgs/puddletag/template +++ b/srcpkgs/puddletag/template @@ -1,7 +1,7 @@ # Template file for 'puddletag' pkgname=puddletag version=2.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3 python3-configobj python3-mutagen python3-parsing diff --git a/srcpkgs/pulseaudio-equalizer-ladspa/template b/srcpkgs/pulseaudio-equalizer-ladspa/template index 17241afd07e27b..520f22733fe8cd 100644 --- a/srcpkgs/pulseaudio-equalizer-ladspa/template +++ b/srcpkgs/pulseaudio-equalizer-ladspa/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio-equalizer-ladspa' pkgname=pulseaudio-equalizer-ladspa version=3.0.2 -revision=6 +revision=7 build_style=meson pycompile_module="pulseeq" hostmakedepends="glib-devel pkg-config python3" diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template index 0beb5777bc706f..4189a475b87095 100644 --- a/srcpkgs/py3status/template +++ b/srcpkgs/py3status/template @@ -1,7 +1,7 @@ # Template file for 'py3status' pkgname=py3status version=3.59 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel hatchling" depends="python3-pyudev" diff --git a/srcpkgs/pychess/template b/srcpkgs/pychess/template index 769890dd96c52e..e68c221364d2d8 100644 --- a/srcpkgs/pychess/template +++ b/srcpkgs/pychess/template @@ -1,7 +1,7 @@ # Template file for 'pychess' pkgname=pychess -version=1.0.4 -revision=2 +version=1.0.5 +revision=1 build_style=python3-module _commondeps="python3-gobject python3-cairo python3-pexpect python3-SQLAlchemy2 gst1-python3 gtksourceview" @@ -14,7 +14,7 @@ maintainer="cipr3s " license="GPL-3.0-or-later" homepage="https://pychess.github.io" distfiles="https://github.com/pychess/pychess/archive/refs/tags/${version}.tar.gz" -checksum=68cd4a0197d7e325f0e46fb52b88ce8ac7425c6c9adea60c8838a57af713b0a5 +checksum=3dda31117e5a18b0e0357aaafea6d498f64e717ad8beab82adcde00711be5638 pre_build() { PYTHONPATH=lib python3 pgn2ecodb.py diff --git a/srcpkgs/pycp/template b/srcpkgs/pycp/template index 763c61ea643eb0..a465c032f6cb05 100644 --- a/srcpkgs/pycp/template +++ b/srcpkgs/pycp/template @@ -1,7 +1,7 @@ # Template file for 'pycp' pkgname=pycp version=8.0.8 -revision=6 +revision=7 build_style=python3-module pycompile_module="pycp" hostmakedepends="help2man python3-setuptools" diff --git a/srcpkgs/pyliblo/patches/cython3.patch b/srcpkgs/pyliblo/patches/cython3.patch new file mode 100644 index 00000000000000..6f01930e1758a6 --- /dev/null +++ b/srcpkgs/pyliblo/patches/cython3.patch @@ -0,0 +1,32 @@ +Taken from + + https://gitlab.archlinux.org/archlinux/packaging/packages/python-pyliblo + +diff -urN pyliblo-0.10.0-orig/src/liblo.pxd pyliblo-0.10.0/src/liblo.pxd +--- pyliblo-0.10.0-orig/src/liblo.pxd 2015-03-14 23:32:24.000000000 -0300 ++++ pyliblo-0.10.0/src/liblo.pxd 2023-08-02 04:17:47.601508337 -0400 +@@ -53,20 +53,20 @@ + int lo_send_bundle_from(lo_address targ, lo_server serv, lo_bundle b) + + # server +- lo_server lo_server_new_with_proto(char *port, int proto, lo_err_handler err_h) ++ lo_server lo_server_new_with_proto(char *port, int proto, void(*err_h)(int num, const_char *msg, const_char *where) except * nogil) + void lo_server_free(lo_server s) + char *lo_server_get_url(lo_server s) + int lo_server_get_port(lo_server s) + int lo_server_get_protocol(lo_server s) +- lo_method lo_server_add_method(lo_server s, char *path, char *typespec, lo_method_handler h, void *user_data) ++ lo_method lo_server_add_method(lo_server s, char *path, char *typespec, int(*h)(const_char *path, const_char *types, lo_arg **argv, int argc, lo_message msg, void *user_data) except?-1 nogil, void *user_data) + void lo_server_del_method(lo_server s, char *path, char *typespec) +- int lo_server_add_bundle_handlers(lo_server s, lo_bundle_start_handler sh, lo_bundle_end_handler eh, void *user_data) ++ int lo_server_add_bundle_handlers(lo_server s, int(*sh)(lo_timetag time, void *user_data) except?-1 nogil , int(*eh)(void *user_data) except?-1 nogil, void *user_data) + int lo_server_recv(lo_server s) nogil + int lo_server_recv_noblock(lo_server s, int timeout) nogil + int lo_server_get_socket_fd(lo_server s) + + # server thread +- lo_server_thread lo_server_thread_new_with_proto(char *port, int proto, lo_err_handler err_h) ++ lo_server_thread lo_server_thread_new_with_proto(char *port, int proto, void(*err_h)(int num, const_char *msg, const_char *where) except * nogil) + void lo_server_thread_free(lo_server_thread st) + lo_server lo_server_thread_get_server(lo_server_thread st) + void lo_server_thread_start(lo_server_thread st) diff --git a/srcpkgs/pyliblo/patches/python-3.11.patch b/srcpkgs/pyliblo/patches/python-3.11.patch new file mode 100644 index 00000000000000..b8bdbb8397d2d8 --- /dev/null +++ b/srcpkgs/pyliblo/patches/python-3.11.patch @@ -0,0 +1,19 @@ +Taken from + + https://gitlab.archlinux.org/archlinux/packaging/packages/python-pyliblo + +diff -ruN a/src/liblo.pyx b/src/liblo.pyx +--- a/src/liblo.pyx 2015-04-14 09:02:22.000000000 +0200 ++++ b/src/liblo.pyx 2023-04-06 19:51:56.042679208 +0200 +@@ -258,9 +258,9 @@ + cb.user_data) + + # call function +- if _inspect.getargspec(func)[1] == None: ++ if _inspect.getfullargspec(func)[1] == None: + # determine number of arguments to call the function with +- n = len(_inspect.getargspec(func)[0]) ++ n = len(_inspect.getfullargspec(func)[0]) + if _inspect.ismethod(func): + n -= 1 # self doesn't count + r = cb.func(*func_args[0:n]) diff --git a/srcpkgs/pyliblo/template b/srcpkgs/pyliblo/template index 44b0efdb28307b..9c823e9e10980b 100644 --- a/srcpkgs/pyliblo/template +++ b/srcpkgs/pyliblo/template @@ -1,9 +1,9 @@ # Template file for 'pyliblo' pkgname=pyliblo version=0.10.0 -revision=4 +revision=5 build_style=python3-module -hostmakedepends="python3-setuptools python3-Cython0.29" +hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel liblo-devel" depends="python3" short_desc="Python bindings for the liblo OSC library" @@ -13,3 +13,7 @@ homepage="http://das.nasophon.de/pyliblo/" distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz" checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f make_check=ci-skip # fails "test.test_liblo.ServerCreationTestCase" due to root + +do_check() { + PYTHONPATH="$(cd build/lib* && pwd)" python3 ./test/test_liblo.py +} diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template index 6651652239436c..08cdfb1cb2d8dc 100644 --- a/srcpkgs/pylint/template +++ b/srcpkgs/pylint/template @@ -1,7 +1,7 @@ # Template file for 'pylint' pkgname=pylint version=3.3.1 -revision=1 +revision=2 build_style=python3-pep517 make_build_args="--skip-dependency-check" make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py" diff --git a/srcpkgs/pymol/template b/srcpkgs/pymol/template index ea761e5afd06d9..229d06d32db97c 100644 --- a/srcpkgs/pymol/template +++ b/srcpkgs/pymol/template @@ -1,7 +1,7 @@ # Template file for 'pymol' pkgname=pymol version=2.5.0 -revision=7 +revision=8 build_style="python3-module" build_helper="numpy" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/pyotherside/template b/srcpkgs/pyotherside/template index 1e9ec8ed7ed42e..80130b1840aef4 100644 --- a/srcpkgs/pyotherside/template +++ b/srcpkgs/pyotherside/template @@ -1,7 +1,7 @@ # Template file for 'pyotherside' pkgname=pyotherside version=1.6.1 -revision=1 +revision=2 build_style=qmake configure_args="PYTHON_CONFIG=${XBPS_CROSS_BASE}/usr/bin/python3-config" hostmakedepends="qt5-qmake qt5-host-tools" diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template index b9f1cc0f98aaad..8826ed0b50c088 100644 --- a/srcpkgs/pyradio/template +++ b/srcpkgs/pyradio/template @@ -1,7 +1,7 @@ # Template file for 'pyradio' pkgname=pyradio version=0.9.3.11.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-requests python3-dnspython python3-psutil python3-rich diff --git a/srcpkgs/pysolfc/template b/srcpkgs/pysolfc/template index 447024b66da5b2..b351dc174921d8 100644 --- a/srcpkgs/pysolfc/template +++ b/srcpkgs/pysolfc/template @@ -1,7 +1,7 @@ # Template file for 'pysolfc' pkgname=pysolfc version=3.1.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="gettext python3-pygame python3-random2 python3-six python3-tkinter python3-Pillow python3-attrs python3-pysol_cards" diff --git a/srcpkgs/python/template b/srcpkgs/python/template index c7d9066c75813b..198120e7717578 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -1,6 +1,6 @@ # Template file for 'python' pkgname=python -version=2.7.9999 +version=3.13 revision=1 build_style=meta depends="python${version%%.*}" diff --git a/srcpkgs/python3-3to2/template b/srcpkgs/python3-3to2/template index 98d1481d863252..6af81d65f82eb6 100644 --- a/srcpkgs/python3-3to2/template +++ b/srcpkgs/python3-3to2/template @@ -1,7 +1,7 @@ # Template file for 'python3-3to2' pkgname=python3-3to2 version=1.1.1 -revision=6 +revision=7 build_style=python3-module pycompile_module="lib3to2" hostmakedepends="python3-setuptools unzip" diff --git a/srcpkgs/python3-Arpeggio/template b/srcpkgs/python3-Arpeggio/template index 5dbd12e4171a7c..5f248b342fd1a1 100644 --- a/srcpkgs/python3-Arpeggio/template +++ b/srcpkgs/python3-Arpeggio/template @@ -1,7 +1,7 @@ # Template file for 'python3-Arpeggio' pkgname=python3-Arpeggio version=2.0.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-Arrow/template b/srcpkgs/python3-Arrow/template index d72afac240beaf..4239c2cfe4d54a 100644 --- a/srcpkgs/python3-Arrow/template +++ b/srcpkgs/python3-Arrow/template @@ -1,7 +1,7 @@ # Template file for 'python3-Arrow' pkgname=python3-Arrow version=1.2.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dateutil" diff --git a/srcpkgs/python3-Babel/template b/srcpkgs/python3-Babel/template index c1625da5fe8881..2f07dc15d2c747 100644 --- a/srcpkgs/python3-Babel/template +++ b/srcpkgs/python3-Babel/template @@ -1,7 +1,7 @@ # Template file for 'python3-Babel' pkgname=python3-Babel version=2.16.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template index 9d41743d35df74..364445f875e54c 100644 --- a/srcpkgs/python3-BeautifulSoup4/template +++ b/srcpkgs/python3-BeautifulSoup4/template @@ -1,7 +1,7 @@ # Template file for 'python3-BeautifulSoup4' pkgname=python3-BeautifulSoup4 version=4.12.2 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-soupsieve" diff --git a/srcpkgs/python3-Bottleneck/template b/srcpkgs/python3-Bottleneck/template index 1c9400da55a2ec..ca8e441c093ebf 100644 --- a/srcpkgs/python3-Bottleneck/template +++ b/srcpkgs/python3-Bottleneck/template @@ -1,7 +1,7 @@ # Template file for 'python3-Bottleneck' pkgname=python3-Bottleneck version=1.4.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_target=".xbps-testdir/*/${py3_sitelib}/bottleneck/tests" hostmakedepends="python3-setuptools python3-versioneer python3-wheel python3-numpy" diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template index d2b86573d87d81..0942824d298da5 100644 --- a/srcpkgs/python3-Brotli/template +++ b/srcpkgs/python3-Brotli/template @@ -1,7 +1,7 @@ # Template file for 'python3-Brotli' pkgname=python3-Brotli version=1.1.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel brotli-devel" diff --git a/srcpkgs/python3-Cheroot/template b/srcpkgs/python3-Cheroot/template index 4a2e37ab2c7777..83ea54aa498b83 100644 --- a/srcpkgs/python3-Cheroot/template +++ b/srcpkgs/python3-Cheroot/template @@ -1,7 +1,7 @@ # Template file for 'python3-Cheroot' pkgname=python3-Cheroot version=8.4.5 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3-setuptools python3-six diff --git a/srcpkgs/python3-CherryPy/template b/srcpkgs/python3-CherryPy/template index 8675e179c6030f..28c0f7b1302199 100644 --- a/srcpkgs/python3-CherryPy/template +++ b/srcpkgs/python3-CherryPy/template @@ -1,7 +1,7 @@ # Template file for 'python3-CherryPy' pkgname=python3-CherryPy version=18.8.0 -revision=3 +revision=4 build_style=python3-module make_check_args="--ignore cherrypy/test/test_session.py --deselect cherrypy/test/test_states.py::ServerStateTests::test_2_KeyboardInterrupt" diff --git a/srcpkgs/python3-ConfigArgParse/template b/srcpkgs/python3-ConfigArgParse/template index b0debe1cd51470..a07362a6a747a4 100644 --- a/srcpkgs/python3-ConfigArgParse/template +++ b/srcpkgs/python3-ConfigArgParse/template @@ -1,7 +1,7 @@ # Template file for 'python3-ConfigArgParse' pkgname=python3-ConfigArgParse version=1.7 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-Cython/template b/srcpkgs/python3-Cython/template index faec5722ae171a..a01702f0747d10 100644 --- a/srcpkgs/python3-Cython/template +++ b/srcpkgs/python3-Cython/template @@ -1,7 +1,7 @@ # Template file for 'python3-Cython' pkgname=python3-Cython version=3.0.11 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-Cython0.29/template b/srcpkgs/python3-Cython0.29/template deleted file mode 100644 index d68f70edc48a33..00000000000000 --- a/srcpkgs/python3-Cython0.29/template +++ /dev/null @@ -1,31 +0,0 @@ -# Template file for 'python3-Cython0.29' -pkgname=python3-Cython0.29 -version=0.29.37 -revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools" -makedepends="python3-devel" -depends="python3-setuptools" -short_desc="Python to C compiler (legacy version)" -maintainer="Andrew J. Hesford " -license="Apache-2.0" -homepage="https://cython.org/" -changelog="https://raw.githubusercontent.com/cython/cython/master/CHANGES.rst" -distfiles="${PYPI_SITE}/C/Cython/Cython-${version}.tar.gz" -checksum=f813d4a6dd94adee5d4ff266191d1d95bf6d4164a4facc535422c021b2504cfb -# Test are flaky -make_check=no -conflicts="python3-Cython>=0" -replaces="python3-Cython>=0" - -alternatives=" - cython:cygdb:/usr/bin/cygdb3 - cython:cython:/usr/bin/cython3 - cython:cythonize:/usr/bin/cythonize3 -" - -post_install() { - mv ${DESTDIR}/usr/bin/cygdb{,3} - mv ${DESTDIR}/usr/bin/cython{,3} - mv ${DESTDIR}/usr/bin/cythonize{,3} -} diff --git a/srcpkgs/python3-Cython0.29/update b/srcpkgs/python3-Cython0.29/update deleted file mode 100644 index 7fbe21105b46e5..00000000000000 --- a/srcpkgs/python3-Cython0.29/update +++ /dev/null @@ -1,3 +0,0 @@ -pkgname=Cython -pattern="Cython-\K0\.[\d\.]+(?=.tar.gz)" -ignore="*[A-Za-z]*" diff --git a/srcpkgs/python3-EasyProcess/template b/srcpkgs/python3-EasyProcess/template index 9f5e5387a7b599..6eaee1e99807b8 100644 --- a/srcpkgs/python3-EasyProcess/template +++ b/srcpkgs/python3-EasyProcess/template @@ -1,18 +1,17 @@ # Template file for 'python3-EasyProcess' pkgname=python3-EasyProcess version=1.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" -checkdepends="python3-pytest python3-nose python3-PyVirtualDisplay inetutils - xorg-server-xvfb python3-six" short_desc="Easy to use python subprocess interface" maintainer="Đoàn Trần Công Danh " license="BSD-2-Clause" homepage="https://github.com/ponty/easyprocess" distfiles="${PYPI_SITE}/E/EasyProcess/EasyProcess-${version}.tar.gz" checksum=885898302a57aab948973e8b5d32a4229392b9fb2d986ab1d4ffd590e5ba90ec +make_check=no # Tests require removed python3-nose post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python3-Faker/template b/srcpkgs/python3-Faker/template index 452b8cfb998f51..18aeb17533fa7c 100644 --- a/srcpkgs/python3-Faker/template +++ b/srcpkgs/python3-Faker/template @@ -1,7 +1,7 @@ # Template file for 'python3-Faker' pkgname=python3-Faker version=33.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools" depends="python3-dateutil" diff --git a/srcpkgs/python3-Flask-Babel/template b/srcpkgs/python3-Flask-Babel/template index ff0fb4bb066865..da803b64cba3ca 100644 --- a/srcpkgs/python3-Flask-Babel/template +++ b/srcpkgs/python3-Flask-Babel/template @@ -1,7 +1,7 @@ # Template file for 'python3-Flask-Babel' pkgname=python3-Flask-Babel version=4.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-pytz python3-Jinja2 python3-Babel python3-Flask" diff --git a/srcpkgs/python3-Flask-Cors/template b/srcpkgs/python3-Flask-Cors/template index 6e75c20ba01b42..daff2078497d41 100644 --- a/srcpkgs/python3-Flask-Cors/template +++ b/srcpkgs/python3-Flask-Cors/template @@ -1,7 +1,7 @@ # Template file for 'python3-Flask-Cors' pkgname=python3-Flask-Cors version=5.0.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Flask python3-six" diff --git a/srcpkgs/python3-Flask-HTTPAuth/template b/srcpkgs/python3-Flask-HTTPAuth/template index e833d5332019ef..48883db2f80458 100644 --- a/srcpkgs/python3-Flask-HTTPAuth/template +++ b/srcpkgs/python3-Flask-HTTPAuth/template @@ -1,7 +1,7 @@ # Template file for 'python3-Flask-HTTPAuth' pkgname=python3-Flask-HTTPAuth version=4.8.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Flask" diff --git a/srcpkgs/python3-Flask-Login/template b/srcpkgs/python3-Flask-Login/template index c1b662043f44b8..dbb0c43f8ffa56 100644 --- a/srcpkgs/python3-Flask-Login/template +++ b/srcpkgs/python3-Flask-Login/template @@ -1,7 +1,7 @@ # Template file for 'python3-Flask-Login' pkgname=python3-Flask-Login version=0.6.2 -revision=4 +revision=5 build_style=python3-module make_check_args="-p no:warnings" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-Flask-RESTful/template b/srcpkgs/python3-Flask-RESTful/template index e138fe862977a6..f36865706089c6 100644 --- a/srcpkgs/python3-Flask-RESTful/template +++ b/srcpkgs/python3-Flask-RESTful/template @@ -1,17 +1,17 @@ # Template file for 'python3-Flask-RESTful' pkgname=python3-Flask-RESTful version=0.3.10 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Flask python3-six python3-pytz python3-aniso8601" -checkdepends="python3-pytest python3-nose python3-mock $depends" short_desc="Simple framework for creating REST APIs" maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://flask-restful.readthedocs.io/en/latest/" distfiles="https://github.com/flask-restful/flask-restful/archive/${version}.tar.gz" checksum=f0b709993627cfa8141aba6c4cae46d918b0fd07f158fe5ea3195b041ddd831b +make_check=no # Tests require removed python3-nose post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-Flask-WTF/template b/srcpkgs/python3-Flask-WTF/template index 575213d79cae8e..242df6f8e2268b 100644 --- a/srcpkgs/python3-Flask-WTF/template +++ b/srcpkgs/python3-Flask-WTF/template @@ -1,6 +1,6 @@ # Template file for 'python3-Flask-WTF' pkgname=python3-Flask-WTF -version=1.2.1 +version=1.2.2 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/lepture/flask-wtf" changelog="https://raw.githubusercontent.com/wtforms/flask-wtf/main/docs/changes.rst" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=d069b141376fd6784198ca087a4b7fb56c4ce00856e108a37a9f9a02286cd1be +checksum=54c29c2ff464d9875191299afdd9148c4ea83e39456a9c08f7d0543bf46fd4fd post_install() { vlicense LICENSE.rst diff --git a/srcpkgs/python3-Flask/template b/srcpkgs/python3-Flask/template index b78079da07d9f3..f9565736a39e10 100644 --- a/srcpkgs/python3-Flask/template +++ b/srcpkgs/python3-Flask/template @@ -1,7 +1,7 @@ # Template file for 'python3-Flask' pkgname=python3-Flask version=3.0.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3-Werkzeug python3-Jinja2 python3-itsdangerous diff --git a/srcpkgs/python3-GitPython/template b/srcpkgs/python3-GitPython/template index d919fb30f7f2a8..18a42acfa710d4 100644 --- a/srcpkgs/python3-GitPython/template +++ b/srcpkgs/python3-GitPython/template @@ -1,7 +1,7 @@ # Template file for 'python3-GitPython' pkgname=python3-GitPython version=3.1.31 -revision=2 +revision=3 build_style=python3-module make_check_args="--deselect test/test_base.py::TestBase::test_with_rw_remote_and_rw_repo --deselect test/test_git.py::TestGit::test_refresh diff --git a/srcpkgs/python3-IPy/template b/srcpkgs/python3-IPy/template index 7ba4183e8e9acf..5300c4c731ec6f 100644 --- a/srcpkgs/python3-IPy/template +++ b/srcpkgs/python3-IPy/template @@ -1,7 +1,7 @@ # Template file for 'python3-IPy' pkgname=python3-IPy version=1.01 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-Inflector/template b/srcpkgs/python3-Inflector/template index 078d431ed05b5b..8fb381fdfda469 100644 --- a/srcpkgs/python3-Inflector/template +++ b/srcpkgs/python3-Inflector/template @@ -1,7 +1,7 @@ # Template file for 'python3-Inflector' pkgname=python3-Inflector version=3.0.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template index 1466b90f64bf05..e1ef5a87d38f64 100644 --- a/srcpkgs/python3-Jinja2/template +++ b/srcpkgs/python3-Jinja2/template @@ -1,7 +1,7 @@ # Template file for 'python3-Jinja2' pkgname=python3-Jinja2 version=3.1.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3-MarkupSafe" diff --git a/srcpkgs/python3-Levenshtein/template b/srcpkgs/python3-Levenshtein/template index 39470d3338cd17..b86a041e73d209 100644 --- a/srcpkgs/python3-Levenshtein/template +++ b/srcpkgs/python3-Levenshtein/template @@ -1,9 +1,9 @@ # Template file for 'python3-Levenshtein' pkgname=python3-Levenshtein -version=0.25.1 +version=0.26.1 revision=1 build_style=python3-pep517 -hostmakedepends="cmake python3-scikit-build" +hostmakedepends="cmake python3-scikit-build-core ninja" makedepends="python3-devel rapidfuzz-cpp" depends="python3-rapidfuzz" checkdepends="${depends} python3-pytest" @@ -11,7 +11,7 @@ short_desc="Functions for computation of distance and string similarity" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/maxbachmann/Levenshtein" -distfiles="${PYPI_SITE}/L/Levenshtein/Levenshtein-${version}.tar.gz" -checksum=2df14471c778c75ffbd59cb64bbecfd4b0ef320ef9f80e4804764be7d5678980 +distfiles="${PYPI_SITE}/l/levenshtein/levenshtein-${version}.tar.gz" +checksum=0d19ba22330d50609b2349021ec3cf7d905c6fe21195a2d0d876a146e7ed2575 export CMAKE_ARGS="-DPython_INCLUDE_DIR:PATH=${XBPS_CROSS_BASE}/${py3_inc}" diff --git a/srcpkgs/python3-M2Crypto/template b/srcpkgs/python3-M2Crypto/template index c93e70c6325161..a61177702ed9bb 100644 --- a/srcpkgs/python3-M2Crypto/template +++ b/srcpkgs/python3-M2Crypto/template @@ -1,7 +1,7 @@ # Template file for 'python3-M2Crypto' pkgname=python3-M2Crypto version=0.42.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools swig openssl-devel" makedepends="openssl-devel python3-devel" diff --git a/srcpkgs/python3-Mako/template b/srcpkgs/python3-Mako/template index d6e200aa1835ab..c77e8c0e722fa0 100644 --- a/srcpkgs/python3-Mako/template +++ b/srcpkgs/python3-Mako/template @@ -1,7 +1,7 @@ # Template file for 'python3-Mako' pkgname=python3-Mako version=1.3.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-MarkupSafe" diff --git a/srcpkgs/python3-Markdown/template b/srcpkgs/python3-Markdown/template index 7226522fa5c282..12acc077389e09 100644 --- a/srcpkgs/python3-Markdown/template +++ b/srcpkgs/python3-Markdown/template @@ -1,7 +1,7 @@ # Template file for 'python3-Markdown' pkgname=python3-Markdown version=3.6 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template index ab000c13f0615e..35a1805b015170 100644 --- a/srcpkgs/python3-MarkupSafe/template +++ b/srcpkgs/python3-MarkupSafe/template @@ -1,6 +1,6 @@ # Template file for 'python3-MarkupSafe' pkgname=python3-MarkupSafe -version=2.1.5 +version=3.0.2 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,9 +11,9 @@ short_desc="Implements a XML/HTML/XHTML Markup safe string for Python3" maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://palletsprojects.com/p/markupsafe/" -distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz" -checksum=d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b +distfiles="${PYPI_SITE}/M/MarkupSafe/markupsafe-${version}.tar.gz" +checksum=ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0 post_install() { - vlicense LICENSE.rst + vlicense LICENSE.txt } diff --git a/srcpkgs/python3-Markups/template b/srcpkgs/python3-Markups/template index c2473511785102..38d0973bdb9edd 100644 --- a/srcpkgs/python3-Markups/template +++ b/srcpkgs/python3-Markups/template @@ -1,7 +1,7 @@ # Template file for 'python3-Markups' pkgname=python3-Markups version=3.0.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-markdown-math" diff --git a/srcpkgs/python3-MechanicalSoup/template b/srcpkgs/python3-MechanicalSoup/template index 6165401d080389..2fcccc69e0a13c 100644 --- a/srcpkgs/python3-MechanicalSoup/template +++ b/srcpkgs/python3-MechanicalSoup/template @@ -1,7 +1,7 @@ # Template file for 'python3-MechanicalSoup' pkgname=python3-MechanicalSoup version=0.12.0 -revision=6 +revision=7 build_style=python3-module pycompile_module="mechanicalsoup" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-MiniMock/template b/srcpkgs/python3-MiniMock/template index 94d49b16dcd150..96b79669a3c059 100644 --- a/srcpkgs/python3-MiniMock/template +++ b/srcpkgs/python3-MiniMock/template @@ -1,7 +1,7 @@ # Template file for 'python3-MiniMock' pkgname=python3-MiniMock version=1.2.8 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-MyST-Parser/template b/srcpkgs/python3-MyST-Parser/template index c98f43d7392199..7cf9cfb8ca7941 100644 --- a/srcpkgs/python3-MyST-Parser/template +++ b/srcpkgs/python3-MyST-Parser/template @@ -1,7 +1,7 @@ # Template file for 'python3-MyST-Parser' pkgname=python3-MyST-Parser version=3.0.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" short_desc="Sphinx and Docutils extension to parse MyST" diff --git a/srcpkgs/python3-PGPy/template b/srcpkgs/python3-PGPy/template index 81f66d687e1869..02a38f91fa10f7 100644 --- a/srcpkgs/python3-PGPy/template +++ b/srcpkgs/python3-PGPy/template @@ -1,7 +1,7 @@ # Template file for 'python3-PGPy' pkgname=python3-PGPy version=0.6.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-wheel" depends="python3-cryptography python3-pyasn1 python3-six" diff --git a/srcpkgs/python3-Pebble/template b/srcpkgs/python3-Pebble/template index b8035787c576be..59d32d3c33b697 100644 --- a/srcpkgs/python3-Pebble/template +++ b/srcpkgs/python3-Pebble/template @@ -1,7 +1,7 @@ # Template file for 'python3-Pebble' pkgname=python3-Pebble version=5.0.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-Pillow/template b/srcpkgs/python3-Pillow/template index e55f722de47661..a0876a4512c1a8 100644 --- a/srcpkgs/python3-Pillow/template +++ b/srcpkgs/python3-Pillow/template @@ -1,6 +1,6 @@ # Template file for 'python3-Pillow' pkgname=python3-Pillow -version=10.4.0 +version=11.0.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,7 +14,7 @@ license="custom:PIL" homepage="https://python-pillow.org" changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst" distfiles="${PYPI_SITE}/p/pillow/pillow-${version}.tar.gz" -checksum=166c1cd4d24309b30d61f79f4a9114b7b2313d7450912277855ff5dfd7cd4a06 +checksum=72bacbaf24ac003fea9bff9837d1eedb6088758d41e100c1552930151f677739 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-PyAudio/template b/srcpkgs/python3-PyAudio/template index 5559e3bae708cf..f1e5634a26d211 100644 --- a/srcpkgs/python3-PyAudio/template +++ b/srcpkgs/python3-PyAudio/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyAudio' pkgname=python3-PyAudio version=0.2.12 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel portaudio-devel" diff --git a/srcpkgs/python3-PyBrowserID/template b/srcpkgs/python3-PyBrowserID/template index c187857dd59766..a20dbbd1c854aa 100644 --- a/srcpkgs/python3-PyBrowserID/template +++ b/srcpkgs/python3-PyBrowserID/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyBrowserID' pkgname=python3-PyBrowserID version=0.14.0 -revision=7 +revision=8 build_style=python3-module pycompile_module="browserid" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-PyFxA/template b/srcpkgs/python3-PyFxA/template index 48d63160755ebe..687b896fe7d1e8 100644 --- a/srcpkgs/python3-PyFxA/template +++ b/srcpkgs/python3-PyFxA/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyFxA' pkgname=python3-PyFxA version=0.7.3 -revision=6 +revision=7 build_style=python3-module pycompile_module="fxa" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-PyHamcrest/template b/srcpkgs/python3-PyHamcrest/template index 9b77a77755e24b..c5f642d209e7ef 100644 --- a/srcpkgs/python3-PyHamcrest/template +++ b/srcpkgs/python3-PyHamcrest/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyHamcrest' pkgname=python3-PyHamcrest version=2.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatch-vcs" depends="python3" diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template index f92daea7cb1880..d959c44acf3bcf 100644 --- a/srcpkgs/python3-PyICU/template +++ b/srcpkgs/python3-PyICU/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyICU' pkgname=python3-PyICU version=2.11 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel icu-devel" diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template index 5f576666b76589..79d627dbcb725b 100644 --- a/srcpkgs/python3-PyJWT/template +++ b/srcpkgs/python3-PyJWT/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyJWT' pkgname=python3-PyJWT version=2.7.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-cryptography" diff --git a/srcpkgs/python3-PyOpenGL-accelerate/template b/srcpkgs/python3-PyOpenGL-accelerate/template index 2161cd9b433d47..06c0e0075da468 100644 --- a/srcpkgs/python3-PyOpenGL-accelerate/template +++ b/srcpkgs/python3-PyOpenGL-accelerate/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyOpenGL-accelerate' pkgname=python3-PyOpenGL-accelerate version=3.1.7 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel" diff --git a/srcpkgs/python3-PyOpenGL/template b/srcpkgs/python3-PyOpenGL/template index f49cea6fa4f013..b66a8bb4eda81b 100644 --- a/srcpkgs/python3-PyOpenGL/template +++ b/srcpkgs/python3-PyOpenGL/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyOpenGL' pkgname=python3-PyOpenGL version=3.1.5 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-PyQt-builder/template b/srcpkgs/python3-PyQt-builder/template index 37adfe52a2c1a2..80d737009057ea 100644 --- a/srcpkgs/python3-PyQt-builder/template +++ b/srcpkgs/python3-PyQt-builder/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyQt-builder' pkgname=python3-PyQt-builder version=1.16.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-setuptools_scm sip python3-wheel" depends="sip>=6.7" diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template index 84371f972c951e..6ac2fb77edc1aa 100644 --- a/srcpkgs/python3-PyQt5-networkauth/template +++ b/srcpkgs/python3-PyQt5-networkauth/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyQt5-networkauth' pkgname=python3-PyQt5-networkauth version=5.15.5 -revision=3 +revision=4 build_style=sip-build build_helper="python3" hostmakedepends="qt5-qmake pkg-config sip python3-PyQt-builder" diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template index 0ac01180e5b506..6e47e2e7642a55 100644 --- a/srcpkgs/python3-PyQt5-webengine/template +++ b/srcpkgs/python3-PyQt5-webengine/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyQt5-webengine' pkgname=python3-PyQt5-webengine version=5.15.6 -revision=3 +revision=4 build_style=sip-build build_helper="qmake python3" hostmakedepends="pkg-config qt5-qmake sip python3-PyQt-builder" diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template index 2087c93f224de2..3f984155ba94bb 100644 --- a/srcpkgs/python3-PyQt5/template +++ b/srcpkgs/python3-PyQt5/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyQt5' pkgname=python3-PyQt5 version=5.15.10 -revision=1 +revision=2 build_style=sip-build build_helper=qemu configure_args="--confirm-license" diff --git a/srcpkgs/python3-PyVirtualDisplay/template b/srcpkgs/python3-PyVirtualDisplay/template index 833ab7b2cdc504..28f6dc88fc1066 100644 --- a/srcpkgs/python3-PyVirtualDisplay/template +++ b/srcpkgs/python3-PyVirtualDisplay/template @@ -1,7 +1,7 @@ # Template file for 'python3-PyVirtualDisplay' pkgname=python3-PyVirtualDisplay version=3.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-EasyProcess" diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template index f86f50f2012bbc..bc7023e3660a99 100644 --- a/srcpkgs/python3-Pygments/template +++ b/srcpkgs/python3-Pygments/template @@ -1,7 +1,7 @@ # Template file for 'python3-Pygments' pkgname=python3-Pygments version=2.18.0 -revision=1 +revision=2 build_style=python3-pep517 # Ignored tests rely on unpackaged wcag_contrast_ratio module make_check_args="--ignore=tests/contrast/test_contrasts.py" diff --git a/srcpkgs/python3-Pyphen/template b/srcpkgs/python3-Pyphen/template index 37add8bb67bbbd..5031652d2e49bc 100644 --- a/srcpkgs/python3-Pyphen/template +++ b/srcpkgs/python3-Pyphen/template @@ -1,7 +1,7 @@ # Template file for 'python3-Pyphen' pkgname=python3-Pyphen version=0.17.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-flit_core" checkdepends="python3-pytest-isort python3-pytest-cov python3-pytest-flake8 diff --git a/srcpkgs/python3-Pyro4/template b/srcpkgs/python3-Pyro4/template index 9205ee4f4824ad..5a88e1ab7ca4b1 100644 --- a/srcpkgs/python3-Pyro4/template +++ b/srcpkgs/python3-Pyro4/template @@ -1,7 +1,7 @@ # Template file for 'python3-Pyro4' pkgname=python3-Pyro4 version=4.80 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-serpent" diff --git a/srcpkgs/python3-QtAwesome/template b/srcpkgs/python3-QtAwesome/template index ecf628744e1e93..c7abd1ebe0f257 100644 --- a/srcpkgs/python3-QtAwesome/template +++ b/srcpkgs/python3-QtAwesome/template @@ -1,7 +1,7 @@ # Template file for 'python3-QtAwesome' pkgname=python3-QtAwesome version=1.3.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-QtPy" diff --git a/srcpkgs/python3-QtPy/template b/srcpkgs/python3-QtPy/template index 79e4016fb02361..d654aba6d112c3 100644 --- a/srcpkgs/python3-QtPy/template +++ b/srcpkgs/python3-QtPy/template @@ -1,7 +1,7 @@ # Template file for 'python3-QtPy' pkgname=python3-QtPy version=2.4.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" # depends on either of PyQt5, PyQt6 diff --git a/srcpkgs/python3-RPi.GPIO/template b/srcpkgs/python3-RPi.GPIO/template index 306b6ca9157af1..3f290793444bbb 100644 --- a/srcpkgs/python3-RPi.GPIO/template +++ b/srcpkgs/python3-RPi.GPIO/template @@ -1,7 +1,7 @@ # Template file for 'python3-RPi.GPIO' pkgname=python3-RPi.GPIO version=0.7.1 -revision=3 +revision=4 archs="armv[67]l* aarch64*" build_style=python3-module hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-ReParser/template b/srcpkgs/python3-ReParser/template index a49c64d1b51718..74d510974c3e54 100644 --- a/srcpkgs/python3-ReParser/template +++ b/srcpkgs/python3-ReParser/template @@ -1,7 +1,7 @@ # Template file for 'python3-ReParser' pkgname=python3-ReParser version=1.4.3 -revision=6 +revision=7 build_style=python3-module pycompile_module="reparser.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-Ropper/template b/srcpkgs/python3-Ropper/template index f65eb94a127067..bf90a46fdd330e 100644 --- a/srcpkgs/python3-Ropper/template +++ b/srcpkgs/python3-Ropper/template @@ -1,7 +1,7 @@ # Template file for 'python3-Ropper' pkgname=python3-Ropper version=1.13.10 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="capstone-python3 python3-filebytes keystone-python3 python3-setuptools" diff --git a/srcpkgs/python3-SQLAlchemy/template b/srcpkgs/python3-SQLAlchemy/template index e3d67f29108b1b..57e5c655e03a00 100644 --- a/srcpkgs/python3-SQLAlchemy/template +++ b/srcpkgs/python3-SQLAlchemy/template @@ -1,6 +1,6 @@ # Template file for 'python3-SQLAlchemy' pkgname=python3-SQLAlchemy -version=1.4.50 +version=1.4.54 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,8 +11,8 @@ short_desc="SQL Toolkit and Object Relational Mapper for Python3" maintainer="Orphaned " license="MIT" homepage="https://www.sqlalchemy.org" -distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz" -checksum=3b97ddf509fc21e10b09403b5219b06c5b558b27fc2453150274fa4e70707dbf +distfiles="${PYPI_SITE}/s/sqlalchemy/sqlalchemy-${version}.tar.gz" +checksum=4470fbed088c35dc20b78a39aaf4ae54fe81790c783b3264872a0224f437c31a post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-SQLAlchemy/update b/srcpkgs/python3-SQLAlchemy/update new file mode 100644 index 00000000000000..45447ff669d625 --- /dev/null +++ b/srcpkgs/python3-SQLAlchemy/update @@ -0,0 +1,2 @@ +pkgname=sqlalchemy +pattern="${pkgname}-\K1\.[0-9.]+(post[0-9]*)?(?=\.tar\.gz)" diff --git a/srcpkgs/python3-SQLAlchemy2/template b/srcpkgs/python3-SQLAlchemy2/template index 24793492f83e18..9025510d587cdb 100644 --- a/srcpkgs/python3-SQLAlchemy2/template +++ b/srcpkgs/python3-SQLAlchemy2/template @@ -1,6 +1,6 @@ # Template file for 'python3-SQLAlchemy2' pkgname=python3-SQLAlchemy2 -version=2.0.23 +version=2.0.36 revision=1 build_style=python3-pep517 make_install_target="dist/SQLAlchemy-${version}-*-*-*.whl" @@ -13,8 +13,8 @@ maintainer="icp " license="MIT" homepage="https://www.sqlalchemy.org" changelog="https://docs.sqlalchemy.org/en/20/changelog/" -distfiles="${PYPI_SITE}/S/SQLAlchemy/SQLAlchemy-${version}.tar.gz" -checksum=c1bda93cbbe4aa2aa0aa8655c5aeda505cd219ff3e8da91d1d329e143e4aff69 +distfiles="${PYPI_SITE}/s/sqlaLchemy/sqlalchemy-${version}.tar.gz" +checksum=7f2767680b6d2398aea7082e45a774b2b0767b5c8d8ffb9c8b683088ea9b29c5 conflicts="python3-SQLAlchemy" diff --git a/srcpkgs/python3-SQLAlchemy2/update b/srcpkgs/python3-SQLAlchemy2/update new file mode 100644 index 00000000000000..bda8ba45e2c5e2 --- /dev/null +++ b/srcpkgs/python3-SQLAlchemy2/update @@ -0,0 +1 @@ +pkgname=sqlalchemy diff --git a/srcpkgs/python3-SecretStorage/template b/srcpkgs/python3-SecretStorage/template index 747af5a1c4c052..0a178cc3f7ae42 100644 --- a/srcpkgs/python3-SecretStorage/template +++ b/srcpkgs/python3-SecretStorage/template @@ -1,7 +1,7 @@ # Template file for 'python3-SecretStorage' pkgname=python3-SecretStorage version=3.3.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-jeepney python3-cryptography" diff --git a/srcpkgs/python3-SoCo/template b/srcpkgs/python3-SoCo/template index 5b0fa489fba64b..34e889385721fa 100644 --- a/srcpkgs/python3-SoCo/template +++ b/srcpkgs/python3-SoCo/template @@ -1,7 +1,7 @@ # Template file for 'python3-SoCo' pkgname=python3-SoCo version=0.29.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-xmltodict python3-requests python3-ifaddr python3-appdirs python3-lxml" diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template index eed352bec3e24a..32a5f267ac4535 100644 --- a/srcpkgs/python3-Sphinx/template +++ b/srcpkgs/python3-Sphinx/template @@ -1,7 +1,7 @@ # Template file for 'python3-Sphinx' pkgname=python3-Sphinx version=7.2.6 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core python3-pyproject-hooks" depends="python3-Jinja2 python3-docutils python3-Pygments diff --git a/srcpkgs/python3-Telethon/template b/srcpkgs/python3-Telethon/template index 6c8275c5d11ec0..4a3eeb166f6694 100644 --- a/srcpkgs/python3-Telethon/template +++ b/srcpkgs/python3-Telethon/template @@ -1,7 +1,7 @@ # Template file for 'python3-Telethon' pkgname=python3-Telethon version=1.32.1 -revision=1 +revision=2 build_style=python3-module make_check_args="--deselect tests/readthedocs/quick_references/test_client_reference.py::test_all_methods_present --deselect tests/telethon/test_utils.py::test_private_get_extension diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template index 2d993d219b848c..a3a6be8c2d88b2 100644 --- a/srcpkgs/python3-Twisted/template +++ b/srcpkgs/python3-Twisted/template @@ -1,7 +1,7 @@ # Template file for 'python3-Twisted' pkgname=python3-Twisted version=24.7.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-fancy-pypi-readme python3-incremental python3-setuptools" diff --git a/srcpkgs/python3-TxSNI/template b/srcpkgs/python3-TxSNI/template index 836ccfbb2ec7d1..2bee2db1028cad 100644 --- a/srcpkgs/python3-TxSNI/template +++ b/srcpkgs/python3-TxSNI/template @@ -1,7 +1,7 @@ # Template file for 'python3-TxSNI' pkgname=python3-TxSNI version=0.2.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Twisted python3-openssl" diff --git a/srcpkgs/python3-Unidecode/template b/srcpkgs/python3-Unidecode/template index 3b5ab5d057c72c..6f0d7ed3d2e4c3 100644 --- a/srcpkgs/python3-Unidecode/template +++ b/srcpkgs/python3-Unidecode/template @@ -1,7 +1,7 @@ # Template file for 'python3-Unidecode' pkgname=python3-Unidecode version=1.3.7 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-WTForms/template b/srcpkgs/python3-WTForms/template index 851dd57654f328..2680b367351755 100644 --- a/srcpkgs/python3-WTForms/template +++ b/srcpkgs/python3-WTForms/template @@ -1,7 +1,7 @@ # Template file for 'python3-WTForms' pkgname=python3-WTForms version=3.1.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools hatchling python3-Babel" depends="python3 python3-MarkupSafe python3-email-validator" diff --git a/srcpkgs/python3-WeasyPrint/template b/srcpkgs/python3-WeasyPrint/template index cbf9dc00bb5d6f..b14e6c1ef55c95 100644 --- a/srcpkgs/python3-WeasyPrint/template +++ b/srcpkgs/python3-WeasyPrint/template @@ -1,7 +1,7 @@ # Template file for 'python3-WeasyPrint' pkgname=python3-WeasyPrint version=63.0 -revision=1 +revision=2 build_style=python3-pep517 _runtime_deps="fonttools python3-Pillow python3-cssselect2 python3-html5lib python3-cffi python3-Pyphen python3-pydyf python3-tinyhtml5 glib pango" diff --git a/srcpkgs/python3-WebOb/template b/srcpkgs/python3-WebOb/template index 6394f98612681e..0b91f1be58ee9b 100644 --- a/srcpkgs/python3-WebOb/template +++ b/srcpkgs/python3-WebOb/template @@ -1,7 +1,7 @@ # Template file for 'python3-WebOb' pkgname=python3-WebOb version=1.8.5 -revision=6 +revision=7 build_style=python3-module pycompile_module="webob" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template index c98d61d7e2622a..46582ff1944d35 100644 --- a/srcpkgs/python3-Werkzeug/template +++ b/srcpkgs/python3-Werkzeug/template @@ -1,7 +1,7 @@ # Template file for 'python3-Werkzeug' pkgname=python3-Werkzeug version=3.0.1 -revision=1 +revision=2 build_style=python3-pep517 # Some tests depend on unpackaged dependencies make_check_args=" diff --git a/srcpkgs/python3-Whoosh/template b/srcpkgs/python3-Whoosh/template index 09b5545c948ba9..7ff26de09f5c4f 100644 --- a/srcpkgs/python3-Whoosh/template +++ b/srcpkgs/python3-Whoosh/template @@ -1,7 +1,7 @@ # Template file for 'python3-Whoosh' pkgname=python3-Whoosh version=2.7.4 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-XlsxWriter/template b/srcpkgs/python3-XlsxWriter/template index 7962e61ad433a3..1474b46f0b9747 100644 --- a/srcpkgs/python3-XlsxWriter/template +++ b/srcpkgs/python3-XlsxWriter/template @@ -1,7 +1,7 @@ # Template file for 'python3-XlsxWriter' pkgname=python3-XlsxWriter version=1.3.7 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-Yapsy/template b/srcpkgs/python3-Yapsy/template index 8701f41d0a2ea1..35d2810735ef7c 100644 --- a/srcpkgs/python3-Yapsy/template +++ b/srcpkgs/python3-Yapsy/template @@ -1,7 +1,7 @@ # Template file for 'python3-Yapsy' pkgname=python3-Yapsy version=1.12.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-aalib/template b/srcpkgs/python3-aalib/template index 6b84b749fee11d..6f41161a932cd5 100644 --- a/srcpkgs/python3-aalib/template +++ b/srcpkgs/python3-aalib/template @@ -1,7 +1,7 @@ # Template file for 'python3-aalib' pkgname=python3-aalib version=0.3.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="aalib python3" diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template index 4db21729bb4b22..aaa2b666df61a0 100644 --- a/srcpkgs/python3-acme/template +++ b/srcpkgs/python3-acme/template @@ -1,7 +1,7 @@ # Template file for 'python3-acme' pkgname=python3-acme version=2.7.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-setuptools python3-wheel" depends="python3-cryptography python3-openssl python3-pyrfc3339 diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template index d88b911d29489d..47ed2dab4fad31 100644 --- a/srcpkgs/python3-adblock/template +++ b/srcpkgs/python3-adblock/template @@ -1,7 +1,7 @@ # Template file for 'python3-adblock' pkgname=python3-adblock version=0.6.0 -revision=5 +revision=6 build_style=python3-pep517 build_helper="rust" make_check_args="-k not(test_required_python_version)" diff --git a/srcpkgs/python3-aioamqp/template b/srcpkgs/python3-aioamqp/template index d883f90a00cc6b..6a3ef286d3e5f4 100644 --- a/srcpkgs/python3-aioamqp/template +++ b/srcpkgs/python3-aioamqp/template @@ -1,7 +1,7 @@ # Template file for 'python3-aioamqp' pkgname=python3-aioamqp version=0.15.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pamqp" diff --git a/srcpkgs/python3-aiodns/template b/srcpkgs/python3-aiodns/template index d4e0498cb98df7..82cfb9189eef85 100644 --- a/srcpkgs/python3-aiodns/template +++ b/srcpkgs/python3-aiodns/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiodns' pkgname=python3-aiodns version=2.0.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pycares" diff --git a/srcpkgs/python3-aiofiles/template b/srcpkgs/python3-aiofiles/template index a5c79dd244ec94..8299b8cf8f2c85 100644 --- a/srcpkgs/python3-aiofiles/template +++ b/srcpkgs/python3-aiofiles/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiofiles' pkgname=python3-aiofiles version=24.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/python3-aiohappyeyeballs/template b/srcpkgs/python3-aiohappyeyeballs/template index 6ae8a4e65bf8d7..1748e9cef448bf 100644 --- a/srcpkgs/python3-aiohappyeyeballs/template +++ b/srcpkgs/python3-aiohappyeyeballs/template @@ -1,6 +1,6 @@ # Template file for 'python3-aiohappyeyeballs' pkgname=python3-aiohappyeyeballs -version=2.4.3 +version=2.4.4 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" @@ -12,7 +12,7 @@ license="PSF-2.0" homepage="https://aiohappyeyeballs.readthedocs.io" changelog="https://raw.githubusercontent.com/aio-libs/aiohappyeyeballs/main/CHANGELOG.md" distfiles="https://github.com/aio-libs/aiohappyeyeballs/archive/v${version}.tar.gz" -checksum=0bb4dacfcedb8ef80f8983d4f66242b926c4c29dd271d7f8178f9517ea66abf6 +checksum=3306a0837888d7abf89e9ae6197461672ada69d641bdaa6373af593fdb678934 pre_check() { vsed -i -e '/^addopts/d' pyproject.toml diff --git a/srcpkgs/python3-aiohttp-cors/template b/srcpkgs/python3-aiohttp-cors/template index 709f7f206805eb..7d8cd1c98d90a8 100644 --- a/srcpkgs/python3-aiohttp-cors/template +++ b/srcpkgs/python3-aiohttp-cors/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiohttp-cors' pkgname=python3-aiohttp-cors version=0.7.0 -revision=6 +revision=7 build_style=python3-module pycompile_module="aiohttp_cors" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-aiohttp-sse-client/template b/srcpkgs/python3-aiohttp-sse-client/template index 5c4f3be44c9f83..cd31f23a6a28ad 100644 --- a/srcpkgs/python3-aiohttp-sse-client/template +++ b/srcpkgs/python3-aiohttp-sse-client/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiohttp-sse-client' pkgname=python3-aiohttp-sse-client version=0.2.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-aiohttp python3-attrs python3-multidict python3-yarl" diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template index 949652b28ecaf9..899d07b85d85b7 100644 --- a/srcpkgs/python3-aiohttp/template +++ b/srcpkgs/python3-aiohttp/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiohttp' pkgname=python3-aiohttp version=3.9.5 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" makedepends="python3-devel" diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template index 11f8f7fc149b56..e77ec1e3f2780d 100644 --- a/srcpkgs/python3-aiohttp_socks/template +++ b/srcpkgs/python3-aiohttp_socks/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiohttp_socks' pkgname=python3-aiohttp_socks version=0.8.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-aiohttp python3-socks" diff --git a/srcpkgs/python3-aioinflux/template b/srcpkgs/python3-aioinflux/template index eea5645a95a626..41a7062e589b2e 100644 --- a/srcpkgs/python3-aioinflux/template +++ b/srcpkgs/python3-aioinflux/template @@ -1,7 +1,7 @@ # Template file for 'python3-aioinflux' pkgname=python3-aioinflux version=0.9.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-aiohttp python3-ciso8601" diff --git a/srcpkgs/python3-aionotify/template b/srcpkgs/python3-aionotify/template index d23c2fe2fe83ad..78294516ecdbca 100644 --- a/srcpkgs/python3-aionotify/template +++ b/srcpkgs/python3-aionotify/template @@ -1,7 +1,7 @@ # Template file for 'python3-aionotify' pkgname=python3-aionotify version=0.2.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-aioresponses/template b/srcpkgs/python3-aioresponses/template index 7030087532eb44..182617aa877151 100644 --- a/srcpkgs/python3-aioresponses/template +++ b/srcpkgs/python3-aioresponses/template @@ -1,7 +1,7 @@ # Template file for 'python3-aioresponses' pkgname=python3-aioresponses version=0.7.6 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-pbr python3-setuptools" depends="python3-aiohttp" diff --git a/srcpkgs/python3-aiorpcx/template b/srcpkgs/python3-aiorpcx/template index 66496de5973e03..ac6eb499a65b24 100644 --- a/srcpkgs/python3-aiorpcx/template +++ b/srcpkgs/python3-aiorpcx/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiorpcx' pkgname=python3-aiorpcx version=0.22.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-attrs" diff --git a/srcpkgs/python3-aiosignal/template b/srcpkgs/python3-aiosignal/template index 25a34eeed8cb75..896a1d5bf93f1a 100644 --- a/srcpkgs/python3-aiosignal/template +++ b/srcpkgs/python3-aiosignal/template @@ -1,7 +1,7 @@ # Template file for 'python3-aiosignal' pkgname=python3-aiosignal version=1.3.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-wheel" depends="python3-frozenlist" diff --git a/srcpkgs/python3-aiostream/template b/srcpkgs/python3-aiostream/template index 3997853ff7bdd7..8a14c1c87963f8 100644 --- a/srcpkgs/python3-aiostream/template +++ b/srcpkgs/python3-aiostream/template @@ -1,6 +1,6 @@ # Template file for 'python3-aiostream' pkgname=python3-aiostream -version=0.6.2 +version=0.6.4 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -10,5 +10,5 @@ maintainer="Andrew J. Hesford " license="GPL-3.0-or-later" homepage="https://aiostream.readthedocs.io/" distfiles="${PYPI_SITE}/a/aiostream/aiostream-${version}.tar.gz" -checksum=481e58c7f94b98f37a81384411ee39336dffb933784753b1cfa0a26f3681cc2c +checksum=f99bc6b1b9cea3e70885dc235a233523597555fe4a585ed21d65264b3f1ff3d2 make_check=no # tests do not see custom fixtures diff --git a/srcpkgs/python3-ajsonrpc/template b/srcpkgs/python3-ajsonrpc/template index e966224ea1eb8b..89280446010e5b 100644 --- a/srcpkgs/python3-ajsonrpc/template +++ b/srcpkgs/python3-ajsonrpc/template @@ -1,7 +1,7 @@ # Template file for 'python3-ajsonrpc' pkgname=python3-ajsonrpc version=1.2.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-alabaster/template b/srcpkgs/python3-alabaster/template index f3b491846e2dff..2abdd0f3b870b2 100644 --- a/srcpkgs/python3-alabaster/template +++ b/srcpkgs/python3-alabaster/template @@ -1,7 +1,7 @@ # Template file for 'python3-alabaster' pkgname=python3-alabaster version=0.7.12 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-alembic/template b/srcpkgs/python3-alembic/template index ca326578eb715c..639a93d4ff541e 100644 --- a/srcpkgs/python3-alembic/template +++ b/srcpkgs/python3-alembic/template @@ -1,7 +1,7 @@ # Template file for 'python3-alembic' pkgname=python3-alembic version=1.9.4 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Mako python3-SQLAlchemy python3-dateutil python3-editor" diff --git a/srcpkgs/python3-alsa/template b/srcpkgs/python3-alsa/template index 9c85415d85da58..139435fa105251 100644 --- a/srcpkgs/python3-alsa/template +++ b/srcpkgs/python3-alsa/template @@ -1,7 +1,7 @@ # Template file for 'python3-alsa' pkgname=python3-alsa version=1.1.6 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel alsa-lib-devel" diff --git a/srcpkgs/python3-altgraph/template b/srcpkgs/python3-altgraph/template index 0d8342d2c1b02e..e214e463b6e095 100644 --- a/srcpkgs/python3-altgraph/template +++ b/srcpkgs/python3-altgraph/template @@ -1,7 +1,7 @@ # Template file for 'python3-altgraph' pkgname=python3-altgraph version=0.17 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-aniso8601/template b/srcpkgs/python3-aniso8601/template index 7932199d42a644..391fc65ce06139 100644 --- a/srcpkgs/python3-aniso8601/template +++ b/srcpkgs/python3-aniso8601/template @@ -1,7 +1,7 @@ # Template file for 'python3-aniso8601' pkgname=python3-aniso8601 version=9.0.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dateutil" diff --git a/srcpkgs/python3-annotated-types/template b/srcpkgs/python3-annotated-types/template index ca3900a9904302..b5c71d8beff3bc 100644 --- a/srcpkgs/python3-annotated-types/template +++ b/srcpkgs/python3-annotated-types/template @@ -1,7 +1,7 @@ # Template file for 'python3-annotated-types' pkgname=python3-annotated-types version=0.6.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template index a70a780cfb278c..985a4b21194c1f 100644 --- a/srcpkgs/python3-ansible-compat/template +++ b/srcpkgs/python3-ansible-compat/template @@ -1,7 +1,7 @@ # Template file for 'python3-ansible-compat' pkgname=python3-ansible-compat version=24.9.1 -revision=1 +revision=2 build_style=python3-pep517 # deselect unnecessary tests in venv make_check_args="--deselect test/test_runtime_scan_path.py::test_scan_sys_path[scanF-raises_not_foundT] diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template index ab27dba9e37d57..2c6fbf58669b4f 100644 --- a/srcpkgs/python3-ansible-lint/template +++ b/srcpkgs/python3-ansible-lint/template @@ -1,7 +1,7 @@ # Template file for 'python3-ansible-lint' pkgname=python3-ansible-lint version=24.9.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-ansible-compat ansible-core black python3-filelock diff --git a/srcpkgs/python3-ansicolor/template b/srcpkgs/python3-ansicolor/template index e51ad42f98b604..6ea159cece05bb 100644 --- a/srcpkgs/python3-ansicolor/template +++ b/srcpkgs/python3-ansicolor/template @@ -1,7 +1,7 @@ # Template file for 'python3-ansicolor' pkgname=python3-ansicolor version=0.2.6 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-ansicolors/template b/srcpkgs/python3-ansicolors/template index 87870b1990dedb..56464843816cc3 100644 --- a/srcpkgs/python3-ansicolors/template +++ b/srcpkgs/python3-ansicolors/template @@ -1,7 +1,7 @@ # Template file for 'python3-ansicolors' pkgname=python3-ansicolors version=1.1.8 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-ansiwrap/template b/srcpkgs/python3-ansiwrap/template index d99756681199fa..2d8a6a85f4b57c 100644 --- a/srcpkgs/python3-ansiwrap/template +++ b/srcpkgs/python3-ansiwrap/template @@ -1,7 +1,7 @@ # Template file for 'python3-ansiwrap' pkgname=python3-ansiwrap version=0.8.4 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-anyio/template b/srcpkgs/python3-anyio/template index bf15d94014cceb..13776f697758c2 100644 --- a/srcpkgs/python3-anyio/template +++ b/srcpkgs/python3-anyio/template @@ -1,7 +1,7 @@ # Template file for 'python3-anyio' pkgname=python3-anyio version=4.4.0 -revision=1 +revision=2 build_style=python3-pep517 # This file needs python module `exceptiongroup` make_check_args="--ignore tests/test_taskgroups.py" diff --git a/srcpkgs/python3-anytree/template b/srcpkgs/python3-anytree/template index baf83848390064..48c207335ed257 100644 --- a/srcpkgs/python3-anytree/template +++ b/srcpkgs/python3-anytree/template @@ -1,11 +1,10 @@ # Template file for 'python3-anytree' pkgname=python3-anytree version=2.12.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-six" -checkdepends="python3-pytest python3-six python3-coverage python3-nose graphviz" short_desc="Powerful and lightweight Python tree data structure" maintainer="Orphaned " license="Apache-2.0" @@ -13,3 +12,4 @@ homepage="https://github.com/c0fec0de/anytree" #distfiles="${PYPI_SITE}/a/anytree/anytree-${version}.tar.gz" distfiles="https://github.com/c0fec0de/anytree/archive/refs/tags/${version}.tar.gz>anytree-${version}.tar.gz" # tests are missing in PYPI tarball checksum=a6b6b6b6b0d0d626b9e6afcb42946f9d23159586c6f08e8ba3dde0e22cd83a1b +make_check=no # Tests require removed python3-nose diff --git a/srcpkgs/python3-appdirs/template b/srcpkgs/python3-appdirs/template index ad60a465562dae..cea8dfbdd77f13 100644 --- a/srcpkgs/python3-appdirs/template +++ b/srcpkgs/python3-appdirs/template @@ -1,7 +1,7 @@ # Template file for 'python3-appdirs' pkgname=python3-appdirs version=1.4.4 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-applib/template b/srcpkgs/python3-applib/template index 9c786b1830cc7c..b6acaade60270b 100644 --- a/srcpkgs/python3-applib/template +++ b/srcpkgs/python3-applib/template @@ -1,7 +1,7 @@ # Template file for 'python3-applib' pkgname=python3-applib version=1.2 -revision=7 +revision=8 create_wrksrc=yes build_wrksrc="applib-${version}" build_style=python3-module diff --git a/srcpkgs/python3-apprise/template b/srcpkgs/python3-apprise/template index ef8d644a1a274b..2e9a5cb35e0963 100644 --- a/srcpkgs/python3-apprise/template +++ b/srcpkgs/python3-apprise/template @@ -1,7 +1,7 @@ # Template file for 'python3-apprise' pkgname=python3-apprise version=1.9.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-Babel" depends="python3-certifi python3-Markdown python3-click python3-requests diff --git a/srcpkgs/python3-apsw/template b/srcpkgs/python3-apsw/template index d9581f13665b28..3058146dfb0779 100644 --- a/srcpkgs/python3-apsw/template +++ b/srcpkgs/python3-apsw/template @@ -1,7 +1,7 @@ # Template file for 'python3-apsw' pkgname=python3-apsw version=3.39.3.0 -revision=3 +revision=4 build_style=python3-module make_build_args="--enable=load_extension" hostmakedepends="python3-devel python3-setuptools" diff --git a/srcpkgs/python3-aputils/template b/srcpkgs/python3-aputils/template index f2632044821c96..dd921c4b62729d 100644 --- a/srcpkgs/python3-aputils/template +++ b/srcpkgs/python3-aputils/template @@ -1,7 +1,7 @@ # Template file for 'python3-aputils' pkgname=python3-aputils version=0.1.4 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-pycryptodome" diff --git a/srcpkgs/python3-argcomplete/template b/srcpkgs/python3-argcomplete/template index d1c4e0f3475797..13cc7afbce0a9b 100644 --- a/srcpkgs/python3-argcomplete/template +++ b/srcpkgs/python3-argcomplete/template @@ -1,7 +1,7 @@ # Template file for 'python3-argcomplete' pkgname=python3-argcomplete version=3.5.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3" diff --git a/srcpkgs/python3-argh/template b/srcpkgs/python3-argh/template index a1d8187cc45dcf..4bbbee0db5a75d 100644 --- a/srcpkgs/python3-argh/template +++ b/srcpkgs/python3-argh/template @@ -1,7 +1,7 @@ # Template file for 'python3-argh' pkgname=python3-argh version=0.26.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-argon2-cffi-bindings/template b/srcpkgs/python3-argon2-cffi-bindings/template index 3748f546c76d39..3dfe9b2d6c163d 100644 --- a/srcpkgs/python3-argon2-cffi-bindings/template +++ b/srcpkgs/python3-argon2-cffi-bindings/template @@ -1,7 +1,7 @@ # Template file for 'python3-argon2-cffi-bindings' pkgname=python3-argon2-cffi-bindings version=21.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel python3-cffi" makedepends="python3-devel libargon2-devel" diff --git a/srcpkgs/python3-argon2/template b/srcpkgs/python3-argon2/template index 59dc2c94e01817..fe36ff1567b883 100644 --- a/srcpkgs/python3-argon2/template +++ b/srcpkgs/python3-argon2/template @@ -1,7 +1,7 @@ # Template file for 'python3-argon2' pkgname=python3-argon2 version=23.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme" depends="python3-argon2-cffi-bindings" diff --git a/srcpkgs/python3-art/template b/srcpkgs/python3-art/template index b39c52714b5b66..c9ac45ed093030 100644 --- a/srcpkgs/python3-art/template +++ b/srcpkgs/python3-art/template @@ -1,7 +1,7 @@ # Template file for 'python3-art' pkgname=python3-art version=6.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-arxiv2bib/template b/srcpkgs/python3-arxiv2bib/template index 72763aee307248..4c9d0caf95a6b7 100644 --- a/srcpkgs/python3-arxiv2bib/template +++ b/srcpkgs/python3-arxiv2bib/template @@ -1,7 +1,7 @@ # Template file for 'python3-arxiv2bib' pkgname=python3-arxiv2bib version=1.0.8 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-asgiref/template b/srcpkgs/python3-asgiref/template index 78b207508b7153..03298915aedb62 100644 --- a/srcpkgs/python3-asgiref/template +++ b/srcpkgs/python3-asgiref/template @@ -1,7 +1,7 @@ # Template file for 'python3-asgiref' pkgname=python3-asgiref version=3.5.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-asn1crypto/template b/srcpkgs/python3-asn1crypto/template index a9a2bc0ea3ea23..ce1a3fe4a8f9b2 100644 --- a/srcpkgs/python3-asn1crypto/template +++ b/srcpkgs/python3-asn1crypto/template @@ -1,7 +1,7 @@ # Template file for 'python3-asn1crypto' pkgname=python3-asn1crypto version=1.4.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-aspectlib/template b/srcpkgs/python3-aspectlib/template index cc234b166880bc..926fe9e47c1b35 100644 --- a/srcpkgs/python3-aspectlib/template +++ b/srcpkgs/python3-aspectlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-aspectlib' pkgname=python3-aspectlib version=2.0.0 -revision=2 +revision=3 build_style=python3-pep517 make_check_args="--ignore tests/test_integrations.py" hostmakedepends="python3-setuptools python3-wheel" diff --git a/srcpkgs/python3-asteval/template b/srcpkgs/python3-asteval/template index 5172c884bf6d0b..79700ef99d257c 100644 --- a/srcpkgs/python3-asteval/template +++ b/srcpkgs/python3-asteval/template @@ -1,7 +1,7 @@ # Template file for 'python3-asteval' pkgname=python3-asteval version=0.9.26 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-astral/template b/srcpkgs/python3-astral/template index d40bad1bdeb9bb..82e0290420b485 100644 --- a/srcpkgs/python3-astral/template +++ b/srcpkgs/python3-astral/template @@ -1,7 +1,7 @@ # Template file for 'python3-astral' pkgname=python3-astral version=2.2 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="python3-pytz" diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template index 6c9ddeda9587c8..dc5db3294907ac 100644 --- a/srcpkgs/python3-astroid/template +++ b/srcpkgs/python3-astroid/template @@ -1,7 +1,7 @@ # Template file for 'python3-astroid' pkgname=python3-astroid version=3.2.4 -revision=1 +revision=2 build_style=python3-pep517 make_check_args=" --deselect tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils diff --git a/srcpkgs/python3-asttokens/template b/srcpkgs/python3-asttokens/template index 6f61374e8f8baf..da9c8019895b03 100644 --- a/srcpkgs/python3-asttokens/template +++ b/srcpkgs/python3-asttokens/template @@ -1,6 +1,6 @@ # Template file for 'python3-asttokens' pkgname=python3-asttokens -version=2.4.1 +version=3.0.0 revision=1 build_style=python3-module # needs a specific astroid version @@ -14,4 +14,4 @@ maintainer="Andrew J. Hesford " license="Apache-2.0" homepage="https://github.com/gristlabs/asttokens" distfiles="${PYPI_SITE}/a/asttokens/asttokens-${version}.tar.gz" -checksum=b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11254ba0 +checksum=0dcd8baa8d62b0c1d118b399b2ddba3c4aff271d0d7a9e0d4c1681c79035bbc7 diff --git a/srcpkgs/python3-async-lru/template b/srcpkgs/python3-async-lru/template index e7d70d7be07079..96456af4a55a51 100644 --- a/srcpkgs/python3-async-lru/template +++ b/srcpkgs/python3-async-lru/template @@ -1,7 +1,7 @@ # Template file for 'python3-async-lru' pkgname=python3-async-lru version=2.0.4 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-typing_extensions" diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template index 717438a5063643..6e72713cb9b50a 100644 --- a/srcpkgs/python3-async-timeout/template +++ b/srcpkgs/python3-async-timeout/template @@ -1,7 +1,7 @@ # Template file for 'python3-async-timeout' pkgname=python3-async-timeout version=4.0.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-async_generator/template b/srcpkgs/python3-async_generator/template index 1079bfe3114751..64c862aa2e2417 100644 --- a/srcpkgs/python3-async_generator/template +++ b/srcpkgs/python3-async_generator/template @@ -1,7 +1,7 @@ # Template file for 'python3-async_generator' pkgname=python3-async_generator version=1.10 -revision=6 +revision=7 build_style=python3-module pycompile_module="async_generator" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-atomicwrites/template b/srcpkgs/python3-atomicwrites/template index 64713ccbb803bb..dc14256fc0fc57 100644 --- a/srcpkgs/python3-atomicwrites/template +++ b/srcpkgs/python3-atomicwrites/template @@ -1,7 +1,7 @@ # Template file for 'python3-atomicwrites' pkgname=python3-atomicwrites version=1.4.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-atspi/template b/srcpkgs/python3-atspi/template index a4e85ca067b594..4a46169b0c17ef 100644 --- a/srcpkgs/python3-atspi/template +++ b/srcpkgs/python3-atspi/template @@ -1,7 +1,7 @@ # Template file for 'python3-atspi' pkgname=python3-atspi version=2.38.0 -revision=6 +revision=7 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="at-spi2-core-devel python3-gobject-devel" diff --git a/srcpkgs/python3-attrs/template b/srcpkgs/python3-attrs/template index bffefd3d1cc50b..1491514fbee6cd 100644 --- a/srcpkgs/python3-attrs/template +++ b/srcpkgs/python3-attrs/template @@ -1,7 +1,7 @@ # Template file for 'python3-attrs' pkgname=python3-attrs version=24.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools hatch-vcs hatch-fancy-pypi-readme" depends="python3" diff --git a/srcpkgs/python3-audioread/template b/srcpkgs/python3-audioread/template index 6b1dabded6f83b..37e1bfa5f6bcb9 100644 --- a/srcpkgs/python3-audioread/template +++ b/srcpkgs/python3-audioread/template @@ -1,7 +1,7 @@ # Template file for 'python3-audioread' pkgname=python3-audioread version=3.0.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-augeas/template b/srcpkgs/python3-augeas/template index 13b51d487f959c..c5ee2390b304ef 100644 --- a/srcpkgs/python3-augeas/template +++ b/srcpkgs/python3-augeas/template @@ -1,7 +1,7 @@ # Template file for 'python3-augeas' pkgname=python3-augeas version=1.1.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools augeas-devel python3-cffi" makedepends="python3-devel" diff --git a/srcpkgs/python3-authres/template b/srcpkgs/python3-authres/template index 071496ddafe8a3..eb753352ac5d62 100644 --- a/srcpkgs/python3-authres/template +++ b/srcpkgs/python3-authres/template @@ -1,7 +1,7 @@ # Template file for 'python3-authres' pkgname=python3-authres version=1.2.0 -revision=7 +revision=8 build_style=python3-module pycompile_module=authres hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-autobahn/template b/srcpkgs/python3-autobahn/template index bfbb249f4fbcb3..3f4d7726e0de4c 100644 --- a/srcpkgs/python3-autobahn/template +++ b/srcpkgs/python3-autobahn/template @@ -1,7 +1,7 @@ # Template file for 'python3-autobahn' pkgname=python3-autobahn version=23.6.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="python3-cffi python3-Twisted python3-cryptography python3-txaio diff --git a/srcpkgs/python3-autocommand/patches/license.patch b/srcpkgs/python3-autocommand/patches/license.patch new file mode 100644 index 00000000000000..402ff45770ea35 --- /dev/null +++ b/srcpkgs/python3-autocommand/patches/license.patch @@ -0,0 +1,9 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -22,3 +22,6 @@ + [project.urls] + "Homepage" = "https://github.com/Lucretiel/autocommand" + "Bug Tracker" = "https://github.com/Lucretiel/autocommand/issues" ++ ++[project.license] ++file = "LICENSE" diff --git a/srcpkgs/python3-autocommand/template b/srcpkgs/python3-autocommand/template index f6beb653793ae9..3537068e15cdb3 100644 --- a/srcpkgs/python3-autocommand/template +++ b/srcpkgs/python3-autocommand/template @@ -1,7 +1,7 @@ # Template file for 'python3-autocommand' pkgname=python3-autocommand version=2.2.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-automat/template b/srcpkgs/python3-automat/template index 2207067483c8d3..c56800232e0902 100644 --- a/srcpkgs/python3-automat/template +++ b/srcpkgs/python3-automat/template @@ -1,7 +1,7 @@ # Template file for 'python3-automat' pkgname=python3-automat version=22.10.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-attrs python3-six" diff --git a/srcpkgs/python3-axolotl-curve25519/template b/srcpkgs/python3-axolotl-curve25519/template index 13563bd0cc91a2..fe0f109a508a0a 100644 --- a/srcpkgs/python3-axolotl-curve25519/template +++ b/srcpkgs/python3-axolotl-curve25519/template @@ -2,7 +2,7 @@ pkgname=python3-axolotl-curve25519 _pkgname=${pkgname/3/} version=0.4.1.post2 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-axolotl/template b/srcpkgs/python3-axolotl/template index 47b474003e1603..0e06d434897c7f 100644 --- a/srcpkgs/python3-axolotl/template +++ b/srcpkgs/python3-axolotl/template @@ -2,7 +2,7 @@ pkgname=python3-axolotl _pkgname=${pkgname/3/} version=0.2.3 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-axolotl-curve25519 python3-cryptography python3-protobuf" diff --git a/srcpkgs/python3-b2sdk/template b/srcpkgs/python3-b2sdk/template index 0eb9eebc63edc8..eaf049c82c9cf1 100644 --- a/srcpkgs/python3-b2sdk/template +++ b/srcpkgs/python3-b2sdk/template @@ -1,7 +1,7 @@ # Template file for 'python3-b2sdk' pkgname=python3-b2sdk version=2.6.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3 python3-build python3-packaging python3-pdm-backend python3-setuptools python3-setuptools_scm python3-wheel" depends="python3-logfury python3-Arrow python3-requests python3-tqdm" diff --git a/srcpkgs/python3-babelfish/template b/srcpkgs/python3-babelfish/template index deadfe7de8a804..837efb858fbb36 100644 --- a/srcpkgs/python3-babelfish/template +++ b/srcpkgs/python3-babelfish/template @@ -1,7 +1,7 @@ # Template file for 'python3-babelfish' pkgname=python3-babelfish version=0.6.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-backcall/template b/srcpkgs/python3-backcall/template index 580aec50f65115..b0c397cbe54018 100644 --- a/srcpkgs/python3-backcall/template +++ b/srcpkgs/python3-backcall/template @@ -1,7 +1,7 @@ # Template file for 'python3-backcall' pkgname=python3-backcall version=0.2.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-bcrypt/template b/srcpkgs/python3-bcrypt/template index 99305f2aab87f6..6145c49102dea6 100644 --- a/srcpkgs/python3-bcrypt/template +++ b/srcpkgs/python3-bcrypt/template @@ -1,7 +1,7 @@ # Template file for 'python3-bcrypt' pkgname=python3-bcrypt version=4.1.2 -revision=1 +revision=2 build_style=python3-pep517 build_helper="rust" hostmakedepends="python3-setuptools-rust python3-wheel python3-cffi cargo" diff --git a/srcpkgs/python3-beniget/template b/srcpkgs/python3-beniget/template index d1eb9004584b37..946ade0cf46b41 100644 --- a/srcpkgs/python3-beniget/template +++ b/srcpkgs/python3-beniget/template @@ -1,7 +1,7 @@ # Template file for 'python3-beniget' pkgname=python3-beniget version=0.4.2.post1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-gast" depends="python3-gast" diff --git a/srcpkgs/python3-betamax-matchers/template b/srcpkgs/python3-betamax-matchers/template index 3d16019c4fdf65..8057df16d8ce70 100644 --- a/srcpkgs/python3-betamax-matchers/template +++ b/srcpkgs/python3-betamax-matchers/template @@ -1,7 +1,7 @@ # Template file for 'python3-betamax-matchers' pkgname=python3-betamax-matchers version=0.4.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-betamax python3-requests-toolbelt" diff --git a/srcpkgs/python3-betamax/template b/srcpkgs/python3-betamax/template index 61de0d09087be9..c43a7ddb90a26c 100644 --- a/srcpkgs/python3-betamax/template +++ b/srcpkgs/python3-betamax/template @@ -1,7 +1,7 @@ # Template file for 'python3-betamax' pkgname=python3-betamax version=0.8.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests" diff --git a/srcpkgs/python3-bibtexparser/template b/srcpkgs/python3-bibtexparser/template index 24fc814473e9f5..f33f62750ba49d 100644 --- a/srcpkgs/python3-bibtexparser/template +++ b/srcpkgs/python3-bibtexparser/template @@ -1,7 +1,7 @@ # Template file for 'python3-bibtexparser' pkgname=python3-bibtexparser version=1.1.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-parsing python3-future" diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template index 86deff3dd36a9f..0b44f95ed97cc1 100644 --- a/srcpkgs/python3-binaryornot/template +++ b/srcpkgs/python3-binaryornot/template @@ -1,7 +1,7 @@ # Template file for 'python3-binaryornot' pkgname=python3-binaryornot version=0.4.4 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-chardet" diff --git a/srcpkgs/python3-bitarray/template b/srcpkgs/python3-bitarray/template index 8e5cd8c48b6315..c0aedc648cdc7f 100644 --- a/srcpkgs/python3-bitarray/template +++ b/srcpkgs/python3-bitarray/template @@ -1,7 +1,7 @@ # Template file for 'python3-bitarray' pkgname=python3-bitarray version=2.9.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel libcurl-devel" diff --git a/srcpkgs/python3-bitbucket-api/template b/srcpkgs/python3-bitbucket-api/template index f40eb73158ef20..b61540654e2f5c 100644 --- a/srcpkgs/python3-bitbucket-api/template +++ b/srcpkgs/python3-bitbucket-api/template @@ -1,7 +1,7 @@ # Template file for 'python3-bitbucket-api' pkgname=python3-bitbucket-api version=0.5.0 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests-oauthlib python3-sh" diff --git a/srcpkgs/python3-bitstring/template b/srcpkgs/python3-bitstring/template index e32598cd438450..0a17c94a50c7c2 100644 --- a/srcpkgs/python3-bitstring/template +++ b/srcpkgs/python3-bitstring/template @@ -1,7 +1,7 @@ # Template file for 'python3-bitstring' pkgname=python3-bitstring version=4.1.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-bitarray" diff --git a/srcpkgs/python3-bleach/template b/srcpkgs/python3-bleach/template index 7dd579d84d18e3..8cf2201528c939 100644 --- a/srcpkgs/python3-bleach/template +++ b/srcpkgs/python3-bleach/template @@ -1,7 +1,7 @@ # Template file for 'python3-bleach' pkgname=python3-bleach version=6.0.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-six python3-webencodings" diff --git a/srcpkgs/python3-blessed/template b/srcpkgs/python3-blessed/template index b557cc9264e41f..2f349315cb4f3e 100644 --- a/srcpkgs/python3-blessed/template +++ b/srcpkgs/python3-blessed/template @@ -1,7 +1,7 @@ # Template file for 'python3-blessed' pkgname=python3-blessed version=1.20.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-wcwidth" diff --git a/srcpkgs/python3-blessings/template b/srcpkgs/python3-blessings/template index 620d565cc6178d..173b7d55b74384 100644 --- a/srcpkgs/python3-blessings/template +++ b/srcpkgs/python3-blessings/template @@ -1,7 +1,7 @@ # Template file for 'python3-blessings' pkgname=python3-blessings version=1.7 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" diff --git a/srcpkgs/python3-blinker/template b/srcpkgs/python3-blinker/template index ebf49591c310b8..f2fd1cdd408ffe 100644 --- a/srcpkgs/python3-blinker/template +++ b/srcpkgs/python3-blinker/template @@ -1,7 +1,7 @@ # Template file for 'python3-blinker' pkgname=python3-blinker version=1.7.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" makedepends="python3-devel" diff --git a/srcpkgs/python3-bokeh/template b/srcpkgs/python3-bokeh/template index 3f83889cb71b13..1a74965ee6a346 100644 --- a/srcpkgs/python3-bokeh/template +++ b/srcpkgs/python3-bokeh/template @@ -1,6 +1,6 @@ # Template file for 'python3-bokeh' pkgname=python3-bokeh -version=3.6.0 +version=3.6.2 revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-colorama" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://bokeh.org" changelog="https://raw.githubusercontent.com/bokeh/bokeh/main/CHANGELOG" distfiles="${PYPI_SITE}/b/bokeh/bokeh-${version}.tar.gz" -checksum=0032dc1e76ad097b07626e51584685ff48c65481fbaaad105663b1046165867a +checksum=2f3043d9ecb3d5dc2e8c0ebf8ad55727617188d4e534f3e7208b36357e352396 # Tests have unpackaged dependencies and require fetching data; skipping make_check=no diff --git a/srcpkgs/python3-boltons/template b/srcpkgs/python3-boltons/template index ea368192df5042..a2fead1f046aa9 100644 --- a/srcpkgs/python3-boltons/template +++ b/srcpkgs/python3-boltons/template @@ -1,7 +1,7 @@ # Template file for 'python3-boltons' pkgname=python3-boltons version=20.2.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template index 9fd3e31e05d3fc..d25b71a5159fe8 100644 --- a/srcpkgs/python3-boolean.py/template +++ b/srcpkgs/python3-boolean.py/template @@ -1,7 +1,7 @@ # Template file for 'python3-boolean.py' pkgname=python3-boolean.py version=3.8 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template index 2adaeffdb70342..15dc623f19a2f2 100644 --- a/srcpkgs/python3-boto3/template +++ b/srcpkgs/python3-boto3/template @@ -1,7 +1,7 @@ # Template file for 'python3-boto3' pkgname=python3-boto3 version=1.35.19 -revision=1 +revision=2 build_style=python3-module make_check_args="--ignore=tests/integration" # These tests require aws credentials hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template index 1e893164c22c65..e8a51b3facf5f3 100644 --- a/srcpkgs/python3-botocore/template +++ b/srcpkgs/python3-botocore/template @@ -1,7 +1,7 @@ # Template file for 'python3-botocore' pkgname=python3-botocore version=1.32.6 -revision=1 +revision=2 build_style=python3-module # integration tests want aws credentials make_check_target="tests/functional tests/unit" diff --git a/srcpkgs/python3-bottle/template b/srcpkgs/python3-bottle/template index 2590c647a79c8f..760bd0e80cc822 100644 --- a/srcpkgs/python3-bottle/template +++ b/srcpkgs/python3-bottle/template @@ -1,7 +1,7 @@ # Template file for 'python3-bottle' pkgname=python3-bottle -version=0.12.25 -revision=2 +version=0.13.2 +revision=1 build_style=python3-module make_check_args="--deselect test/test_sendfile.py::TestSendFile::test_invalid" hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ license="MIT" homepage="https://bottlepy.org" changelog="https://raw.githubusercontent.com/bottlepy/bottle/master/docs/changelog.rst" distfiles="${PYPI_SITE}/b/bottle/bottle-${version}.tar.gz" -checksum=e1a9c94970ae6d710b3fb4526294dfeb86f2cb4a81eff3a4b98dc40fb0e5e021 +checksum=e53803b9d298c7d343d00ba7d27b0059415f04b9f6f40b8d58b5bf914ba9d348 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-bracex/template b/srcpkgs/python3-bracex/template index 807ae4225239de..8888bdc8741fda 100644 --- a/srcpkgs/python3-bracex/template +++ b/srcpkgs/python3-bracex/template @@ -1,7 +1,7 @@ # Template file for 'python3-bracex' pkgname=python3-bracex version=2.3.post1 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/python3-breathe/template b/srcpkgs/python3-breathe/template index c375abc8f5e7b4..77918f1d96f0dd 100644 --- a/srcpkgs/python3-breathe/template +++ b/srcpkgs/python3-breathe/template @@ -1,7 +1,7 @@ # Template file for 'python3-breathe' pkgname=python3-breathe version=4.35.0 -revision=2 +revision=3 build_style=python3-module _pyreqs="python3-Sphinx python3-docutils python3-six" hostmakedepends="python3-setuptools ${_pyreqs}" diff --git a/srcpkgs/python3-bsddb3/template b/srcpkgs/python3-bsddb3/template index c9418b98c50755..e21b61ec2ce465 100644 --- a/srcpkgs/python3-bsddb3/template +++ b/srcpkgs/python3-bsddb3/template @@ -1,7 +1,7 @@ # Template file for 'python3-bsddb3' pkgname=python3-bsddb3 version=6.2.7 -revision=5 +revision=6 build_style=python3-module make_build_args="--berkeley-db=${XBPS_CROSS_BASE}/usr" make_install_args="--berkeley-db=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/python3-build/template b/srcpkgs/python3-build/template index aa1280bceac2cb..3fa0404225b87e 100644 --- a/srcpkgs/python3-build/template +++ b/srcpkgs/python3-build/template @@ -1,6 +1,6 @@ # Template file for 'python3-build' pkgname=python3-build -version=1.2.2 +version=1.2.2.post1 revision=1 # This package is used by the python3-pep517 build style; using that style here # would create a build cycle @@ -14,7 +14,7 @@ license="MIT" homepage="https://pypa-build.readthedocs.io/" changelog="https://raw.githubusercontent.com/pypa/build/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/b/build/build-${version}.tar.gz" -checksum=119b2fb462adef986483438377a13b2f42064a2a3a4161f24a0cca698a07ac8c +checksum=b36993e92ca9375a219c99e606a122ff365a760a2d4bba0caa09bd5278b608b7 # PyPI package provides no tests make_check=no diff --git a/srcpkgs/python3-cached-property/template b/srcpkgs/python3-cached-property/template index 636c8f4566988f..a5b58c33119ff0 100644 --- a/srcpkgs/python3-cached-property/template +++ b/srcpkgs/python3-cached-property/template @@ -1,7 +1,7 @@ # Template file for 'python3-cached-property' pkgname=python3-cached-property version=1.5.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-cachetools/template b/srcpkgs/python3-cachetools/template index b1170a6cc4d188..67ed0be520870b 100644 --- a/srcpkgs/python3-cachetools/template +++ b/srcpkgs/python3-cachetools/template @@ -1,7 +1,7 @@ # Template file for 'python3-cachetools' pkgname=python3-cachetools version=5.5.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-cairo/template b/srcpkgs/python3-cairo/template index 6962db30fa0c30..ce8d62721606f0 100644 --- a/srcpkgs/python3-cairo/template +++ b/srcpkgs/python3-cairo/template @@ -1,7 +1,7 @@ # Template file for 'python3-cairo' pkgname=python3-cairo version=1.26.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" makedepends="cairo-devel python3-devel" diff --git a/srcpkgs/python3-cairocffi/template b/srcpkgs/python3-cairocffi/template index e727933e060336..0560d9cfa00291 100644 --- a/srcpkgs/python3-cairocffi/template +++ b/srcpkgs/python3-cairocffi/template @@ -1,7 +1,7 @@ # Template file for 'python3-cairocffi' pkgname=python3-cairocffi version=1.7.1 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--pyargs cairocffi" hostmakedepends="python3-setuptools python3-cffi python3-wheel diff --git a/srcpkgs/python3-cairosvg/template b/srcpkgs/python3-cairosvg/template index a20a7f350a4600..9b86f7d97163bc 100644 --- a/srcpkgs/python3-cairosvg/template +++ b/srcpkgs/python3-cairosvg/template @@ -1,7 +1,7 @@ # Template file for 'python3-cairosvg' pkgname=python3-cairosvg version=2.7.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-cairocffi python3-cssselect2 python3-defusedxml python3-Pillow diff --git a/srcpkgs/python3-calver/template b/srcpkgs/python3-calver/template index d4421bc14acfef..f57e20cb3611a7 100644 --- a/srcpkgs/python3-calver/template +++ b/srcpkgs/python3-calver/template @@ -1,7 +1,7 @@ # Template file for 'python3-calver' pkgname=python3-calver version=2022.6.26 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template index 717e90a3725efc..6e37e74a91e650 100644 --- a/srcpkgs/python3-canonicaljson/template +++ b/srcpkgs/python3-canonicaljson/template @@ -1,7 +1,7 @@ # Template file for 'python3-canonicaljson' pkgname=python3-canonicaljson version=2.0.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-casttube/template b/srcpkgs/python3-casttube/template index 356394558e2ff1..372eb950f0d414 100644 --- a/srcpkgs/python3-casttube/template +++ b/srcpkgs/python3-casttube/template @@ -1,7 +1,7 @@ # Template file for 'python3-casttube' pkgname=python3-casttube version=0.2.0 -revision=6 +revision=7 build_style=python3-module pycompile_module="casttube" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-cattrs/template b/srcpkgs/python3-cattrs/template index 72e8b8bda54b3e..1bb6117a005606 100644 --- a/srcpkgs/python3-cattrs/template +++ b/srcpkgs/python3-cattrs/template @@ -1,7 +1,7 @@ # Template file for 'python3-cattrs' pkgname=python3-cattrs version=24.1.2 -revision=1 +revision=2 build_style=python3-pep517 # Initial ignores require unpackaged dependencies; # deselections and subsequent ignores do invalid NaN comparisons diff --git a/srcpkgs/python3-cchardet/template b/srcpkgs/python3-cchardet/template index d6636df451cec0..09fd2d559cb2f4 100644 --- a/srcpkgs/python3-cchardet/template +++ b/srcpkgs/python3-cchardet/template @@ -1,7 +1,7 @@ # Template file for 'python3-cchardet' pkgname=python3-cchardet version=2.1.7 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel" diff --git a/srcpkgs/python3-certifi/template b/srcpkgs/python3-certifi/template index 0a6039ec5496de..6917f4ba5b8dd7 100644 --- a/srcpkgs/python3-certifi/template +++ b/srcpkgs/python3-certifi/template @@ -1,7 +1,7 @@ # Template file for 'python3-certifi' pkgname=python3-certifi version=2022.09.24 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-cffi/template b/srcpkgs/python3-cffi/template index 9642b3b4ad217f..c756de59429672 100644 --- a/srcpkgs/python3-cffi/template +++ b/srcpkgs/python3-cffi/template @@ -1,7 +1,7 @@ # Template file for 'python3-cffi' pkgname=python3-cffi version=1.17.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel libffi-devel" makedepends="python3-devel libffi-devel" diff --git a/srcpkgs/python3-cfgv/template b/srcpkgs/python3-cfgv/template index d6cfbc78255a6f..4bbccebed22b48 100644 --- a/srcpkgs/python3-cfgv/template +++ b/srcpkgs/python3-cfgv/template @@ -1,7 +1,7 @@ # Template file for 'python3-cfgv' pkgname=python3-cfgv version=3.3.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-changelogs/template b/srcpkgs/python3-changelogs/template deleted file mode 100644 index fe4efeed175afc..00000000000000 --- a/srcpkgs/python3-changelogs/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'python3-changelogs' -pkgname=python3-changelogs -version=0.15.0 -revision=4 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-requests python3-lxml python3-packaging - python3-validators python3-gitchangelog" -short_desc="Changelog finder and parser for vendors like PyPi and npm" -maintainer="Orphaned " -license="MIT" -homepage="https://github.com/pyupio/changelogs" -changelog="https://raw.githubusercontent.com/pyupio/changelogs/master/HISTORY.rst" -distfiles="https://github.com/pyupio/changelogs/archive/${version}.tar.gz" -checksum=d2c14fd7c0847effe2f8eaebf33d77c7872c60f246aa592ca6906a1b32c02b9c - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/python3-chardet/template b/srcpkgs/python3-chardet/template index c40384ff575c78..23425818a68526 100644 --- a/srcpkgs/python3-chardet/template +++ b/srcpkgs/python3-chardet/template @@ -1,7 +1,7 @@ # Template file for 'python3-chardet' pkgname=python3-chardet version=5.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template index ff6895367b1627..b2dcd52dce4f77 100644 --- a/srcpkgs/python3-charset-normalizer/template +++ b/srcpkgs/python3-charset-normalizer/template @@ -1,7 +1,7 @@ # Template file for 'python3-charset-normalizer' pkgname=python3-charset-normalizer version=3.3.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-cheetah3/template b/srcpkgs/python3-cheetah3/template index 693ea3ee053ab1..8010b2ca40666d 100644 --- a/srcpkgs/python3-cheetah3/template +++ b/srcpkgs/python3-cheetah3/template @@ -1,7 +1,7 @@ # Template file for 'python3-cheetah3' pkgname=python3-cheetah3 version=3.2.6.post2 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-chess/template b/srcpkgs/python3-chess/template index 8ab3feba55bbd7..73f3a25ef316a1 100644 --- a/srcpkgs/python3-chess/template +++ b/srcpkgs/python3-chess/template @@ -1,7 +1,7 @@ # Template file for 'python3-chess' pkgname=python3-chess version=1.11.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template index 2a929d2a3d4e43..aff6546a594d5e 100644 --- a/srcpkgs/python3-chromecast/template +++ b/srcpkgs/python3-chromecast/template @@ -1,7 +1,7 @@ # Template file for 'python3-chromecast' pkgname=python3-chromecast version=13.0.7 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-casttube" depends="python3-protobuf python3-zeroconf python3-casttube" diff --git a/srcpkgs/python3-chroot/template b/srcpkgs/python3-chroot/template index 461151aff64339..c65a22a9f18dc4 100644 --- a/srcpkgs/python3-chroot/template +++ b/srcpkgs/python3-chroot/template @@ -1,7 +1,7 @@ # Template file for 'python3-chroot' pkgname=python3-chroot version=0.10.4 -revision=2 +revision=3 build_style=python3-module # OSError: [Errno 16] Device or resource busy: '/proc' make_check_args="--deselect=tests/test_chroot.py::TestChroot::test_chroot" diff --git a/srcpkgs/python3-ciso8601/template b/srcpkgs/python3-ciso8601/template index 271a713644e3f3..906b8310b5c9f0 100644 --- a/srcpkgs/python3-ciso8601/template +++ b/srcpkgs/python3-ciso8601/template @@ -1,6 +1,6 @@ # Template file for 'python3-ciso8601' pkgname=python3-ciso8601 -version=2.3.1 +version=2.3.2 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/closeio/ciso8601" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=1aa2a42c466fbb253d626fc8e563615aae57e46c5f695ed52446422b90463cca +checksum=318b91ed0d1adcfa51e13f3b3212a0836b0eae88b25e58aea7bfbdcbe624e127 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-cjkwrap/template b/srcpkgs/python3-cjkwrap/template index e5071a523a3fb5..774f078a67f0d4 100644 --- a/srcpkgs/python3-cjkwrap/template +++ b/srcpkgs/python3-cjkwrap/template @@ -1,7 +1,7 @@ # Template file for 'python3-cjkwrap' pkgname=python3-cjkwrap version=2.2 -revision=7 +revision=8 build_style=python3-module pycompile_module="cjkwrap.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-cli-ui/template b/srcpkgs/python3-cli-ui/template index be217a4aeb3b25..b91fde81d3f29a 100644 --- a/srcpkgs/python3-cli-ui/template +++ b/srcpkgs/python3-cli-ui/template @@ -1,7 +1,7 @@ # Template file for 'python3-cli-ui' pkgname=python3-cli-ui version=0.17.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-colorama python3-tabulate python3-Unidecode" diff --git a/srcpkgs/python3-cli_helpers/template b/srcpkgs/python3-cli_helpers/template index 52861874f34d25..92acbab6497b17 100644 --- a/srcpkgs/python3-cli_helpers/template +++ b/srcpkgs/python3-cli_helpers/template @@ -1,7 +1,7 @@ # Template file for 'python3-cli_helpers' pkgname=python3-cli_helpers version=2.3.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-configobj python3-tabulate python3-Pygments" diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template index 4347957fe63b77..2cbfc64ae773aa 100644 --- a/srcpkgs/python3-click-log/template +++ b/srcpkgs/python3-click-log/template @@ -1,7 +1,7 @@ # Template file for 'python3-click-log' pkgname=python3-click-log version=0.4.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-click" diff --git a/srcpkgs/python3-click-plugins/template b/srcpkgs/python3-click-plugins/template index 7a5565beca33d1..2787cc95c6c202 100644 --- a/srcpkgs/python3-click-plugins/template +++ b/srcpkgs/python3-click-plugins/template @@ -1,7 +1,7 @@ # Template file for 'python3-click-plugins' pkgname=python3-click-plugins version=1.1.1 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-click" diff --git a/srcpkgs/python3-click-repl/template b/srcpkgs/python3-click-repl/template index 0b117a17a117ef..779bea3643540e 100644 --- a/srcpkgs/python3-click-repl/template +++ b/srcpkgs/python3-click-repl/template @@ -1,7 +1,7 @@ # Template file for 'python3-click-repl' pkgname=python3-click-repl version=0.1.6 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-click python3-prompt_toolkit" diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template index d05914f20245c5..b550cff2edacec 100644 --- a/srcpkgs/python3-click-threading/template +++ b/srcpkgs/python3-click-threading/template @@ -1,7 +1,7 @@ # Template file for 'python3-click-threading' pkgname=python3-click-threading version=0.5.0 -revision=3 +revision=4 build_style="python3-module" hostmakedepends="python3-setuptools" depends="python3-click" diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template index f595b6f0c017b1..507938e9182839 100644 --- a/srcpkgs/python3-click/template +++ b/srcpkgs/python3-click/template @@ -1,7 +1,7 @@ # Template file for 'python3-click' pkgname=python3-click version=8.1.7 -revision=2 +revision=3 build_style="python3-module" hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-cloudscraper/template b/srcpkgs/python3-cloudscraper/template index 32403e5f88fbdb..1cec559e45a05a 100644 --- a/srcpkgs/python3-cloudscraper/template +++ b/srcpkgs/python3-cloudscraper/template @@ -1,7 +1,7 @@ # Template file for 'python3-cloudscraper' pkgname=python3-cloudscraper version=1.2.58 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests-toolbelt" diff --git a/srcpkgs/python3-cmdln/template b/srcpkgs/python3-cmdln/template index a90876e91ffb89..8be2d2c8b2ffe1 100644 --- a/srcpkgs/python3-cmdln/template +++ b/srcpkgs/python3-cmdln/template @@ -1,7 +1,7 @@ # Template file for 'python3-cmdln' pkgname=python3-cmdln version=2.0.0 -revision=6 +revision=7 build_style=python3-module pycompile_module="cmdln.py" hostmakedepends="python3-setuptools unzip" diff --git a/srcpkgs/python3-codespell/template b/srcpkgs/python3-codespell/template index bfd291b4336bec..0c65efe1f98a60 100644 --- a/srcpkgs/python3-codespell/template +++ b/srcpkgs/python3-codespell/template @@ -1,7 +1,7 @@ # Template file for 'python3-codespell' pkgname=python3-codespell version=2.3.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--deselect codespell_lib/tests/test_basic.py::test_command --deselect codespell_lib/tests/test_basic.py::test_permission_error" diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template index 6f735ed9f6542b..5df8d6abad16f8 100644 --- a/srcpkgs/python3-colorama/template +++ b/srcpkgs/python3-colorama/template @@ -1,7 +1,7 @@ # Template file for 'python3-colorama' pkgname=python3-colorama version=0.4.6 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/python3-colorclass/template b/srcpkgs/python3-colorclass/template index e9834d3ac664f0..85e6a0acad5e7f 100644 --- a/srcpkgs/python3-colorclass/template +++ b/srcpkgs/python3-colorclass/template @@ -1,7 +1,7 @@ # Template file for 'python3-colorclass' pkgname=python3-colorclass version=2.2.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-colored-traceback/template b/srcpkgs/python3-colored-traceback/template index 11a40e8d47b6db..64c71010de881d 100644 --- a/srcpkgs/python3-colored-traceback/template +++ b/srcpkgs/python3-colored-traceback/template @@ -1,7 +1,7 @@ # Template file for 'python3-colored-traceback' pkgname=python3-colored-traceback version=0.4.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-colorama" diff --git a/srcpkgs/python3-colorlog/template b/srcpkgs/python3-colorlog/template index 67dce1b7ff6880..c2ac00b2625c8e 100644 --- a/srcpkgs/python3-colorlog/template +++ b/srcpkgs/python3-colorlog/template @@ -1,7 +1,7 @@ # Template file for 'python3-colorlog' pkgname=python3-colorlog version=6.8.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-colour/template b/srcpkgs/python3-colour/template index fccee02399616b..60659654e3ddd8 100644 --- a/srcpkgs/python3-colour/template +++ b/srcpkgs/python3-colour/template @@ -1,7 +1,7 @@ # Template file for 'python3-colour' pkgname=python3-colour version=0.1.5 -revision=2 +revision=3 depends="python3" short_desc="Python library, converts and manipulates various color representation" maintainer="Martin Dimov " diff --git a/srcpkgs/python3-comm/template b/srcpkgs/python3-comm/template index a5f6af7ce9d196..be360563dccc03 100644 --- a/srcpkgs/python3-comm/template +++ b/srcpkgs/python3-comm/template @@ -1,7 +1,7 @@ # Template file for 'python3-comm' pkgname=python3-comm version=0.2.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-traitlets" diff --git a/srcpkgs/python3-commonmark/template b/srcpkgs/python3-commonmark/template index 96f964f9d9893d..5e40b4cb0fab7f 100644 --- a/srcpkgs/python3-commonmark/template +++ b/srcpkgs/python3-commonmark/template @@ -1,7 +1,7 @@ # Template file for 'python3-commonmark' pkgname=python3-commonmark version=0.9.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-configobj/template b/srcpkgs/python3-configobj/template index 3c87ce9ac37e26..0690d5f8de0858 100644 --- a/srcpkgs/python3-configobj/template +++ b/srcpkgs/python3-configobj/template @@ -1,7 +1,7 @@ # Template file for 'python3-configobj' pkgname=python3-configobj version=5.0.8 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template index ab5b09648d9937..8da5da4bcc3baf 100644 --- a/srcpkgs/python3-confuse/template +++ b/srcpkgs/python3-confuse/template @@ -1,7 +1,7 @@ # Template file for 'python3-confuse' pkgname=python3-confuse version=2.0.0 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3-yaml" diff --git a/srcpkgs/python3-constantly/template b/srcpkgs/python3-constantly/template index 41102ac1738700..2d60e07786108f 100644 --- a/srcpkgs/python3-constantly/template +++ b/srcpkgs/python3-constantly/template @@ -1,7 +1,7 @@ # Template file for 'python3-constantly' pkgname=python3-constantly version=23.10.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-versioneer" depends="python3" diff --git a/srcpkgs/python3-construct/template b/srcpkgs/python3-construct/template index b59a1c55b07161..ea9a7178186420 100644 --- a/srcpkgs/python3-construct/template +++ b/srcpkgs/python3-construct/template @@ -1,7 +1,7 @@ # Template file for 'python3-construct' pkgname=python3-construct version=2.10.68 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-contourpy/template b/srcpkgs/python3-contourpy/template index eaf2c5298847d8..cfd94bfcbb4248 100644 --- a/srcpkgs/python3-contourpy/template +++ b/srcpkgs/python3-contourpy/template @@ -1,7 +1,7 @@ # Template file for 'python3-contourpy' pkgname=python3-contourpy version=1.2.1 -revision=1 +revision=2 build_style=python3-pep517 build_helper=meson hostmakedepends="python3-meson-python python3-pybind11 pkg-config" diff --git a/srcpkgs/python3-conway-polynomials/template b/srcpkgs/python3-conway-polynomials/template index 2724d49767eb8c..af679f82026517 100644 --- a/srcpkgs/python3-conway-polynomials/template +++ b/srcpkgs/python3-conway-polynomials/template @@ -1,7 +1,7 @@ # Template file for 'python3-conway-polynomials' pkgname=python3-conway-polynomials version=0.10 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--doctest-modules --doctest-glob=README.rst" hostmakedepends="python3-setuptools python3-wheel" diff --git a/srcpkgs/python3-coverage/template b/srcpkgs/python3-coverage/template index e8937d89ecb720..4f1525c4d4586d 100644 --- a/srcpkgs/python3-coverage/template +++ b/srcpkgs/python3-coverage/template @@ -1,7 +1,7 @@ # Template file for 'python3-coverage' pkgname=python3-coverage version=7.6.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-coveralls/template b/srcpkgs/python3-coveralls/template index f4afb85cec6ebb..67437581e484e3 100644 --- a/srcpkgs/python3-coveralls/template +++ b/srcpkgs/python3-coveralls/template @@ -1,7 +1,7 @@ # Template file for 'python3-coveralls' pkgname=python3-coveralls version=2.9.2 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-coverage" depends="python3" diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template index e95f0523d98019..35c9159cbbe2f2 100644 --- a/srcpkgs/python3-cppy/template +++ b/srcpkgs/python3-cppy/template @@ -1,7 +1,7 @@ # Template file for 'python3-cppy' pkgname=python3-cppy -version=1.2.1 -revision=4 +version=1.3.0 +revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://cppy.readthedocs.io" changelog="https://raw.githubusercontent.com/nucleic/cppy/master/releasenotes.rst" distfiles="${PYPI_SITE}/c/cppy/cppy-${version}.tar.gz" -checksum=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b +checksum=da7413a286d5d31626ba35ed2c70ddfb033520cc81310088ba5a57d34039f604 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-cram/template b/srcpkgs/python3-cram/template index 15e955b95d3bdc..e7cd5ac611df85 100644 --- a/srcpkgs/python3-cram/template +++ b/srcpkgs/python3-cram/template @@ -1,7 +1,7 @@ # Template file for 'python3-cram' pkgname=python3-cram version=0.7 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-crccheck/template b/srcpkgs/python3-crccheck/template index 3278a87e772ea6..6736f30f180a71 100644 --- a/srcpkgs/python3-crccheck/template +++ b/srcpkgs/python3-crccheck/template @@ -1,17 +1,17 @@ # Template file for 'python3-crccheck' pkgname=python3-crccheck version=1.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" -checkdepends="${depends} python3-pytest python3-nose" short_desc="Calculation library for CRCs and Checksums" maintainer="Alex Childs " license="GPL-3.0-or-later" homepage="https://bitbucket.org/martin_scharrer/crccheck" distfiles="${PYPI_SITE}/c/crccheck/crccheck-${version}.tar.gz" checksum=45962231cab62b82d05160553eebd9b60ef3ae79dc39527caef52e27f979fa96 +make_check=no # Tests require removed python3-nose post_install() { rm -r ${DESTDIR}/${py3_sitelib}/tests diff --git a/srcpkgs/python3-crcmod/template b/srcpkgs/python3-crcmod/template index 1f3cef6e6af2a9..b49a473f8ea656 100644 --- a/srcpkgs/python3-crcmod/template +++ b/srcpkgs/python3-crcmod/template @@ -1,7 +1,7 @@ # Template file for 'python3-crcmod' pkgname=python3-crcmod version=1.7 -revision=7 +revision=8 build_style=python3-module pycompile_module="crcmod" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template index ffc104e763dd8b..f59e04a357492f 100644 --- a/srcpkgs/python3-cryptography/template +++ b/srcpkgs/python3-cryptography/template @@ -2,7 +2,7 @@ # On update, check python3-openssl, # it has very tie requirements for cryptography pkgname=python3-cryptography -version=43.0.1 +version=44.0.0 revision=1 build_style=python3-pep517 build_helper="rust" @@ -19,7 +19,7 @@ license="BSD-3-Clause, Apache-2.0" homepage="https://github.com/pyca/cryptography" changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz" -checksum=203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d +checksum=cd4e834f340b4293430701e772ec543b0fbe6c2dea510a5286fe0acabe153a02 pre_check() { vsed -i '/addopts/d' pyproject.toml diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template index 8a8376845b7c7b..55f009b28654eb 100644 --- a/srcpkgs/python3-cryptography_vectors/template +++ b/srcpkgs/python3-cryptography_vectors/template @@ -1,6 +1,6 @@ # Template file for 'python3-cryptography_vectors' pkgname=python3-cryptography_vectors -version=43.0.1 +version=44.0.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-flit_core" @@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause, Apache-2.0" homepage="https://github.com/pyca/cryptography" distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz" -checksum=68a0fc18fe27b309e933a293a54f3356b78a14c15207e96c9ff85681af0509de +checksum=106228766c45b9a5ffd1a8b3e254f0560c821da79d5cd7fd113a17e3753580ab post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template index e09a2572cdf98f..fbe78b31bab355 100644 --- a/srcpkgs/python3-css-parser/template +++ b/srcpkgs/python3-css-parser/template @@ -1,7 +1,7 @@ # Template file for 'python3-css-parser' pkgname=python3-css-parser -version=1.0.8 -revision=2 +version=1.0.10 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" @@ -11,8 +11,8 @@ maintainer="Orphaned " license="LGPL-3.0-or-later" homepage="https://github.com/ebook-utils/css-parser" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=17b3778e6c85f651f75d7182162643ddff5cbf8ec817e87067abaa66e44b7655 +checksum=0b1fe5771cf4dcecf1c63502331a3b628fc99507f0d1b5b893a8a6b292d7f3e0 do_check() { - python3 setup.py test + python3 ./run_tests.py } diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template index 5c1c16b4894295..4243e146784d2c 100644 --- a/srcpkgs/python3-cssselect/template +++ b/srcpkgs/python3-cssselect/template @@ -1,7 +1,7 @@ # Template file for 'python3-cssselect' pkgname=python3-cssselect version=1.2.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-cssselect2/template b/srcpkgs/python3-cssselect2/template index 74b235b430a9f4..64363d5a8d57cd 100644 --- a/srcpkgs/python3-cssselect2/template +++ b/srcpkgs/python3-cssselect2/template @@ -1,7 +1,7 @@ # Template file for 'python3-cssselect2' pkgname=python3-cssselect2 version=0.7.0 -revision=2 +revision=3 build_style=python3-pep517 _runtime_deps="python3-tinycss2 python3-webencodings" hostmakedepends="python3-poetry-core python3-flit_core ${_runtime_deps}" diff --git a/srcpkgs/python3-cssutils/template b/srcpkgs/python3-cssutils/template index a24f5537bdedfb..1cb7a1396c95bf 100644 --- a/srcpkgs/python3-cssutils/template +++ b/srcpkgs/python3-cssutils/template @@ -1,7 +1,7 @@ # Template file for 'python3-cssutils' pkgname=python3-cssutils version=2.9.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" short_desc="CSS Cascading Style Sheets library for Python3" diff --git a/srcpkgs/python3-cups/template b/srcpkgs/python3-cups/template index 9f5831fece0e64..816ae34dd31fd5 100644 --- a/srcpkgs/python3-cups/template +++ b/srcpkgs/python3-cups/template @@ -1,7 +1,7 @@ # Template file for 'python3-cups' pkgname=python3-cups version=2.0.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel cups-devel" diff --git a/srcpkgs/python3-curio/template b/srcpkgs/python3-curio/template index be09b67c70cb56..f7a45489b8a4fb 100644 --- a/srcpkgs/python3-curio/template +++ b/srcpkgs/python3-curio/template @@ -1,7 +1,7 @@ # Template file for 'python3-curio' pkgname=python3-curio version=1.6 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template index a3f449f98a9eec..736a5e871045da 100644 --- a/srcpkgs/python3-curl/template +++ b/srcpkgs/python3-curl/template @@ -1,7 +1,7 @@ # Template file for 'python3-curl' pkgname=python3-curl version=7.45.3 -revision=1 +revision=2 build_style=python3-module # hanging/failing tests make_check_args="--ignore tests/multi_socket_select_test.py diff --git a/srcpkgs/python3-curtsies/template b/srcpkgs/python3-curtsies/template index 4457a640ed74d5..5cc90184f6dd69 100644 --- a/srcpkgs/python3-curtsies/template +++ b/srcpkgs/python3-curtsies/template @@ -1,7 +1,7 @@ # Template file for 'python3-curtsies' pkgname=python3-curtsies version=0.4.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-blessed python3-cwcwidth" diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template index d6e94ff1cec40a..c21a16a8783ae1 100644 --- a/srcpkgs/python3-cvxopt/template +++ b/srcpkgs/python3-cvxopt/template @@ -1,7 +1,7 @@ # Template file for 'python3-cvxopt' pkgname=python3-cvxopt version=1.3.2 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel SuiteSparse-devel gsl-devel glpk-devel fftw-devel diff --git a/srcpkgs/python3-cwcwidth/template b/srcpkgs/python3-cwcwidth/template index c556c799bb523e..19a900e9bcd615 100644 --- a/srcpkgs/python3-cwcwidth/template +++ b/srcpkgs/python3-cwcwidth/template @@ -1,7 +1,7 @@ # Template file for 'python3-cwcwidth' pkgname=python3-cwcwidth version=0.1.9 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-Cython python3-setuptools python3-wheel" makedepends="python3-devel" diff --git a/srcpkgs/python3-cycler/template b/srcpkgs/python3-cycler/template index 68106067bfe490..82075d19186c43 100644 --- a/srcpkgs/python3-cycler/template +++ b/srcpkgs/python3-cycler/template @@ -1,7 +1,7 @@ # Template file for 'python3-cycler' pkgname=python3-cycler version=0.12.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-cypari2/template b/srcpkgs/python3-cypari2/template index 2a6b284f2f0ab1..e6f2dbb7e4ee5b 100644 --- a/srcpkgs/python3-cypari2/template +++ b/srcpkgs/python3-cypari2/template @@ -1,7 +1,7 @@ # Template file for 'python3-cypari2' pkgname=python3-cypari2 version=2.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-Cython python3-cysignals pari perl" diff --git a/srcpkgs/python3-cysignals/template b/srcpkgs/python3-cysignals/template index 6cd461880c9d6f..cf39b51cedeafc 100644 --- a/srcpkgs/python3-cysignals/template +++ b/srcpkgs/python3-cysignals/template @@ -1,7 +1,7 @@ # Template file for 'python3-cysignals' pkgname=python3-cysignals version=1.11.4 -revision=1 +revision=2 # need gnu-configure build style to support cross build build_style=gnu-configure build_helper=python3 diff --git a/srcpkgs/python3-daemonize/template b/srcpkgs/python3-daemonize/template index f3665d9c19c205..1de897543b6efb 100644 --- a/srcpkgs/python3-daemonize/template +++ b/srcpkgs/python3-daemonize/template @@ -1,7 +1,7 @@ # Template file for 'python3-daemonize' pkgname=python3-daemonize version=2.5.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-dateparser/template b/srcpkgs/python3-dateparser/template index 910ade7aaceecd..9aad3aaf145f86 100644 --- a/srcpkgs/python3-dateparser/template +++ b/srcpkgs/python3-dateparser/template @@ -1,7 +1,7 @@ # Template file for 'python3-dateparser' pkgname=python3-dateparser version=1.1.8 -revision=2 +revision=3 build_style=python3-module make_check_args="--ignore tests/test_hijri.py --ignore tests/test_jalali.py --ignore tests/test_language_detect.py --ignore tests/test_dateparser_data_integrity.py" diff --git a/srcpkgs/python3-dateutil/template b/srcpkgs/python3-dateutil/template index 31a4324a307f74..3460e649eab05f 100644 --- a/srcpkgs/python3-dateutil/template +++ b/srcpkgs/python3-dateutil/template @@ -1,7 +1,7 @@ # Template file for 'python3-dateutil' pkgname=python3-dateutil version=2.9.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-six tzdata" diff --git a/srcpkgs/python3-dbus-next/template b/srcpkgs/python3-dbus-next/template index 7f263285c8255b..9c34ed01924549 100644 --- a/srcpkgs/python3-dbus-next/template +++ b/srcpkgs/python3-dbus-next/template @@ -1,7 +1,7 @@ # Template file for 'python3-dbus-next' pkgname=python3-dbus-next version=0.2.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-dbus/template b/srcpkgs/python3-dbus/template index 7c2fa19f6890a1..faa4b1dafc0dd6 100644 --- a/srcpkgs/python3-dbus/template +++ b/srcpkgs/python3-dbus/template @@ -1,7 +1,7 @@ # Template file for 'python3-dbus' pkgname=python3-dbus version=1.3.2 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config python3" makedepends="libglib-devel python3-devel" diff --git a/srcpkgs/python3-dbusmock/template b/srcpkgs/python3-dbusmock/template index f37732a7d1f24a..98ed46059cd2c9 100644 --- a/srcpkgs/python3-dbusmock/template +++ b/srcpkgs/python3-dbusmock/template @@ -1,7 +1,7 @@ # Template file for 'python3-dbusmock' pkgname=python3-dbusmock version=0.30.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-setuptools_scm" depends="python3-dbus python3-gobject" diff --git a/srcpkgs/python3-ddt/template b/srcpkgs/python3-ddt/template index f53a79c6893327..0d0dacddb8aa92 100644 --- a/srcpkgs/python3-ddt/template +++ b/srcpkgs/python3-ddt/template @@ -1,7 +1,7 @@ # Template file for 'python3-ddt' pkgname=python3-ddt version=1.6.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template index 6f400d9320044b..66b9e22017a65a 100644 --- a/srcpkgs/python3-debian/template +++ b/srcpkgs/python3-debian/template @@ -1,7 +1,7 @@ # Template file for 'python3-debian' pkgname=python3-debian version=0.1.49 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-chardet" diff --git a/srcpkgs/python3-decorator/template b/srcpkgs/python3-decorator/template index 838b71279d6bda..13012a7277203e 100644 --- a/srcpkgs/python3-decorator/template +++ b/srcpkgs/python3-decorator/template @@ -1,7 +1,7 @@ # Template file for 'python3-decorator' pkgname=python3-decorator version=5.1.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-defusedxml/template b/srcpkgs/python3-defusedxml/template index cfedc3b0148b6b..647dbd9a199447 100644 --- a/srcpkgs/python3-defusedxml/template +++ b/srcpkgs/python3-defusedxml/template @@ -1,7 +1,7 @@ # Template file for 'python3-defusedxml' pkgname=python3-defusedxml version=0.7.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-deprecated/template b/srcpkgs/python3-deprecated/template index 2c313446083946..70c25f914f4e75 100644 --- a/srcpkgs/python3-deprecated/template +++ b/srcpkgs/python3-deprecated/template @@ -1,7 +1,7 @@ # Template file for 'python3-deprecated' pkgname=python3-deprecated -version=1.2.14 -revision=2 +version=1.2.15 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-wrapt" @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/tantale/deprecated" changelog="https://raw.githubusercontent.com/tantale/deprecated/master/CHANGELOG.rst" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=3309fa073e6c13a126be9fb88959a02689b15a066fa7e222a07b62325e9673a7 +checksum=ee3f4d9ebef7e592be4f5cc1dc8d1bab4f64d8161598df2261d5e80e4be816bd post_install() { vlicense LICENSE.rst diff --git a/srcpkgs/python3-deprecation/template b/srcpkgs/python3-deprecation/template index 5257d2a0f79d0f..12ef0646b95602 100644 --- a/srcpkgs/python3-deprecation/template +++ b/srcpkgs/python3-deprecation/template @@ -1,7 +1,7 @@ # Template file for 'python3-deprecation' pkgname=python3-deprecation version=2.1.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-packaging" diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template index 2425afa6a49fde..235340d2b546b3 100644 --- a/srcpkgs/python3-dill/template +++ b/srcpkgs/python3-dill/template @@ -1,7 +1,7 @@ # Template file for 'python3-dill' pkgname=python3-dill version=0.3.6 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-dirty-equals/template b/srcpkgs/python3-dirty-equals/template index 55b6835e143c74..30f12f48ee9a29 100644 --- a/srcpkgs/python3-dirty-equals/template +++ b/srcpkgs/python3-dirty-equals/template @@ -1,7 +1,7 @@ # Template file for 'python3-dirty-equals' pkgname=python3-dirty-equals version=0.7.1 -revision=1 +revision=2 build_style=python3-pep517 # requires unpackaged pytest-examples and circular dependency on pydantic make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_other.py" diff --git a/srcpkgs/python3-discid/template b/srcpkgs/python3-discid/template index f89b243f2f208c..8c5ee5edca8e36 100644 --- a/srcpkgs/python3-discid/template +++ b/srcpkgs/python3-discid/template @@ -1,7 +1,7 @@ # Template file for 'python3-discid' pkgname=python3-discid version=1.2.0 -revision=7 +revision=8 build_style=python3-module pycompile_module=discid hostmakedepends="python3 python3-setuptools libdiscid" diff --git a/srcpkgs/python3-discogs_client/template b/srcpkgs/python3-discogs_client/template index 97b749b3e534c0..8a7ce6a90911f1 100644 --- a/srcpkgs/python3-discogs_client/template +++ b/srcpkgs/python3-discogs_client/template @@ -1,7 +1,7 @@ # Template file for 'python3-discogs_client' pkgname=python3-discogs_client version=2.2.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-six python3-oauthlib" diff --git a/srcpkgs/python3-distlib/template b/srcpkgs/python3-distlib/template index c71af0fd55df8f..e00eefd1b8e5c8 100644 --- a/srcpkgs/python3-distlib/template +++ b/srcpkgs/python3-distlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-distlib' pkgname=python3-distlib version=0.3.6 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template index 70fcef2eda1a96..12734e936379c5 100644 --- a/srcpkgs/python3-distro/template +++ b/srcpkgs/python3-distro/template @@ -1,7 +1,7 @@ # Template file for 'python3-distro' pkgname=python3-distro version=1.9.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" diff --git a/srcpkgs/python3-distutils-extra/template b/srcpkgs/python3-distutils-extra/template index d3e9b0d6469810..06a5a93e53fd07 100644 --- a/srcpkgs/python3-distutils-extra/template +++ b/srcpkgs/python3-distutils-extra/template @@ -1,7 +1,7 @@ # Template file for 'python3-distutils-extra' pkgname=python3-distutils-extra version=2.39 -revision=10 +revision=11 build_style=python3-module hostmakedepends="intltool python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-dkimpy/template b/srcpkgs/python3-dkimpy/template index bbad09ac65b7e0..ac88ac304e963b 100644 --- a/srcpkgs/python3-dkimpy/template +++ b/srcpkgs/python3-dkimpy/template @@ -1,7 +1,7 @@ # Template file for 'python3-dkimpy' pkgname=python3-dkimpy version=1.0.5 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dnspython python3-authres python3-pynacl python3-aiodns" diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template index c90fab431579f3..7621d6bef22bea 100644 --- a/srcpkgs/python3-dnspython/template +++ b/srcpkgs/python3-dnspython/template @@ -1,7 +1,7 @@ # Template file for 'python3-dnspython' pkgname=python3-dnspython version=2.6.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/python3-dnsrecon/template b/srcpkgs/python3-dnsrecon/template index 9b983719d1a6ee..ce4998e2d0348b 100644 --- a/srcpkgs/python3-dnsrecon/template +++ b/srcpkgs/python3-dnsrecon/template @@ -1,7 +1,7 @@ # Template file for 'python3-dnsrecon' pkgname=python3-dnsrecon version=1.3.1 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="-k not(test_zone_transfer)" hostmakedepends="python3-wheel" diff --git a/srcpkgs/python3-docker/template b/srcpkgs/python3-docker/template index 0f5bd514525b08..ae8d506d905195 100644 --- a/srcpkgs/python3-docker/template +++ b/srcpkgs/python3-docker/template @@ -1,7 +1,7 @@ # Template file for 'python3-docker' pkgname=python3-docker version=5.0.2 -revision=4 +revision=5 build_style=python3-module make_check_target="tests/unit" # other tests fail due to needing a running docker daemon hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-dockerpty/template b/srcpkgs/python3-dockerpty/template index 93b048a677a21c..107bc3737ff44e 100644 --- a/srcpkgs/python3-dockerpty/template +++ b/srcpkgs/python3-dockerpty/template @@ -1,7 +1,7 @@ # Template file for 'python3-dockerpty' pkgname=python3-dockerpty version=0.4.1 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-docker" diff --git a/srcpkgs/python3-docopt/template b/srcpkgs/python3-docopt/template index c015ee61516bfa..4e5a30511f98aa 100644 --- a/srcpkgs/python3-docopt/template +++ b/srcpkgs/python3-docopt/template @@ -1,7 +1,7 @@ # Template file for 'python3-docopt' pkgname=python3-docopt version=0.6.2 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-docstring-to-markdown/template b/srcpkgs/python3-docstring-to-markdown/template index 788f9126f3730e..ee43bfa81fc6e0 100644 --- a/srcpkgs/python3-docstring-to-markdown/template +++ b/srcpkgs/python3-docstring-to-markdown/template @@ -1,7 +1,7 @@ # Template file for 'python3-docstring-to-markdown' pkgname=python3-docstring-to-markdown version=0.12 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template index 8fc1fd728afd60..48b7f848142754 100644 --- a/srcpkgs/python3-docutils/template +++ b/srcpkgs/python3-docutils/template @@ -1,7 +1,7 @@ # Template file for 'python3-docutils' pkgname=python3-docutils version=0.20.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" # docutils/writers/odf_odt/pygmentsformatter.py diff --git a/srcpkgs/python3-dogpile.cache/template b/srcpkgs/python3-dogpile.cache/template index e8af558d48aa47..9352517504fcc7 100644 --- a/srcpkgs/python3-dogpile.cache/template +++ b/srcpkgs/python3-dogpile.cache/template @@ -1,7 +1,7 @@ # Template file for 'python3-dogpile.cache' pkgname=python3-dogpile.cache version=1.1.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-decorator" diff --git a/srcpkgs/python3-doi/template b/srcpkgs/python3-doi/template index e8ae590895694f..1a7b04252097af 100644 --- a/srcpkgs/python3-doi/template +++ b/srcpkgs/python3-doi/template @@ -1,7 +1,7 @@ # Template file for 'python3-doi' pkgname=python3-doi version=0.2.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-dominate/template b/srcpkgs/python3-dominate/template index 068f2c7b3fea88..4fe60db7d1d928 100644 --- a/srcpkgs/python3-dominate/template +++ b/srcpkgs/python3-dominate/template @@ -1,7 +1,7 @@ # Template file for 'python3-dominate' pkgname=python3-dominate version=2.9.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-dotenv/template b/srcpkgs/python3-dotenv/template index 32e777477de068..468831abbe9621 100644 --- a/srcpkgs/python3-dotenv/template +++ b/srcpkgs/python3-dotenv/template @@ -1,7 +1,7 @@ # Template file for 'python3-dotenv' pkgname=python3-dotenv version=1.0.0 -revision=2 +revision=3 build_style=python3-module # CLI tests and test_set_key_permission_error fail in xbps-src's build environment make_check_args="-k not(test_run) diff --git a/srcpkgs/python3-dotty-dict/template b/srcpkgs/python3-dotty-dict/template index 1b4d0085515ea5..28f21418ef760c 100644 --- a/srcpkgs/python3-dotty-dict/template +++ b/srcpkgs/python3-dotty-dict/template @@ -1,7 +1,7 @@ # Template file for 'python3-dotty-dict' pkgname=python3-dotty-dict version=1.3.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-dpkt/template b/srcpkgs/python3-dpkt/template index 065cacaddb42ed..0021ee2c7b2057 100644 --- a/srcpkgs/python3-dpkt/template +++ b/srcpkgs/python3-dpkt/template @@ -1,7 +1,7 @@ # Template file for 'python3-dpkt' pkgname=python3-dpkt version=1.9.8 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-drgn/template b/srcpkgs/python3-drgn/template index 6b0b0336ab3af7..8a236364a1bdf5 100644 --- a/srcpkgs/python3-drgn/template +++ b/srcpkgs/python3-drgn/template @@ -1,7 +1,7 @@ # Template file for 'python3-drgn' pkgname=python3-drgn version=0.0.29 -revision=1 +revision=2 build_style=python3-module hostmakedepends="automake libtool pkg-config python3-setuptools" makedepends="elfutils-devel libgomp-devel python3-devel libkdumpfile-devel" diff --git a/srcpkgs/python3-dulwich/template b/srcpkgs/python3-dulwich/template index b83beb4eec1392..9694d0f2b9ee28 100644 --- a/srcpkgs/python3-dulwich/template +++ b/srcpkgs/python3-dulwich/template @@ -1,7 +1,7 @@ # Template file for 'python3-dulwich' pkgname=python3-dulwich version=0.21.7 -revision=1 +revision=2 build_style=python3-module make_check_target="dulwich/tests" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-easygui/template b/srcpkgs/python3-easygui/template index ef6148d21d6ba1..437679fb81972f 100644 --- a/srcpkgs/python3-easygui/template +++ b/srcpkgs/python3-easygui/template @@ -1,7 +1,7 @@ # Template file for 'python3-easygui' pkgname=python3-easygui version=0.98.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-tkinter" diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template index 0cce9910988f7c..3bb83bf7d6a124 100644 --- a/srcpkgs/python3-ecdsa/template +++ b/srcpkgs/python3-ecdsa/template @@ -1,7 +1,7 @@ # Template file for 'python3-ecdsa' pkgname=python3-ecdsa version=0.18.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" diff --git a/srcpkgs/python3-editables/template b/srcpkgs/python3-editables/template index 6269cdf1010a40..d6adfd0de2c506 100644 --- a/srcpkgs/python3-editables/template +++ b/srcpkgs/python3-editables/template @@ -1,7 +1,7 @@ # Template file for 'python3-editables' pkgname=python3-editables version=0.5 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-editor/template b/srcpkgs/python3-editor/template index 96538c5d923f2c..9d4a2c955717d1 100644 --- a/srcpkgs/python3-editor/template +++ b/srcpkgs/python3-editor/template @@ -1,7 +1,7 @@ # Template file for 'python3-editor' pkgname=python3-editor version=1.0.4 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-eduvpn-client/template b/srcpkgs/python3-eduvpn-client/template index a39a671f8610f1..2b24b128defaa0 100644 --- a/srcpkgs/python3-eduvpn-client/template +++ b/srcpkgs/python3-eduvpn-client/template @@ -1,7 +1,7 @@ # Template file for 'python3-eduvpn-client' pkgname=python3-eduvpn-client version=4.4.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="eduvpn-common python3-gobject NetworkManager-openvpn" diff --git a/srcpkgs/python3-efl/template b/srcpkgs/python3-efl/template deleted file mode 100644 index f928de724eda99..00000000000000 --- a/srcpkgs/python3-efl/template +++ /dev/null @@ -1,40 +0,0 @@ -# Template file for 'python3-efl' -pkgname=python3-efl -version=1.23.0 -revision=7 -build_style=python3-module -hostmakedepends="pkg-config python3-devel python3-Cython0.29" -makedepends="efl-devel python3-dbus-devel" -depends="python3-dbus" -short_desc="Python3 bindings for Enlightenment Foundation Libraries" -maintainer="Orphaned " -license="LGPL-3.0-only, GPL-3.0-only" -homepage="http://enlightenment.org" -distfiles="http://download.enlightenment.org/rel/bindings/python/python-efl-${version}.tar.xz" -checksum=2bdef4153e3df2ed3edef9f1ebb4554054405425247a9fabb3c784b48232d69b - -post_extract() { - # Pre-generated cython output is incompatible with Python 3.9 - rm -f efl/elementary/__init__.c efl/evas/efl.evas.c \ - efl/utils/{conversions,logger,deprecated}.c \ - efl/emotion/efl.emotion.c efl/eo/efl.eo.c \ - efl/ecore/efl.ecore.c efl/edje/efl.edje.c \ - efl/dbus_mainloop/efl.dbus_mainloop.c \ - efl/ethumb/efl.ethumb{,_client}.c \ - efl/ecore_input/efl.ecore_input.c \ - efl/edje_edit/efl.edje_edit.c \ - efl/ecore_con/efl.ecore_con.c \ - efl/ecore_x/efl.ecore_x.c -} - -pre_build() { - # any higher optimization level and gcc OOMs on i686 (even -Os) - case "$XBPS_TARGET_MACHINE" in - i686*) export CFLAGS+=" -O1";; - esac - - # the build likes to add -g without asking - if [ -z "$XBPS_DEBUG_PKGS" ]; then - export CFLAGS+=" -g0" - fi -} diff --git a/srcpkgs/python3-elementpath/template b/srcpkgs/python3-elementpath/template index 46cc06d3b10046..50822cbb089e39 100644 --- a/srcpkgs/python3-elementpath/template +++ b/srcpkgs/python3-elementpath/template @@ -1,7 +1,7 @@ # Template file for 'python3-elementpath' pkgname=python3-elementpath version=3.0.2 -revision=3 +revision=4 build_style=python3-module # depends on xmlschema and memory_profiling make_check_args="--ignore tests/memory_profiling.py \ diff --git a/srcpkgs/python3-email-validator/template b/srcpkgs/python3-email-validator/template index 2f2be69e5c96a4..bce887234e3556 100644 --- a/srcpkgs/python3-email-validator/template +++ b/srcpkgs/python3-email-validator/template @@ -1,7 +1,7 @@ # Template file for 'python3-email-validator' pkgname=python3-email-validator version=2.2.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3" diff --git a/srcpkgs/python3-emoji/template b/srcpkgs/python3-emoji/template index 21c32dfa83c268..2c17b00e0264b2 100644 --- a/srcpkgs/python3-emoji/template +++ b/srcpkgs/python3-emoji/template @@ -1,7 +1,7 @@ # Template file for 'python3-emoji' pkgname=python3-emoji version=2.7.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-empy/template b/srcpkgs/python3-empy/template index 39f3ee6c79340d..d5997dd4b1bdc7 100644 --- a/srcpkgs/python3-empy/template +++ b/srcpkgs/python3-empy/template @@ -1,7 +1,7 @@ # Template file for 'python3-empy' pkgname=python3-empy version=3.3.4 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-enchant/template b/srcpkgs/python3-enchant/template index 12aa14efe113dc..a3c4f9a709cd0c 100644 --- a/srcpkgs/python3-enchant/template +++ b/srcpkgs/python3-enchant/template @@ -1,7 +1,7 @@ # Template file for 'python3-enchant' pkgname=python3-enchant version=3.2.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools enchant2-devel" depends="python3 enchant2" diff --git a/srcpkgs/python3-enrich/template b/srcpkgs/python3-enrich/template index 1f19267a6b5447..e601531b2d8fb0 100644 --- a/srcpkgs/python3-enrich/template +++ b/srcpkgs/python3-enrich/template @@ -1,7 +1,7 @@ # Template file for 'python3-enrich' pkgname=python3-enrich version=1.2.7 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools_scm python3-wheel python3-rich" depends="python3-rich" diff --git a/srcpkgs/python3-entrypoints/template b/srcpkgs/python3-entrypoints/template index 16c29691644269..3739c55d59f483 100644 --- a/srcpkgs/python3-entrypoints/template +++ b/srcpkgs/python3-entrypoints/template @@ -1,7 +1,7 @@ # Template file for 'python3-entrypoints' pkgname=python3-entrypoints version=0.4 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-envdir/template b/srcpkgs/python3-envdir/template index 509210671af3cf..a02b56fec5631d 100644 --- a/srcpkgs/python3-envdir/template +++ b/srcpkgs/python3-envdir/template @@ -1,7 +1,7 @@ # Template file for 'python3-envdir' pkgname=python3-envdir version=1.0.1 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-enzyme/template b/srcpkgs/python3-enzyme/template index c72e6530d4b99f..8056f920113f78 100644 --- a/srcpkgs/python3-enzyme/template +++ b/srcpkgs/python3-enzyme/template @@ -1,7 +1,7 @@ # Template file for 'python3-enzyme' pkgname=python3-enzyme version=0.4.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-esprima/template b/srcpkgs/python3-esprima/template index a13c14af09dbaf..5f18d05e1d8fe3 100644 --- a/srcpkgs/python3-esprima/template +++ b/srcpkgs/python3-esprima/template @@ -1,7 +1,7 @@ # Template file for 'python3-esprima' pkgname=python3-esprima version=4.0.1 -revision=7 +revision=8 create_wrksrc=yes build_wrksrc="esprima-${version}" build_style=python3-module diff --git a/srcpkgs/python3-et-xmlfile/template b/srcpkgs/python3-et-xmlfile/template index 4fc7e995ef5b69..f022d4abc63a0a 100644 --- a/srcpkgs/python3-et-xmlfile/template +++ b/srcpkgs/python3-et-xmlfile/template @@ -1,7 +1,7 @@ # Template file for 'python3-et-xmlfile' pkgname=python3-et-xmlfile version=1.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends=python3 diff --git a/srcpkgs/python3-etebase/template b/srcpkgs/python3-etebase/template index 696a8d3d7c4f0e..9e72c48f1f9248 100644 --- a/srcpkgs/python3-etebase/template +++ b/srcpkgs/python3-etebase/template @@ -1,7 +1,7 @@ # Template file for 'python3-etebase' pkgname=python3-etebase version=0.31.5 -revision=6 +revision=7 build_style=python3-module build_helper="rust" hostmakedepends="python3-setuptools-rust python3-wheel cargo pkg-config" diff --git a/srcpkgs/python3-etesync/template b/srcpkgs/python3-etesync/template index b6d5c17ea83ebe..71267be32e138f 100644 --- a/srcpkgs/python3-etesync/template +++ b/srcpkgs/python3-etesync/template @@ -1,7 +1,7 @@ # Template file for 'python3-etesync' pkgname=python3-etesync version=0.12.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-appdirs python3-asn1crypto python3-cffi python3-cryptography python3-dateutil diff --git a/srcpkgs/python3-evdev/template b/srcpkgs/python3-evdev/template index db69bdc7781c09..c8c22401af0066 100644 --- a/srcpkgs/python3-evdev/template +++ b/srcpkgs/python3-evdev/template @@ -1,7 +1,7 @@ # Template file for 'python3-evdev' pkgname=python3-evdev version=1.6.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-ewmh/template b/srcpkgs/python3-ewmh/template index 03497da0d4054c..6853e70ba6fc3e 100644 --- a/srcpkgs/python3-ewmh/template +++ b/srcpkgs/python3-ewmh/template @@ -1,7 +1,7 @@ # Template file for 'python3-ewmh' pkgname=python3-ewmh version=0.1.6 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-xlib" diff --git a/srcpkgs/python3-execnet/template b/srcpkgs/python3-execnet/template index d24998926ac073..189c85d2c82208 100644 --- a/srcpkgs/python3-execnet/template +++ b/srcpkgs/python3-execnet/template @@ -1,7 +1,7 @@ # Template file for 'python3-execnet' pkgname=python3-execnet version=2.1.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3" diff --git a/srcpkgs/python3-executing/template b/srcpkgs/python3-executing/template index 666c75ba377eec..41f4ac92fa819c 100644 --- a/srcpkgs/python3-executing/template +++ b/srcpkgs/python3-executing/template @@ -1,7 +1,7 @@ # Template file for 'python3-executing' pkgname=python3-executing version=2.1.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_target="tests/test_main.py" hostmakedepends="python3-setuptools_scm python3-wheel" diff --git a/srcpkgs/python3-exifread/template b/srcpkgs/python3-exifread/template index 9cb9e4a4f1e53c..99c594c972144b 100644 --- a/srcpkgs/python3-exifread/template +++ b/srcpkgs/python3-exifread/template @@ -1,7 +1,7 @@ # Template file for 'python3-exifread' pkgname=python3-exifread version=2.3.2 -revision=4 +revision=5 build_style="python3-module" hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template index d4735da5c7e52f..dc9c1f5ae97bf9 100644 --- a/srcpkgs/python3-fasteners/template +++ b/srcpkgs/python3-fasteners/template @@ -1,7 +1,7 @@ # Template file for 'python3-fasteners' pkgname=python3-fasteners version=0.19 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3 python3-wheel" depends="python3" diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template index c61cf03282aa24..13bfefedc42605 100644 --- a/srcpkgs/python3-fastjsonschema/template +++ b/srcpkgs/python3-fastjsonschema/template @@ -1,7 +1,7 @@ # Template file for 'python3-fastjsonschema' pkgname=python3-fastjsonschema version=2.20.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-feedgenerator/template b/srcpkgs/python3-feedgenerator/template index 1be6eb48843405..b9c1da4e06acca 100644 --- a/srcpkgs/python3-feedgenerator/template +++ b/srcpkgs/python3-feedgenerator/template @@ -1,7 +1,7 @@ # Template file for 'python3-feedgenerator' pkgname=python3-feedgenerator version=1.9.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-feedparser/template b/srcpkgs/python3-feedparser/template index 6295f90a0ab40a..14c90f19d80acf 100644 --- a/srcpkgs/python3-feedparser/template +++ b/srcpkgs/python3-feedparser/template @@ -1,7 +1,7 @@ # Template file for 'python3-feedparser' pkgname=python3-feedparser version=6.0.11 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-sgmllib python3-requests" diff --git a/srcpkgs/python3-ffmpeg-python/template b/srcpkgs/python3-ffmpeg-python/template index e4eddfb3270527..be000d331a61b1 100644 --- a/srcpkgs/python3-ffmpeg-python/template +++ b/srcpkgs/python3-ffmpeg-python/template @@ -1,7 +1,7 @@ # Template file for 'python3-ffmpeg-python' pkgname=python3-ffmpeg-python version=0.2.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="ffmpeg python3-future" diff --git a/srcpkgs/python3-fido2/template b/srcpkgs/python3-fido2/template index 2d94fcd365ea94..c50ff8ab319c10 100644 --- a/srcpkgs/python3-fido2/template +++ b/srcpkgs/python3-fido2/template @@ -2,7 +2,7 @@ pkgname=python3-fido2 _pkgname=fido2 version=1.1.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-six python3-cryptography python3-pyscard" diff --git a/srcpkgs/python3-fields/template b/srcpkgs/python3-fields/template index fd8d6a47c82408..111c158be5a47d 100644 --- a/srcpkgs/python3-fields/template +++ b/srcpkgs/python3-fields/template @@ -1,7 +1,7 @@ # Template file for 'python3-fields' pkgname=python3-fields version=5.0.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-filebytes/template b/srcpkgs/python3-filebytes/template index fe023d59a625dc..cf0e3484367e9b 100644 --- a/srcpkgs/python3-filebytes/template +++ b/srcpkgs/python3-filebytes/template @@ -1,7 +1,7 @@ # Template file for 'python3-filebytes' pkgname=python3-filebytes version=0.10.2 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-filelock/template b/srcpkgs/python3-filelock/template index de958d109c7f1b..bdc4742e22c200 100644 --- a/srcpkgs/python3-filelock/template +++ b/srcpkgs/python3-filelock/template @@ -1,7 +1,7 @@ # Template file for 'python3-filelock' pkgname=python3-filelock version=3.15.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3" diff --git a/srcpkgs/python3-filetype/template b/srcpkgs/python3-filetype/template index b2d6446f8ffe20..9d79e58a854d60 100644 --- a/srcpkgs/python3-filetype/template +++ b/srcpkgs/python3-filetype/template @@ -1,7 +1,7 @@ # Template file for 'python3-filetype' pkgname=python3-filetype version=1.2.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-fishnet/template b/srcpkgs/python3-fishnet/template index 03246f6df90997..5dabc2afe03586 100644 --- a/srcpkgs/python3-fishnet/template +++ b/srcpkgs/python3-fishnet/template @@ -1,7 +1,7 @@ # Template file for 'python3-fishnet' pkgname=python3-fishnet version=1.15.18 -revision=6 +revision=7 build_style=python3-module pycompile_module="fishnet.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-flaky/template b/srcpkgs/python3-flaky/template index c2c20cc7ba3ffd..07760ccd763d21 100644 --- a/srcpkgs/python3-flaky/template +++ b/srcpkgs/python3-flaky/template @@ -1,7 +1,7 @@ # Template file for 'python3-flaky' pkgname=python3-flaky version=3.8.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-flasgger/template b/srcpkgs/python3-flasgger/template index 2cf6a5c5d440c1..a9d2161b684754 100644 --- a/srcpkgs/python3-flasgger/template +++ b/srcpkgs/python3-flasgger/template @@ -1,7 +1,7 @@ # Template file for 'python3-flasgger' pkgname=python3-flasgger version=0.9.7.1 -revision=1 +revision=2 build_style=python3-module # Examples require unpackaged "flex" make_check_args="--ignore tests/test_examples.py" diff --git a/srcpkgs/python3-flexmock/template b/srcpkgs/python3-flexmock/template index e3b8c9cf786896..7d1a9aeb95ea5c 100644 --- a/srcpkgs/python3-flexmock/template +++ b/srcpkgs/python3-flexmock/template @@ -1,7 +1,7 @@ # Template file for 'python3-flexmock' pkgname=python3-flexmock version=0.12.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3" diff --git a/srcpkgs/python3-flit_core/template b/srcpkgs/python3-flit_core/template index 56f909f7fd794a..10a8accd67d8e5 100644 --- a/srcpkgs/python3-flit_core/template +++ b/srcpkgs/python3-flit_core/template @@ -1,7 +1,7 @@ # Template file for 'python3-flit_core' pkgname=python3-flit_core -version=3.9.0 -revision=3 +version=3.10.1 +revision=1 # This package is required by python3-build and python3-installer, used by the # python3-pep517 style; so using that style here would create a cycle hostmakedepends="python3" @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://flit.pypa.io/" changelog="https://flit.pypa.io/en/stable/history.html" distfiles="${PYPI_SITE}/f/flit_core/flit_core-${version}.tar.gz" -checksum=72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba +checksum=66e5b87874a0d6e39691f0e22f09306736b633548670ad3c09ec9db03c5662f7 do_build() { python3 -m flit_core.wheel diff --git a/srcpkgs/python3-fpylll/template b/srcpkgs/python3-fpylll/template index 4009039d35bc5c..10cf315f00d771 100644 --- a/srcpkgs/python3-fpylll/template +++ b/srcpkgs/python3-fpylll/template @@ -1,7 +1,7 @@ # Template file for 'python3-fpylll' pkgname=python3-fpylll version=0.6.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-Cython python3-cysignals" diff --git a/srcpkgs/python3-freezegun/template b/srcpkgs/python3-freezegun/template index 24ef674d368eea..653237b3f44dea 100644 --- a/srcpkgs/python3-freezegun/template +++ b/srcpkgs/python3-freezegun/template @@ -1,7 +1,7 @@ # Template file for 'python3-freezegun' pkgname=python3-freezegun version=1.2.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dateutil" diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template index dcb86cb5b6398e..08b17044a001de 100644 --- a/srcpkgs/python3-frozendict/template +++ b/srcpkgs/python3-frozendict/template @@ -1,7 +1,7 @@ # Template file for 'python3-frozendict' pkgname=python3-frozendict version=2.3.5 -revision=2 +revision=3 build_style=python3-module make_check_args="-k not(test_c_extension)" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-frozenlist/patches/no-expandvars.patch b/srcpkgs/python3-frozenlist/patches/no-expandvars.patch new file mode 100644 index 00000000000000..5ed8c78b20f064 --- /dev/null +++ b/srcpkgs/python3-frozenlist/patches/no-expandvars.patch @@ -0,0 +1,23 @@ +diff -ur a/packaging/pep517_backend/_cython_configuration.py b/packaging/pep517_backend/_cython_configuration.py +--- a/packaging/pep517_backend/_cython_configuration.py 2024-11-16 13:10:48.821864296 -0500 ++++ b/packaging/pep517_backend/_cython_configuration.py 2024-11-16 13:12:37.985262597 -0500 +@@ -7,7 +7,7 @@ + from pathlib import Path + from sys import version_info as _python_version_tuple + +-from expandvars import expandvars ++from os.path import expandvars + + from ._compat import load_toml_from_string # noqa: WPS436 + from ._transformers import ( # noqa: WPS436 +diff -ur a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml 2024-11-16 13:10:48.821864296 -0500 ++++ b/pyproject.toml 2024-11-16 13:10:59.594903606 -0500 +@@ -3,7 +3,6 @@ + # NOTE: The following build dependencies are necessary for initial + # NOTE: provisioning of the in-tree build backend located under + # NOTE: `packaging/pep517_backend/`. +- "expandvars", + "setuptools >= 47", # Minimum required for `version = attr:` + "tomli; python_version < '3.11'", + ] diff --git a/srcpkgs/python3-frozenlist/template b/srcpkgs/python3-frozenlist/template index 8c7983a4e0180f..d533734432892c 100644 --- a/srcpkgs/python3-frozenlist/template +++ b/srcpkgs/python3-frozenlist/template @@ -1,9 +1,9 @@ # Template file for 'python3-frozenlist' pkgname=python3-frozenlist -version=1.4.0 +version=1.5.0 revision=1 -build_style=python3-module -hostmakedepends="python3-setuptools python3-wheel" +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-wheel python3-Cython" makedepends="python3-devel" depends="python3" checkdepends="python3-pytest python3-pytest-asyncio python3-pytest-cov" @@ -12,4 +12,4 @@ maintainer="Arjan Mossel " license="Apache-2.0" homepage="https://github.com/aio-libs/frozenlist" distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz" -checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251 +checksum=81d5af29e61b9c8348e876d442253723928dce6433e0e76cd925cd83f1b4b817 diff --git a/srcpkgs/python3-furl/template b/srcpkgs/python3-furl/template index 03b272b58f01cc..88019b997fc800 100644 --- a/srcpkgs/python3-furl/template +++ b/srcpkgs/python3-furl/template @@ -1,7 +1,7 @@ # Template file for 'python3-furl' pkgname=python3-furl version=2.1.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-orderedmultidict" diff --git a/srcpkgs/python3-fuse/template b/srcpkgs/python3-fuse/template index d7860366e847ee..f3c727f9321b6d 100644 --- a/srcpkgs/python3-fuse/template +++ b/srcpkgs/python3-fuse/template @@ -1,7 +1,7 @@ # Template file for 'python3-fuse' pkgname=python3-fuse version=1.0.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="pkg-config python3-setuptools" makedepends="fuse-devel python3-devel" diff --git a/srcpkgs/python3-future/template b/srcpkgs/python3-future/template index e167dd63717467..66807c0c6d2816 100644 --- a/srcpkgs/python3-future/template +++ b/srcpkgs/python3-future/template @@ -1,7 +1,7 @@ # Template file for 'python3-future' pkgname=python3-future version=0.18.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-fuzzyfinder/template b/srcpkgs/python3-fuzzyfinder/template index c053fd865bbb80..1e16378bdc79c0 100644 --- a/srcpkgs/python3-fuzzyfinder/template +++ b/srcpkgs/python3-fuzzyfinder/template @@ -1,7 +1,7 @@ # Template file for 'python3-fuzzyfinder' pkgname=python3-fuzzyfinder version=2.1.0 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-gast/template b/srcpkgs/python3-gast/template index fd05c8b4e544a6..0aa6a89b91e8af 100644 --- a/srcpkgs/python3-gast/template +++ b/srcpkgs/python3-gast/template @@ -1,7 +1,7 @@ # Template file for 'python3-gast' pkgname=python3-gast version=0.6.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-geojson/template b/srcpkgs/python3-geojson/template index 55b5a2d2ca4066..af2ca686d173d8 100644 --- a/srcpkgs/python3-geojson/template +++ b/srcpkgs/python3-geojson/template @@ -1,7 +1,7 @@ # Template file for 'python3-geojson' pkgname=python3-geojson version=2.5.0 -revision=6 +revision=7 build_style=python3-module pycompile_module="geojson" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-gevent/template b/srcpkgs/python3-gevent/template index a61545d6a315f9..5d1bdb8c038bdd 100644 --- a/srcpkgs/python3-gevent/template +++ b/srcpkgs/python3-gevent/template @@ -1,7 +1,7 @@ # Template file for 'python3-gevent' pkgname=python3-gevent version=23.9.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel libev-devel libuv-devel c-ares-devel python3-greenlet-devel" diff --git a/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch deleted file mode 100644 index 8663e69a0e279f..00000000000000 --- a/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch +++ /dev/null @@ -1,25 +0,0 @@ -Make sure that setuptools_scm actually installs the module and entrypoint. - ---- a/setup.cfg 2021-01-28 10:10:54.291152917 -0500 -+++ b/setup.cfg 2021-01-28 10:13:12.191007896 -0500 -@@ -61,3 +61,20 @@ - tag_date = 0 - tag_svn_revision = 0 - -+[options] -+packages = -+ gitchangelog -+package_dir = -+ =src -+setup_requires = -+ setuptools -+ setuptools-scm -+ -+[options.entry_points] -+console_scripts = -+ gitchangelog = gitchangelog.gitchangelog:main -+ -+[options.package_data] -+gitchangelog = -+ gitchangelog.rc.* -+ templates/**/* diff --git a/srcpkgs/python3-gitchangelog/patches/setup.py.patch b/srcpkgs/python3-gitchangelog/patches/setup.py.patch deleted file mode 100644 index 23c261a1fbdfc7..00000000000000 --- a/srcpkgs/python3-gitchangelog/patches/setup.py.patch +++ /dev/null @@ -1,25 +0,0 @@ -The d2to1 package is defunct and not offered by Void; roughly equivalent -functionality is provided by setuptools_scm, which is provided by Void. Drop -the special d2to1 setup call to allow setuptools_scm to work properly. - ---- a/setup.py 2021-01-28 10:00:20.165871918 -0500 -+++ b/setup.py 2021-01-28 10:01:07.760817952 -0500 -@@ -58,17 +58,4 @@ - ## Normal d2to1 setup - ## - --setup( -- setup_requires=['d2to1'], -- extras_require={ -- 'Mustache': ["pystache", ], -- 'Mako': ["mako", ], -- 'test': [ -- "nose", -- "minimock", -- "mako", -- "pystache", -- ], -- }, -- d2to1=True --) -+setup(use_scm_version=True) diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template deleted file mode 100644 index a4573fd372f617..00000000000000 --- a/srcpkgs/python3-gitchangelog/template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'python3-gitchangelog' -pkgname=python3-gitchangelog -version=3.0.4 -revision=7 -build_style=python3-module -hostmakedepends="python3-setuptools_scm" -depends="python3-pystache python3-Mako" -short_desc="Creates a changelog from git log history" -maintainer="Orphaned " -license="BSD-3-Clause" -homepage="https://github.com/vaab/gitchangelog" -distfiles="${PYPI_SITE}/g/gitchangelog/gitchangelog-${version}.tar.gz" -checksum=3d8d6a730450fbd5b0a9bc58d0dd3e269c967d7eb4fece0c5cff4372a3f77421 - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/python3-gitdb/template b/srcpkgs/python3-gitdb/template index 94629ce8351a4c..c84ed4931ba681 100644 --- a/srcpkgs/python3-gitdb/template +++ b/srcpkgs/python3-gitdb/template @@ -1,7 +1,7 @@ # Template file for 'python3-gitdb' pkgname=python3-gitdb version=4.0.10 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-smmap" diff --git a/srcpkgs/python3-gitea-client/template b/srcpkgs/python3-gitea-client/template index d9071dc68b1af5..b5f088feec634b 100644 --- a/srcpkgs/python3-gitea-client/template +++ b/srcpkgs/python3-gitea-client/template @@ -1,7 +1,7 @@ # Template file for 'python3-gitea-client' pkgname=python3-gitea-client version=1.0.9 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-attrs python3-future python3-requests python3-responses" diff --git a/srcpkgs/python3-github3/template b/srcpkgs/python3-github3/template index 9151fa548dea44..b5eddd25dfc1a3 100644 --- a/srcpkgs/python3-github3/template +++ b/srcpkgs/python3-github3/template @@ -1,7 +1,7 @@ # Template file for 'python3-github3' pkgname=python3-github3 version=3.2.0 -revision=3 +revision=4 build_style=python3-module make_check_args="-k not(test_delete_key)" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-gitlab/template b/srcpkgs/python3-gitlab/template index 5041a7ff86bfa0..b29a9c14438386 100644 --- a/srcpkgs/python3-gitlab/template +++ b/srcpkgs/python3-gitlab/template @@ -1,7 +1,7 @@ # Template file for 'python3-gitlab' pkgname=python3-gitlab version=3.6.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-requests-toolbelt" diff --git a/srcpkgs/python3-glad/template b/srcpkgs/python3-glad/template index 6833ca3b9e72b1..a883640c269a91 100644 --- a/srcpkgs/python3-glad/template +++ b/srcpkgs/python3-glad/template @@ -1,7 +1,7 @@ # Template file for 'python3-glad' pkgname=python3-glad version=2.0.4 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-Jinja2" diff --git a/srcpkgs/python3-gmpy2/template b/srcpkgs/python3-gmpy2/template index 44de709067551d..93d82a79f67299 100644 --- a/srcpkgs/python3-gmpy2/template +++ b/srcpkgs/python3-gmpy2/template @@ -1,7 +1,7 @@ # Template file for 'python3-gmpy2' pkgname=python3-gmpy2 version=2.2.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" makedepends="python3-devel gmp-devel mpfr-devel libmpc-devel" diff --git a/srcpkgs/python3-gntp/template b/srcpkgs/python3-gntp/template index b0e4c6c0eee238..0df7d2b8d0c847 100644 --- a/srcpkgs/python3-gntp/template +++ b/srcpkgs/python3-gntp/template @@ -1,7 +1,7 @@ # Template file for 'python3-gntp' pkgname=python3-gntp version=1.0.3 -revision=12 +revision=13 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-gnupg/template b/srcpkgs/python3-gnupg/template index d5b50a1273bd0b..83fc1cb3b41f64 100644 --- a/srcpkgs/python3-gnupg/template +++ b/srcpkgs/python3-gnupg/template @@ -1,7 +1,7 @@ # Template file for 'python3-gnupg' pkgname=python3-gnupg version=0.5.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3 gnupg" diff --git a/srcpkgs/python3-gobject/template b/srcpkgs/python3-gobject/template index b58b7f1340b063..f4ba15f76ec89c 100644 --- a/srcpkgs/python3-gobject/template +++ b/srcpkgs/python3-gobject/template @@ -1,6 +1,6 @@ # Template file for 'python3-gobject' pkgname=python3-gobject -version=3.48.2 +version=3.50.0 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://pygobject.readthedocs.io/" changelog="https://pygobject.readthedocs.io/en/latest/changelog.html" distfiles="${GNOME_SITE}/pygobject/${version%.*}/pygobject-${version}.tar.xz" -checksum=0794aeb4a9be31a092ac20621b5f54ec280f9185943d328b105cdae6298ad1a7 +checksum=8d836e75b5a881d457ee1622cae4a32bcdba28a0ba562193adb3bbb472472212 make_check_pre="xvfb-run" python3-gobject-devel_package() { diff --git a/srcpkgs/python3-google-api-core/template b/srcpkgs/python3-google-api-core/template index a6447f80622ad3..ae9f56926b5cdb 100644 --- a/srcpkgs/python3-google-api-core/template +++ b/srcpkgs/python3-google-api-core/template @@ -1,7 +1,7 @@ # Template file for 'python3-google-api-core' pkgname=python3-google-api-core version=2.11.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-googleapis-common-protos python3-protobuf python3-google-auth diff --git a/srcpkgs/python3-google-api-python-client/template b/srcpkgs/python3-google-api-python-client/template index dfca76ef2fc27b..19c64dc342c6bf 100644 --- a/srcpkgs/python3-google-api-python-client/template +++ b/srcpkgs/python3-google-api-python-client/template @@ -1,7 +1,7 @@ # Template file for 'python3-google-api-python-client' pkgname=python3-google-api-python-client version=2.80.0 -revision=2 +revision=3 build_style=python3-module make_check_args="--deselect=tests/test__helpers.py::PositionalTests::test_usage --deselect=tests/test_discovery.py::DiscoveryErrors::test_tests_should_be_run_with_strict_positional_enforcement" diff --git a/srcpkgs/python3-google-auth-httplib2/template b/srcpkgs/python3-google-auth-httplib2/template index 05f9446fc886f5..8761667fbab31c 100644 --- a/srcpkgs/python3-google-auth-httplib2/template +++ b/srcpkgs/python3-google-auth-httplib2/template @@ -1,7 +1,7 @@ # Template file for 'python3-google-auth-httplib2' pkgname=python3-google-auth-httplib2 version=0.1.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-google-auth python3-httplib2" diff --git a/srcpkgs/python3-google-auth-oauthlib/template b/srcpkgs/python3-google-auth-oauthlib/template index 2f1d7ee16eb1cb..1fad33b9aff7b3 100644 --- a/srcpkgs/python3-google-auth-oauthlib/template +++ b/srcpkgs/python3-google-auth-oauthlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-google-auth-oauthlib' pkgname=python3-google-auth-oauthlib version=1.0.0 -revision=2 +revision=3 build_style=python3-module make_check_args="--deselect tests/unit/test_flow.py::TestInstalledAppFlow::test_run_local_server_bind_addr" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-google-auth/template b/srcpkgs/python3-google-auth/template index e57c842d2f83d4..16c66fdc47a932 100644 --- a/srcpkgs/python3-google-auth/template +++ b/srcpkgs/python3-google-auth/template @@ -1,7 +1,7 @@ # Template file for 'python3-google-auth' pkgname=python3-google-auth version=2.16.2 -revision=2 +revision=3 build_style=python3-module # upstream restricts python3-cryptography to lower versions # for tests; causing them to fail with the version in repo diff --git a/srcpkgs/python3-google-i18n-address/template b/srcpkgs/python3-google-i18n-address/template index 658315a30cb9b4..636f8d69ca895f 100644 --- a/srcpkgs/python3-google-i18n-address/template +++ b/srcpkgs/python3-google-i18n-address/template @@ -1,7 +1,7 @@ # Template file for 'python3-google-i18n-address' pkgname=python3-google-i18n-address version=3.1.1 -revision=1 +revision=2 build_style=python3-pep517 make_check_target="tests/" hostmakedepends="python3-poetry-core hatchling" diff --git a/srcpkgs/python3-googleapis-common-protos/template b/srcpkgs/python3-googleapis-common-protos/template index 82a90b89272173..1fdf795f81bd44 100644 --- a/srcpkgs/python3-googleapis-common-protos/template +++ b/srcpkgs/python3-googleapis-common-protos/template @@ -1,7 +1,7 @@ # Template file for 'python3-googleapis-common-protos' pkgname=python3-googleapis-common-protos version=1.58.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-protobuf" diff --git a/srcpkgs/python3-graphviz/template b/srcpkgs/python3-graphviz/template index 36d71a29e1e99f..633c00218253fc 100644 --- a/srcpkgs/python3-graphviz/template +++ b/srcpkgs/python3-graphviz/template @@ -1,7 +1,7 @@ # Template file for 'python3-graphviz' pkgname=python3-graphviz version=0.20.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="graphviz python3" diff --git a/srcpkgs/python3-greenlet/template b/srcpkgs/python3-greenlet/template index 0bcb4171771f1f..ba0efc4a787e6e 100644 --- a/srcpkgs/python3-greenlet/template +++ b/srcpkgs/python3-greenlet/template @@ -1,6 +1,6 @@ # Template file for 'python3-greenlet' pkgname=python3-greenlet -version=3.0.3 +version=3.1.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/python-greenlet/greenlet" changelog="https://raw.githubusercontent.com/python-greenlet/greenlet/master/CHANGES.rst" distfiles="${PYPI_SITE}/g/greenlet/greenlet-${version}.tar.gz" -checksum=43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491 +checksum=4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467 do_check() { python3 setup.py build_ext --inplace diff --git a/srcpkgs/python3-grequests/template b/srcpkgs/python3-grequests/template index a4b34676c43b3b..c8c54b4f464dac 100644 --- a/srcpkgs/python3-grequests/template +++ b/srcpkgs/python3-grequests/template @@ -1,17 +1,17 @@ # Template file for 'python3-grequests' pkgname=python3-grequests version=0.6.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-gevent python3-requests" -checkdepends="${depends} python3-nose" short_desc="Asynchronus HTTP requests with gevent" maintainer="Orphaned " license="BSD-2-Clause" homepage="https://github.com/spyoungtech/grequests" distfiles="https://github.com/spyoungtech/grequests/archive/v${version}.tar.gz" checksum=8c4a7c004d6f01a44bb84069043b1d266228af238a4d4f2ea6f6bbdd4c37ee0e +make_check=no # Tests require removed python3-nose post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-grpcio-tools/patches/cross.patch b/srcpkgs/python3-grpcio-tools/patches/cross.patch new file mode 100644 index 00000000000000..a00e5080641e57 --- /dev/null +++ b/srcpkgs/python3-grpcio-tools/patches/cross.patch @@ -0,0 +1,13 @@ +In Void cross-build environments, $CC and $CXX may actually contain arguments. + +--- a/setup.py 2024-11-26 09:12:22.059041830 -0500 ++++ b/setup.py 2024-11-26 09:12:44.641146370 -0500 +@@ -92,7 +92,7 @@ + ) + cxx = os.environ.get("CXX", "c++") + cpp_test = subprocess.Popen( +- [cxx, "-x", "c++", "-std=c++14", "-"], ++ shlex.split(cxx) + ["-x", "c++", "-std=c++14", "-"], + stdin=PIPE, + stdout=PIPE, + stderr=PIPE, diff --git a/srcpkgs/python3-grpcio-tools/template b/srcpkgs/python3-grpcio-tools/template index c5d4420c2a4e2b..e0ba3cc521337e 100644 --- a/srcpkgs/python3-grpcio-tools/template +++ b/srcpkgs/python3-grpcio-tools/template @@ -1,6 +1,6 @@ # Template file for 'python3-grpcio-tools' pkgname=python3-grpcio-tools -version=1.60.1 +version=1.67.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" @@ -11,8 +11,8 @@ short_desc="Protobuf code generator for gRPC" maintainer="Orphaned " license="Apache-2.0" homepage="https://grpc.io" -distfiles="${PYPI_SITE}/g/grpcio-tools/grpcio-tools-${version}.tar.gz" -checksum=da08224ab8675c6d464b988bd8ca02cccd2bf0275bceefe8f6219bfd4a4f5e85 +distfiles="${PYPI_SITE}/g/grpcio_tools/grpcio_tools-${version}.tar.gz" +checksum=d9657f5ddc62b52f58904e6054b7d8a8909ed08a1e28b734be3a707087bcf004 export GRPC_PYTHON_BUILD_WITH_CYTHON=1 diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index c255fca6481415..4de81544485817 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -1,9 +1,9 @@ # Template file for 'python3-grpcio' pkgname=python3-grpcio -version=1.60.1 -revision=2 +version=1.67.1 +revision=1 build_style=python3-module -hostmakedepends="python3-setuptools python3-six python3-Cython0.29" +hostmakedepends="python3-setuptools python3-six python3-Cython" makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel abseil-cpp-devel" depends="python3-six" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://grpc.io" distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz" -checksum=dd1d3a8d1d2e50ad9b59e10aa7f07c7d1be2b367f3f2d33c5fade96ed5460962 +checksum=3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732 export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 diff --git a/srcpkgs/python3-guessit/template b/srcpkgs/python3-guessit/template index 926dc03ff57a3b..8242ed2c8f7ddf 100644 --- a/srcpkgs/python3-guessit/template +++ b/srcpkgs/python3-guessit/template @@ -1,7 +1,7 @@ # Template file for 'python3-guessit' pkgname=python3-guessit version=3.1.1 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-rebulk python3-babelfish python3-dateutil" diff --git a/srcpkgs/python3-h11/template b/srcpkgs/python3-h11/template index e01f289b4a2fc9..2fc75c07290e11 100644 --- a/srcpkgs/python3-h11/template +++ b/srcpkgs/python3-h11/template @@ -1,7 +1,7 @@ # Template file for 'python3-h11' pkgname=python3-h11 version=0.14.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-h2/template b/srcpkgs/python3-h2/template index 90a0c639613044..84a5fcf082a9ed 100644 --- a/srcpkgs/python3-h2/template +++ b/srcpkgs/python3-h2/template @@ -1,7 +1,7 @@ # Template file for 'python3-h2' pkgname=python3-h2 version=4.1.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-hpack python3-hyperframe" diff --git a/srcpkgs/python3-h5py/template b/srcpkgs/python3-h5py/template index 407a7e3f9017f9..fc1b22026bad17 100644 --- a/srcpkgs/python3-h5py/template +++ b/srcpkgs/python3-h5py/template @@ -1,10 +1,10 @@ # Template file for 'python3-h5py' pkgname=python3-h5py version=3.12.1 -revision=1 +revision=2 build_style=python3-module build_helper="numpy" -hostmakedepends="python3-setuptools python3-Cython0.29 python3-pkgconfig" +hostmakedepends="python3-setuptools python3-Cython python3-pkgconfig" makedepends="python3-devel hdf5-devel" depends="python3-numpy" short_desc="HDF5 for Python" diff --git a/srcpkgs/python3-habanero/template b/srcpkgs/python3-habanero/template index 4349e05a4da0c7..2eef5c063745cf 100644 --- a/srcpkgs/python3-habanero/template +++ b/srcpkgs/python3-habanero/template @@ -1,7 +1,7 @@ # Template file for 'python3-habanero' pkgname=python3-habanero version=0.6.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests" diff --git a/srcpkgs/python3-halo/template b/srcpkgs/python3-halo/template index c2db538b84820f..8cdedc290fbb33 100644 --- a/srcpkgs/python3-halo/template +++ b/srcpkgs/python3-halo/template @@ -1,7 +1,7 @@ # Template file for 'python3-halo' pkgname=python3-halo version=0.0.31 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-log_symbols python3-spinners python3-termcolor diff --git a/srcpkgs/python3-hawkauthlib/template b/srcpkgs/python3-hawkauthlib/template index bc61a8a62fab70..f222602af95e3f 100644 --- a/srcpkgs/python3-hawkauthlib/template +++ b/srcpkgs/python3-hawkauthlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-hawkauthlib' pkgname=python3-hawkauthlib version=2.0.0 -revision=7 +revision=8 build_style=python3-module pycompile_module="hawkauthlib" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template index c87a434184912d..0eb473ed9258a8 100644 --- a/srcpkgs/python3-hcloud/template +++ b/srcpkgs/python3-hcloud/template @@ -1,7 +1,7 @@ # Template file for 'python3-hcloud' pkgname=python3-hcloud version=1.32.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-future python3-dateutil" diff --git a/srcpkgs/python3-hid/template b/srcpkgs/python3-hid/template index 28da3418ee4ae6..325e3e2ea47cc5 100644 --- a/srcpkgs/python3-hid/template +++ b/srcpkgs/python3-hid/template @@ -1,11 +1,10 @@ # Template file for 'python3-hid' pkgname=python3-hid version=1.0.4 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="hidapi python3" -checkdepends="hidapi python3-nose" short_desc="Python hidapi bindings in ctypes" maintainer="Orphaned " license="MIT" @@ -13,6 +12,7 @@ homepage="https://github.com/apmorton/pyhidapi" # Can't use PyPi as the tarball there doesn't include LICENSE distfiles="${homepage}/archive/refs/tags/${version}.tar.gz" checksum=b4a48e643cf345cf061edb287255a2cfb9778eb89756a915a5baf8eabfb3a0e0 +make_check=no # Tests require removed python3-nose post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-hiredis/template b/srcpkgs/python3-hiredis/template index 501584dbd6ec43..96851bc5c3b408 100644 --- a/srcpkgs/python3-hiredis/template +++ b/srcpkgs/python3-hiredis/template @@ -1,7 +1,7 @@ # Template file for 'python3-hiredis' pkgname=python3-hiredis version=2.3.0 -revision=1 +revision=2 build_wrksrc="hiredis-py-${version}" build_style=python3-module hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-hjson/template b/srcpkgs/python3-hjson/template index 41c9b8ec66f6b3..9db138265872bc 100644 --- a/srcpkgs/python3-hjson/template +++ b/srcpkgs/python3-hjson/template @@ -1,7 +1,7 @@ # Template file for 'python3-hjson' pkgname=python3-hjson version=3.1.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-hkdf/template b/srcpkgs/python3-hkdf/template index a2bffc72fbf334..758fc60d97ae50 100644 --- a/srcpkgs/python3-hkdf/template +++ b/srcpkgs/python3-hkdf/template @@ -1,7 +1,7 @@ # Template file for 'python3-hkdf' pkgname=python3-hkdf version=0.0.3 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-hoedown/template b/srcpkgs/python3-hoedown/template index db90c0ee367ea6..385b95fe2e1932 100644 --- a/srcpkgs/python3-hoedown/template +++ b/srcpkgs/python3-hoedown/template @@ -1,7 +1,7 @@ # Template file for 'python3-hoedown' pkgname=python3-hoedown version=0.3.0 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel" diff --git a/srcpkgs/python3-hpack/template b/srcpkgs/python3-hpack/template index 263f4de678bdf6..0f69aa0d2bae1e 100644 --- a/srcpkgs/python3-hpack/template +++ b/srcpkgs/python3-hpack/template @@ -1,7 +1,7 @@ # Template file for 'python3-hpack' pkgname=python3-hpack version=4.0.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-html2text/template b/srcpkgs/python3-html2text/template index 40a0f45ec4e539..24ac6606824bad 100644 --- a/srcpkgs/python3-html2text/template +++ b/srcpkgs/python3-html2text/template @@ -1,7 +1,7 @@ # Template file for 'python3-html2text' pkgname=python3-html2text version=2024.2.26 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template index 9aeb4df623a7e7..ca990d67e4f9f9 100644 --- a/srcpkgs/python3-html5-parser/template +++ b/srcpkgs/python3-html5-parser/template @@ -1,7 +1,7 @@ # Template file for 'python3-html5-parser' pkgname=python3-html5-parser version=0.4.10 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools pkg-config" makedepends="python3-devel libxml2-devel" diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template index c07661a443e111..98b955adcce415 100644 --- a/srcpkgs/python3-html5lib/template +++ b/srcpkgs/python3-html5lib/template @@ -1,7 +1,7 @@ # Template file for 'python3-html5lib' pkgname=python3-html5lib version=1.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-webencodings" diff --git a/srcpkgs/python3-httmock/template b/srcpkgs/python3-httmock/template index cf0584eb3133c9..4e8d993884e69d 100644 --- a/srcpkgs/python3-httmock/template +++ b/srcpkgs/python3-httmock/template @@ -1,7 +1,7 @@ # Template file for 'python3-httmock' pkgname=python3-httmock version=1.4.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests" diff --git a/srcpkgs/python3-httpbin/template b/srcpkgs/python3-httpbin/template index 757b2a827aadec..5496f0059c309a 100644 --- a/srcpkgs/python3-httpbin/template +++ b/srcpkgs/python3-httpbin/template @@ -1,7 +1,7 @@ # Template file for 'python3-httpbin' pkgname=python3-httpbin version=0.10.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-Flask python3-Brotli python3-decorator python3-flasgger diff --git a/srcpkgs/python3-httpcore/template b/srcpkgs/python3-httpcore/template index cb309d34154cc3..4b774174b05835 100644 --- a/srcpkgs/python3-httpcore/template +++ b/srcpkgs/python3-httpcore/template @@ -1,7 +1,7 @@ # Template file for 'python3-httpcore' pkgname=python3-httpcore version=1.0.7 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core hatchling hatch-fancy-pypi-readme" depends="python3-h11 python3-sniffio python3-anyio python3-h2 python3-certifi diff --git a/srcpkgs/python3-httplib2/template b/srcpkgs/python3-httplib2/template index 00b48293cb2db3..2a63cd3309f247 100644 --- a/srcpkgs/python3-httplib2/template +++ b/srcpkgs/python3-httplib2/template @@ -1,7 +1,7 @@ # Template file for 'python3-httplib2' pkgname=python3-httplib2 version=0.22.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 ca-certificates python3-parsing" diff --git a/srcpkgs/python3-httpx/template b/srcpkgs/python3-httpx/template index 8657d643868f6b..e4275ea32d3f8c 100644 --- a/srcpkgs/python3-httpx/template +++ b/srcpkgs/python3-httpx/template @@ -1,7 +1,7 @@ # Template file for 'python3-httpx' pkgname=python3-httpx version=0.27.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-fancy-pypi-readme" depends="python3-idna python3-certifi python3-h2 python3-Brotli diff --git a/srcpkgs/python3-humanize/template b/srcpkgs/python3-humanize/template index 0f7a00e6c18ffb..04ef8b8c095ed1 100644 --- a/srcpkgs/python3-humanize/template +++ b/srcpkgs/python3-humanize/template @@ -1,7 +1,7 @@ # Template file for 'python3-humanize' pkgname=python3-humanize version=4.10.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3" diff --git a/srcpkgs/python3-hypercorn/template b/srcpkgs/python3-hypercorn/template index dc89d21eec828f..50a8c719be087e 100644 --- a/srcpkgs/python3-hypercorn/template +++ b/srcpkgs/python3-hypercorn/template @@ -1,7 +1,7 @@ # Template file for 'python3-hypercorn' pkgname=python3-hypercorn version=0.17.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-h11 python3-h2 python3-priority python3-wsproto" diff --git a/srcpkgs/python3-hyperframe/template b/srcpkgs/python3-hyperframe/template index b20bebe777c78c..865d3e5e55f5af 100644 --- a/srcpkgs/python3-hyperframe/template +++ b/srcpkgs/python3-hyperframe/template @@ -1,7 +1,7 @@ # Template file for 'python3-hyperframe' pkgname=python3-hyperframe version=6.0.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-hyperlink/template b/srcpkgs/python3-hyperlink/template index 868471f43869ec..38167b7eda9079 100644 --- a/srcpkgs/python3-hyperlink/template +++ b/srcpkgs/python3-hyperlink/template @@ -1,7 +1,7 @@ # Template file for 'python3-hyperlink' pkgname=python3-hyperlink version=21.0.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-idna" diff --git a/srcpkgs/python3-hypothesis/template b/srcpkgs/python3-hypothesis/template index f5460e9010fabb..1a0fe6ac494ebc 100644 --- a/srcpkgs/python3-hypothesis/template +++ b/srcpkgs/python3-hypothesis/template @@ -1,6 +1,6 @@ # Template file for 'python3-hypothesis' pkgname=python3-hypothesis -version=6.112.0 +version=6.122.0 revision=1 build_wrksrc=hypothesis-python build_style=python3-pep517 @@ -24,7 +24,7 @@ license="MPL-2.0" homepage="https://hypothesis.works/" changelog="https://raw.githubusercontent.com/HypothesisWorks/hypothesis/master/hypothesis-python/docs/changes.rst" distfiles="https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-${version}.tar.gz" -checksum=752c79fa703bdc7e5fa5d489e23a2fc057c6a290bc64db385eb72ed12c770845 +checksum=947322c71ffbeffcfdb2cb9b72d5923a05f5aeb1073f1da4adebe014fe7b7b07 if [ "$XBPS_CHECK_PKGS" != full ]; then # Skip "full" tests unless explicitly requested" diff --git a/srcpkgs/python3-i3ipc/template b/srcpkgs/python3-i3ipc/template index 2ee624893267fa..18d465d595d26d 100644 --- a/srcpkgs/python3-i3ipc/template +++ b/srcpkgs/python3-i3ipc/template @@ -1,7 +1,7 @@ # Template file for 'python3-i3ipc' pkgname=python3-i3ipc version=2.2.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-xlib" diff --git a/srcpkgs/python3-icalendar/template b/srcpkgs/python3-icalendar/template index 2f536e6d5d6716..df0e0cffe16667 100644 --- a/srcpkgs/python3-icalendar/template +++ b/srcpkgs/python3-icalendar/template @@ -1,7 +1,7 @@ # Template file for 'python3-icalendar' pkgname=python3-icalendar version=5.0.11 -revision=1 +revision=2 build_style=python3-module make_check_target=src/icalendar/tests # Test uses different date formats, so calendars are not actually equal diff --git a/srcpkgs/python3-identify/template b/srcpkgs/python3-identify/template index 1290e6591aed7a..96c7f5e3fa2d0c 100644 --- a/srcpkgs/python3-identify/template +++ b/srcpkgs/python3-identify/template @@ -1,7 +1,7 @@ # Template file for 'python3-identify' pkgname=python3-identify version=2.4.12 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-idna/template b/srcpkgs/python3-idna/template index 520335878283f5..ee220ff742671d 100644 --- a/srcpkgs/python3-idna/template +++ b/srcpkgs/python3-idna/template @@ -1,7 +1,7 @@ # Template file for 'python3-idna' pkgname=python3-idna version=3.7 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-ifaddr/template b/srcpkgs/python3-ifaddr/template index cb37ba2c0d61bc..24f4c9318d9c17 100644 --- a/srcpkgs/python3-ifaddr/template +++ b/srcpkgs/python3-ifaddr/template @@ -1,7 +1,7 @@ # Template file for 'python3-ifaddr' pkgname=python3-ifaddr version=0.1.7 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-ijson/template b/srcpkgs/python3-ijson/template index 6da11ca0eeb4da..c284a90431e95c 100644 --- a/srcpkgs/python3-ijson/template +++ b/srcpkgs/python3-ijson/template @@ -1,7 +1,7 @@ # Template file for 'python3-ijson' pkgname=python3-ijson version=3.3.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="yajl-devel python3-devel" diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template index 73cee3ee66bd89..624cbeceead456 100644 --- a/srcpkgs/python3-imageio/template +++ b/srcpkgs/python3-imageio/template @@ -1,6 +1,6 @@ # Template file for 'python3-imageio' pkgname=python3-imageio -version=2.35.1 +version=2.36.1 revision=1 build_style=python3-module # tests have unpackaged dependencies, require network or missing data files @@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford " license="BSD-2-Clause" homepage="https://github.com/imageio/imageio" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=6e628cbf32ba1f745ead68415e6c65baa407a96648057bb42dccc8458678d514 +checksum=1bcc0f5003c2deb68e2c31994246d5cc5ead341ec81732cdffaf70c25e893ce4 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-imagesize/template b/srcpkgs/python3-imagesize/template index 536895fe2331cd..373821241c1ad1 100644 --- a/srcpkgs/python3-imagesize/template +++ b/srcpkgs/python3-imagesize/template @@ -1,7 +1,7 @@ # Template file for 'python3-imagesize' pkgname=python3-imagesize version=1.4.1 -revision=1 +revision=2 build_style=python3-module # Triest to fetch a dead url make_check_args="--deselect test/test_get_filelike.py::test_get_filelike" diff --git a/srcpkgs/python3-imaplib2/template b/srcpkgs/python3-imaplib2/template index 9d6fdca25fdbf1..f7c52f45405061 100644 --- a/srcpkgs/python3-imaplib2/template +++ b/srcpkgs/python3-imaplib2/template @@ -1,7 +1,7 @@ # Template file for 'python3-imaplib2' pkgname=python3-imaplib2 version=3.6 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-immutabledict/template b/srcpkgs/python3-immutabledict/template index 7a5ef6ba6214cb..57eb323179685a 100644 --- a/srcpkgs/python3-immutabledict/template +++ b/srcpkgs/python3-immutabledict/template @@ -1,7 +1,7 @@ # Template file for 'python3-immutabledict' pkgname=python3-immutabledict version=4.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" makedepends="python3-devel" diff --git a/srcpkgs/python3-importlib_metadata/template b/srcpkgs/python3-importlib_metadata/template index 851a5174f28cbd..0370f55458fb5e 100644 --- a/srcpkgs/python3-importlib_metadata/template +++ b/srcpkgs/python3-importlib_metadata/template @@ -1,7 +1,7 @@ # Template file for 'python3-importlib_metadata' pkgname=python3-importlib_metadata version=8.5.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-zipp" diff --git a/srcpkgs/python3-incremental/template b/srcpkgs/python3-incremental/template index 797f28e878ab49..1eb99e0f45536b 100644 --- a/srcpkgs/python3-incremental/template +++ b/srcpkgs/python3-incremental/template @@ -1,7 +1,7 @@ # Template file for 'python3-incremental' pkgname=python3-incremental version=24.7.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-inflate64/template b/srcpkgs/python3-inflate64/template index d6788064d9988e..09859110c404c2 100644 --- a/srcpkgs/python3-inflate64/template +++ b/srcpkgs/python3-inflate64/template @@ -1,7 +1,7 @@ # Template file for 'python3-inflate64' pkgname=python3-inflate64 version=1.0.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" diff --git a/srcpkgs/python3-inflect/template b/srcpkgs/python3-inflect/template index 46e6571941a44b..cec20bacfb0f54 100644 --- a/srcpkgs/python3-inflect/template +++ b/srcpkgs/python3-inflect/template @@ -1,7 +1,7 @@ # Template file for 'python3-inflect' pkgname=python3-inflect version=7.4.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-more-itertools python3-typeguard python3-typing_extensions" diff --git a/srcpkgs/python3-influxdb/template b/srcpkgs/python3-influxdb/template index 070edb94df80d8..a877b1d8712411 100644 --- a/srcpkgs/python3-influxdb/template +++ b/srcpkgs/python3-influxdb/template @@ -1,7 +1,7 @@ # Template file for 'python3-influxdb' pkgname=python3-influxdb version=5.3.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-six python3-pytz python3-msgpack python3-dateutil" diff --git a/srcpkgs/python3-iniconfig/template b/srcpkgs/python3-iniconfig/template index 8006b49755e65b..2b3f215977c5f6 100644 --- a/srcpkgs/python3-iniconfig/template +++ b/srcpkgs/python3-iniconfig/template @@ -1,7 +1,7 @@ # Template file for 'python3-iniconfig' pkgname=python3-iniconfig version=1.1.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-injector/template b/srcpkgs/python3-injector/template index 78ce53f8aeebb4..b30e22d56a8000 100644 --- a/srcpkgs/python3-injector/template +++ b/srcpkgs/python3-injector/template @@ -1,7 +1,7 @@ # Template file for 'python3-injector' pkgname=python3-injector version=0.19.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-typing_extensions python3-setuptools" depends="python3 python3-typing_extensions" diff --git a/srcpkgs/python3-inotify/template b/srcpkgs/python3-inotify/template index b53c64fb25bfcb..303639e71d4bd2 100644 --- a/srcpkgs/python3-inotify/template +++ b/srcpkgs/python3-inotify/template @@ -1,7 +1,7 @@ # Template file for 'python3-inotify' pkgname=python3-inotify version=0.9.6 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-installer/template b/srcpkgs/python3-installer/template index 1dd954714f6448..6ac895de585ce2 100644 --- a/srcpkgs/python3-installer/template +++ b/srcpkgs/python3-installer/template @@ -1,7 +1,7 @@ # Template file for 'python3-installer' pkgname=python3-installer version=0.7.0 -revision=2 +revision=3 # This package is used by the python3-pep517 build style; using that style here # would create a build cycle build_style=python3-module diff --git a/srcpkgs/python3-intervaltree/template b/srcpkgs/python3-intervaltree/template index 39c9ba3aa5561e..7f83a970c3f0a2 100644 --- a/srcpkgs/python3-intervaltree/template +++ b/srcpkgs/python3-intervaltree/template @@ -1,7 +1,7 @@ # Template file for 'python3-intervaltree' pkgname=python3-intervaltree version=3.1.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-sortedcontainers" diff --git a/srcpkgs/python3-iptools/template b/srcpkgs/python3-iptools/template index 0dbb80379da6f0..1cf2a25dbac09d 100644 --- a/srcpkgs/python3-iptools/template +++ b/srcpkgs/python3-iptools/template @@ -1,7 +1,7 @@ # Template file for 'python3-iptools' pkgname=python3-iptools version=0.7.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-ipyparallel/template b/srcpkgs/python3-ipyparallel/template index 5c5b39a5532274..7f12ce86548218 100644 --- a/srcpkgs/python3-ipyparallel/template +++ b/srcpkgs/python3-ipyparallel/template @@ -1,6 +1,6 @@ # Template file for 'python3-ipyparallel' pkgname=python3-ipyparallel -version=8.8.0 +version=9.0.0 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -16,7 +16,7 @@ license="BSD-3-Clause" homepage="https://ipyparallel.readthedocs.io/" changelog="https://ipyparallel.readthedocs.io/en/latest/changelog.html" distfiles="${PYPI_SITE}/i/ipyparallel/ipyparallel-${version}.tar.gz" -checksum=2404d59f86a3aaa3bd27bf6b57df777bff5c1363c1c6e60403759d16ed42dc7b +checksum=70601cbaf9a169d350ffe22c82d5bbdfe6dfe4c4df02836d9990e9c559b5bcb6 # having HOME=/tmp confuses a few tests make_check_pre="env HOME=/home" diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template index 59763902af04bf..0c3021f5644337 100644 --- a/srcpkgs/python3-ipython/template +++ b/srcpkgs/python3-ipython/template @@ -1,6 +1,6 @@ # Template file for 'python3-ipython' pkgname=python3-ipython -version=8.28.0 +version=8.30.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -16,7 +16,7 @@ license="BSD-3-Clause" homepage="https://ipython.org/" changelog="https://github.com/ipython/ipython/raw/main/docs/source/whatsnew/version8.rst" distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz" -checksum=0d0d15ca1e01faeb868ef56bc7ee5a0de5bd66885735682e8a322ae289a13d1a +checksum=cb0a405a306d2995a5cbb9901894d240784a9f341394c6ba3f4fe8c6eb89ff6e conflicts="python-ipython<=5.8.0_2" make_check_pre="env PYTHONPATH=." diff --git a/srcpkgs/python3-ipython_genutils/template b/srcpkgs/python3-ipython_genutils/template index 28df882e6d70bd..9634458b390371 100644 --- a/srcpkgs/python3-ipython_genutils/template +++ b/srcpkgs/python3-ipython_genutils/template @@ -1,7 +1,7 @@ # Template file for 'python3-ipython_genutils' pkgname=python3-ipython_genutils version=0.2.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template index 037d5fa0fbe39d..22143ffaf9a5e4 100644 --- a/srcpkgs/python3-ipython_ipykernel/template +++ b/srcpkgs/python3-ipython_ipykernel/template @@ -1,7 +1,7 @@ # Template file for 'python3-ipython_ipykernel' pkgname=python3-ipython_ipykernel version=6.29.5 -revision=1 +revision=2 build_style=python3-pep517 # run all tests available make_check_target="tests" diff --git a/srcpkgs/python3-irc/template b/srcpkgs/python3-irc/template index 2b573aac307445..f5ef27c377aa29 100644 --- a/srcpkgs/python3-irc/template +++ b/srcpkgs/python3-irc/template @@ -1,7 +1,7 @@ # Template file for 'python3-irc' pkgname=python3-irc version=20.1.0 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-jaraco.collections python3-jaraco.text python3-jaraco.logging diff --git a/srcpkgs/python3-isbnlib/template b/srcpkgs/python3-isbnlib/template index f723c2c03bc5de..f3765ad6fe534b 100644 --- a/srcpkgs/python3-isbnlib/template +++ b/srcpkgs/python3-isbnlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-isbnlib' pkgname=python3-isbnlib version=3.10.8 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-iso8601/template b/srcpkgs/python3-iso8601/template index 249cef1d47c4cf..1d725f5d0344c5 100644 --- a/srcpkgs/python3-iso8601/template +++ b/srcpkgs/python3-iso8601/template @@ -1,7 +1,7 @@ # Template file for 'python3-iso8601' pkgname=python3-iso8601 version=2.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3" diff --git a/srcpkgs/python3-isodate/template b/srcpkgs/python3-isodate/template index 058f95dbc22142..244db83f22f259 100644 --- a/srcpkgs/python3-isodate/template +++ b/srcpkgs/python3-isodate/template @@ -1,7 +1,7 @@ # Template file for 'python3-isodate' pkgname=python3-isodate version=0.6.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" diff --git a/srcpkgs/python3-isort/template b/srcpkgs/python3-isort/template index 3e8e7054f51f5b..bf90d6cca5465f 100644 --- a/srcpkgs/python3-isort/template +++ b/srcpkgs/python3-isort/template @@ -1,7 +1,7 @@ # Template file for 'python3-isort' pkgname=python3-isort version=5.13.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3" diff --git a/srcpkgs/python3-iterable-io/template b/srcpkgs/python3-iterable-io/template index d7616cfd136baf..2ac605875a1879 100644 --- a/srcpkgs/python3-iterable-io/template +++ b/srcpkgs/python3-iterable-io/template @@ -1,7 +1,7 @@ # Template file for 'python3-iterable-io' pkgname=python3-iterable-io version=1.0.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-itsdangerous/template b/srcpkgs/python3-itsdangerous/template index 039e0ca95699c1..be78cef031a8cc 100644 --- a/srcpkgs/python3-itsdangerous/template +++ b/srcpkgs/python3-itsdangerous/template @@ -1,7 +1,7 @@ # Template file for 'python3-itsdangerous' pkgname=python3-itsdangerous version=2.1.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-itunespy/template b/srcpkgs/python3-itunespy/template index 7c48399c301495..0970835f360195 100644 --- a/srcpkgs/python3-itunespy/template +++ b/srcpkgs/python3-itunespy/template @@ -1,7 +1,7 @@ # Template file for 'python3-itunespy' pkgname=python3-itunespy version=1.6.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-pycountry" diff --git a/srcpkgs/python3-iwlib/template b/srcpkgs/python3-iwlib/template index 4910491a3c1897..e5c4f82adcdb2a 100644 --- a/srcpkgs/python3-iwlib/template +++ b/srcpkgs/python3-iwlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-iwlib' pkgname=python3-iwlib version=1.7.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools python3-cffi" makedepends="python3-devel wireless_tools-devel libffi-devel" diff --git a/srcpkgs/python3-janus/template b/srcpkgs/python3-janus/template index e7fd3ec3579c8d..c57011b37f3765 100644 --- a/srcpkgs/python3-janus/template +++ b/srcpkgs/python3-janus/template @@ -1,7 +1,7 @@ # Template file for 'python3-janus' pkgname=python3-janus version=1.0.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-typing_extensions" diff --git a/srcpkgs/python3-jaraco.classes/template b/srcpkgs/python3-jaraco.classes/template index da0530c1aad5f3..8e63a80bae322a 100644 --- a/srcpkgs/python3-jaraco.classes/template +++ b/srcpkgs/python3-jaraco.classes/template @@ -1,7 +1,7 @@ # Template file for 'python3-jaraco.classes' pkgname=python3-jaraco.classes version=3.4.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-more-itertools" diff --git a/srcpkgs/python3-jaraco.collections/template b/srcpkgs/python3-jaraco.collections/template index fd4b9a878e0247..d98a4d34ada852 100644 --- a/srcpkgs/python3-jaraco.collections/template +++ b/srcpkgs/python3-jaraco.collections/template @@ -1,7 +1,7 @@ # Template file for 'python3-jaraco.collections' pkgname=python3-jaraco.collections version=5.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-jaraco.classes python3-jaraco.text" diff --git a/srcpkgs/python3-jaraco.context/template b/srcpkgs/python3-jaraco.context/template index d6637eaec67ac9..61b3d9240e6526 100644 --- a/srcpkgs/python3-jaraco.context/template +++ b/srcpkgs/python3-jaraco.context/template @@ -1,7 +1,7 @@ # Template file for 'python3-jaraco.context' pkgname=python3-jaraco.context version=6.0.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-jaraco.functools/template b/srcpkgs/python3-jaraco.functools/template index 0ebc5d8027e33d..cc5d10756537eb 100644 --- a/srcpkgs/python3-jaraco.functools/template +++ b/srcpkgs/python3-jaraco.functools/template @@ -1,7 +1,7 @@ # Template file for 'python3-jaraco.functools' pkgname=python3-jaraco.functools version=4.0.2 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--override-ini='addopts=--doctest-modules'" hostmakedepends="python3-wheel python3-setuptools_scm" diff --git a/srcpkgs/python3-jaraco.logging/template b/srcpkgs/python3-jaraco.logging/template index 29fe5144f3450d..8474dc4236f461 100644 --- a/srcpkgs/python3-jaraco.logging/template +++ b/srcpkgs/python3-jaraco.logging/template @@ -1,7 +1,7 @@ # Template file for 'python3-jaraco.logging' pkgname=python3-jaraco.logging version=3.3.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-tempora" diff --git a/srcpkgs/python3-jaraco.stream/template b/srcpkgs/python3-jaraco.stream/template index 873c7c592bd016..46b6c74616b44c 100644 --- a/srcpkgs/python3-jaraco.stream/template +++ b/srcpkgs/python3-jaraco.stream/template @@ -1,7 +1,7 @@ # Template file for 'python3-jaraco.stream' pkgname=python3-jaraco.stream version=3.0.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-jaraco.text/template b/srcpkgs/python3-jaraco.text/template index 761692a3d4fcbe..a3824bfbce7d27 100644 --- a/srcpkgs/python3-jaraco.text/template +++ b/srcpkgs/python3-jaraco.text/template @@ -1,7 +1,7 @@ # Template file for 'python3-jaraco.text' pkgname=python3-jaraco.text version=4.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-jaraco.functools python3-jaraco.context python3-autocommand diff --git a/srcpkgs/python3-jedi/template b/srcpkgs/python3-jedi/template index d5b17fda081bed..dc5ae987ef1341 100644 --- a/srcpkgs/python3-jedi/template +++ b/srcpkgs/python3-jedi/template @@ -1,7 +1,7 @@ # Template file for 'python3-jedi' pkgname=python3-jedi version=0.19.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-parso" diff --git a/srcpkgs/python3-jeepney/template b/srcpkgs/python3-jeepney/template index dfedc95e879bbf..562c2c9088fd31 100644 --- a/srcpkgs/python3-jeepney/template +++ b/srcpkgs/python3-jeepney/template @@ -1,7 +1,7 @@ # Template file for 'python3-jeepney' pkgname=python3-jeepney version=0.8.0 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template index a6ebb721e337a1..be998db1c51fc3 100644 --- a/srcpkgs/python3-jellyfish/template +++ b/srcpkgs/python3-jellyfish/template @@ -1,6 +1,6 @@ # Template file for 'python3-jellyfish' pkgname=python3-jellyfish -version=1.0.4 +version=1.1.0 revision=1 build_style=python3-pep517 build_helper="rust" @@ -14,7 +14,7 @@ license="BSD-2-Clause" homepage="https://jamesturk.github.io/jellyfish/" changelog="https://raw.githubusercontent.com/jamesturk/jellyfish/main/docs/changelog.md" distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz" -checksum=72aabb3bedd513cdd20712242fd51173b59972c0b146b7a0b9c6f32f1656293f +checksum=2a2eec494c81dc1eb23dfef543110dad1873538eccaffabea8520bdac8aecbc1 if [ "$CROSS_BUILD" ]; then makedepends+=" rust-std" diff --git a/srcpkgs/python3-jmespath/template b/srcpkgs/python3-jmespath/template index 2bc9f420c5111a..9b7a4dcc093cda 100644 --- a/srcpkgs/python3-jmespath/template +++ b/srcpkgs/python3-jmespath/template @@ -1,7 +1,7 @@ # Template file for 'python3-jmespath' pkgname=python3-jmespath version=1.0.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-joblib/template b/srcpkgs/python3-joblib/template index 5ff84acef13585..b972e5de0488bb 100644 --- a/srcpkgs/python3-joblib/template +++ b/srcpkgs/python3-joblib/template @@ -1,7 +1,7 @@ # Template file for 'python3-joblib' pkgname=python3-joblib version=1.4.2 -revision=1 +revision=2 build_style=python3-pep517 make_check_args=" --deselect joblib/test/test_disk.py::test_disk_used diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template index 2946ff85d27100..46e86fc9d9cb78 100644 --- a/srcpkgs/python3-josepy/template +++ b/srcpkgs/python3-josepy/template @@ -1,7 +1,7 @@ # Template file for 'python3-josepy' pkgname=python3-josepy version=1.13.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-cryptography python3-openssl python3-setuptools python3-six" diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template index 8385beff15da63..06be7119455586 100644 --- a/srcpkgs/python3-jq/template +++ b/srcpkgs/python3-jq/template @@ -1,9 +1,9 @@ # Template file for 'python3-jq' pkgname=python3-jq -version=1.6.0 +version=1.8.0 revision=1 build_style=python3-module -hostmakedepends="python3-setuptools python3-Cython0.29" +hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel jq-devel oniguruma-devel" depends="python3" short_desc="Python bindings for jq" @@ -12,7 +12,7 @@ license="BSD-2-Clause" homepage="https://pypi.org/project/jq/" changelog="https://raw.githubusercontent.com/mwilliamson/jq.py/master/CHANGELOG.rst" distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz" -checksum=a06131057b4b0794d871c0718e796b23b942b20a19acd4cba13f7cbbb07d0aab +checksum=dea40029307d53d91153f0dea51e5e724793edada9aa03fe36cc4e4e46a96501 export JQPY_USE_SYSTEM_LIBS=1 diff --git a/srcpkgs/python3-json-logger/template b/srcpkgs/python3-json-logger/template index 99b4feb9a2189f..8a4380354c2446 100644 --- a/srcpkgs/python3-json-logger/template +++ b/srcpkgs/python3-json-logger/template @@ -1,7 +1,7 @@ # Template file for 'python3-json-logger' pkgname=python3-json-logger version=2.0.7 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-json5/template b/srcpkgs/python3-json5/template index ef0ebfb2d70c53..a0656d05038ff5 100644 --- a/srcpkgs/python3-json5/template +++ b/srcpkgs/python3-json5/template @@ -1,7 +1,7 @@ # Template file for 'python3-json5' pkgname=python3-json5 version=0.9.25 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-jsondiff/template b/srcpkgs/python3-jsondiff/template index 6ce295bf4f0c2e..b97ef704a4a4c8 100644 --- a/srcpkgs/python3-jsondiff/template +++ b/srcpkgs/python3-jsondiff/template @@ -1,17 +1,17 @@ # Template file for 'python3-jsondiff' pkgname=python3-jsondiff version=2.0.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" -checkdepends="python3-nose-random" short_desc="Diff JSON and JSON-like structures in Python" maintainer="Piotr Wójcik " license="MIT" homepage="https://github.com/ZoomerAnalytics/jsondiff" distfiles="${PYPI_SITE}/j/jsondiff/jsondiff-${version}.tar.gz" checksum=2795844ef075ec8a2b8d385c4d59f5ea48b08e7180fce3cb2787be0db00b1fb4 +make_check=no # Tests require removed python3-nose-random post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-jsonpatch/template b/srcpkgs/python3-jsonpatch/template index 4b8a4cbb4d3a58..a8d88ffdf9a927 100644 --- a/srcpkgs/python3-jsonpatch/template +++ b/srcpkgs/python3-jsonpatch/template @@ -1,7 +1,7 @@ # Template file for 'python3-jsonpatch' pkgname=python3-jsonpatch version=1.33 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-pypandoc" depends="python3-jsonpointer" diff --git a/srcpkgs/python3-jsonpointer/template b/srcpkgs/python3-jsonpointer/template index 2f7172414db179..428316bf740944 100644 --- a/srcpkgs/python3-jsonpointer/template +++ b/srcpkgs/python3-jsonpointer/template @@ -1,7 +1,7 @@ # Template file for 'python3-jsonpointer' pkgname=python3-jsonpointer version=3.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-jsonrpclib/template b/srcpkgs/python3-jsonrpclib/template index 661e33deb5f40d..9577f49c4b373a 100644 --- a/srcpkgs/python3-jsonrpclib/template +++ b/srcpkgs/python3-jsonrpclib/template @@ -1,7 +1,7 @@ # Template file for 'python3-jsonrpclib' pkgname=python3-jsonrpclib version=0.4.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-jsonschema-path/template b/srcpkgs/python3-jsonschema-path/template index 85f7a1ad8afbae..b38c1454a1ec56 100644 --- a/srcpkgs/python3-jsonschema-path/template +++ b/srcpkgs/python3-jsonschema-path/template @@ -1,7 +1,7 @@ # Template file for 'python3-jsonschema-path' pkgname=python3-jsonschema-path version=0.3.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-pathable python3-referencing python3-yaml" diff --git a/srcpkgs/python3-jsonschema-specifications/template b/srcpkgs/python3-jsonschema-specifications/template index cdf6a66d1477b6..9cb567944915aa 100644 --- a/srcpkgs/python3-jsonschema-specifications/template +++ b/srcpkgs/python3-jsonschema-specifications/template @@ -1,7 +1,7 @@ # Template file for 'python3-jsonschema-specifications' pkgname=python3-jsonschema-specifications version=2023.12.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3-referencing" diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template index 2c54d086c4caef..0d19311f27c89d 100644 --- a/srcpkgs/python3-jsonschema/template +++ b/srcpkgs/python3-jsonschema/template @@ -1,7 +1,7 @@ # Template file for 'python3-jsonschema' pkgname=python3-jsonschema version=4.23.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme" depends="python3-attrs python3-jsonschema-specifications" diff --git a/srcpkgs/python3-jupyter/template b/srcpkgs/python3-jupyter/template index 69c23fc1dc05a0..5c6ab914d4cef8 100644 --- a/srcpkgs/python3-jupyter/template +++ b/srcpkgs/python3-jupyter/template @@ -3,7 +3,7 @@ # THIS PACKAGE WAS SPLIT FROM python3-jupyter_core TO AVOID A DEPENDENCY CYCLE pkgname=python3-jupyter version=4.7.1 -revision=4 +revision=5 build_style=meta depends="python3-jupyter_notebook python3-jupyter_console python3-jupyter_ipywidgets" short_desc="Jupyter metapackage for Void Linux" diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template index 99e5302de7e136..7f6ed7b35d8c01 100644 --- a/srcpkgs/python3-jupyter_client/template +++ b/srcpkgs/python3-jupyter_client/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_client' pkgname=python3-jupyter_client version=8.6.2 -revision=1 +revision=2 build_style=python3-pep517 # 1st: random fail (see https://github.com/jupyter/jupyter_client/issues/979) # 2nd: fail by timeout in ~ 60s diff --git a/srcpkgs/python3-jupyter_console/template b/srcpkgs/python3-jupyter_console/template index 1b286c83e5a576..8c470c84d6bf50 100644 --- a/srcpkgs/python3-jupyter_console/template +++ b/srcpkgs/python3-jupyter_console/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_console' pkgname=python3-jupyter_console version=6.6.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-ipython_ipykernel python3-ipython python3-jupyter_client diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template index f229a3adb66b14..9d5ff5bdb5abfb 100644 --- a/srcpkgs/python3-jupyter_core/template +++ b/srcpkgs/python3-jupyter_core/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_core' pkgname=python3-jupyter_core version=5.7.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-traitlets python3-platformdirs" diff --git a/srcpkgs/python3-jupyter_events/template b/srcpkgs/python3-jupyter_events/template index 1675c6e34df546..f1191124ca7f32 100644 --- a/srcpkgs/python3-jupyter_events/template +++ b/srcpkgs/python3-jupyter_events/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_events' pkgname=python3-jupyter_events version=0.10.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-jsonschema python3-json-logger python3-yaml python3-traitlets diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template index f77931f6bdc799..da7840682a6178 100644 --- a/srcpkgs/python3-jupyter_ipywidgets/template +++ b/srcpkgs/python3-jupyter_ipywidgets/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_ipywidgets' pkgname=python3-jupyter_ipywidgets version=8.1.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-ipython_ipykernel python3-jupyter_widgetsnbextension" diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template index 33742fdab28c82..3bf3da5423c28b 100644 --- a/srcpkgs/python3-jupyter_nbconvert/template +++ b/srcpkgs/python3-jupyter_nbconvert/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_nbconvert' pkgname=python3-jupyter_nbconvert version=7.16.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-BeautifulSoup4 python3-bleach python3-defusedxml diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template index 4d140dd2462b84..779116e239f75c 100644 --- a/srcpkgs/python3-jupyter_nbformat/template +++ b/srcpkgs/python3-jupyter_nbformat/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_nbformat' pkgname=python3-jupyter_nbformat version=5.10.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-nodejs-version" depends="python3-fastjsonschema python3-jsonschema python3-jupyter_core diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template index 366db9c139843c..3984d364cd7eb5 100644 --- a/srcpkgs/python3-jupyter_notebook/template +++ b/srcpkgs/python3-jupyter_notebook/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_notebook' pkgname=python3-jupyter_notebook version=7.2.1 -revision=1 +revision=2 build_style=python3-pep517 make_build_args="--skip-dependency-check" hostmakedepends="hatchling hatch-jupyter-builder jupyterlab" diff --git a/srcpkgs/python3-jupyter_packaging/template b/srcpkgs/python3-jupyter_packaging/template index 7099bf7995681d..14289fde3127ad 100644 --- a/srcpkgs/python3-jupyter_packaging/template +++ b/srcpkgs/python3-jupyter_packaging/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_packaging' pkgname=python3-jupyter_packaging version=0.12.3 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-deprecation python3-packaging python3-setuptools diff --git a/srcpkgs/python3-jupyter_qtconsole/template b/srcpkgs/python3-jupyter_qtconsole/template index 9f078e541ba354..4a77feb6f7632a 100644 --- a/srcpkgs/python3-jupyter_qtconsole/template +++ b/srcpkgs/python3-jupyter_qtconsole/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_qtconsole' pkgname=python3-jupyter_qtconsole version=5.5.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-traitlets python3-jupyter_core python3-jupyter_client diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template index c33c03d36e2cd4..a91e9f0ea23c76 100644 --- a/srcpkgs/python3-jupyter_server/template +++ b/srcpkgs/python3-jupyter_server/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_server' pkgname=python3-jupyter_server version=2.14.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-jupyter-builder" depends="python3-anyio python3-argon2 python3-jupyter_client diff --git a/srcpkgs/python3-jupyter_server_terminals/template b/srcpkgs/python3-jupyter_server_terminals/template index b12507d3152f80..26cbc0278436f5 100644 --- a/srcpkgs/python3-jupyter_server_terminals/template +++ b/srcpkgs/python3-jupyter_server_terminals/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_server_terminals' pkgname=python3-jupyter_server_terminals version=0.5.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-terminado" diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template index a5c40839870327..82146ccfd62d32 100644 --- a/srcpkgs/python3-jupyter_widgetsnbextension/template +++ b/srcpkgs/python3-jupyter_widgetsnbextension/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_widgetsnbextension' pkgname=python3-jupyter_widgetsnbextension version=4.0.11 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-jupyter_packaging" short_desc="Interactive HTML widgets for Jupyter notebooks" diff --git a/srcpkgs/python3-jupyterlab_pygments/template b/srcpkgs/python3-jupyterlab_pygments/template index eb4bedbbdd49fb..eb8e7a693717b7 100644 --- a/srcpkgs/python3-jupyterlab_pygments/template +++ b/srcpkgs/python3-jupyterlab_pygments/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyterlab_pygments' pkgname=python3-jupyterlab_pygments version=0.3.0 -revision=1 +revision=2 build_style=python3-pep517 make_build_args="--skip-dependency-check" # jupyterlab not needed hostmakedepends="hatch-jupyter-builder hatch-nodejs-version" diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template index ca2e82a95ae1c7..28acd33298b97e 100644 --- a/srcpkgs/python3-jupyterlab_server/template +++ b/srcpkgs/python3-jupyterlab_server/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyterlab_server' pkgname=python3-jupyterlab_server version=2.27.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-jupyter_server python3-Babel python3-json5 python3-requests" diff --git a/srcpkgs/python3-kaitaistruct/template b/srcpkgs/python3-kaitaistruct/template index 6db94ab4babdc7..bc9d1c228383f1 100644 --- a/srcpkgs/python3-kaitaistruct/template +++ b/srcpkgs/python3-kaitaistruct/template @@ -1,7 +1,7 @@ # Template file for 'python3-kaitaistruct' pkgname=python3-kaitaistruct version=0.10 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-kaptan/template b/srcpkgs/python3-kaptan/template index 1b561f11f307b1..24941295f10d5e 100644 --- a/srcpkgs/python3-kaptan/template +++ b/srcpkgs/python3-kaptan/template @@ -1,7 +1,7 @@ # Template file for 'python3-kaptan' pkgname=python3-kaptan version=0.5.12 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-yaml" diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template index d36e7cbe171360..ac702f17de401f 100644 --- a/srcpkgs/python3-keyring/template +++ b/srcpkgs/python3-keyring/template @@ -1,7 +1,7 @@ # Template file for 'python3-keyring' pkgname=python3-keyring version=25.4.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-SecretStorage python3-jeepney diff --git a/srcpkgs/python3-keyrings-alt/template b/srcpkgs/python3-keyrings-alt/template index 0ff6f2b7dd1625..004f0fd76b906c 100644 --- a/srcpkgs/python3-keyrings-alt/template +++ b/srcpkgs/python3-keyrings-alt/template @@ -1,7 +1,7 @@ # Template file for 'python3-keyrings-alt' pkgname=python3-keyrings-alt version=4.1.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3-keyring" diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template index d39cb4a4be8da0..078c5860bed2ce 100644 --- a/srcpkgs/python3-keyutils/template +++ b/srcpkgs/python3-keyutils/template @@ -1,7 +1,7 @@ # Template file for 'python3-keyutils' pkgname=python3-keyutils version=0.6 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel keyutils-devel" diff --git a/srcpkgs/python3-kitchen/template b/srcpkgs/python3-kitchen/template index d17187c5d2a410..51de2f67e2b45b 100644 --- a/srcpkgs/python3-kitchen/template +++ b/srcpkgs/python3-kitchen/template @@ -1,7 +1,7 @@ # Template file for 'python3-kitchen' pkgname=python3-kitchen version=1.2.6 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-kiwisolver/template b/srcpkgs/python3-kiwisolver/template index c4fe5a704e77e5..ca57ad5da392ed 100644 --- a/srcpkgs/python3-kiwisolver/template +++ b/srcpkgs/python3-kiwisolver/template @@ -1,7 +1,7 @@ # Template file for 'python3-kiwisolver' pkgname=python3-kiwisolver version=1.4.5 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel python3-cppy" makedepends="python3-devel python3-cppy" diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template index d458a8cdafe035..a4c570f80aa5dd 100644 --- a/srcpkgs/python3-lazy-object-proxy/template +++ b/srcpkgs/python3-lazy-object-proxy/template @@ -1,7 +1,7 @@ # Template file for 'python3-lazy-object-proxy' pkgname=python3-lazy-object-proxy version=1.9.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" diff --git a/srcpkgs/python3-lazy_loader/template b/srcpkgs/python3-lazy_loader/template index dc33e65c50c375..db0e5374089543 100644 --- a/srcpkgs/python3-lazy_loader/template +++ b/srcpkgs/python3-lazy_loader/template @@ -1,7 +1,7 @@ # Template file for 'python3-lazy_loader' pkgname=python3-lazy_loader version=0.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-ldap/template b/srcpkgs/python3-ldap/template index 180205b0999d61..7f9bdaa31d2343 100644 --- a/srcpkgs/python3-ldap/template +++ b/srcpkgs/python3-ldap/template @@ -1,7 +1,7 @@ # Template file for 'python3-ldap' pkgname=python3-ldap version=3.4.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-wheel python3-pyasn1-modules" makedepends="python3-devel libldap-devel" diff --git a/srcpkgs/python3-ldap3/template b/srcpkgs/python3-ldap3/template index e6c2b5fd829d36..5023b8ae0b6f0c 100644 --- a/srcpkgs/python3-ldap3/template +++ b/srcpkgs/python3-ldap3/template @@ -1,7 +1,7 @@ # Template file for 'python3-ldap3' pkgname=python3-ldap3 version=2.8.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pyasn1" diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template index c834b199977191..3e083e8f5b12e4 100644 --- a/srcpkgs/python3-libarchive-c/template +++ b/srcpkgs/python3-libarchive-c/template @@ -1,7 +1,7 @@ # Template file for 'python3-libarchive-c' pkgname=python3-libarchive-c version=4.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="libarchive python3" diff --git a/srcpkgs/python3-libevdev/template b/srcpkgs/python3-libevdev/template index cbd5763e6e3469..13cf844f3df3c5 100644 --- a/srcpkgs/python3-libevdev/template +++ b/srcpkgs/python3-libevdev/template @@ -1,7 +1,7 @@ # Template file for 'python3-libevdev' pkgname=python3-libevdev version=0.9 -revision=5 +revision=6 _githash=5cc6bd17be733f87c77726fee2a6fa760f413a3e build_style=python3-module hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-libtmux/template b/srcpkgs/python3-libtmux/template index 85333754bc5c09..534f2d28ba1c7e 100644 --- a/srcpkgs/python3-libtmux/template +++ b/srcpkgs/python3-libtmux/template @@ -1,7 +1,7 @@ # Template file for 'python3-libtmux' pkgname=python3-libtmux version=0.37.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_target="tests" hostmakedepends="python3-poetry-core" diff --git a/srcpkgs/python3-libusb1/template b/srcpkgs/python3-libusb1/template index de39b747f2312f..ee106e4ddcc310 100644 --- a/srcpkgs/python3-libusb1/template +++ b/srcpkgs/python3-libusb1/template @@ -1,7 +1,7 @@ # Template file for 'python3-libusb1' pkgname=python3-libusb1 version=3.1.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="libusb-devel" diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template index e22a3b92854c73..53c9423a92b275 100644 --- a/srcpkgs/python3-license-expression/template +++ b/srcpkgs/python3-license-expression/template @@ -1,7 +1,7 @@ # Template file for 'python3-license-expression' pkgname=python3-license-expression version=21.6.14 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-setuptools_scm" depends="python3-boolean.py" diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template index bf6c31c31c1e71..1f51aeef50f9a0 100644 --- a/srcpkgs/python3-listparser/template +++ b/srcpkgs/python3-listparser/template @@ -1,7 +1,7 @@ # Template file for 'python3-listparser' pkgname=python3-listparser version=0.18 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template index fd792e3fe8d3e2..87e96242b0f6a2 100644 --- a/srcpkgs/python3-llfuse/template +++ b/srcpkgs/python3-llfuse/template @@ -1,7 +1,7 @@ # Template file for 'python3-llfuse' pkgname=python3-llfuse version=1.5.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools pkg-config" makedepends="python3-devel fuse-devel attr-devel" diff --git a/srcpkgs/python3-log_symbols/template b/srcpkgs/python3-log_symbols/template index 7e5fbcf7e40699..7c2e28c96b7bf6 100644 --- a/srcpkgs/python3-log_symbols/template +++ b/srcpkgs/python3-log_symbols/template @@ -1,7 +1,7 @@ # Template file for 'python3-log_symbols' pkgname=python3-log_symbols version=0.0.14 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-colorama" diff --git a/srcpkgs/python3-logbook/template b/srcpkgs/python3-logbook/template index bb85ea54c98136..a1b44df6dee69e 100644 --- a/srcpkgs/python3-logbook/template +++ b/srcpkgs/python3-logbook/template @@ -1,10 +1,11 @@ # Template file for 'python3-logbook' pkgname=python3-logbook -version=1.5.3 -revision=7 +version=1.8.0 +revision=1 build_style=python3-pep517 make_check_args="--ignore=scripts" -hostmakedepends="python3-setuptools python3-wheel python3-devel python3-Cython0.29" +hostmakedepends="python3-setuptools python3-wheel python3-Cython" +makedepends="python3-devel" depends="python3" checkdepends="python3-execnet python3-pytest python3-pyzmq python3-SQLAlchemy python3-Jinja2 python3-Brotli" @@ -13,10 +14,10 @@ maintainer="Orphaned " license="BSD-3-Clause" homepage="https://logbook.readthedocs.org" distfiles="https://github.com/getlogbook/logbook/archive/${version}.tar.gz" -checksum=d23a1d2b3dd094adcafb6c7e636f9b88782a6868538f96beb7b10534f9a16557 +checksum=cdd9b101b35f2f630e15a3086835172f212bd4533bcfeb39cb156799294e0229 pre_build() { - cython logbook/_speedups.pyx + cythonize src/cython/speedups.pyx } post_install() { diff --git a/srcpkgs/python3-logfury/template b/srcpkgs/python3-logfury/template index 628c314326e20f..34ca425008cfda 100644 --- a/srcpkgs/python3-logfury/template +++ b/srcpkgs/python3-logfury/template @@ -1,7 +1,7 @@ # Template file for 'python3-logfury' pkgname=python3-logfury version=1.0.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-loguru/template b/srcpkgs/python3-loguru/template index 734ceb1d765bda..f75480c0cab861 100644 --- a/srcpkgs/python3-loguru/template +++ b/srcpkgs/python3-loguru/template @@ -1,7 +1,7 @@ # Template file for 'python3-loguru' pkgname=python3-loguru version=0.7.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-looseversion/template b/srcpkgs/python3-looseversion/template index fa9ed794dc1e14..71b323e4bf7343 100644 --- a/srcpkgs/python3-looseversion/template +++ b/srcpkgs/python3-looseversion/template @@ -1,7 +1,7 @@ # Template file for 'python3-looseversion' pkgname=python3-looseversion version=1.3.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools hatchling" depends="python3" diff --git a/srcpkgs/python3-lrcalc/template b/srcpkgs/python3-lrcalc/template index 71308a2f3d5b3a..f975b6ea5c02fd 100644 --- a/srcpkgs/python3-lrcalc/template +++ b/srcpkgs/python3-lrcalc/template @@ -1,7 +1,7 @@ # Template file for 'python3-lrcalc' pkgname=python3-lrcalc version=2.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel lrcalc-devel" diff --git a/srcpkgs/python3-lsp-jsonrpc/template b/srcpkgs/python3-lsp-jsonrpc/template index 742b1c265c2dc0..77b280d7cb3996 100644 --- a/srcpkgs/python3-lsp-jsonrpc/template +++ b/srcpkgs/python3-lsp-jsonrpc/template @@ -1,7 +1,7 @@ # Template file for 'python3-lsp-jsonrpc' pkgname=python3-lsp-jsonrpc version=1.1.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-ultrajson" diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template index 63189e1a2b412d..aef2371dd42bb2 100644 --- a/srcpkgs/python3-lsp-server/template +++ b/srcpkgs/python3-lsp-server/template @@ -1,7 +1,7 @@ # Template file for 'python3-lsp-server' pkgname=python3-lsp-server version=1.11.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel" depends="python3-jedi python3-pluggy python3-lsp-jsonrpc python3-ultrajson diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template index 920367f59438fb..21ef9de4d6c084 100644 --- a/srcpkgs/python3-lxml/template +++ b/srcpkgs/python3-lxml/template @@ -1,7 +1,7 @@ # Template file for 'python3-lxml' pkgname=python3-lxml version=4.9.3 -revision=3 +revision=4 build_style=python3-module make_build_args="--with-cython" hostmakedepends="python3-Cython python3-setuptools" diff --git a/srcpkgs/python3-lz4/template b/srcpkgs/python3-lz4/template index 8ac95d83f3b0da..e53b43e903b122 100644 --- a/srcpkgs/python3-lz4/template +++ b/srcpkgs/python3-lz4/template @@ -1,7 +1,7 @@ # Template file for 'python3-lz4' pkgname=python3-lz4 version=4.3.3 -revision=1 +revision=2 build_style=python3-pep517 # Module lz4.stream is experimental and not built by default make_check_args="--ignore=tests/stream" diff --git a/srcpkgs/python3-macaroons/template b/srcpkgs/python3-macaroons/template index 5969093116eb07..50ec71b50e68d1 100644 --- a/srcpkgs/python3-macaroons/template +++ b/srcpkgs/python3-macaroons/template @@ -1,7 +1,7 @@ # Template file for 'python3-macaroons' pkgname=python3-macaroons version=0.13.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-pynacl" diff --git a/srcpkgs/python3-macholib/template b/srcpkgs/python3-macholib/template index f1d3c6b5500f08..e6486942250fbe 100644 --- a/srcpkgs/python3-macholib/template +++ b/srcpkgs/python3-macholib/template @@ -1,7 +1,7 @@ # Template file for 'python3-macholib' pkgname=python3-macholib version=1.16.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-altgraph python3-setuptools" diff --git a/srcpkgs/python3-magic/template b/srcpkgs/python3-magic/template index e343f8b909c1ee..da804444dd3396 100644 --- a/srcpkgs/python3-magic/template +++ b/srcpkgs/python3-magic/template @@ -1,7 +1,7 @@ # Template file for 'python3-magic' pkgname=python3-magic version=0.4.25 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="libmagic" diff --git a/srcpkgs/python3-makefun/template b/srcpkgs/python3-makefun/template index fbd072b69d9412..e936fc0a9767ba 100644 --- a/srcpkgs/python3-makefun/template +++ b/srcpkgs/python3-makefun/template @@ -1,7 +1,7 @@ # Template file for 'python3-makefun' pkgname=python3-makefun version=1.15.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-marisa-trie/template b/srcpkgs/python3-marisa-trie/template index 94623d1f361803..fcc465e58fb34d 100644 --- a/srcpkgs/python3-marisa-trie/template +++ b/srcpkgs/python3-marisa-trie/template @@ -1,7 +1,7 @@ # Template file for 'python3-marisa-trie' pkgname=python3-marisa-trie version=0.7.5 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel" diff --git a/srcpkgs/python3-markdown-it/template b/srcpkgs/python3-markdown-it/template index dee36cc58a1ee2..9598f3afee0ffb 100644 --- a/srcpkgs/python3-markdown-it/template +++ b/srcpkgs/python3-markdown-it/template @@ -1,7 +1,7 @@ # Template file for 'python3-markdown-it' pkgname=python3-markdown-it version=3.0.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3-mdurl" diff --git a/srcpkgs/python3-markdown-math/template b/srcpkgs/python3-markdown-math/template index 2a8680b2d7c662..10edf65b7dc76f 100644 --- a/srcpkgs/python3-markdown-math/template +++ b/srcpkgs/python3-markdown-math/template @@ -1,7 +1,7 @@ # Template file for 'python3-markdown-math' pkgname=python3-markdown-math version=0.8 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Markdown" diff --git a/srcpkgs/python3-markdown2/template b/srcpkgs/python3-markdown2/template index 17274d3790d161..86e628333700da 100644 --- a/srcpkgs/python3-markdown2/template +++ b/srcpkgs/python3-markdown2/template @@ -1,7 +1,7 @@ # Template file for 'python3-markdown2' pkgname=python3-markdown2 version=2.4.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-marshmallow/template b/srcpkgs/python3-marshmallow/template index c5d92ca62c3702..e63535cb965569 100644 --- a/srcpkgs/python3-marshmallow/template +++ b/srcpkgs/python3-marshmallow/template @@ -1,7 +1,7 @@ # Template file for 'python3-marshmallow' pkgname=python3-marshmallow version=3.19.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-packaging" diff --git a/srcpkgs/python3-matplotlib-inline/template b/srcpkgs/python3-matplotlib-inline/template index 833bf0450968a3..b2297a6cd5e457 100644 --- a/srcpkgs/python3-matplotlib-inline/template +++ b/srcpkgs/python3-matplotlib-inline/template @@ -1,7 +1,7 @@ # Template file for 'python3-matplotlib-inline' pkgname=python3-matplotlib-inline version=0.1.7 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-traitlets" diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template index c98abbcd87a43b..98db54b475acfb 100644 --- a/srcpkgs/python3-matplotlib/template +++ b/srcpkgs/python3-matplotlib/template @@ -1,6 +1,6 @@ # Template file for 'python3-matplotlib' pkgname=python3-matplotlib -version=3.9.2 +version=3.9.3 revision=1 build_style=python3-pep517 build_helper="meson numpy" @@ -18,7 +18,7 @@ license="custom:matplotlib, BSD-3-Clause, MIT" homepage="https://matplotlib.org/" changelog="https://github.com/matplotlib/matplotlib/releases" distfiles="${PYPI_SITE}/m/matplotlib/matplotlib-${version}.tar.gz" -checksum=96ab43906269ca64a6366934106fa01534454a69e471b7bf3d79083981aaab92 +checksum=cd5dbbc8e25cad5f706845c4d100e2c8b34691b412b93717ce38d8ae803bcfa5 replaces="python3-matplotlib-data>=0" # Comparison of images is too frail for validation make_check="no" diff --git a/srcpkgs/python3-matrix-common/template b/srcpkgs/python3-matrix-common/template index 948caeaa3d200c..2c06d1f8d98dc6 100644 --- a/srcpkgs/python3-matrix-common/template +++ b/srcpkgs/python3-matrix-common/template @@ -1,7 +1,7 @@ # Template file for 'python3-matrix-common' pkgname=python3-matrix-common version=1.3.0 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-attrs" diff --git a/srcpkgs/python3-matrix-nio/template b/srcpkgs/python3-matrix-nio/template index bda0f5b61d76ac..f91d67f82cf87e 100644 --- a/srcpkgs/python3-matrix-nio/template +++ b/srcpkgs/python3-matrix-nio/template @@ -1,7 +1,7 @@ # Template file for 'python3-matrix-nio' pkgname=python3-matrix-nio version=0.24.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-aiohttp python3-aiofiles python3-h11 diff --git a/srcpkgs/python3-mautrix/template b/srcpkgs/python3-mautrix/template index 78ad7fd72f1d5c..e484edee6b7473 100644 --- a/srcpkgs/python3-mautrix/template +++ b/srcpkgs/python3-mautrix/template @@ -1,7 +1,7 @@ # Template file for 'python3-mautrix' pkgname=python3-mautrix version=0.20.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-aiohttp python3-attrs python3-yarl python3-magic olm-python3" diff --git a/srcpkgs/python3-mccabe/template b/srcpkgs/python3-mccabe/template index 59394d51eff0d1..38c6fbab92dba3 100644 --- a/srcpkgs/python3-mccabe/template +++ b/srcpkgs/python3-mccabe/template @@ -1,7 +1,7 @@ # Template file for 'python3-mccabe' pkgname=python3-mccabe version=0.7.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-md2gemini/template b/srcpkgs/python3-md2gemini/template index fe8d226335dc79..620ed8b07a2a6e 100644 --- a/srcpkgs/python3-md2gemini/template +++ b/srcpkgs/python3-md2gemini/template @@ -1,7 +1,7 @@ # Template file for 'python3-md2gemini' pkgname=python3-md2gemini version=1.9.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-mistune2 python3-cjkwrap python3-wcwidth" diff --git a/srcpkgs/python3-mdit-py-plugins/template b/srcpkgs/python3-mdit-py-plugins/template index cc9ac1c9e9b823..488d659fd3de8e 100644 --- a/srcpkgs/python3-mdit-py-plugins/template +++ b/srcpkgs/python3-mdit-py-plugins/template @@ -1,7 +1,7 @@ # Template file for 'python3-mdit-py-plugins' pkgname=python3-mdit-py-plugins version=0.4.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" short_desc="Markdown-It-Py Plugin Extensions" diff --git a/srcpkgs/python3-mdurl/template b/srcpkgs/python3-mdurl/template index 8d3b400ee133f4..2587a60b8857d0 100644 --- a/srcpkgs/python3-mdurl/template +++ b/srcpkgs/python3-mdurl/template @@ -1,7 +1,7 @@ # Template file for 'python3-mdurl' pkgname=python3-mdurl version=0.1.2 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template index 02cd87ed597788..31cc6090972eb8 100644 --- a/srcpkgs/python3-mechanize/template +++ b/srcpkgs/python3-mechanize/template @@ -1,7 +1,7 @@ # Template file for 'python3-mechanize' pkgname=python3-mechanize version=0.4.7 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-html5lib" diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template index ad750edbe0a4a0..335facc1e66c5e 100644 --- a/srcpkgs/python3-mediafile/template +++ b/srcpkgs/python3-mediafile/template @@ -1,7 +1,7 @@ # Template file for 'python3-mediafile' pkgname=python3-mediafile version=0.12.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3-mutagen python3-six" diff --git a/srcpkgs/python3-memory_allocator/template b/srcpkgs/python3-memory_allocator/template index 600e786d02bd67..1c1e1c1581865a 100644 --- a/srcpkgs/python3-memory_allocator/template +++ b/srcpkgs/python3-memory_allocator/template @@ -1,7 +1,7 @@ # Template file for 'python3-memory_allocator' pkgname=python3-memory_allocator version=0.1.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-Cython" makedepends="python3-devel" diff --git a/srcpkgs/python3-meson-python/template b/srcpkgs/python3-meson-python/template index 01055a208201a8..b21fa2a201af5a 100644 --- a/srcpkgs/python3-meson-python/template +++ b/srcpkgs/python3-meson-python/template @@ -1,17 +1,17 @@ # Template file for 'python3-meson-python' pkgname=python3-meson-python -version=0.16.0 +version=0.17.1 revision=1 build_style=python3-pep517 hostmakedepends="meson python3-pyproject-metadata patchelf" -depends="meson python3-pyproject-metadata patchelf" +depends="meson python3-pyproject-metadata python3-packaging patchelf" short_desc="Meson PEP 517 Python build backend" maintainer="Andrew J. Hesford " license="MIT" homepage="https://meson-python.readthedocs.io/" changelog="https://raw.githubusercontent.com/mesonbuild/meson-python/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/m/meson_python/meson_python-${version}.tar.gz" -checksum=9068c17e36c89d6c7ff709fffb2a8a9925e8cd0b02629728e5ceaf2ec505cb5f +checksum=efb91f69f2e19eef7bc9a471ed2a4e730088cc6b39eacaf3e49fc4f930eb5f83 # tests require custom-built executables, need reconciliation with xbps-src env make_check=no diff --git a/srcpkgs/python3-milc/template b/srcpkgs/python3-milc/template index 44272691caa825..b3e583e39b2b69 100644 --- a/srcpkgs/python3-milc/template +++ b/srcpkgs/python3-milc/template @@ -1,7 +1,7 @@ # Template file for 'python3-milc' pkgname=python3-milc version=1.8.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-appdirs python3-argcomplete python3-colorama python3-halo diff --git a/srcpkgs/python3-minidb/template b/srcpkgs/python3-minidb/template index c69c4df0ef65e6..82ed4a914b6490 100644 --- a/srcpkgs/python3-minidb/template +++ b/srcpkgs/python3-minidb/template @@ -1,7 +1,7 @@ # Template file for 'python3-minidb' pkgname=python3-minidb version=2.0.6 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-miniupnpc/template b/srcpkgs/python3-miniupnpc/template index bef2b740027862..3519444df6b064 100644 --- a/srcpkgs/python3-miniupnpc/template +++ b/srcpkgs/python3-miniupnpc/template @@ -1,7 +1,7 @@ # Template file for 'python3-miniupnpc' pkgname=python3-miniupnpc version=2.0.2 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel miniupnpc-devel" diff --git a/srcpkgs/python3-misaka/template b/srcpkgs/python3-misaka/template index 9d8acd59362269..8d65413df8a429 100644 --- a/srcpkgs/python3-misaka/template +++ b/srcpkgs/python3-misaka/template @@ -1,7 +1,7 @@ # Template file for 'python3-misaka' pkgname=python3-misaka version=2.1.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools python3-cffi" makedepends="python3-devel libffi-devel" diff --git a/srcpkgs/python3-mistune/template b/srcpkgs/python3-mistune/template index 7630964cf1dd13..828db5643c7a2e 100644 --- a/srcpkgs/python3-mistune/template +++ b/srcpkgs/python3-mistune/template @@ -1,7 +1,7 @@ # Template file for 'python3-mistune' pkgname=python3-mistune version=3.0.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-mistune2/template b/srcpkgs/python3-mistune2/template index b483112c253715..2a2f23bf83eb3a 100644 --- a/srcpkgs/python3-mistune2/template +++ b/srcpkgs/python3-mistune2/template @@ -1,7 +1,7 @@ # Template file for 'python3-mistune2' pkgname=python3-mistune2 version=2.0.4 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" diff --git a/srcpkgs/python3-mitmproxy_wireguard/template b/srcpkgs/python3-mitmproxy_wireguard/template index e2dfa751c63ee2..0e9ce93191b0e8 100644 --- a/srcpkgs/python3-mitmproxy_wireguard/template +++ b/srcpkgs/python3-mitmproxy_wireguard/template @@ -1,7 +1,7 @@ # Template file for 'python3-mitmproxy_wireguard' pkgname=python3-mitmproxy_wireguard version=0.1.19 -revision=2 +revision=3 build_style=python3-pep517 build_helper=rust hostmakedepends="cargo maturin" diff --git a/srcpkgs/python3-mock/template b/srcpkgs/python3-mock/template index e0be452276d23f..609b88037f41ab 100644 --- a/srcpkgs/python3-mock/template +++ b/srcpkgs/python3-mock/template @@ -1,7 +1,7 @@ # Template file for 'python3-mock' pkgname=python3-mock version=5.1.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template index 9c98cecaadfd1a..fb0cc7db053b81 100644 --- a/srcpkgs/python3-more-itertools/template +++ b/srcpkgs/python3-more-itertools/template @@ -1,7 +1,7 @@ # Template file for 'python3-more-itertools' pkgname=python3-more-itertools version=10.5.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-mpd2/template b/srcpkgs/python3-mpd2/template index 32a6eab9b962c4..fd5818bbee847c 100644 --- a/srcpkgs/python3-mpd2/template +++ b/srcpkgs/python3-mpd2/template @@ -1,7 +1,7 @@ # Template file for 'python3-mpd2' pkgname=python3-mpd2 version=3.0.4 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-mpdnotify/template b/srcpkgs/python3-mpdnotify/template index c5a73df5d430cd..cd2cf4bdf547ce 100644 --- a/srcpkgs/python3-mpdnotify/template +++ b/srcpkgs/python3-mpdnotify/template @@ -1,7 +1,7 @@ # Template file for 'python3-mpdnotify' pkgname=python3-mpdnotify version=1.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools python3-Pillow python3-mpd2" depends="libnotify python3-mpd2 python3-Pillow python3-setuptools" diff --git a/srcpkgs/python3-mpi4py/template b/srcpkgs/python3-mpi4py/template index ad4e3763570d38..766b8b6d004e24 100644 --- a/srcpkgs/python3-mpi4py/template +++ b/srcpkgs/python3-mpi4py/template @@ -1,6 +1,6 @@ # Template file for 'python3-mpi4py' pkgname=python3-mpi4py -version=4.0.0 +version=4.0.1 revision=1 # OpenMPI >= 5 is 64-bit only archs="x86_64* aarch64* ppc64* riscv64*" @@ -14,7 +14,7 @@ license="BSD-3-Clause" homepage="https://github.com/mpi4py/mpi4py" changelog="https://raw.githubusercontent.com/mpi4py/mpi4py/master/CHANGES.rst" distfiles="$PYPI_SITE/m/mpi4py/mpi4py-${version}.tar.gz" -checksum=820d31ae184d69c17d9b5d55b1d524d56be47d2e6cb318ea4f3e7007feff2ccc +checksum=f3174b245775d556f4fddb32519a2066ef0592edc810c5b5a59238f9a0a40c89 # Tests require a sensible MPI environment make_check=no diff --git a/srcpkgs/python3-mpmath/template b/srcpkgs/python3-mpmath/template index d65f485f09bf1e..5bae4012c56109 100644 --- a/srcpkgs/python3-mpmath/template +++ b/srcpkgs/python3-mpmath/template @@ -1,7 +1,7 @@ # Template file for 'python3-mpmath' pkgname=python3-mpmath version=1.3.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-gmpy2" diff --git a/srcpkgs/python3-mpv/template b/srcpkgs/python3-mpv/template index f624f4a5b4a96f..f55d47cdb78508 100644 --- a/srcpkgs/python3-mpv/template +++ b/srcpkgs/python3-mpv/template @@ -1,7 +1,7 @@ # Template file for 'python3-mpv' pkgname=python3-mpv version=1.0.6 -revision=1 +revision=2 build_style=python3-pep517 # this test takes too long and has a low chance of failure # https://github.com/jaseg/python-mpv/issues/209#issuecomment-1180248112 diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template index ba5f0a40fd8ffe..e8681d951bd795 100644 --- a/srcpkgs/python3-msgpack/template +++ b/srcpkgs/python3-msgpack/template @@ -2,7 +2,7 @@ # Please ensure this version works with 'borg' before bumping! pkgname=python3-msgpack version=1.1.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-msoffcrypto-tool/template b/srcpkgs/python3-msoffcrypto-tool/template index 0ca181f2f166e4..0e30784e715060 100644 --- a/srcpkgs/python3-msoffcrypto-tool/template +++ b/srcpkgs/python3-msoffcrypto-tool/template @@ -1,7 +1,7 @@ # Template file for 'python3-msoffcrypto-tool' pkgname=python3-msoffcrypto-tool version=5.4.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-setuptools python3-olefile python3-cryptography" diff --git a/srcpkgs/python3-mtranslate/template b/srcpkgs/python3-mtranslate/template index 281878bc4b943e..c0f230842cc383 100644 --- a/srcpkgs/python3-mtranslate/template +++ b/srcpkgs/python3-mtranslate/template @@ -1,7 +1,7 @@ # Template file for 'python3-mtranslate' pkgname=python3-mtranslate version=1.8 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-multidict/template b/srcpkgs/python3-multidict/template index 82a24b5c646687..15c0f0270c4802 100644 --- a/srcpkgs/python3-multidict/template +++ b/srcpkgs/python3-multidict/template @@ -1,7 +1,7 @@ # Template file for 'python3-multidict' pkgname=python3-multidict version=5.1.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template index 6592f0b5bed5c7..a11b75bdbfa8c2 100644 --- a/srcpkgs/python3-multivolumefile/template +++ b/srcpkgs/python3-multivolumefile/template @@ -1,7 +1,7 @@ # Template file for 'python3-multivolumefile' pkgname=python3-multivolumefile version=0.2.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-munkres/template b/srcpkgs/python3-munkres/template index 577e05e9254e33..08d555dfcd160f 100644 --- a/srcpkgs/python3-munkres/template +++ b/srcpkgs/python3-munkres/template @@ -1,7 +1,7 @@ # Template file for 'python3-munkres' pkgname=python3-munkres version=1.1.4 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template index 4ea0496f53d056..0f4329f7c92c8d 100644 --- a/srcpkgs/python3-musicbrainzngs/template +++ b/srcpkgs/python3-musicbrainzngs/template @@ -1,7 +1,7 @@ # Template file for 'python3-musicbrainzngs' pkgname=python3-musicbrainzngs version=0.7.1 -revision=4 +revision=5 build_style="python3-module" hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-musicpd/template b/srcpkgs/python3-musicpd/template index b7dfc3349e5b1e..ae91d40632a6be 100644 --- a/srcpkgs/python3-musicpd/template +++ b/srcpkgs/python3-musicpd/template @@ -1,7 +1,7 @@ # Template file for 'python3-musicpd' pkgname=python3-musicpd version=0.4.4 -revision=6 +revision=7 build_style=python3-module pycompile_module="musicpd.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-mutagen/template b/srcpkgs/python3-mutagen/template index 80bcbd477af5cd..e5e10c3250ec73 100644 --- a/srcpkgs/python3-mutagen/template +++ b/srcpkgs/python3-mutagen/template @@ -1,7 +1,7 @@ # Template file for 'python3-mutagen' pkgname=python3-mutagen version=1.46.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" makedepends="$hostmakedepends" diff --git a/srcpkgs/python3-mygpoclient/template b/srcpkgs/python3-mygpoclient/template index ed1381607d12d7..b113bac376bf61 100644 --- a/srcpkgs/python3-mygpoclient/template +++ b/srcpkgs/python3-mygpoclient/template @@ -1,7 +1,7 @@ # Template file for 'python3-mygpoclient' pkgname=python3-mygpoclient version=1.8 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template index d088ca203a0872..c134968ed06d6e 100644 --- a/srcpkgs/python3-mypy/template +++ b/srcpkgs/python3-mypy/template @@ -1,7 +1,7 @@ # Template file for 'python3-mypy' pkgname=python3-mypy version=1.8.0 -revision=1 +revision=2 build_style=python3-module # fails in ci make_check_args="-k not(testDaemonStatusKillRestartRecheck)" diff --git a/srcpkgs/python3-mypy_extensions/template b/srcpkgs/python3-mypy_extensions/template index 5d96135ce4f733..99cfe062302d2a 100644 --- a/srcpkgs/python3-mypy_extensions/template +++ b/srcpkgs/python3-mypy_extensions/template @@ -1,7 +1,7 @@ # Template file for 'python3-mypy_extensions' pkgname=python3-mypy_extensions version=1.0.0 -revision=2 +revision=3 build_style=python3-module make_check_target="tests/testextensions.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template index 95224f5f182de8..94cdca2f4ddd60 100644 --- a/srcpkgs/python3-mysqlclient/template +++ b/srcpkgs/python3-mysqlclient/template @@ -1,7 +1,7 @@ # Template file for 'python3-mysqlclient' pkgname=python3-mysqlclient version=1.3.14 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel" diff --git a/srcpkgs/python3-namedlist/template b/srcpkgs/python3-namedlist/template index 9961fff0e7e5a3..d553f8f4f9e931 100644 --- a/srcpkgs/python3-namedlist/template +++ b/srcpkgs/python3-namedlist/template @@ -1,7 +1,7 @@ # Template file for 'python3-namedlist' pkgname=python3-namedlist version=1.8 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-nanobind/template b/srcpkgs/python3-nanobind/template index 79a26486a5a506..df4267869db9c8 100644 --- a/srcpkgs/python3-nanobind/template +++ b/srcpkgs/python3-nanobind/template @@ -1,6 +1,6 @@ # Template file for 'python3-nanobind' pkgname=python3-nanobind -version=2.2.0 +version=2.4.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-scikit-build-core ninja" @@ -14,7 +14,7 @@ _robin_map_hash="188c45569cc2a5dd768077c193830b51d33a5020" distfiles="${homepage}/archive/v${version}.tar.gz https://github.com/Tessil/robin-map/archive/${_robin_map_hash}.tar.gz " -checksum="bfbfc7e5759f1669e4ddb48752b1ddc5647d1430e94614d6f8626df1d508e65a +checksum="bb35deaed7efac5029ed1e33880a415638352f757d49207a8e6013fefb6c49a7 2f4be670fa4f53c3261ed7af392b414a00e75591f87da0a8dd525de376430747" skip_extraction="${_robin_map_hash}.tar.gz" diff --git a/srcpkgs/python3-natsort/template b/srcpkgs/python3-natsort/template index f827aa58111193..f37ddb2c9ed7f2 100644 --- a/srcpkgs/python3-natsort/template +++ b/srcpkgs/python3-natsort/template @@ -1,7 +1,7 @@ # Template file for 'python3-natsort' pkgname=python3-natsort version=8.4.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-nbclassic/patches/python3.13.patch b/srcpkgs/python3-nbclassic/patches/python3.13.patch new file mode 100644 index 00000000000000..af7962b20c3efc --- /dev/null +++ b/srcpkgs/python3-nbclassic/patches/python3.13.patch @@ -0,0 +1,41 @@ +From 2545d900b40bbb9fa3ea266afa617e6e0be70c71 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?= +Date: Sat, 7 Sep 2024 03:37:00 +0200 +Subject: [PATCH] Replace pipes with shlex (#286) + +pipes module has been deprecated in Python 3.11 and removed in 3.13. https://peps.python.org/pep-0594/ +--- + setupbase.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/setupbase.py b/setupbase.py +index 80f28b6eb..4e7a4feec 100644 +--- a/setupbase.py ++++ b/setupbase.py +@@ -12,7 +12,7 @@ + + import os + import re +-import pipes ++import shlex + import shutil + import sys + +@@ -27,7 +27,7 @@ + from subprocess import list2cmdline + else: + def list2cmdline(cmd_list): +- return ' '.join(map(pipes.quote, cmd_list)) ++ return ' '.join(map(shlex.quote, cmd_list)) + + #------------------------------------------------------------------------------- + # Useful globals and utility functions +@@ -486,7 +486,7 @@ def run(self): + try: + run(['lessc', + '--source-map', +- '--include-path=%s' % pipes.quote(static), ++ '--include-path=%s' % shlex.quote(static), + src, + dst, + ], cwd=repo_root, env=env) diff --git a/srcpkgs/python3-nbclassic/template b/srcpkgs/python3-nbclassic/template index a4d8ae6362c3e3..65fdd842511fcf 100644 --- a/srcpkgs/python3-nbclassic/template +++ b/srcpkgs/python3-nbclassic/template @@ -1,7 +1,7 @@ # Template file for 'python3-nbclassic' pkgname=python3-nbclassic version=1.1.0 -revision=1 +revision=2 build_style=python3-pep517 make_build_args="--skip-dependency-check" hostmakedepends="python3-jupyter_packaging python3-jupyter_server" @@ -20,6 +20,7 @@ post_install() { mv ${DESTDIR}/usr/etc ${DESTDIR} # use system mathjax2 - rm -rf ${DESTDIR}/${py3_sitelib}/nbclassic/static/components/MathJax - ln -sf /usr/share/mathjax ${DESTDIR}/${py3_sitelib}/nbclassic/static/components/MathJax + local _mathjax="${DESTDIR}/${py3_sitelib}/nbclassic/static/components/MathJax" + rm -r "${_mathjax}" + ln -s /usr/share/mathjax "${_mathjax}" } diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template index 684d01548a6389..6053ed8faf4664 100644 --- a/srcpkgs/python3-nbclient/template +++ b/srcpkgs/python3-nbclient/template @@ -1,7 +1,7 @@ # Template file for 'python3-nbclient' pkgname=python3-nbclient version=0.10.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-jupyter_client python3-jupyter_nbformat" diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template index 8c051c324a4b92..bdbd69dd958f74 100644 --- a/srcpkgs/python3-nbxmpp/template +++ b/srcpkgs/python3-nbxmpp/template @@ -1,7 +1,7 @@ # Template file for 'python3-nbxmpp' pkgname=python3-nbxmpp version=5.0.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-gobject python3-openssl python3-precis-i18n python3-idna libsoup3" diff --git a/srcpkgs/python3-ndg_httpsclient/template b/srcpkgs/python3-ndg_httpsclient/template index d3781d807c8217..fbc4f2f229a019 100644 --- a/srcpkgs/python3-ndg_httpsclient/template +++ b/srcpkgs/python3-ndg_httpsclient/template @@ -1,7 +1,7 @@ # Template file for 'python3-ndg_httpsclient' pkgname=python3-ndg_httpsclient version=0.5.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-openssl python3-pyasn1" diff --git a/srcpkgs/python3-neovim/template b/srcpkgs/python3-neovim/template index be2fd507e9c508..555b7cc624532b 100644 --- a/srcpkgs/python3-neovim/template +++ b/srcpkgs/python3-neovim/template @@ -1,7 +1,7 @@ # Template file for 'python3-neovim' pkgname=python3-neovim version=0.5.0 -revision=1 +revision=2 build_style="python3-module" hostmakedepends="python3-setuptools" depends="neovim python3-greenlet python3-msgpack" diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template index 153a37680635f4..88ca3c49ce72a7 100644 --- a/srcpkgs/python3-nest_asyncio/template +++ b/srcpkgs/python3-nest_asyncio/template @@ -1,7 +1,7 @@ # Template file for 'python3-nest_asyncio' pkgname=python3-nest_asyncio version=1.6.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3" diff --git a/srcpkgs/python3-netaddr/template b/srcpkgs/python3-netaddr/template index 4122ee2c623a5f..144a41a98b6ab9 100644 --- a/srcpkgs/python3-netaddr/template +++ b/srcpkgs/python3-netaddr/template @@ -1,7 +1,7 @@ # Template file for 'python3-netaddr' pkgname=python3-netaddr version=1.3.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-netifaces/template b/srcpkgs/python3-netifaces/template index bea1c879d51f25..4cbe08c17a9e6f 100644 --- a/srcpkgs/python3-netifaces/template +++ b/srcpkgs/python3-netifaces/template @@ -1,7 +1,7 @@ # Template file for 'python3-netifaces' pkgname=python3-netifaces version=0.11.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-networkx/template b/srcpkgs/python3-networkx/template index 0460de43b267eb..12d7ec71e36436 100644 --- a/srcpkgs/python3-networkx/template +++ b/srcpkgs/python3-networkx/template @@ -1,7 +1,7 @@ # Template file for 'python3-networkx' pkgname=python3-networkx version=3.4.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-niapy/template b/srcpkgs/python3-niapy/template index 948e3ce1a87396..01b769a886854f 100644 --- a/srcpkgs/python3-niapy/template +++ b/srcpkgs/python3-niapy/template @@ -1,7 +1,7 @@ # Template file for 'python3-niapy' pkgname=python3-niapy version=2.3.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-numpy python3-openpyxl python3-pandas python3-matplotlib" diff --git a/srcpkgs/python3-nose-random/template b/srcpkgs/python3-nose-random/template deleted file mode 100644 index b9c4f5d1718c8c..00000000000000 --- a/srcpkgs/python3-nose-random/template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'python3-nose-random' -pkgname=python3-nose-random -version=1.0.0 -revision=6 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-nose" -checkdepends="python3-nose" -short_desc="Facilitates Monte-Carlo style unit testing" -maintainer="Piotr Wójcik " -license="MIT" -homepage="https://github.com/fzumstein/nose-random" -distfiles="https://github.com/fzumstein/nose-random/archive/${version}.tar.gz" -checksum=528b1c9396cfa415741afaad60ecde695a657c9364dc01240050c747192f5148 - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/python3-nose/patches/setup.py.patch b/srcpkgs/python3-nose/patches/setup.py.patch deleted file mode 100644 index 34fea9b54e9d26..00000000000000 --- a/srcpkgs/python3-nose/patches/setup.py.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -30,7 +30,6 @@ try: - entry_points = { - 'console_scripts': [ - 'nosetests = nose:run_exit', -- 'nosetests%s = nose:run_exit' % py_vers_tag, - ], - 'distutils.commands': [ - ' nosetests = nose.commands:nosetests', -@@ -106,7 +105,6 @@ setup( - license = 'GNU LGPL', - keywords = 'test unittest doctest automatic discovery', - url = 'http://readthedocs.org/docs/nose/', -- data_files = [('man/man1', ['nosetests.1'])], - package_data = {'': ['*.txt', - 'examples/*.py', - 'examples/*/*.py']}, diff --git a/srcpkgs/python3-nose/template b/srcpkgs/python3-nose/template deleted file mode 100644 index 46be66069d5ae3..00000000000000 --- a/srcpkgs/python3-nose/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'python3-nose' -pkgname=python3-nose -version=1.3.7 -revision=10 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-setuptools" -short_desc="Nicer testing for Python3" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="https://github.com/nose-devs/nose" -changelog="https://raw.githubusercontent.com/nose-devs/nose/master/CHANGELOG" -distfiles="${PYPI_SITE}/n/nose/nose-${version}.tar.gz" -checksum=f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 -conflicts="python-nose>=0" -# Tests don't work and this package is no longer maintained, just skip them -make_check=no - -post_patch() { - # Convert py2 syntax to py3 since setuptools no longer does it - 2to3-${py3_ver} -w bin nose unit_tests functional_tests -} diff --git a/srcpkgs/python3-nose2/template b/srcpkgs/python3-nose2/template index 3d99ed31a2baa8..a7325f212ca9e7 100644 --- a/srcpkgs/python3-nose2/template +++ b/srcpkgs/python3-nose2/template @@ -1,7 +1,7 @@ # Template file for 'python3-nose2' pkgname=python3-nose2 version=0.15.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-coverage python3-six" diff --git a/srcpkgs/python3-notebook_shim/template b/srcpkgs/python3-notebook_shim/template index fd75b010d179b6..c3223a080f8fb3 100644 --- a/srcpkgs/python3-notebook_shim/template +++ b/srcpkgs/python3-notebook_shim/template @@ -1,7 +1,7 @@ # Template file for 'python3-notebook_shim' pkgname=python3-notebook_shim version=0.2.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-jupyter_server" diff --git a/srcpkgs/python3-notify2/template b/srcpkgs/python3-notify2/template index 18cbea5b07232c..425262bc9fcba1 100644 --- a/srcpkgs/python3-notify2/template +++ b/srcpkgs/python3-notify2/template @@ -1,7 +1,7 @@ # Template file for 'python3-notify2' pkgname=python3-notify2 version=0.3.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dbus" diff --git a/srcpkgs/python3-npyscreen/template b/srcpkgs/python3-npyscreen/template index 3423ee8ffbc5f4..52a81bf9999eb4 100644 --- a/srcpkgs/python3-npyscreen/template +++ b/srcpkgs/python3-npyscreen/template @@ -1,7 +1,7 @@ # Template file for 'python3-npyscreen' pkgname=python3-npyscreen version=4.10.5.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-ntlm-auth/template b/srcpkgs/python3-ntlm-auth/template index b07d1013af4e3d..91b8dede054bfd 100644 --- a/srcpkgs/python3-ntlm-auth/template +++ b/srcpkgs/python3-ntlm-auth/template @@ -1,7 +1,7 @@ # Template file for 'python3-ntlm-auth' pkgname=python3-ntlm-auth version=1.5.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-six python3-cryptography" diff --git a/srcpkgs/python3-ntplib/template b/srcpkgs/python3-ntplib/template index 096384d21c656b..9f2185e45130a9 100644 --- a/srcpkgs/python3-ntplib/template +++ b/srcpkgs/python3-ntplib/template @@ -1,7 +1,7 @@ # Template file for 'python3-ntplib' pkgname=python3-ntplib version=0.3.4 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template index d148218d101708..e76bb602f124a3 100644 --- a/srcpkgs/python3-numexpr/template +++ b/srcpkgs/python3-numexpr/template @@ -1,7 +1,7 @@ # Template file for 'python3-numexpr' pkgname=python3-numexpr version=2.10.1 -revision=1 +revision=2 build_style=python3-pep517 build_helper="numpy" make_check_args="-k not(test_max_threads_unset)" diff --git a/srcpkgs/python3-numpy-stl/template b/srcpkgs/python3-numpy-stl/template index 72a7448c990aad..84eb1f4b9fa277 100644 --- a/srcpkgs/python3-numpy-stl/template +++ b/srcpkgs/python3-numpy-stl/template @@ -1,7 +1,7 @@ # Template file for 'python3-numpy-stl' pkgname=python3-numpy-stl version=2.17.1 -revision=4 +revision=5 build_style=python3-module build_helper="numpy" # skip flake8 tests diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template index c7b275f34e9ac0..5fc0f09849bd4e 100644 --- a/srcpkgs/python3-numpy/template +++ b/srcpkgs/python3-numpy/template @@ -1,6 +1,6 @@ # Template file for 'python3-numpy' pkgname=python3-numpy -version=2.1.1 +version=2.2.0 revision=1 build_style=python3-pep517 build_helper="meson qemu" @@ -19,7 +19,7 @@ license="BSD-3-Clause" homepage="https://www.numpy.org/" changelog="https://github.com/numpy/numpy/releases" distfiles="${PYPI_SITE}/n/numpy/numpy-${version}.tar.gz" -checksum=d0cf7d55b1051387807405b3898efafa862997b4cba8aa5dbe657be794afeafd +checksum=140dd80ff8981a583a60980be1a655068f8adebf7a45a06a6858c873fcdcd4a0 alternatives="numpy:f2py:/usr/bin/f2py3" build_options="openblas" diff --git a/srcpkgs/python3-nvml/template b/srcpkgs/python3-nvml/template index 9ecb485fcf8e5a..166b0c1fee3f4a 100644 --- a/srcpkgs/python3-nvml/template +++ b/srcpkgs/python3-nvml/template @@ -1,7 +1,7 @@ # Template file for 'python3-nvml' pkgname=python3-nvml version=0.2.4 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-oauth2client/template b/srcpkgs/python3-oauth2client/template index 2b1db5dcaec365..136e7a1f947f2b 100644 --- a/srcpkgs/python3-oauth2client/template +++ b/srcpkgs/python3-oauth2client/template @@ -1,7 +1,7 @@ # Template file for 'python3-oauth2client' pkgname=python3-oauth2client version=4.1.3 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-httplib2 python3-pyasn1 python3-pyasn1-modules diff --git a/srcpkgs/python3-oauthlib/template b/srcpkgs/python3-oauthlib/template index 3c28a64354ba90..33e724d05ada80 100644 --- a/srcpkgs/python3-oauthlib/template +++ b/srcpkgs/python3-oauthlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-oauthlib' pkgname=python3-oauthlib version=3.1.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-objgraph/template b/srcpkgs/python3-objgraph/template index 6cb614476a5708..69728c79bbb900 100644 --- a/srcpkgs/python3-objgraph/template +++ b/srcpkgs/python3-objgraph/template @@ -1,7 +1,7 @@ # Template file for 'python3-objgraph' pkgname=python3-objgraph version=3.6.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="graphviz" diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template index 889b630317fa8e..1d02354f2c41c2 100644 --- a/srcpkgs/python3-occ/template +++ b/srcpkgs/python3-occ/template @@ -1,7 +1,7 @@ # Template file for 'python3-occ' pkgname=python3-occ version=7.7.0 -revision=2 +revision=3 archs="i686* x86_64* armv7l* aarch64* ppc*" build_style=cmake configure_args="-DPYTHONOCC_BUILD_TYPE=None -DCMAKE_BUILD_TYPE=None" diff --git a/srcpkgs/python3-olefile/template b/srcpkgs/python3-olefile/template index 3fa5fd52bea4d4..d31430a1586a0b 100644 --- a/srcpkgs/python3-olefile/template +++ b/srcpkgs/python3-olefile/template @@ -1,7 +1,7 @@ # Template file for 'python3-olefile' pkgname=python3-olefile version=0.46 -revision=8 +revision=9 build_style=python3-module hostmakedepends="unzip python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template index 4fd288892b993d..69206ba104fd0f 100644 --- a/srcpkgs/python3-oletools/template +++ b/srcpkgs/python3-oletools/template @@ -1,7 +1,7 @@ # Template file for 'python3-oletools' pkgname=python3-oletools version=0.60.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-parsing python3-olefile python3-colorclass python3-easygui diff --git a/srcpkgs/python3-omemo-dr/template b/srcpkgs/python3-omemo-dr/template index 836dbd91953cdd..99749ff0540bdd 100644 --- a/srcpkgs/python3-omemo-dr/template +++ b/srcpkgs/python3-omemo-dr/template @@ -1,7 +1,7 @@ # Template file for 'python3-omemo-dr' pkgname=python3-omemo-dr version=1.0.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" makedepends="python3-devel" diff --git a/srcpkgs/python3-opcua/template b/srcpkgs/python3-opcua/template index a06b1e5eb6b1c5..a26952ac76adc0 100644 --- a/srcpkgs/python3-opcua/template +++ b/srcpkgs/python3-opcua/template @@ -1,7 +1,7 @@ # Template file for 'python3-opcua' pkgname=python3-opcua version=0.98.13 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-cryptography python3-dateutil python3-lxml python3-pytz" diff --git a/srcpkgs/python3-openai/template b/srcpkgs/python3-openai/template index e65ce4d8d9a477..ba8df652574431 100644 --- a/srcpkgs/python3-openai/template +++ b/srcpkgs/python3-openai/template @@ -1,7 +1,7 @@ # Template file for 'python3-openai' pkgname=python3-openai version=1.12.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel hatchling" depends="python3-requests python3-numpy python3-pandas python3-tqdm python3-openpyxl python3-pydantic python3-httpx python3-distro" diff --git a/srcpkgs/python3-openapi-core/template b/srcpkgs/python3-openapi-core/template index 60de6336bc1d35..ee5ce56a144a17 100644 --- a/srcpkgs/python3-openapi-core/template +++ b/srcpkgs/python3-openapi-core/template @@ -1,7 +1,7 @@ # Template file for 'python3-openapi-core' pkgname=python3-openapi-core version=0.19.3 -revision=1 +revision=2 build_style=python3-pep517 # disable tests requiring unpackaged dependencies make_check_args=" diff --git a/srcpkgs/python3-openapi-schema-validator/template b/srcpkgs/python3-openapi-schema-validator/template index 30ecfaa90361d0..1103a0691613b2 100644 --- a/srcpkgs/python3-openapi-schema-validator/template +++ b/srcpkgs/python3-openapi-schema-validator/template @@ -1,7 +1,7 @@ # Template file for 'python3-openapi-schema-validator' pkgname=python3-openapi-schema-validator version=0.6.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-jsonschema python3-rfc3339-validator" diff --git a/srcpkgs/python3-openapi-spec-validator/template b/srcpkgs/python3-openapi-spec-validator/template index 084b4d2fbc9f04..0726aadac0e64d 100644 --- a/srcpkgs/python3-openapi-spec-validator/template +++ b/srcpkgs/python3-openapi-spec-validator/template @@ -1,7 +1,7 @@ # Template file for 'python3-openapi-spec-validator' pkgname=python3-openapi-spec-validator version=0.7.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-jsonschema-path python3-lazy-object-proxy diff --git a/srcpkgs/python3-openpyxl/template b/srcpkgs/python3-openpyxl/template index 8bac63bd732cb0..43621163ae01e5 100644 --- a/srcpkgs/python3-openpyxl/template +++ b/srcpkgs/python3-openpyxl/template @@ -1,7 +1,7 @@ # Template file for 'python3-openpyxl' pkgname=python3-openpyxl version=3.1.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-et-xmlfile" diff --git a/srcpkgs/python3-openssl/template b/srcpkgs/python3-openssl/template index 6af0598ad87757..05223ce3af153b 100644 --- a/srcpkgs/python3-openssl/template +++ b/srcpkgs/python3-openssl/template @@ -1,7 +1,7 @@ # Template file for 'python3-openssl' pkgname=python3-openssl version=24.2.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-cryptography" diff --git a/srcpkgs/python3-orderedmultidict/template b/srcpkgs/python3-orderedmultidict/template index ddcdc3773dcc9a..b04df9cbe329cc 100644 --- a/srcpkgs/python3-orderedmultidict/template +++ b/srcpkgs/python3-orderedmultidict/template @@ -1,7 +1,7 @@ # Template file for 'python3-orderedmultidict' pkgname=python3-orderedmultidict version=1.0.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-six" diff --git a/srcpkgs/python3-orjson/template b/srcpkgs/python3-orjson/template index 386dd17c198fd5..5b07fca14d095c 100644 --- a/srcpkgs/python3-orjson/template +++ b/srcpkgs/python3-orjson/template @@ -1,7 +1,7 @@ # Template file for 'python3-orjson' pkgname=python3-orjson version=3.10.12 -revision=1 +revision=2 build_style=python3-pep517 build_helper="rust" hostmakedepends="maturin cargo" diff --git a/srcpkgs/python3-orocos-kdl/template b/srcpkgs/python3-orocos-kdl/template index 6cbdc6b1a62112..693fed255c8046 100644 --- a/srcpkgs/python3-orocos-kdl/template +++ b/srcpkgs/python3-orocos-kdl/template @@ -1,7 +1,7 @@ # Template file for 'python3-orocos-kdl' pkgname=python3-orocos-kdl version=1.4.0 -revision=6 +revision=7 build_wrksrc=python_orocos_kdl build_style=cmake configure_args="-DPYTHON_VERSION=3 -DSIP_EXECUTABLE=/usr/bin/sip" diff --git a/srcpkgs/python3-outcome/template b/srcpkgs/python3-outcome/template index b4ff48da809ce8..5976562a5dcfd2 100644 --- a/srcpkgs/python3-outcome/template +++ b/srcpkgs/python3-outcome/template @@ -1,7 +1,7 @@ # Template file for 'python3-outcome' pkgname=python3-outcome version=1.2.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-overrides/template b/srcpkgs/python3-overrides/template index ed10b82ca6fa3b..b4cebace18ef0f 100644 --- a/srcpkgs/python3-overrides/template +++ b/srcpkgs/python3-overrides/template @@ -1,7 +1,7 @@ # Template file for 'python3-overrides' pkgname=python3-overrides version=7.7.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-owm/template b/srcpkgs/python3-owm/template index ea095c319278d4..6ac4af12f44a60 100644 --- a/srcpkgs/python3-owm/template +++ b/srcpkgs/python3-owm/template @@ -1,7 +1,7 @@ # Template file for 'python3-owm' pkgname=python3-owm version=2.10 -revision=6 +revision=7 build_style=python3-module pycompile_module="pyowm" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-owslib/template b/srcpkgs/python3-owslib/template index c2af1116f7d11c..f46dfd1849f850 100644 --- a/srcpkgs/python3-owslib/template +++ b/srcpkgs/python3-owslib/template @@ -1,7 +1,7 @@ # Template file for 'python3-owslib' pkgname=python3-owslib version=0.25.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="python3-lxml" diff --git a/srcpkgs/python3-packaging/template b/srcpkgs/python3-packaging/template index b909781ac45fd0..40eb0085c247b4 100644 --- a/srcpkgs/python3-packaging/template +++ b/srcpkgs/python3-packaging/template @@ -1,6 +1,6 @@ # Template file for 'python3-packaging' pkgname=python3-packaging -version=24.1 +version=24.2 revision=1 # This package is required by python3-build, used by the python3-pep517 style; # using that style here would create a cycle @@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford " license="Apache-2.0, BSD-2-Clause" homepage="https://github.com/pypa/packaging" distfiles="${PYPI_SITE}/p/packaging/packaging-${version}.tar.gz" -checksum=026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 +checksum=c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f make_check=no # provides no tests do_build() { diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template index 7f21723dd93a91..629c81e10e863e 100644 --- a/srcpkgs/python3-pafy/template +++ b/srcpkgs/python3-pafy/template @@ -1,7 +1,7 @@ # Template file for 'python3-pafy' pkgname=python3-pafy version=0.5.5 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools youtube-dl" depends="youtube-dl" diff --git a/srcpkgs/python3-paho_mqtt/template b/srcpkgs/python3-paho_mqtt/template index fb5574e5a59547..b7da04e13ab8c3 100644 --- a/srcpkgs/python3-paho_mqtt/template +++ b/srcpkgs/python3-paho_mqtt/template @@ -1,7 +1,7 @@ # Template file for 'python3-paho_mqtt' pkgname=python3-paho_mqtt version=2.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/python3-pam/template b/srcpkgs/python3-pam/template index b92473e11c653d..d9c9fcf9c394b8 100644 --- a/srcpkgs/python3-pam/template +++ b/srcpkgs/python3-pam/template @@ -1,7 +1,7 @@ # Template file for 'python3-pam' pkgname=python3-pam version=1.8.4 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 pam" diff --git a/srcpkgs/python3-pamqp/template b/srcpkgs/python3-pamqp/template index 67da2d3210a933..1842de14fd5627 100644 --- a/srcpkgs/python3-pamqp/template +++ b/srcpkgs/python3-pamqp/template @@ -1,7 +1,7 @@ # Template file for 'python3-pamqp' pkgname=python3-pamqp version=3.3.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pandas-msgpack/template b/srcpkgs/python3-pandas-msgpack/template index 180ef87e394a98..a9bf56b2747b90 100644 --- a/srcpkgs/python3-pandas-msgpack/template +++ b/srcpkgs/python3-pandas-msgpack/template @@ -1,7 +1,7 @@ # Template file for 'python3-pandas-msgpack' pkgname=python3-pandas-msgpack version=0.1.5 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel" diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template index 79e6f8462349cd..1421585e997238 100644 --- a/srcpkgs/python3-pandas/template +++ b/srcpkgs/python3-pandas/template @@ -1,7 +1,7 @@ # Template file for 'python3-pandas' pkgname=python3-pandas version=2.2.2 -revision=2 +revision=3 build_style=python3-pep517 build_helper="meson numpy" # Pandas imposes strict and unnecessary restrictions on build dependencies diff --git a/srcpkgs/python3-pandocfilters/template b/srcpkgs/python3-pandocfilters/template index 86c4a348490266..45e58c9c94ddeb 100644 --- a/srcpkgs/python3-pandocfilters/template +++ b/srcpkgs/python3-pandocfilters/template @@ -1,7 +1,7 @@ # Template file for 'python3-pandocfilters' pkgname=python3-pandocfilters version=1.5.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-parameterized/template b/srcpkgs/python3-parameterized/template index 7661670a7d91be..121d655d6e4590 100644 --- a/srcpkgs/python3-parameterized/template +++ b/srcpkgs/python3-parameterized/template @@ -1,7 +1,7 @@ # Template file for 'python3-parameterized' pkgname=python3-parameterized version=0.9.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-paramiko/template b/srcpkgs/python3-paramiko/template index 08603dc4195455..c63c19c9be4626 100644 --- a/srcpkgs/python3-paramiko/template +++ b/srcpkgs/python3-paramiko/template @@ -1,7 +1,7 @@ # Template file for 'python3-paramiko' pkgname=python3-paramiko version=3.4.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-bcrypt python3-cryptography python3-pynacl" diff --git a/srcpkgs/python3-parse/template b/srcpkgs/python3-parse/template index e06950f250f0ee..4dd745742a238a 100644 --- a/srcpkgs/python3-parse/template +++ b/srcpkgs/python3-parse/template @@ -1,7 +1,7 @@ # Template file for 'python3-parse' pkgname=python3-parse version=1.20.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-parsedatetime/template b/srcpkgs/python3-parsedatetime/template index 7a50c02a01f6a7..531d3869a4af97 100644 --- a/srcpkgs/python3-parsedatetime/template +++ b/srcpkgs/python3-parsedatetime/template @@ -1,7 +1,7 @@ # Template file for 'python3-parsedatetime' pkgname=python3-parsedatetime version=2.6 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-future" diff --git a/srcpkgs/python3-parsing/template b/srcpkgs/python3-parsing/template index e6fd3ffbe7fda1..24baa04c8a96f5 100644 --- a/srcpkgs/python3-parsing/template +++ b/srcpkgs/python3-parsing/template @@ -1,6 +1,6 @@ # Template file for 'python3-parsing' pkgname=python3-parsing -version=3.1.4 +version=3.2.0 revision=1 # This package is used by the python3-pep517 build style; using that style here # would create a build cycle @@ -20,7 +20,7 @@ license="MIT" homepage="https://github.com/pyparsing/pyparsing" changelog="https://github.com/pyparsing/pyparsing/raw/master/CHANGES" distfiles="${PYPI_SITE}/p/pyparsing/pyparsing-${version}.tar.gz" -checksum=f86ec8d1a83f11977c9a6ea7598e8c27fc5cddfa5b07ea2241edbbde1d7bc032 +checksum=cbf74e27246d595d9a74b186b810f6fbb86726dbf3b9532efb343f6d7294fe9c do_build() { python3 -m flit_core.wheel diff --git a/srcpkgs/python3-parso/template b/srcpkgs/python3-parso/template index 14f60bf614eb48..3d2f00afef7872 100644 --- a/srcpkgs/python3-parso/template +++ b/srcpkgs/python3-parso/template @@ -1,7 +1,7 @@ # Template file for 'python3-parso' pkgname=python3-parso version=0.8.4 -revision=1 +revision=2 build_style=python3-module # Several error messages changed form and trigger inappropriate failures make_check_args="--ignore=test/test_python_errors.py" diff --git a/srcpkgs/python3-parver/template b/srcpkgs/python3-parver/template index 76cde3ab20dc7f..31be1570cbed63 100644 --- a/srcpkgs/python3-parver/template +++ b/srcpkgs/python3-parver/template @@ -1,7 +1,7 @@ # Template file for 'python3-parver' pkgname=python3-parver version=0.4 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-Arpeggio python3-attrs" diff --git a/srcpkgs/python3-passlib/template b/srcpkgs/python3-passlib/template index 5e99056bce9d0b..bb578b52f190c0 100644 --- a/srcpkgs/python3-passlib/template +++ b/srcpkgs/python3-passlib/template @@ -1,17 +1,17 @@ # Template file for 'python3-passlib' pkgname=python3-passlib version=1.7.4 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" -checkdepends="python3-bcrypt python3-nose" short_desc="Comprehensive password hashing framework for Python3" maintainer="Alin Dobre " license="BSD-3-Clause" homepage="https://passlib.readthedocs.io" distfiles="${PYPI_SITE}/p/passlib/passlib-${version}.tar.gz" checksum=defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04 +make_check=no # Tests require removed python3-nose post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-path-and-address/template b/srcpkgs/python3-path-and-address/template index 7ca9db919a1fc1..da4c378835663f 100644 --- a/srcpkgs/python3-path-and-address/template +++ b/srcpkgs/python3-path-and-address/template @@ -1,7 +1,7 @@ # Template file for 'python3-path-and-address' pkgname=python3-path-and-address version=2.0.1 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-path/template b/srcpkgs/python3-path/template index 1b89c03a82dbb0..12de4f43a2608b 100644 --- a/srcpkgs/python3-path/template +++ b/srcpkgs/python3-path/template @@ -1,7 +1,7 @@ # Template file for 'python3-path' pkgname=python3-path version=17.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-pathable/template b/srcpkgs/python3-pathable/template index 0709c4600c252a..7dac60d4a5c0d5 100644 --- a/srcpkgs/python3-pathable/template +++ b/srcpkgs/python3-pathable/template @@ -1,7 +1,7 @@ # Template file for 'python3-pathable' pkgname=python3-pathable version=0.4.3 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3" diff --git a/srcpkgs/python3-pathlib2/template b/srcpkgs/python3-pathlib2/template index 62debc55a162de..58871dd5aa7a3f 100644 --- a/srcpkgs/python3-pathlib2/template +++ b/srcpkgs/python3-pathlib2/template @@ -1,7 +1,7 @@ # Template file for 'python3-pathlib2' pkgname=python3-pathlib2 version=2.3.4 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" diff --git a/srcpkgs/python3-pathspec/template b/srcpkgs/python3-pathspec/template index 612012b1a34dc3..5f9b1c73123ef0 100644 --- a/srcpkgs/python3-pathspec/template +++ b/srcpkgs/python3-pathspec/template @@ -1,7 +1,7 @@ # Template file for 'python3-pathspec' pkgname=python3-pathspec version=0.12.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-pathtools/template b/srcpkgs/python3-pathtools/template index b841140aae6b2f..76cea466446dea 100644 --- a/srcpkgs/python3-pathtools/template +++ b/srcpkgs/python3-pathtools/template @@ -1,7 +1,7 @@ # Template file for 'python3-pathtools' pkgname=python3-pathtools version=0.1.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pathvalidate/template b/srcpkgs/python3-pathvalidate/template index db2eb3e4a489d8..312b115ea78ad5 100644 --- a/srcpkgs/python3-pathvalidate/template +++ b/srcpkgs/python3-pathvalidate/template @@ -1,7 +1,7 @@ # Template file for 'python3-pathvalidate' pkgname=python3-pathvalidate version=2.5.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pbkdf2/template b/srcpkgs/python3-pbkdf2/template index 0e0269e136e95e..0bac18be07d5f7 100644 --- a/srcpkgs/python3-pbkdf2/template +++ b/srcpkgs/python3-pbkdf2/template @@ -1,7 +1,7 @@ # Template file for 'python3-pbkdf2' pkgname=python3-pbkdf2 version=1.3 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pbr/template b/srcpkgs/python3-pbr/template index 5064dafc76e045..f2e559a50ae3f0 100644 --- a/srcpkgs/python3-pbr/template +++ b/srcpkgs/python3-pbr/template @@ -1,7 +1,7 @@ # Template file for 'python3-pbr' pkgname=python3-pbr version=5.6.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pcodedmp/template b/srcpkgs/python3-pcodedmp/template index 713bc78abeaaa9..94a06b1b00d737 100644 --- a/srcpkgs/python3-pcodedmp/template +++ b/srcpkgs/python3-pcodedmp/template @@ -1,7 +1,7 @@ # Template file for 'python3-pcodedmp' pkgname=python3-pcodedmp version=1.2.6 -revision=6 +revision=7 build_style=python3-module pycompile_module="pcodedmp" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-pdfminer.six/template b/srcpkgs/python3-pdfminer.six/template index e27a9d8e71cac2..dc00e2c554f034 100644 --- a/srcpkgs/python3-pdfminer.six/template +++ b/srcpkgs/python3-pdfminer.six/template @@ -1,7 +1,7 @@ # Template file for 'python3-pdfminer.six' pkgname=python3-pdfminer.six version=20240706 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-poetry-core" depends="python3-charset-normalizer python3-cryptography python3-Pillow" diff --git a/srcpkgs/python3-pdfrw/template b/srcpkgs/python3-pdfrw/template index e1e05f1d2d5bb8..a25b6233e6150a 100644 --- a/srcpkgs/python3-pdfrw/template +++ b/srcpkgs/python3-pdfrw/template @@ -1,7 +1,7 @@ # Template file for 'python3-pdfrw' pkgname=python3-pdfrw version=0.4 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pdm-backend/template b/srcpkgs/python3-pdm-backend/template index 38dd9b4c8f4019..61091ceea4b7a4 100644 --- a/srcpkgs/python3-pdm-backend/template +++ b/srcpkgs/python3-pdm-backend/template @@ -1,7 +1,7 @@ # Template file for 'python3-pdm-backend' pkgname=python3-pdm-backend version=2.4.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3 python3-build python3-packaging" short_desc="PDM-Backend" diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template index db80101152f25b..500f4c93299984 100644 --- a/srcpkgs/python3-peewee/template +++ b/srcpkgs/python3-peewee/template @@ -1,9 +1,9 @@ # Template file for 'python3-peewee' pkgname=python3-peewee -version=3.17.7 -revision=1 +version=3.17.8 +revision=2 build_style=python3-pep517 -hostmakedepends="python3-setuptools python3-wheel python3-Cython0.29" +hostmakedepends="python3-setuptools python3-wheel python3-Cython" makedepends="python3-devel sqlite-devel" depends="python3" short_desc="Small and simple ORM for Python3" @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/coleifer/peewee" changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md" distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz" -checksum=c9b02f2191357093a400433b01d51ec545aaa78357e68975843f4b349d1cd303 +checksum=92131e0c8b69fd66234f5d60ceaa7e9daadd337a2f9fcc12bb2d3886e3e985d8 alternatives="peewee:pwiz:/usr/bin/pwiz.py3" make_check=no # tests require postgres instance diff --git a/srcpkgs/python3-pefile/template b/srcpkgs/python3-pefile/template index d7095553b8d77d..ee0ca0f513880a 100644 --- a/srcpkgs/python3-pefile/template +++ b/srcpkgs/python3-pefile/template @@ -1,7 +1,7 @@ # Template file for 'python3-pefile' pkgname=python3-pefile version=2024.8.26 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pem/template b/srcpkgs/python3-pem/template index 9798f1add13f6d..6ea6376c7baca2 100644 --- a/srcpkgs/python3-pem/template +++ b/srcpkgs/python3-pem/template @@ -1,7 +1,7 @@ # Template file for 'python3-pem' pkgname=python3-pem version=20.1.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pendulum/template b/srcpkgs/python3-pendulum/template index 684daf3a0d19a9..2e2061e6074059 100644 --- a/srcpkgs/python3-pendulum/template +++ b/srcpkgs/python3-pendulum/template @@ -1,7 +1,7 @@ # Template file for 'python3-pendulum' pkgname=python3-pendulum version=2.1.2 -revision=4 +revision=5 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-pep440/template b/srcpkgs/python3-pep440/template index 9ef527e9b94fc0..c9e6ed8ab9b39e 100644 --- a/srcpkgs/python3-pep440/template +++ b/srcpkgs/python3-pep440/template @@ -1,7 +1,7 @@ # Template file for 'python3-pep440' pkgname=python3-pep440 version=0.1.2 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core" checkdepends="python3-pytest-console-scripts" diff --git a/srcpkgs/python3-perf/template b/srcpkgs/python3-perf/template index 93383aa235b6d9..c006ea8b3a6105 100644 --- a/srcpkgs/python3-perf/template +++ b/srcpkgs/python3-perf/template @@ -1,7 +1,7 @@ # Template file for 'python3-perf' pkgname=python3-perf version=1.7.0 -revision=5 +revision=6 build_style=python3-module pycompile_module="pyperf" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-pexpect/template b/srcpkgs/python3-pexpect/template index cb77bc58a366ac..874887cdd30b45 100644 --- a/srcpkgs/python3-pexpect/template +++ b/srcpkgs/python3-pexpect/template @@ -1,7 +1,7 @@ # Template file for 'python3-pexpect' pkgname=python3-pexpect version=4.9.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-ptyprocess" diff --git a/srcpkgs/python3-pgmigrate/template b/srcpkgs/python3-pgmigrate/template index 2830e282943e46..0f9bcd05b212b2 100644 --- a/srcpkgs/python3-pgmigrate/template +++ b/srcpkgs/python3-pgmigrate/template @@ -1,7 +1,7 @@ # Template file for 'python3-pgmigrate' pkgname=python3-pgmigrate version=1.0.5 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-sqlparse python3-psycopg2 python3-yaml" diff --git a/srcpkgs/python3-pgspecial/template b/srcpkgs/python3-pgspecial/template index 3e2ef44d169df4..80ee21917d32d0 100644 --- a/srcpkgs/python3-pgspecial/template +++ b/srcpkgs/python3-pgspecial/template @@ -1,7 +1,7 @@ # Template file for 'python3-pgspecial' pkgname=python3-pgspecial version=2.1.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3-click python3-sqlparse python3-psycopg" diff --git a/srcpkgs/python3-pgzero/template b/srcpkgs/python3-pgzero/template index a3bf6b722d15a6..b43b3142e65ef5 100644 --- a/srcpkgs/python3-pgzero/template +++ b/srcpkgs/python3-pgzero/template @@ -1,7 +1,7 @@ # Template file for 'python3-pgzero' pkgname=python3-pgzero version=1.2.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-pygame python3-numpy" diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template index 5cc50755ea41f4..7600ad872497be 100644 --- a/srcpkgs/python3-phonenumbers/template +++ b/srcpkgs/python3-phonenumbers/template @@ -1,7 +1,7 @@ # Template file for 'python3-phonenumbers' pkgname=python3-phonenumbers version=8.13.43 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-phx-class-registry/template b/srcpkgs/python3-phx-class-registry/template index 0c2ac22a911642..c8e770327ae9fe 100644 --- a/srcpkgs/python3-phx-class-registry/template +++ b/srcpkgs/python3-phx-class-registry/template @@ -1,7 +1,7 @@ # Template file for 'python3-phx-class-registry' pkgname=python3-phx-class-registry version=4.0.5 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" diff --git a/srcpkgs/python3-picamera/template b/srcpkgs/python3-picamera/template index 201c46cbf9e1e5..493d48cacee053 100644 --- a/srcpkgs/python3-picamera/template +++ b/srcpkgs/python3-picamera/template @@ -1,7 +1,7 @@ # Template file for 'python3-picamera' pkgname=python3-picamera version=1.13 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pickleshare/template b/srcpkgs/python3-pickleshare/template index ee110b53b7309a..e34de11a6de398 100644 --- a/srcpkgs/python3-pickleshare/template +++ b/srcpkgs/python3-pickleshare/template @@ -1,7 +1,7 @@ # Template file for 'python3-pickleshare' pkgname=python3-pickleshare version=0.7.5 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-piexif/template b/srcpkgs/python3-piexif/template index 200d2bf80074c8..0edc585d69cd74 100644 --- a/srcpkgs/python3-piexif/template +++ b/srcpkgs/python3-piexif/template @@ -1,7 +1,7 @@ # Template file for 'python3-piexif' pkgname=python3-piexif version=1.1.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template index 86501ca505ffae..4f3bddd6be3523 100644 --- a/srcpkgs/python3-pikepdf/template +++ b/srcpkgs/python3-pikepdf/template @@ -1,7 +1,7 @@ # Template file for 'python3-pikepdf' pkgname=python3-pikepdf version=8.13.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-pybind11 python3-wheel" makedepends="libqpdf-devel python3-pybind11" diff --git a/srcpkgs/python3-pillow-simd/template b/srcpkgs/python3-pillow-simd/template index 26a5b342e6e797..aa7dd4228f311c 100644 --- a/srcpkgs/python3-pillow-simd/template +++ b/srcpkgs/python3-pillow-simd/template @@ -1,7 +1,7 @@ # Template file for 'python3-pillow-simd' pkgname=python3-pillow-simd -version=7.1.2 -revision=7 +version=9.5.0.post2 +revision=1 archs="x86_64*" build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,18 +10,15 @@ makedepends="python3-devel libjpeg-turbo-devel libopenjpeg2-devel libimagequant-devel harfbuzz-devel fribidi-devel libraqm-devel" depends="python3" short_desc="Python3 Imaging Library (PIL) fork (SIMD)" -maintainer="mustaqim " +maintainer="Orphaned " license="custom: PIL" homepage="https://python-pillow.org/pillow-perf/" changelog="https://github.com/uploadcare/pillow-simd/blob/simd/master/CHANGES.SIMD.rst" -distfiles="https://github.com/uploadcare/pillow-simd/archive/${version}.tar.gz" -checksum=72e1c9d48543531f5fc04594fa330d1111ecc2ac04a9bcda0c6ad3abe6a616aa +distfiles="https://github.com/uploadcare/pillow-simd/archive/v${version}.tar.gz" +checksum=6368c626e6e8f27fa04bf816299f194bf91a9baa9ac245a57bc756b01de57fb5 replaces="python3-Pillow>=0" provides="python3-Pillow-${version}_${revision}" - -do_check() { - : # downloads pillow and tests it instead -} +make_check=no # downloads pillow and tests it instead post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pillow_heif/template b/srcpkgs/python3-pillow_heif/template index d06ad1c2729365..ae522dd32abe6f 100644 --- a/srcpkgs/python3-pillow_heif/template +++ b/srcpkgs/python3-pillow_heif/template @@ -1,7 +1,7 @@ # Template file for 'python3-pillow_heif' pkgname=python3-pillow_heif version=0.20.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="libheif-devel python3-devel" diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template index ab47bd1a76b2fd..130533a81d49ed 100644 --- a/srcpkgs/python3-pip/template +++ b/srcpkgs/python3-pip/template @@ -1,6 +1,6 @@ # Template file for 'python3-pip' pkgname=python3-pip -version=24.2 +version=24.3.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -11,7 +11,7 @@ license="MIT" homepage="https://pip.pypa.io/" changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst" distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz" -checksum=5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8 +checksum=ebcb60557f2aefabc2e0f918751cd24ea0d56d8ec5445fe1807f1d2109660b99 # Tests have unpackaged dependencies make_check=no diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template index fbc90eb0c885c8..da153dc82062a0 100644 --- a/srcpkgs/python3-pipenv/template +++ b/srcpkgs/python3-pipenv/template @@ -1,7 +1,7 @@ # Template file for 'python3-pipenv' pkgname=python3-pipenv version=2024.4.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3 python3-pip python3-virtualenv python3-virtualenv-clone" diff --git a/srcpkgs/python3-pipx/template b/srcpkgs/python3-pipx/template index 9357cfe32b5601..4d63326de1d50f 100644 --- a/srcpkgs/python3-pipx/template +++ b/srcpkgs/python3-pipx/template @@ -1,7 +1,7 @@ # Template file for 'python3-pipx' pkgname=python3-pipx version=1.7.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3-argcomplete python3-packaging python3-platformdirs python3-userpath" diff --git a/srcpkgs/python3-pivy/patches/python3.12.patch b/srcpkgs/python3-pivy/patches/python3.12.patch deleted file mode 100644 index 6742d757952118..00000000000000 --- a/srcpkgs/python3-pivy/patches/python3.12.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d3faf04b8770c60ca9b2186059ee82201e3620ad Mon Sep 17 00:00:00 2001 -From: lorenz -Date: Thu, 13 Jul 2023 23:59:17 +0200 -Subject: [PATCH] python 3.12 support - -PyUnicode_GET_SIZE -> PyUnicode_GET_LENGTH ---- - Inventor/SoInput.i | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Inventor/SoInput.i b/Inventor/SoInput.i -index 0925ab50..f0be6383 100644 ---- a/Inventor/SoInput.i -+++ b/Inventor/SoInput.i -@@ -10,7 +10,7 @@ - if (PyUnicode_Check($input)) - { - $1 = (void *) PyUnicode_AsUTF8($input); -- $2 = PyUnicode_GET_SIZE($input); -+ $2 = PyUnicode_GET_LENGTH($input); - } - else if (PyBytes_Check($input)) - { diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template index 2b984696fbd889..3a569ff6809aec 100644 --- a/srcpkgs/python3-pivy/template +++ b/srcpkgs/python3-pivy/template @@ -1,7 +1,7 @@ # Template file for 'python3-pivy' pkgname=python3-pivy -version=0.6.8 -revision=3 +version=0.6.9 +revision=1 build_style=cmake hostmakedepends="python3-devel swig" makedepends="python3-devel coin3-devel" @@ -11,13 +11,7 @@ maintainer="yopito " license="ISC" homepage="https://github.com/coin3d/pivy" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=c443dd7dd724b0bfa06427478b9d24d31e0c3b5138ac5741a2917a443b28f346 - -# still relevant with pivy 0.6.6 ? -case "$XBPS_TARGET_MACHINE" in - ppc64*);; - ppc*) broken="{standard input}:3376761: Error: operand out of range";; -esac +checksum=c207f5ed73089b2281356da4a504c38faaab90900b95639c80772d9d25ba0bbc post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pkgconfig/template b/srcpkgs/python3-pkgconfig/template index 3fb4bc5d6652fb..a36a8ea18158af 100644 --- a/srcpkgs/python3-pkgconfig/template +++ b/srcpkgs/python3-pkgconfig/template @@ -1,7 +1,7 @@ # Template file for 'python3-pkgconfig' pkgname=python3-pkgconfig version=1.5.5 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 pkg-config" diff --git a/srcpkgs/python3-pkginfo/template b/srcpkgs/python3-pkginfo/template index 206d540a087824..347725aa9f5904 100644 --- a/srcpkgs/python3-pkginfo/template +++ b/srcpkgs/python3-pkginfo/template @@ -1,7 +1,7 @@ # Template file for 'python3-pkginfo' pkgname=python3-pkginfo version=1.8.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-platformdirs/template b/srcpkgs/python3-platformdirs/template index d3598571e6779d..6035cd9ec3fd5a 100644 --- a/srcpkgs/python3-platformdirs/template +++ b/srcpkgs/python3-platformdirs/template @@ -1,7 +1,7 @@ # Template file for 'python3-platformdirs' pkgname=python3-platformdirs version=4.3.6 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3" diff --git a/srcpkgs/python3-plotly/template b/srcpkgs/python3-plotly/template index acc53410c1372c..2fa59509523baf 100644 --- a/srcpkgs/python3-plotly/template +++ b/srcpkgs/python3-plotly/template @@ -1,7 +1,7 @@ # Template file for 'python3-plotly' pkgname=python3-plotly version=5.24.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-requests python3-pytz python3-decorator python3-jupyter_nbformat python3-tenacity" diff --git a/srcpkgs/python3-plover_stroke/template b/srcpkgs/python3-plover_stroke/template index e38779045fa6a0..42ede5774b5ea0 100644 --- a/srcpkgs/python3-plover_stroke/template +++ b/srcpkgs/python3-plover_stroke/template @@ -1,7 +1,7 @@ # Template file for 'python3-plover_stroke' pkgname=python3-plover_stroke version=1.1.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template index 9ddc3d4e4a8f05..3c9be73988cab4 100644 --- a/srcpkgs/python3-pluggy/template +++ b/srcpkgs/python3-pluggy/template @@ -1,7 +1,7 @@ # Template file for 'python3-pluggy' pkgname=python3-pluggy version=1.5.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3" diff --git a/srcpkgs/python3-ply/template b/srcpkgs/python3-ply/template index 1cea341e8f2097..2296aab2ffc642 100644 --- a/srcpkgs/python3-ply/template +++ b/srcpkgs/python3-ply/template @@ -1,7 +1,7 @@ # Template file for 'python3-ply' pkgname=python3-ply version=3.11 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pmw/template b/srcpkgs/python3-pmw/template index 9f98bf5f75d57e..df0b3b9cbcfb58 100644 --- a/srcpkgs/python3-pmw/template +++ b/srcpkgs/python3-pmw/template @@ -1,7 +1,7 @@ # Template file for 'python3-pmw' pkgname=python3-pmw version=2.0.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel tk-devel" diff --git a/srcpkgs/python3-podcastparser/template b/srcpkgs/python3-podcastparser/template index bbe0fb724d82fa..52a93fdd4913d2 100644 --- a/srcpkgs/python3-podcastparser/template +++ b/srcpkgs/python3-podcastparser/template @@ -1,7 +1,7 @@ # Template file for 'python3-podcastparser' pkgname=python3-podcastparser version=0.6.9 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-poetry-core/template b/srcpkgs/python3-poetry-core/template index 60d1d99b686fd0..866e48b35bdfc2 100644 --- a/srcpkgs/python3-poetry-core/template +++ b/srcpkgs/python3-poetry-core/template @@ -1,7 +1,7 @@ # Template file for 'python3-poetry-core' pkgname=python3-poetry-core version=1.9.0 -revision=1 +revision=2 build_style="python3-pep517" depends="python3" checkdepends="python3-devel python3-setuptools python3-virtualenv python3-pyrsistent diff --git a/srcpkgs/python3-polib/template b/srcpkgs/python3-polib/template index b0e80bc3d5e821..84185bb85d69a3 100644 --- a/srcpkgs/python3-polib/template +++ b/srcpkgs/python3-polib/template @@ -1,7 +1,7 @@ # Template file for 'python3-polib' pkgname=python3-polib version=1.1.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pooch/template b/srcpkgs/python3-pooch/template index 40d8fa285c93b1..144c81e822e25f 100644 --- a/srcpkgs/python3-pooch/template +++ b/srcpkgs/python3-pooch/template @@ -1,7 +1,7 @@ # Template file for 'python3-pooch' pkgname=python3-pooch version=1.8.2 -revision=1 +revision=2 build_style=python3-pep517 # Fixture not available make_check_args="-k not((test_ftp_downloader)or(test_check_availability_on_ftp))" diff --git a/srcpkgs/python3-portend/template b/srcpkgs/python3-portend/template index 34387eaa89d441..5e1b04886063b9 100644 --- a/srcpkgs/python3-portend/template +++ b/srcpkgs/python3-portend/template @@ -1,7 +1,7 @@ # Template file for 'python3-portend' pkgname=python3-portend version=3.2.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-tempora" diff --git a/srcpkgs/python3-potr/template b/srcpkgs/python3-potr/template index 810c6344d7f46b..822d3d57addfbd 100644 --- a/srcpkgs/python3-potr/template +++ b/srcpkgs/python3-potr/template @@ -1,7 +1,7 @@ # Template file for 'python3-potr' pkgname=python3-potr version=1.0.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-pycryptodome" diff --git a/srcpkgs/python3-pplpy/template b/srcpkgs/python3-pplpy/template index 9717dda878d01f..7eb86be2305866 100644 --- a/srcpkgs/python3-pplpy/template +++ b/srcpkgs/python3-pplpy/template @@ -1,7 +1,7 @@ # Template file for 'python3-pplpy' pkgname=python3-pplpy version=0.8.10 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-Cython python3-cysignals python3-gmpy2" diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template index 9bc48dbc9ee2cb..15f74ccefc7317 100644 --- a/srcpkgs/python3-prctl/template +++ b/srcpkgs/python3-prctl/template @@ -1,7 +1,7 @@ # Template file for 'python3-prctl' pkgname=python3-prctl version=1.7 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools libcap-devel" makedepends="libcap-devel python3-devel" diff --git a/srcpkgs/python3-precis-i18n/template b/srcpkgs/python3-precis-i18n/template index c63a93d107d260..d58520af9a9b32 100644 --- a/srcpkgs/python3-precis-i18n/template +++ b/srcpkgs/python3-precis-i18n/template @@ -1,7 +1,7 @@ # Template file for 'python3-precis-i18n' pkgname=python3-precis-i18n version=1.1.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pretend/template b/srcpkgs/python3-pretend/template index 7ab809b166900b..a35e9e556536dc 100644 --- a/srcpkgs/python3-pretend/template +++ b/srcpkgs/python3-pretend/template @@ -1,7 +1,7 @@ # Template file for 'python3-pretend' pkgname=python3-pretend version=1.0.9 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-primecountpy/template b/srcpkgs/python3-primecountpy/template index eb3587dbb29c8b..18ff02da7ca5c7 100644 --- a/srcpkgs/python3-primecountpy/template +++ b/srcpkgs/python3-primecountpy/template @@ -1,7 +1,7 @@ # Template file for 'python3-primecountpy' pkgname=python3-primecountpy version=0.1.0 -revision=4 +revision=5 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-Cython python3-cysignals" diff --git a/srcpkgs/python3-priority/template b/srcpkgs/python3-priority/template index 8816c3a3160e50..560991dd8dc12b 100644 --- a/srcpkgs/python3-priority/template +++ b/srcpkgs/python3-priority/template @@ -1,7 +1,7 @@ # Template file for 'python3-priority' pkgname=python3-priority version=2.0.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-process-tests/template b/srcpkgs/python3-process-tests/template index 129835d5c53e89..0a57346a3157c1 100644 --- a/srcpkgs/python3-process-tests/template +++ b/srcpkgs/python3-process-tests/template @@ -1,7 +1,7 @@ # Template file for 'python3-process-tests' pkgname=python3-process-tests version=3.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template index 0b3b59c2f24882..1b457a6d580ad1 100644 --- a/srcpkgs/python3-progress/template +++ b/srcpkgs/python3-progress/template @@ -1,7 +1,7 @@ # Template file for 'python3-progress' pkgname=python3-progress version=1.6 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-progressbar/template b/srcpkgs/python3-progressbar/template index 242eb11571c6aa..d6395c335b45b1 100644 --- a/srcpkgs/python3-progressbar/template +++ b/srcpkgs/python3-progressbar/template @@ -1,7 +1,7 @@ # Template file for 'python3-progressbar' pkgname=python3-progressbar version=2.5 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-prometheus_client/template b/srcpkgs/python3-prometheus_client/template index 9d7bd419916e2c..590d0bf11cdc1d 100644 --- a/srcpkgs/python3-prometheus_client/template +++ b/srcpkgs/python3-prometheus_client/template @@ -1,7 +1,7 @@ # Template file for 'python3-prometheus_client' pkgname=python3-prometheus_client version=0.20.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template index 8c1c04614757f2..2083cc48e5c184 100644 --- a/srcpkgs/python3-prompt_toolkit/template +++ b/srcpkgs/python3-prompt_toolkit/template @@ -1,7 +1,7 @@ # Template file for 'python3-prompt_toolkit' pkgname=python3-prompt_toolkit version=3.0.48 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-wcwidth" diff --git a/srcpkgs/python3-proselint/template b/srcpkgs/python3-proselint/template index 9ea2d91eb83239..3574bc9c0ee150 100644 --- a/srcpkgs/python3-proselint/template +++ b/srcpkgs/python3-proselint/template @@ -1,7 +1,7 @@ # Template file for 'python3-proselint' pkgname=python3-proselint version=0.12.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-click python3-future python3-six" diff --git a/srcpkgs/python3-protobuf/template b/srcpkgs/python3-protobuf/template index 301489708bf35a..389b19b8f233ba 100644 --- a/srcpkgs/python3-protobuf/template +++ b/srcpkgs/python3-protobuf/template @@ -1,7 +1,7 @@ # Template file for 'python3-protobuf' pkgname=python3-protobuf version=4.25.2 -revision=1 +revision=2 build_style=python3-module build_wrksrc=python hostmakedepends="python3-setuptools python3-wheel protobuf" diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template index 9b727050b7c5fc..18e96130dfa80b 100644 --- a/srcpkgs/python3-psutil/template +++ b/srcpkgs/python3-psutil/template @@ -1,7 +1,7 @@ # Template file for 'python3-psutil' pkgname=python3-psutil version=5.9.8 -revision=1 +revision=2 build_style=python3-pep517 # Failing tests: see https://github.com/giampaolo/psutil/issues/2043 make_check_args="--import-mode=importlib diff --git a/srcpkgs/python3-psycopg/template b/srcpkgs/python3-psycopg/template index df245e8d772474..f9c798f9328ef3 100644 --- a/srcpkgs/python3-psycopg/template +++ b/srcpkgs/python3-psycopg/template @@ -1,7 +1,7 @@ # Template file for 'python3-psycopg' pkgname=python3-psycopg version=3.2.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-typing_extensions" diff --git a/srcpkgs/python3-psycopg2/template b/srcpkgs/python3-psycopg2/template index ea8b781c456f6e..6398ca52d993a7 100644 --- a/srcpkgs/python3-psycopg2/template +++ b/srcpkgs/python3-psycopg2/template @@ -1,7 +1,7 @@ # Template file for 'python3-psycopg2' pkgname=python3-psycopg2 version=2.9.3 -revision=3 +revision=4 build_style=python3-module # Require postgresql-libs-devel to find executable: pg_config hostmakedepends="postgresql-libs-devel python3-setuptools" diff --git a/srcpkgs/python3-ptyprocess/template b/srcpkgs/python3-ptyprocess/template index d79a8425d09277..16695ff234bd48 100644 --- a/srcpkgs/python3-ptyprocess/template +++ b/srcpkgs/python3-ptyprocess/template @@ -1,7 +1,7 @@ # Template file for 'python3-ptyprocess' pkgname=python3-ptyprocess version=0.7.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-publicsuffix2/template b/srcpkgs/python3-publicsuffix2/template index b1d4510cc7ece6..dbfc327b7e366a 100644 --- a/srcpkgs/python3-publicsuffix2/template +++ b/srcpkgs/python3-publicsuffix2/template @@ -1,7 +1,7 @@ # Template file for 'python3-publicsuffix2' pkgname=python3-publicsuffix2 version=2019.12.21 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-requests python3-wheel public-suffix" depends="python3 public-suffix" diff --git a/srcpkgs/python3-pulsectl-asyncio/template b/srcpkgs/python3-pulsectl-asyncio/template index 50a952af9621c8..d427bae6f94a9c 100644 --- a/srcpkgs/python3-pulsectl-asyncio/template +++ b/srcpkgs/python3-pulsectl-asyncio/template @@ -1,7 +1,7 @@ # Template file for 'python3-pulsectl-asyncio' pkgname=python3-pulsectl-asyncio version=1.2.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-pulsectl libpulseaudio" diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template index 7e9fd6a09877cc..1f3a3d37eecc26 100644 --- a/srcpkgs/python3-pulsectl/template +++ b/srcpkgs/python3-pulsectl/template @@ -1,7 +1,7 @@ # Template file for 'python3-pulsectl' pkgname=python3-pulsectl version=24.8.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-pure-protobuf/template b/srcpkgs/python3-pure-protobuf/template index c5ff7143c07590..7002ee0149bd65 100644 --- a/srcpkgs/python3-pure-protobuf/template +++ b/srcpkgs/python3-pure-protobuf/template @@ -1,7 +1,7 @@ # Template file for 'python3-pure-protobuf' pkgname=python3-pure-protobuf version=2.0.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pure_eval/template b/srcpkgs/python3-pure_eval/template index d435d16a11b39c..c76df9af49e11d 100644 --- a/srcpkgs/python3-pure_eval/template +++ b/srcpkgs/python3-pure_eval/template @@ -1,7 +1,7 @@ # Template file for 'python3-pure_eval' pkgname=python3-pure_eval version=0.2.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-puremagic/template b/srcpkgs/python3-puremagic/template index 8f53dee447742e..f5ce47acf5e31e 100644 --- a/srcpkgs/python3-puremagic/template +++ b/srcpkgs/python3-puremagic/template @@ -1,7 +1,7 @@ # Template file for 'python3-puremagic' pkgname=python3-puremagic version=1.11 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template index cf5f0e5df7047c..a157455b9c7bc8 100644 --- a/srcpkgs/python3-pwntools/template +++ b/srcpkgs/python3-pwntools/template @@ -1,7 +1,7 @@ # Template file for 'python3-pwntools' pkgname=python3-pwntools version=4.13.1 -revision=1 +revision=2 build_style=python3-module make_install_args="--only-use-pwn-command" hostmakedepends="python3-setuptools python3-devel" diff --git a/srcpkgs/python3-py-cpuinfo/template b/srcpkgs/python3-py-cpuinfo/template index 543d39bde29ce4..3ea7b4dc60186f 100644 --- a/srcpkgs/python3-py-cpuinfo/template +++ b/srcpkgs/python3-py-cpuinfo/template @@ -1,7 +1,7 @@ # Template file for 'python3-py-cpuinfo' pkgname=python3-py-cpuinfo version=8.0.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-py/template b/srcpkgs/python3-py/template index 68e4d72677c306..52d243f2efea2a 100644 --- a/srcpkgs/python3-py/template +++ b/srcpkgs/python3-py/template @@ -1,7 +1,7 @@ # Template file for 'python3-py' pkgname=python3-py version=1.11.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template index f8a9da49b26614..58f41b06c4349a 100644 --- a/srcpkgs/python3-py7zr/template +++ b/srcpkgs/python3-py7zr/template @@ -1,7 +1,7 @@ # Template file for 'python3-py7zr' pkgname=python3-py7zr version=0.21.0 -revision=1 +revision=2 build_style=python3-pep517 # - test_concurrent.py fails on timeout. This test downloads several different # 7z archives; likely failing due to slow download or dead links - diff --git a/srcpkgs/python3-pyDes/template b/srcpkgs/python3-pyDes/template index 78bebbd12de766..a85b8ed32a44e6 100644 --- a/srcpkgs/python3-pyDes/template +++ b/srcpkgs/python3-pyDes/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyDes' pkgname=python3-pyDes version=2.0.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pyFFTW/template b/srcpkgs/python3-pyFFTW/template index dbcdd69070fb5c..74717375709c24 100644 --- a/srcpkgs/python3-pyFFTW/template +++ b/srcpkgs/python3-pyFFTW/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyFFTW' pkgname=python3-pyFFTW -version=0.14.0 -revision=2 +version=0.15.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython python3-numpy" makedepends="fftw-devel python3-devel" @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://github.com/pyFFTW/pyFFTW" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=337e7cba161a78f0cdfc7903cb483d7ddc519e648c1b2e27ff9737f1e7d35854 +checksum=e73f30803272f7fda0952a2e6368358ed15b985ae2e9fe2d63937790b56b5607 pre_check() { cp build/lib*/pyfftw/pyfftw.*.so pyfftw diff --git a/srcpkgs/python3-pyacoustid/template b/srcpkgs/python3-pyacoustid/template index 1b2f72de8b6d5b..2f7a69c4572fb9 100644 --- a/srcpkgs/python3-pyacoustid/template +++ b/srcpkgs/python3-pyacoustid/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyacoustid' pkgname=python3-pyacoustid version=1.3.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="chromaprint python3-audioread python3-requests" diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template index bc54d534a02fa2..c583f3b54b2942 100644 --- a/srcpkgs/python3-pyaes/template +++ b/srcpkgs/python3-pyaes/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyaes' pkgname=python3-pyaes version=1.6.1 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pyasn1-modules/template b/srcpkgs/python3-pyasn1-modules/template index 742c8bc6f4e8f7..e308a6f8293da0 100644 --- a/srcpkgs/python3-pyasn1-modules/template +++ b/srcpkgs/python3-pyasn1-modules/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyasn1-modules' pkgname=python3-pyasn1-modules version=0.3.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pyasn1" diff --git a/srcpkgs/python3-pyasn1/template b/srcpkgs/python3-pyasn1/template index c58be4fa03d450..62f275b9f2217b 100644 --- a/srcpkgs/python3-pyasn1/template +++ b/srcpkgs/python3-pyasn1/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyasn1' pkgname=python3-pyasn1 version=0.5.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pyasynchat/template b/srcpkgs/python3-pyasynchat/template index 0f009aab1cc282..4b59ea88b8d4a4 100644 --- a/srcpkgs/python3-pyasynchat/template +++ b/srcpkgs/python3-pyasynchat/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyasynchat' pkgname=python3-pyasynchat version=1.0.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-pyasyncore" depends="python3-pyasyncore" diff --git a/srcpkgs/python3-pyasyncore/template b/srcpkgs/python3-pyasyncore/template index 58ad0e77592ad1..2ef8423567eae9 100644 --- a/srcpkgs/python3-pyasyncore/template +++ b/srcpkgs/python3-pyasyncore/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyasyncore' pkgname=python3-pyasyncore version=1.0.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template index 4831758cf29d46..b310004b8bcbfd 100644 --- a/srcpkgs/python3-pybcj/template +++ b/srcpkgs/python3-pybcj/template @@ -1,7 +1,7 @@ # Template file for 'python3-pybcj' pkgname=python3-pybcj version=1.0.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template index cec2f5f8b4b6d0..773afaf9c89481 100644 --- a/srcpkgs/python3-pybind11/template +++ b/srcpkgs/python3-pybind11/template @@ -1,7 +1,7 @@ # Template file for 'python3-pybind11' pkgname=python3-pybind11 version=2.13.6 -revision=1 +revision=2 build_style=python3-module hostmakedepends="cmake python3-setuptools python3-pytest python3-sphinx_rtd_theme python3-breathe" diff --git a/srcpkgs/python3-pycares/template b/srcpkgs/python3-pycares/template index 6d58c5de7cd662..ba3aaf41baa34c 100644 --- a/srcpkgs/python3-pycares/template +++ b/srcpkgs/python3-pycares/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycares' pkgname=python3-pycares version=3.1.1 -revision=6 +revision=7 build_style=python3-module # using bundled c-ares which is patched for TTL support hostmakedepends="python3-setuptools python3-cffi" diff --git a/srcpkgs/python3-pycdio/template b/srcpkgs/python3-pycdio/template index b958e5f53fa0c1..b05fa9a9beab4d 100644 --- a/srcpkgs/python3-pycdio/template +++ b/srcpkgs/python3-pycdio/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycdio' pkgname=python3-pycdio version=2.1.0 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools pkg-config swig" makedepends="libcdio-devel python3-devel" diff --git a/srcpkgs/python3-pychm/template b/srcpkgs/python3-pychm/template index 149d004f217328..a4b7dc730f8b86 100644 --- a/srcpkgs/python3-pychm/template +++ b/srcpkgs/python3-pychm/template @@ -1,7 +1,7 @@ # Template file for 'python3-pychm' pkgname=python3-pychm version=0.8.6 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3 python3-setuptools" makedepends="libchmlib-devel python3-devel" diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template index e6374af617aecc..091d53efd294d7 100644 --- a/srcpkgs/python3-pyclip/template +++ b/srcpkgs/python3-pyclip/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyclip' pkgname=python3-pyclip version=0.7.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pyclipper/template b/srcpkgs/python3-pyclipper/template index 903afa8d88e411..f886bfb3c05619 100644 --- a/srcpkgs/python3-pyclipper/template +++ b/srcpkgs/python3-pyclipper/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyclipper' pkgname=python3-pyclipper -version=1.3.0.post5 +version=1.3.0.post6 revision=1 build_style=python3-module hostmakedepends="python3-setuptools_scm python3-Cython" @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/fonttools/pyclipper" distfiles="${PYPI_SITE}/p/pyclipper/pyclipper-${version}.tar.gz" -checksum=c0239f928e0bf78a3efc2f2f615a10bfcdb9f33012d46d64c8d1225b4bde7096 +checksum=42bff0102fa7a7f2abdd795a2594654d62b786d0c6cd67b72d469114fdeb608c post_extract() { # Force regeneration of Cython modules diff --git a/srcpkgs/python3-pycodestyle/template b/srcpkgs/python3-pycodestyle/template index 98bce87adeef79..1f7c9f7dec3103 100644 --- a/srcpkgs/python3-pycodestyle/template +++ b/srcpkgs/python3-pycodestyle/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycodestyle' pkgname=python3-pycodestyle version=2.12.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-pycollada/template b/srcpkgs/python3-pycollada/template index bef804b24e0a5f..eea82bdd84fd4b 100644 --- a/srcpkgs/python3-pycollada/template +++ b/srcpkgs/python3-pycollada/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycollada' pkgname=python3-pycollada version=0.8 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-dateutil python3-numpy" diff --git a/srcpkgs/python3-pycotap/template b/srcpkgs/python3-pycotap/template index a4bcce9290f2ac..9db5d3d893468f 100644 --- a/srcpkgs/python3-pycotap/template +++ b/srcpkgs/python3-pycotap/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycotap' pkgname=python3-pycotap version=1.2.2 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pycountry/template b/srcpkgs/python3-pycountry/template index 43041a2783e502..42e900b41c6db3 100644 --- a/srcpkgs/python3-pycountry/template +++ b/srcpkgs/python3-pycountry/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycountry' pkgname=python3-pycountry version=23.12.11 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3 python3-importlib_metadata" diff --git a/srcpkgs/python3-pycparser/template b/srcpkgs/python3-pycparser/template index 5bb3ca177e001c..34df301d2fdcda 100644 --- a/srcpkgs/python3-pycparser/template +++ b/srcpkgs/python3-pycparser/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycparser' pkgname=python3-pycparser version=2.21 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-ply" diff --git a/srcpkgs/python3-pycryptodome/template b/srcpkgs/python3-pycryptodome/template index 18053bfa20a4a2..6496b80696a834 100644 --- a/srcpkgs/python3-pycryptodome/template +++ b/srcpkgs/python3-pycryptodome/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycryptodome' pkgname=python3-pycryptodome version=3.17 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-pycryptodomex/template b/srcpkgs/python3-pycryptodomex/template index fb5c9931f9be6e..883d4620e7e5e1 100644 --- a/srcpkgs/python3-pycryptodomex/template +++ b/srcpkgs/python3-pycryptodomex/template @@ -1,7 +1,7 @@ # Template file for 'python3-pycryptodomex' pkgname=python3-pycryptodomex version=3.16.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-pydantic-core/template b/srcpkgs/python3-pydantic-core/template index 74e09f8b94734e..38ba2f5f5dc453 100644 --- a/srcpkgs/python3-pydantic-core/template +++ b/srcpkgs/python3-pydantic-core/template @@ -1,11 +1,11 @@ # Template file for 'python3-pydantic-core' pkgname=python3-pydantic-core version=2.21.0 -revision=1 +revision=2 build_style=python3-pep517 -build_helper=rust -hostmakedepends="maturin cargo" -makedepends="python3-typing_extensions" +build_helper="rust" +hostmakedepends="maturin cargo python3-typing_extensions" +makedepends="rust-std python3-devel" depends="python3-typing_extensions" checkdepends="${depends} python3-pytest python3-pytest-benchmark python3-pytest-timeout python3-pytest-mock python3-hypothesis @@ -18,16 +18,9 @@ changelog="https://github.com/pydantic/pydantic-core/releases" distfiles="${PYPI_SITE}/p/pydantic_core/pydantic_core-${version}.tar.gz" checksum=79c747f9916e5b6cb588dfd994d9ac15a93e43eb07467d9e6f24d892c176bbf5 -# taken from python3-adblock -if [ "$CROSS_BUILD" ]; then - makedepends+=" rust-std" - hostmakedepends+=" python3-typing_extensions" - export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib" - export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" -fi - do_build() { - maturin build -o . --release --target "${RUST_TARGET}" --manylinux off + maturin build -i /usr/bin/python3 -o . \ + --release --target "${RUST_TARGET}" --manylinux off mkdir -p dist mv pydantic_core-${version}-*.whl dist/pydantic_core-${version}-py3-none-any.whl } diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template index 566bf06905234f..cc655391554003 100644 --- a/srcpkgs/python3-pydantic/template +++ b/srcpkgs/python3-pydantic/template @@ -1,7 +1,7 @@ # Template file for 'python3-pydantic' pkgname=python3-pydantic version=2.8.2 -revision=1 +revision=2 build_style=python3-pep517 # 1) requires unpackaged pytest-examples, 2) requires unpackaged cloudpickle # 3) is already fixed: https://github.com/pydantic/pydantic-core/pull/1286 diff --git a/srcpkgs/python3-pydbus/template b/srcpkgs/python3-pydbus/template index 39377afa3c3cf3..28e06c8449bacf 100644 --- a/srcpkgs/python3-pydbus/template +++ b/srcpkgs/python3-pydbus/template @@ -1,7 +1,7 @@ # Template file for 'python3-pydbus' pkgname=python3-pydbus version=0.6.0 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pydyf/template b/srcpkgs/python3-pydyf/template index 392d463dd8e4c5..cfb67d00ba33f3 100644 --- a/srcpkgs/python3-pydyf/template +++ b/srcpkgs/python3-pydyf/template @@ -1,7 +1,7 @@ # Template file for 'python3-pydyf' pkgname=python3-pydyf version=0.11.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-flit_core" checkdepends="python3-pytest-cov python3-pytest-isort python3-pytest-flake8 diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template index aa8d6e80de6f97..31ed26c00ab2b5 100644 --- a/srcpkgs/python3-pyelftools/template +++ b/srcpkgs/python3-pyelftools/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyelftools' pkgname=python3-pyelftools version=0.31 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pyfavicon/template b/srcpkgs/python3-pyfavicon/template index 6bccfa516c89da..226cda5f61278d 100644 --- a/srcpkgs/python3-pyfavicon/template +++ b/srcpkgs/python3-pyfavicon/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyfavicon' pkgname=python3-pyfavicon version=0.1.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-BeautifulSoup4 python3-Pillow python3-aiohttp" diff --git a/srcpkgs/python3-pyfiglet/template b/srcpkgs/python3-pyfiglet/template index cc2c3e76bbdbd6..2ecb317bcd85b3 100644 --- a/srcpkgs/python3-pyfiglet/template +++ b/srcpkgs/python3-pyfiglet/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyfiglet' pkgname=python3-pyfiglet version=0.8.0 -revision=6 +revision=7 build_style="python3-module" pycompile_module="pyfiglet" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-pyflakes/template b/srcpkgs/python3-pyflakes/template index 8dfff07ea5b970..bacf98c1ae897f 100644 --- a/srcpkgs/python3-pyflakes/template +++ b/srcpkgs/python3-pyflakes/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyflakes' pkgname=python3-pyflakes version=3.2.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pyfuse3/template b/srcpkgs/python3-pyfuse3/template index dd75556c9b28e5..81bcc8a6a0288e 100644 --- a/srcpkgs/python3-pyfuse3/template +++ b/srcpkgs/python3-pyfuse3/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyfuse3' pkgname=python3-pyfuse3 -version=3.3.0 -revision=2 +version=3.4.0 +revision=1 build_style=python3-module hostmakedepends="pkg-config python3-setuptools" makedepends="fuse3-devel python3-devel" @@ -13,4 +13,4 @@ license="LGPL-2.0-or-later" homepage="https://pypi.org/project/pyfuse3/" changelog="https://raw.githubusercontent.com/libfuse/pyfuse3/master/Changes.rst" distfiles="${PYPI_SITE}/p/pyfuse3/pyfuse3-${version}.tar.gz" -checksum=2b31fe412479f9620da2067dd739ed23f4cc37364224891938dedf7766e573bd +checksum=793493f4d5e2b3bc10e13b3421d426a6e2e3365264c24376a50b8cbc69762d39 diff --git a/srcpkgs/python3-pygame/template b/srcpkgs/python3-pygame/template index 3be65270bd056d..7b2b3d44321c13 100644 --- a/srcpkgs/python3-pygame/template +++ b/srcpkgs/python3-pygame/template @@ -1,11 +1,11 @@ # Template file for 'python3-pygame' pkgname=python3-pygame -version=2.5.2 +version=2.6.1 revision=1 build_style=python3-module make_build_args="cython" -hostmakedepends="pkg-config python3-setuptools python3-Cython0.29 - SDL2_mixer-devel SDL2_image-devel SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel" +hostmakedepends="pkg-config python3-setuptools python3-Cython SDL2_mixer-devel + SDL2_image-devel SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel" makedepends="python3-devel SDL2_mixer-devel SDL2_image-devel SDL2_ttf-devel libjpeg-turbo-devel portmidi-devel" depends="python3" @@ -14,10 +14,14 @@ maintainer="Archaeme " license="LGPL-2.1-or-later" homepage="https://www.pygame.org/" distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz" -checksum=c1b89eb5d539e7ac5cf75513125fb5f2f0a2d918b1fd6e981f23bf0ac1b1c24a +checksum=56fb02ead529cee00d415c3e007f75e0780c655909aaa8e8bf616ee09c9feb1f export PORTMIDI_INC_PORTTIME=1 +case "${XBPS_TARGET_MACHINE}" in + i686*) export CFLAGS="-msse2" ;; +esac + post_extract() { find src_c/cython/pygame -name '*.pyx' | sed 's,cython/pygame/,,;s/pyx$/c/' | diff --git a/srcpkgs/python3-pygccxml/template b/srcpkgs/python3-pygccxml/template index cad678b2a7ca9a..a678da66ada622 100644 --- a/srcpkgs/python3-pygccxml/template +++ b/srcpkgs/python3-pygccxml/template @@ -1,7 +1,7 @@ # Template file for 'python3-pygccxml' pkgname=python3-pygccxml version=2.2.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-Sphinx python3-sphinx_rtd_theme" depends="CastXML which" diff --git a/srcpkgs/python3-pygdbmi/template b/srcpkgs/python3-pygdbmi/template index dc3a705046b7f6..30409f7b67f32b 100644 --- a/srcpkgs/python3-pygdbmi/template +++ b/srcpkgs/python3-pygdbmi/template @@ -1,7 +1,7 @@ # Template file for 'python3-pygdbmi' pkgname=python3-pygdbmi version=0.11.0.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" short_desc="Parse gdb machine interface output with Python" diff --git a/srcpkgs/python3-pygit2/template b/srcpkgs/python3-pygit2/template index db60278c5661c6..129e338013a63d 100644 --- a/srcpkgs/python3-pygit2/template +++ b/srcpkgs/python3-pygit2/template @@ -1,7 +1,7 @@ # Template file for 'python3-pygit2' pkgname=python3-pygit2 version=1.16.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="pkg-config python3-devel python3-cffi python3-setuptools python3-wheel" makedepends="python3-devel libgit2-1.8-devel python3-cached-property libssh2-devel diff --git a/srcpkgs/python3-pyglet/template b/srcpkgs/python3-pyglet/template index f7057f4f9bd775..57f31fcf67faad 100644 --- a/srcpkgs/python3-pyglet/template +++ b/srcpkgs/python3-pyglet/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyglet' pkgname=python3-pyglet version=1.4.10 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools unzip" depends="python3" diff --git a/srcpkgs/python3-pyinfra/template b/srcpkgs/python3-pyinfra/template index 58f7e7b7d69fea..c1c3a638e0138d 100644 --- a/srcpkgs/python3-pyinfra/template +++ b/srcpkgs/python3-pyinfra/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyinfra' pkgname=python3-pyinfra version=3.1.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3 python3-Jinja2 python3-click python3-colorama python3-dateutil diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template index fb340f915de912..8dc91fa7871bf9 100644 --- a/srcpkgs/python3-pykeepass/template +++ b/srcpkgs/python3-pykeepass/template @@ -1,7 +1,7 @@ # Template file for 'python3-pykeepass' pkgname=python3-pykeepass version=4.0.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dateutil python3-argon2 python3-construct python3-lxml diff --git a/srcpkgs/python3-pykka/template b/srcpkgs/python3-pykka/template index 4729447ed474bb..b14b8985f05fcb 100644 --- a/srcpkgs/python3-pykka/template +++ b/srcpkgs/python3-pykka/template @@ -1,7 +1,7 @@ # Template file for 'python3-pykka' pkgname=python3-pykka version=2.0.2 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pykwalify/template b/srcpkgs/python3-pykwalify/template index 0d6eb03f32a0f6..35ea6e7fb8b0b1 100644 --- a/srcpkgs/python3-pykwalify/template +++ b/srcpkgs/python3-pykwalify/template @@ -1,7 +1,7 @@ # Template file for 'python3-pykwalify' pkgname=python3-pykwalify version=1.8.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-ruamel.yaml python3-docopt python3-dateutil" diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template index d8ca9697b29d48..086859175c79cb 100644 --- a/srcpkgs/python3-pylast/template +++ b/srcpkgs/python3-pylast/template @@ -1,7 +1,7 @@ # Template file for 'python3-pylast' pkgname=python3-pylast version=5.3.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3-httpx" diff --git a/srcpkgs/python3-pylibgen/template b/srcpkgs/python3-pylibgen/template index 6f7ed1da9c213e..259e667e809618 100644 --- a/srcpkgs/python3-pylibgen/template +++ b/srcpkgs/python3-pylibgen/template @@ -1,7 +1,7 @@ # Template file for 'python3-pylibgen' pkgname=python3-pylibgen version=2.0.2 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests" diff --git a/srcpkgs/python3-pylru/template b/srcpkgs/python3-pylru/template index 6f5cf7bdace01e..a1721168912de9 100644 --- a/srcpkgs/python3-pylru/template +++ b/srcpkgs/python3-pylru/template @@ -1,7 +1,7 @@ # Template file for 'python3-pylru' pkgname=python3-pylru version=1.2.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pymediainfo/template b/srcpkgs/python3-pymediainfo/template index ac93843287d306..9ab140f325b7a0 100644 --- a/srcpkgs/python3-pymediainfo/template +++ b/srcpkgs/python3-pymediainfo/template @@ -1,7 +1,7 @@ # Template file for 'python3-pymediainfo' pkgname=python3-pymediainfo version=6.0.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="libmediainfo" diff --git a/srcpkgs/python3-pynacl/template b/srcpkgs/python3-pynacl/template index 71ee77e86d182c..a5021c6f355fa4 100644 --- a/srcpkgs/python3-pynacl/template +++ b/srcpkgs/python3-pynacl/template @@ -1,7 +1,7 @@ # Template file for 'python3-pynacl' pkgname=python3-pynacl version=1.5.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-cffi python3-wheel" makedepends="python3-devel python3-cffi libsodium-devel" diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template index 09320616592f80..b358acae981a14 100644 --- a/srcpkgs/python3-pyopencl/template +++ b/srcpkgs/python3-pyopencl/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyopencl' pkgname=python3-pyopencl -version=2024.2.7 -revision=2 +version=2024.3 +revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-numpy python3-scikit-build-core cmake ninja python3-nanobind" @@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford " license="X11, Apache-2.0, BSD-3-Clause" homepage="https://mathema.tician.de/software/pyopencl" distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz" -checksum=6ae4458a959b6ad9c138fb711a52c4d57c2c2f798eb3aecc4c26830cb2726140 +checksum=d5d08de9b0a6d85695caba1769aceae4e7661f06951c507bd1ce8fb7a89e2413 # Tests require a working OpenCL platform make_check=no diff --git a/srcpkgs/python3-pyotp/template b/srcpkgs/python3-pyotp/template index 0f0ae31f18a451..d40deae430c33c 100644 --- a/srcpkgs/python3-pyotp/template +++ b/srcpkgs/python3-pyotp/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyotp' pkgname=python3-pyotp version=2.6.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pypandoc/template b/srcpkgs/python3-pypandoc/template index 3abe8c82b034aa..7afe0ed1e8f9f1 100644 --- a/srcpkgs/python3-pypandoc/template +++ b/srcpkgs/python3-pypandoc/template @@ -1,7 +1,7 @@ # Template file for 'python3-pypandoc' pkgname=python3-pypandoc version=1.6.4 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="pandoc python3" diff --git a/srcpkgs/python3-pypdf/template b/srcpkgs/python3-pypdf/template index 5d07bdf669fa0e..6a75a9b86797a0 100644 --- a/srcpkgs/python3-pypdf/template +++ b/srcpkgs/python3-pypdf/template @@ -1,7 +1,7 @@ # Template file for 'python3-pypdf' pkgname=python3-pypdf version=3.17.4 -revision=1 +revision=2 _sample_files_gitrev=964fb47b0fbfa89864680582640ae4eedf143890 build_wrksrc="pypdf-${version}" build_style=python3-pep517 diff --git a/srcpkgs/python3-pyperclip/template b/srcpkgs/python3-pyperclip/template index c10a9aeeefc6f5..a1dca720a65edc 100644 --- a/srcpkgs/python3-pyperclip/template +++ b/srcpkgs/python3-pyperclip/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyperclip' pkgname=python3-pyperclip version=1.8.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pypng/template b/srcpkgs/python3-pypng/template index 6ef365893c1982..9e3b25b75069aa 100644 --- a/srcpkgs/python3-pypng/template +++ b/srcpkgs/python3-pypng/template @@ -1,7 +1,7 @@ # Template file for 'python3-pypng' pkgname=python3-pypng version=0.20220715.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template index 6a54ffabc73efc..a8f767bf57c01b 100644 --- a/srcpkgs/python3-pyppmd/template +++ b/srcpkgs/python3-pyppmd/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyppmd' pkgname=python3-pyppmd version=1.1.0 -revision=1 +revision=2 build_style=python3-module make_check_args="--noconftest --ignore=tests/test_benchmark.py" hostmakedepends="python3-setuptools_scm" diff --git a/srcpkgs/python3-pyproject-api/template b/srcpkgs/python3-pyproject-api/template index 5570e6d92e910c..5a21da2f98ca89 100644 --- a/srcpkgs/python3-pyproject-api/template +++ b/srcpkgs/python3-pyproject-api/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyproject-api' pkgname=python3-pyproject-api version=1.8.0 -revision=1 +revision=2 build_style=python3-pep517 # failing test, see: https://github.com/tox-dev/pyproject-api/issues/153 make_check_args="--deselect tests/test_frontend_setuptools.py::test_setuptools_prepare_metadata_for_build_wheel" diff --git a/srcpkgs/python3-pyproject-hooks/template b/srcpkgs/python3-pyproject-hooks/template index 774c846d7e0478..9848b10009d775 100644 --- a/srcpkgs/python3-pyproject-hooks/template +++ b/srcpkgs/python3-pyproject-hooks/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyproject-hooks' pkgname=python3-pyproject-hooks version=1.2.0 -revision=1 +revision=2 # This package is required by python3-build, used by the python3-pep517 style; # using that style here would create a cycle build_style=python3-module diff --git a/srcpkgs/python3-pyproject-metadata/template b/srcpkgs/python3-pyproject-metadata/template index 15d8afa4ace18b..611bf1f2840d67 100644 --- a/srcpkgs/python3-pyproject-metadata/template +++ b/srcpkgs/python3-pyproject-metadata/template @@ -1,6 +1,6 @@ # Template file for 'python3-pyproject-metadata' pkgname=python3-pyproject-metadata -version=0.8.0 +version=0.9.0 revision=1 build_style=python3-pep517 hostmakedepends="python3-flit_core python3-wheel" @@ -11,7 +11,7 @@ license="MIT" homepage="https://pep621.readthedocs.io/" changelog="https://raw.githubusercontent.com/FFY00/python-pyproject-metadata/main/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pyproject_metadata/pyproject_metadata-${version}.tar.gz" -checksum=376d5a00764ac29440a54579f88e66b7d9cb7e629d35c35a1c7248bfebc9b455 +checksum=8511c00a4cad96686af6a6b4143433298beb96105a9379afdc9b0328f4f260c9 make_check=no # tarball includes no tests post_install() { diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template index e736c5552e00ed..2777c01d1afbc2 100644 --- a/srcpkgs/python3-pyqt5-qsci/template +++ b/srcpkgs/python3-pyqt5-qsci/template @@ -4,7 +4,7 @@ # qscintilla-qt5 -> PyQt5 -> pyqt5-qsci pkgname=python3-pyqt5-qsci version=2.14.1 -revision=2 +revision=3 build_wrksrc=Python build_style=sip-build build_helper=qemu diff --git a/srcpkgs/python3-pyqt6-3d/template b/srcpkgs/python3-pyqt6-3d/template index e60a51397d710c..3f5415b221cd98 100644 --- a/srcpkgs/python3-pyqt6-3d/template +++ b/srcpkgs/python3-pyqt6-3d/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-3d' pkgname=python3-pyqt6-3d version=6.7.0 -revision=1 +revision=2 build_style=sip-build build_helper="python3" hostmakedepends="qt6-base python3-PyQt-builder pkg-config" diff --git a/srcpkgs/python3-pyqt6-charts/template b/srcpkgs/python3-pyqt6-charts/template index eee424dc7efce4..cee469ec42d362 100644 --- a/srcpkgs/python3-pyqt6-charts/template +++ b/srcpkgs/python3-pyqt6-charts/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-charts' pkgname=python3-pyqt6-charts version=6.7.0 -revision=1 +revision=2 build_style=sip-build build_helper="python3" hostmakedepends="qt6-base python3-PyQt-builder pkg-config" diff --git a/srcpkgs/python3-pyqt6-networkauth/template b/srcpkgs/python3-pyqt6-networkauth/template index f4ece09899425a..a708285458857d 100644 --- a/srcpkgs/python3-pyqt6-networkauth/template +++ b/srcpkgs/python3-pyqt6-networkauth/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-networkauth' pkgname=python3-pyqt6-networkauth version=6.7.0 -revision=1 +revision=2 build_style=sip-build build_helper="python3" hostmakedepends="qt6-base python3-PyQt-builder pkg-config" diff --git a/srcpkgs/python3-pyqt6-qsci/template b/srcpkgs/python3-pyqt6-qsci/template index 12f7466c79f77f..f80b97b529c2c8 100644 --- a/srcpkgs/python3-pyqt6-qsci/template +++ b/srcpkgs/python3-pyqt6-qsci/template @@ -3,7 +3,7 @@ # Splited because pyqt6-qsci requires qscintilla-qt6 built at configure time. pkgname=python3-pyqt6-qsci version=2.14.1 -revision=1 +revision=2 build_wrksrc=Python build_style=sip-build build_helper=qemu diff --git a/srcpkgs/python3-pyqt6-sip/template b/srcpkgs/python3-pyqt6-sip/template index 45468694ee590c..514591ef885df0 100644 --- a/srcpkgs/python3-pyqt6-sip/template +++ b/srcpkgs/python3-pyqt6-sip/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-sip' pkgname=python3-pyqt6-sip version=13.8.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-devel python3-setuptools sip" makedepends="python3-devel" diff --git a/srcpkgs/python3-pyqt6-webengine/template b/srcpkgs/python3-pyqt6-webengine/template index 5d718db6c023c7..fb0ae5383c9967 100644 --- a/srcpkgs/python3-pyqt6-webengine/template +++ b/srcpkgs/python3-pyqt6-webengine/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6-webengine' pkgname=python3-pyqt6-webengine version=6.7.0 -revision=1 +revision=2 build_style=sip-build build_helper=python3 hostmakedepends="qt6-base python3-PyQt-builder pkg-config" diff --git a/srcpkgs/python3-pyqt6/template b/srcpkgs/python3-pyqt6/template index 5cdf4cf243005b..45cd11722a6963 100644 --- a/srcpkgs/python3-pyqt6/template +++ b/srcpkgs/python3-pyqt6/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqt6' pkgname=python3-pyqt6 version=6.7.1 -revision=1 +revision=2 build_style=sip-build build_helper=qemu configure_args="--confirm-license --dbus $XBPS_CROSS_BASE/usr/include/dbus-1.0 diff --git a/srcpkgs/python3-pyqtgraph/template b/srcpkgs/python3-pyqtgraph/template index fd58932ba44742..1a0877a0345eed 100644 --- a/srcpkgs/python3-pyqtgraph/template +++ b/srcpkgs/python3-pyqtgraph/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyqtgraph' pkgname=python3-pyqtgraph version=0.13.7 -revision=1 +revision=2 build_style=python3-module make_check_target="tests" make_install_args="--no-compile" diff --git a/srcpkgs/python3-pyrfc3339/template b/srcpkgs/python3-pyrfc3339/template index 01decf9d0fed20..03854ff53d1f0e 100644 --- a/srcpkgs/python3-pyrfc3339/template +++ b/srcpkgs/python3-pyrfc3339/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyrfc3339' pkgname=python3-pyrfc3339 version=1.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pytz" diff --git a/srcpkgs/python3-pyrsistent/template b/srcpkgs/python3-pyrsistent/template index 446b28329e2b63..e2be88dc443b90 100644 --- a/srcpkgs/python3-pyrsistent/template +++ b/srcpkgs/python3-pyrsistent/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyrsistent' pkgname=python3-pyrsistent version=0.19.3 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-devel" depends="python3" diff --git a/srcpkgs/python3-pyscard/template b/srcpkgs/python3-pyscard/template index 5e59b539d5215c..460c8898a35c69 100644 --- a/srcpkgs/python3-pyscard/template +++ b/srcpkgs/python3-pyscard/template @@ -2,7 +2,7 @@ pkgname=python3-pyscard _pkgname=pyscard version=2.0.5 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools swig" makedepends="python3-devel pcsclite-devel" diff --git a/srcpkgs/python3-pyscss/template b/srcpkgs/python3-pyscss/template index 053d99de60dced..2ace4c2d779858 100644 --- a/srcpkgs/python3-pyscss/template +++ b/srcpkgs/python3-pyscss/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyscss' pkgname=python3-pyscss version=1.3.7 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools pcre-devel" makedepends="pcre-devel python3-devel" diff --git a/srcpkgs/python3-pysdl2/template b/srcpkgs/python3-pysdl2/template index 057896786d7e61..c6f4230e20f4ec 100644 --- a/srcpkgs/python3-pysdl2/template +++ b/srcpkgs/python3-pysdl2/template @@ -1,7 +1,7 @@ # Template file for 'python3-pysdl2' pkgname=python3-pysdl2 version=0.9.6 -revision=6 +revision=7 build_style=python3-module pycompile_module="sdl2" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-pyserial/template b/srcpkgs/python3-pyserial/template index e7645fccbee816..26b41623aabdda 100644 --- a/srcpkgs/python3-pyserial/template +++ b/srcpkgs/python3-pyserial/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyserial' pkgname=python3-pyserial version=3.5 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pysigset/template b/srcpkgs/python3-pysigset/template index b855fba8ae4209..b86eff02b14415 100644 --- a/srcpkgs/python3-pysigset/template +++ b/srcpkgs/python3-pysigset/template @@ -1,7 +1,7 @@ # Template file for 'python3-pysigset' pkgname=python3-pysigset version=0.4.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pysocks/template b/srcpkgs/python3-pysocks/template index c04d623ce9b3e5..9f99f6fecdd2d0 100644 --- a/srcpkgs/python3-pysocks/template +++ b/srcpkgs/python3-pysocks/template @@ -1,7 +1,7 @@ # Template file for 'python3-pysocks' pkgname=python3-pysocks version=1.7.0 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template index 539fae8ffa1da9..26504ca0b358da 100644 --- a/srcpkgs/python3-pysol_cards/template +++ b/srcpkgs/python3-pysol_cards/template @@ -1,7 +1,7 @@ # Template file for 'python3-pysol_cards' pkgname=python3-pysol_cards version=0.14.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-pbr" depends="python3-pbr python3-six" diff --git a/srcpkgs/python3-pyspnego/template b/srcpkgs/python3-pyspnego/template index 289b915e052e2b..83df31232bae1e 100644 --- a/srcpkgs/python3-pyspnego/template +++ b/srcpkgs/python3-pyspnego/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyspnego' pkgname=python3-pyspnego version=0.11.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3 python3-cryptography" diff --git a/srcpkgs/python3-pysrt/template b/srcpkgs/python3-pysrt/template index 0da904ea8aea64..2cad2a005a113e 100644 --- a/srcpkgs/python3-pysrt/template +++ b/srcpkgs/python3-pysrt/template @@ -1,7 +1,7 @@ # Template file for 'python3-pysrt' pkgname=python3-pysrt version=1.1.2 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-chardet" diff --git a/srcpkgs/python3-pystache/patches/setup.patch b/srcpkgs/python3-pystache/patches/setup.patch deleted file mode 100644 index 3849245d01d634..00000000000000 --- a/srcpkgs/python3-pystache/patches/setup.patch +++ /dev/null @@ -1,27 +0,0 @@ -1. setuptools no longer supports use_2to3, so drop the setup() arg -2. Drop the pystache-test entrypoint script here rather than in-template - ---- ./setup.py -+++ ./setup.py -@@ -351,13 +351,6 @@ - - """ - extra = {} -- # TODO: it might be more correct to check whether we are using -- # Distribute instead of setuptools, since use_2to3 doesn't take -- # effect when using Python 2, even when using Distribute. -- if py_version >= (3, ): -- # Causes 2to3 to be run during the build step. -- extra['use_2to3'] = True -- - return extra - - -@@ -401,7 +394,6 @@ - entry_points = { - 'console_scripts': [ - 'pystache=pystache.commands.render:main', -- 'pystache-test=pystache.commands.test:main', - ], - }, - classifiers = CLASSIFIERS, diff --git a/srcpkgs/python3-pystache/template b/srcpkgs/python3-pystache/template deleted file mode 100644 index df56a83ccdd383..00000000000000 --- a/srcpkgs/python3-pystache/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'python3-pystache' -pkgname=python3-pystache -version=0.5.4 -revision=8 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-setuptools" -short_desc="Python3 implementation of Mustache" -maintainer="John " -license="MIT" -homepage="https://github.com/defunkt/pystache" -distfiles="${PYPI_SITE}/p/pystache/pystache-${version}.tar.gz" -checksum=f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a - -do_build() { - # Convert py2 syntax to py3 since setuptools no longer does it - 2to3-${py3_ver} -w pystache - python3 setup.py build --build-base=build-${py3_ver} -} - -post_install() { - vlicense LICENSE - ln -s pystache "${DESTDIR}/usr/bin/pystache3" -} diff --git a/srcpkgs/python3-pytaglib/template b/srcpkgs/python3-pytaglib/template index 147b444167e533..f2e95a4f3bd3c2 100644 --- a/srcpkgs/python3-pytaglib/template +++ b/srcpkgs/python3-pytaglib/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytaglib' pkgname=python3-pytaglib version=1.4.6 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel taglib-devel" diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template index 184583d5cba0be..a3a704ada8d3f5 100644 --- a/srcpkgs/python3-pyte/template +++ b/srcpkgs/python3-pyte/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyte' pkgname=python3-pyte version=0.8.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-wcwidth" diff --git a/srcpkgs/python3-pytest-aiohttp/template b/srcpkgs/python3-pytest-aiohttp/template index 18c46bc75d3d9d..23b92599cce847 100644 --- a/srcpkgs/python3-pytest-aiohttp/template +++ b/srcpkgs/python3-pytest-aiohttp/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-aiohttp' pkgname=python3-pytest-aiohttp version=1.0.5 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-pytest python3-aiohttp python3-pytest-asyncio" diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template index 7806dd3b1d964b..091f8f5d42a04b 100644 --- a/srcpkgs/python3-pytest-asyncio/template +++ b/srcpkgs/python3-pytest-asyncio/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-asyncio' pkgname=python3-pytest-asyncio version=0.23.8 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-pytest" diff --git a/srcpkgs/python3-pytest-benchmark/template b/srcpkgs/python3-pytest-benchmark/template index ddee987ec8923c..1e0ae4ebb316de 100644 --- a/srcpkgs/python3-pytest-benchmark/template +++ b/srcpkgs/python3-pytest-benchmark/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-benchmark' pkgname=python3-pytest-benchmark version=4.0.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-pytest python3-py-cpuinfo" diff --git a/srcpkgs/python3-pytest-black/template b/srcpkgs/python3-pytest-black/template index cd6a6c79c2b3ae..e39a5bf5d4dd81 100644 --- a/srcpkgs/python3-pytest-black/template +++ b/srcpkgs/python3-pytest-black/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-black' pkgname=python3-pytest-black version=0.3.12 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-setuptools_scm" depends="python3-pytest black python3-toml" diff --git a/srcpkgs/python3-pytest-console-scripts/template b/srcpkgs/python3-pytest-console-scripts/template index 60eae35dc03cbc..e412120227c80e 100644 --- a/srcpkgs/python3-pytest-console-scripts/template +++ b/srcpkgs/python3-pytest-console-scripts/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-console-scripts' pkgname=python3-pytest-console-scripts version=1.4.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-pytest" diff --git a/srcpkgs/python3-pytest-cov/template b/srcpkgs/python3-pytest-cov/template index 18a6e041206c5a..cbf51bbbf4ad8f 100644 --- a/srcpkgs/python3-pytest-cov/template +++ b/srcpkgs/python3-pytest-cov/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-cov' pkgname=python3-pytest-cov version=5.0.0 -revision=1 +revision=2 build_style=python3-pep517 # this test fails with python3-coverage >= 7.6 make_check_args=" diff --git a/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch b/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch deleted file mode 100644 index f3455685738d9f..00000000000000 --- a/srcpkgs/python3-pytest-fixture-config/patches/no_setuptools_git.patch +++ /dev/null @@ -1,11 +0,0 @@ -Void doesn't package setuptools-git, and there's no need to start now. - ---- a/common_setup.py -+++ b/common_setup.py -@@ -72,6 +72,5 @@ - license='MIT license', - platforms=['unix', 'linux'], - cmdclass={'test': PyTest, 'egg_info': EggInfo}, -- setup_requires=['setuptools-git'], - include_package_data=True - ) diff --git a/srcpkgs/python3-pytest-fixture-config/template b/srcpkgs/python3-pytest-fixture-config/template index e1adc058224e18..1276088cefa73d 100644 --- a/srcpkgs/python3-pytest-fixture-config/template +++ b/srcpkgs/python3-pytest-fixture-config/template @@ -1,8 +1,8 @@ # Template file for 'python3-pytest-fixture-config' pkgname=python3-pytest-fixture-config _pkgname=${pkgname#*-} -version=1.7.0 -revision=3 +version=1.8.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pytest" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="MIT" homepage="https://github.com/manahl/pytest-plugins" distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz" -checksum=41a17417721f6862ce6b40e3280fddd8e1659b2c306ec46b237d7021fec5218e +checksum=c739895fe20851bdba53f246d0599aa389bc1a1cba48db2ecac0130576dc1b0e post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pytest-flake8/template b/srcpkgs/python3-pytest-flake8/template index 05a9b97baa5051..8543724ee5f083 100644 --- a/srcpkgs/python3-pytest-flake8/template +++ b/srcpkgs/python3-pytest-flake8/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-flake8' pkgname=python3-pytest-flake8 version=1.1.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pytest flake8" diff --git a/srcpkgs/python3-pytest-forked/template b/srcpkgs/python3-pytest-forked/template index 2275ced7b0be56..1415f54d2ee50b 100644 --- a/srcpkgs/python3-pytest-forked/template +++ b/srcpkgs/python3-pytest-forked/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-forked' pkgname=python3-pytest-forked version=1.6.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-setuptools_scm" depends="python3-pytest" diff --git a/srcpkgs/python3-pytest-httpbin/template b/srcpkgs/python3-pytest-httpbin/template index 6da49672890220..fbd16c48970319 100644 --- a/srcpkgs/python3-pytest-httpbin/template +++ b/srcpkgs/python3-pytest-httpbin/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-httpbin' pkgname=python3-pytest-httpbin version=2.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3-pytest python3-httpbin" diff --git a/srcpkgs/python3-pytest-httpserver/template b/srcpkgs/python3-pytest-httpserver/template index b1df749d8452f6..3a4baff8dbf8e3 100644 --- a/srcpkgs/python3-pytest-httpserver/template +++ b/srcpkgs/python3-pytest-httpserver/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-httpserver' pkgname=python3-pytest-httpserver version=1.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-pytest python3-Werkzeug" diff --git a/srcpkgs/python3-pytest-import-check/template b/srcpkgs/python3-pytest-import-check/template index faa3a2a0c348f0..f007d6de15fe57 100644 --- a/srcpkgs/python3-pytest-import-check/template +++ b/srcpkgs/python3-pytest-import-check/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-import-check' pkgname=python3-pytest-import-check version=0.0.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3-pytest" diff --git a/srcpkgs/python3-pytest-isort/template b/srcpkgs/python3-pytest-isort/template index ef368d41a6799b..a47d7e6a3e11f7 100644 --- a/srcpkgs/python3-pytest-isort/template +++ b/srcpkgs/python3-pytest-isort/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-isort' pkgname=python3-pytest-isort version=3.1.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-pytest python3-isort" diff --git a/srcpkgs/python3-pytest-jupyter/template b/srcpkgs/python3-pytest-jupyter/template index 007d9fe5332419..525803d58b36f4 100644 --- a/srcpkgs/python3-pytest-jupyter/template +++ b/srcpkgs/python3-pytest-jupyter/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-jupyter' pkgname=python3-pytest-jupyter version=0.10.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-jupyter_core python3-pytest-timeout" diff --git a/srcpkgs/python3-pytest-lazy-fixture/template b/srcpkgs/python3-pytest-lazy-fixture/template index 075aedc1f32711..a31cd190cd567d 100644 --- a/srcpkgs/python3-pytest-lazy-fixture/template +++ b/srcpkgs/python3-pytest-lazy-fixture/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-lazy-fixture' pkgname=python3-pytest-lazy-fixture version=0.6.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pytest" diff --git a/srcpkgs/python3-pytest-localserver/template b/srcpkgs/python3-pytest-localserver/template index 37558ba825e2f0..d12b782a4117d7 100644 --- a/srcpkgs/python3-pytest-localserver/template +++ b/srcpkgs/python3-pytest-localserver/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-localserver' pkgname=python3-pytest-localserver version=0.8.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-Werkzeug" diff --git a/srcpkgs/python3-pytest-mock/template b/srcpkgs/python3-pytest-mock/template index 92cd63db56be1b..489475281f7ae7 100644 --- a/srcpkgs/python3-pytest-mock/template +++ b/srcpkgs/python3-pytest-mock/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-mock' pkgname=python3-pytest-mock version=3.14.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-pytest" diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template index 27770da43a3d63..10a9bcee5d3e3b 100644 --- a/srcpkgs/python3-pytest-qt/template +++ b/srcpkgs/python3-pytest-qt/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-qt' pkgname=python3-pytest-qt version=4.2.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3-pytest" diff --git a/srcpkgs/python3-pytest-subtests/template b/srcpkgs/python3-pytest-subtests/template index 322c54c19584cc..c5cf59c977b4c5 100644 --- a/srcpkgs/python3-pytest-subtests/template +++ b/srcpkgs/python3-pytest-subtests/template @@ -1,17 +1,17 @@ # Template file for 'python3-pytest-subtests' pkgname=python3-pytest-subtests -version=0.13.1 +version=0.14.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" -depends="python3-pytest" +depends="python3-pytest python3-attrs" checkdepends="$depends" short_desc="Subtest fixture for python3-pytest" maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/pytest-dev/pytest-subtests" distfiles="${PYPI_SITE}/p/pytest_subtests/pytest_subtests-${version}.tar.gz" -checksum=989e38f0f1c01bc7c6b2e04db7d9fd859db35d77c2c1a430c831a70cbf3fde2d +checksum=350c00adc36c3aff676a66135c81aed9e2182e15f6c3ec8721366918bbbf7580 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pytest-sugar/template b/srcpkgs/python3-pytest-sugar/template index 641fb7c7d61bf0..eb5c994caafe94 100644 --- a/srcpkgs/python3-pytest-sugar/template +++ b/srcpkgs/python3-pytest-sugar/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-sugar' pkgname=python3-pytest-sugar version=0.9.6 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pytest python3-termcolor python3-packaging" diff --git a/srcpkgs/python3-pytest-timeout/template b/srcpkgs/python3-pytest-timeout/template index 1c59c27c65c68a..800295aaeb487d 100644 --- a/srcpkgs/python3-pytest-timeout/template +++ b/srcpkgs/python3-pytest-timeout/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-timeout' pkgname=python3-pytest-timeout version=2.3.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3-pytest" diff --git a/srcpkgs/python3-pytest-trio/template b/srcpkgs/python3-pytest-trio/template index fb66ee0551c0ce..7528bb0c31e3bb 100644 --- a/srcpkgs/python3-pytest-trio/template +++ b/srcpkgs/python3-pytest-trio/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-trio' pkgname=python3-pytest-trio version=0.8.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-trio python3-outcome python3-pytest" diff --git a/srcpkgs/python3-pytest-xdist/template b/srcpkgs/python3-pytest-xdist/template index acd55441d66b01..65d5cd5d64f71e 100644 --- a/srcpkgs/python3-pytest-xdist/template +++ b/srcpkgs/python3-pytest-xdist/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-xdist' pkgname=python3-pytest-xdist version=3.6.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-pytest python3-execnet" diff --git a/srcpkgs/python3-pytest-xvfb/template b/srcpkgs/python3-pytest-xvfb/template index c3ae7c5c1edd66..eaf7c7f9de478f 100644 --- a/srcpkgs/python3-pytest-xvfb/template +++ b/srcpkgs/python3-pytest-xvfb/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest-xvfb' pkgname=python3-pytest-xvfb version=2.0.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pytest>=2.8.1 python3-PyVirtualDisplay xorg-server-xvfb xauth" diff --git a/srcpkgs/python3-pytest/template b/srcpkgs/python3-pytest/template index 5c8cd78726f048..65aea2f517bb9e 100644 --- a/srcpkgs/python3-pytest/template +++ b/srcpkgs/python3-pytest/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytest' pkgname=python3-pytest version=8.3.1 -revision=1 +revision=2 build_style=python3-pep517 _common_deps="python3-iniconfig python3-pluggy" hostmakedepends="python3-setuptools_scm python3-Sphinx ${_common_deps}" diff --git a/srcpkgs/python3-python-multipart/template b/srcpkgs/python3-python-multipart/template index 4abc51d5911d58..90bd35a53b062c 100644 --- a/srcpkgs/python3-python-multipart/template +++ b/srcpkgs/python3-python-multipart/template @@ -1,7 +1,7 @@ # Template file for 'python3-python-multipart' pkgname=python3-python-multipart version=0.0.9 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" checkdepends="python3-pytest python3-yaml" diff --git a/srcpkgs/python3-pythondialog/template b/srcpkgs/python3-pythondialog/template index ee6cc54a793930..8d23ee0314dded 100644 --- a/srcpkgs/python3-pythondialog/template +++ b/srcpkgs/python3-pythondialog/template @@ -1,7 +1,7 @@ # Template file for 'python3-pythondialog' pkgname=python3-pythondialog version=3.5.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template index 4e0d341032db1c..b2bfc0da7c0eed 100644 --- a/srcpkgs/python3-pytools/template +++ b/srcpkgs/python3-pytools/template @@ -1,6 +1,6 @@ # Template file for 'python3-pytools' pkgname=python3-pytools -version=2024.1.14 +version=2024.1.20 revision=1 build_style=python3-pep517 # Ignored checks require unpackaged siphash24 package @@ -11,15 +11,15 @@ make_check_args=" --deselect pytools/test/test_persistent_dict.py::test_dataclass_hashing --deselect pytools/test/test_persistent_dict.py::test_hash_function " -hostmakedepends="python3-setuptools python3-wheel" -depends="python3-platformdirs python3-numpy python3-typing_extensions" +hostmakedepends="hatchling" +depends="python3-platformdirs python3-typing_extensions" checkdepends="python3-pytest-xdist $depends" short_desc="Python utilities from Andreas Kloeckner" maintainer="Andrew J. Hesford " license="X11" homepage="https://pypi.org/project/pytools" distfiles="${PYPI_SITE}/p/pytools/pytools-${version}.tar.gz" -checksum=39e5bbaf81fa432e688b82dd0980212d18f97b23e51a8c7afe7592249fe40ab1 +checksum=649fc68eb9568c80f676dbf3256b38e2a5783a538ffc700db74e14946c50d7d3 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pytz/template b/srcpkgs/python3-pytz/template index 7abb16e8bb3fb4..26da9b19525068 100644 --- a/srcpkgs/python3-pytz/template +++ b/srcpkgs/python3-pytz/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytz' pkgname=python3-pytz version=2024.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 tzdata" diff --git a/srcpkgs/python3-pytz_deprecation_shim/template b/srcpkgs/python3-pytz_deprecation_shim/template index 1e3344a20336c0..d2419e73c97b20 100644 --- a/srcpkgs/python3-pytz_deprecation_shim/template +++ b/srcpkgs/python3-pytz_deprecation_shim/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytz_deprecation_shim' pkgname=python3-pytz_deprecation_shim version=0.1.0 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" diff --git a/srcpkgs/python3-pytzdata/template b/srcpkgs/python3-pytzdata/template index 4745ce9fdbdce4..09bac2417613a2 100644 --- a/srcpkgs/python3-pytzdata/template +++ b/srcpkgs/python3-pytzdata/template @@ -1,7 +1,7 @@ # Template file for 'python3-pytzdata' pkgname=python3-pytzdata version=2020.1 -revision=4 +revision=5 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3 tzdata" diff --git a/srcpkgs/python3-pyudev/template b/srcpkgs/python3-pyudev/template index a864c8dad157d2..e4975397859315 100644 --- a/srcpkgs/python3-pyudev/template +++ b/srcpkgs/python3-pyudev/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyudev' pkgname=python3-pyudev version=0.24.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-six eudev-libudev" diff --git a/srcpkgs/python3-pywayland/template b/srcpkgs/python3-pywayland/template index 4f5b05811f3431..3b41a1ed8d90ee 100644 --- a/srcpkgs/python3-pywayland/template +++ b/srcpkgs/python3-pywayland/template @@ -1,7 +1,7 @@ # Template file for 'python3-pywayland' pkgname=python3-pywayland version=0.4.17 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools wayland-protocols pkg-config python3-wheel python3-cffi wayland-devel" diff --git a/srcpkgs/python3-pywinrm/template b/srcpkgs/python3-pywinrm/template index 7d4607dca4b8ac..e8c7f76bc3798a 100644 --- a/srcpkgs/python3-pywinrm/template +++ b/srcpkgs/python3-pywinrm/template @@ -1,7 +1,7 @@ # Template file for 'python3-pywinrm' pkgname=python3-pywinrm version=0.5.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3 python3-requests python3-requests-ntlm python3-xmltodict" diff --git a/srcpkgs/python3-pywlroots/template b/srcpkgs/python3-pywlroots/template index b24e5295878823..d7c8b6e68d9346 100644 --- a/srcpkgs/python3-pywlroots/template +++ b/srcpkgs/python3-pywlroots/template @@ -1,7 +1,7 @@ # Template file for 'python3-pywlroots' pkgname=python3-pywlroots version=0.17.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-cffi python3-pywayland python3-xkbcommon python3-wheel python3-devel wlroots${version%.*}-devel" diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template index ca38ea2524f2f3..79a67824ffa818 100644 --- a/srcpkgs/python3-pywt/template +++ b/srcpkgs/python3-pywt/template @@ -1,6 +1,6 @@ # Template file for 'python3-pywt' pkgname=python3-pywt -version=1.7.0 +version=1.8.0 revision=1 build_style=python3-pep517 build_helper="meson numpy" @@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/PyWavelets/pywt" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=cd1893547ee1cfa990da6b1dda322d17b8b318a2b801945c609d5a3d9eb53bef +checksum=4e7e6fcf65bcf58e9e7ec7b278b8921f34fd7b1884ab9c7b32a91beec29412fc post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pyx/template b/srcpkgs/python3-pyx/template index 847d6d1b392b02..dc900e00db1b43 100644 --- a/srcpkgs/python3-pyx/template +++ b/srcpkgs/python3-pyx/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyx' pkgname=python3-pyx version=0.15 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 virtual?tex" diff --git a/srcpkgs/python3-pyxattr/template b/srcpkgs/python3-pyxattr/template index bcd2f128456733..25a8c31a905f60 100644 --- a/srcpkgs/python3-pyxattr/template +++ b/srcpkgs/python3-pyxattr/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyxattr' pkgname=python3-pyxattr version=0.8.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-pyzbar/template b/srcpkgs/python3-pyzbar/template index 2b772a4d8e9ea6..736779ae244e64 100644 --- a/srcpkgs/python3-pyzbar/template +++ b/srcpkgs/python3-pyzbar/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyzbar' pkgname=python3-pyzbar version=0.1.9 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="libzbar python3" diff --git a/srcpkgs/python3-pyzmq/template b/srcpkgs/python3-pyzmq/template index ff54d4de544be8..0797742994c6ca 100644 --- a/srcpkgs/python3-pyzmq/template +++ b/srcpkgs/python3-pyzmq/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyzmq' pkgname=python3-pyzmq version=26.2.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--ignore tests/test_log.py" make_check_target="tests" diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template index daba86a8a46239..5034115f03a63c 100644 --- a/srcpkgs/python3-pyzstd/template +++ b/srcpkgs/python3-pyzstd/template @@ -1,7 +1,7 @@ # Template file for 'python3-pyzstd' pkgname=python3-pyzstd version=0.16.0 -revision=1 +revision=2 build_style=python3-module make_build_args="--dynamic-link-zstd" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-qrcode/template b/srcpkgs/python3-qrcode/template index ebe91ed2e61191..a2f2830c8f3289 100644 --- a/srcpkgs/python3-qrcode/template +++ b/srcpkgs/python3-qrcode/template @@ -1,7 +1,7 @@ # Template file for 'python3-qrcode' pkgname=python3-qrcode version=7.4.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pypng python3-typing_extensions" diff --git a/srcpkgs/python3-qtile-extras/template b/srcpkgs/python3-qtile-extras/template index edfc8b1e07f224..efec4615b23f9e 100644 --- a/srcpkgs/python3-qtile-extras/template +++ b/srcpkgs/python3-qtile-extras/template @@ -1,7 +1,7 @@ # Template file for 'python3-qtile-extras' pkgname=python3-qtile-extras version=0.29.0 -revision=1 +revision=2 build_style=python3-pep517 makedepends="python3-wheel python3-setuptools_scm" depends="qtile" diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template index e0ee0058bf6d41..a4266cdd9ad6cc 100644 --- a/srcpkgs/python3-quart/template +++ b/srcpkgs/python3-quart/template @@ -1,6 +1,6 @@ # Template file for 'python3-quart' pkgname=python3-quart -version=0.19.6 +version=0.19.9 revision=1 build_style=python3-pep517 hostmakedepends="python3-poetry-core" @@ -14,7 +14,7 @@ license="MIT" homepage="https://quart.palletsprojects.com/en/latest/" changelog="https://raw.githubusercontent.com/pallets/quart/main/CHANGES.rst" distfiles="https://github.com/pallets/quart/archive/refs/tags/${version}.tar.gz" -checksum=286c098b1da58e88f15de4eb6e92166577c429fa13f20f940afbde54c2a2220f +checksum=309df8ce6aca080fbb3a03b973fac8a28e78e95dd7e0df7e87279b6ea4fc2545 pre_check() { vsed -e '/addopts/d' -i pyproject.toml diff --git a/srcpkgs/python3-random2/template b/srcpkgs/python3-random2/template index f63e81a4200c7a..fd0d10d55d4ab6 100644 --- a/srcpkgs/python3-random2/template +++ b/srcpkgs/python3-random2/template @@ -1,7 +1,7 @@ # Template file for 'python3-random2' pkgname=python3-random2 version=1.0.1 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools unzip" depends="python3-setuptools" diff --git a/srcpkgs/python3-rapidfuzz/template b/srcpkgs/python3-rapidfuzz/template index 9aa737a38caec2..55169d59e2b674 100644 --- a/srcpkgs/python3-rapidfuzz/template +++ b/srcpkgs/python3-rapidfuzz/template @@ -1,7 +1,7 @@ # Template file for 'python3-rapidfuzz' pkgname=python3-rapidfuzz version=3.10.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-scikit-build-core ninja" makedepends="python3-devel rapidfuzz-cpp" diff --git a/srcpkgs/python3-rarfile/template b/srcpkgs/python3-rarfile/template index 1ef192ccafe73a..cfa44a9684b3f7 100644 --- a/srcpkgs/python3-rarfile/template +++ b/srcpkgs/python3-rarfile/template @@ -1,7 +1,7 @@ # Template file for 'python3-rarfile' pkgname=python3-rarfile version=4.0 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-raven/template b/srcpkgs/python3-raven/template index e7a9cf480f7c9e..c51b7455138d02 100644 --- a/srcpkgs/python3-raven/template +++ b/srcpkgs/python3-raven/template @@ -1,7 +1,7 @@ # Template file for 'python3-raven' pkgname=python3-raven version=6.10.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="ca-certificates python3-setuptools" diff --git a/srcpkgs/python3-rdflib/template b/srcpkgs/python3-rdflib/template index 1ea3f086408906..1807983a4893df 100644 --- a/srcpkgs/python3-rdflib/template +++ b/srcpkgs/python3-rdflib/template @@ -1,7 +1,7 @@ # Template file for 'python3-rdflib' pkgname=python3-rdflib version=6.2.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-setuptools python3-isodate python3-parsing" diff --git a/srcpkgs/python3-re-assert/template b/srcpkgs/python3-re-assert/template index 4e5a7aa78befa9..5f981fd0ea07d7 100644 --- a/srcpkgs/python3-re-assert/template +++ b/srcpkgs/python3-re-assert/template @@ -1,7 +1,7 @@ # Template file for 'python3-re-assert' pkgname=python3-re-assert version=1.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-regex" diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template index 6b23acb05806f0..65a320f92f8ea6 100644 --- a/srcpkgs/python3-readability-lxml/template +++ b/srcpkgs/python3-readability-lxml/template @@ -1,7 +1,7 @@ # Template file for 'python3-readability-lxml' pkgname=python3-readability-lxml version=0.8.1 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-lxml python3-chardet python3-cssselect" diff --git a/srcpkgs/python3-readlike/template b/srcpkgs/python3-readlike/template index b9684be854158b..d666d61301aded 100644 --- a/srcpkgs/python3-readlike/template +++ b/srcpkgs/python3-readlike/template @@ -1,7 +1,7 @@ # Template file for 'python3-readlike' pkgname=python3-readlike version=0.1.3 -revision=6 +revision=7 build_style=python3-module pycompile_module="readlike.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-rebulk/template b/srcpkgs/python3-rebulk/template index 744678c48a034d..9aeb3fbd4196fa 100644 --- a/srcpkgs/python3-rebulk/template +++ b/srcpkgs/python3-rebulk/template @@ -1,7 +1,7 @@ # Template file for 'python3-rebulk' pkgname=python3-rebulk version=2.0.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-six" diff --git a/srcpkgs/python3-recommonmark/template b/srcpkgs/python3-recommonmark/template index 7be4e90e2c4010..856802247661c7 100644 --- a/srcpkgs/python3-recommonmark/template +++ b/srcpkgs/python3-recommonmark/template @@ -1,7 +1,7 @@ # Template file for 'python3-recommonmark' pkgname=python3-recommonmark version=0.7.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-commonmark python3-docutils python3-Sphinx" diff --git a/srcpkgs/python3-redis/template b/srcpkgs/python3-redis/template index 5df2d0c45f38d8..db77eeaf3468a4 100644 --- a/srcpkgs/python3-redis/template +++ b/srcpkgs/python3-redis/template @@ -1,6 +1,6 @@ # Template file for 'python3-redis' pkgname=python3-redis -version=5.1.0 +version=5.2.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/redis/redis-py" changelog="https://raw.githubusercontent.com/redis/redis-py/master/CHANGES" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=1ac0b73774a8f62b0f66adbbb5b586e3b53c82183b5d2ddf39faf616a186a3db +checksum=fdb92ef773faac88c2bf80c47ecddbbdf93bae93363b4e6f9418b5686260420b replaces="python3-aioredis<=2.0.1_1" make_check=no # tests require a running redis server diff --git a/srcpkgs/python3-reedsolo/template b/srcpkgs/python3-reedsolo/template index e64a0b4efc57a5..097c9b5ff0700d 100644 --- a/srcpkgs/python3-reedsolo/template +++ b/srcpkgs/python3-reedsolo/template @@ -1,7 +1,7 @@ # Template file for 'python3-reedsolo' pkgname=python3-reedsolo version=1.5.11 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-referencing/template b/srcpkgs/python3-referencing/template index cb173afa1000e7..e8bc124598453f 100644 --- a/srcpkgs/python3-referencing/template +++ b/srcpkgs/python3-referencing/template @@ -1,7 +1,7 @@ # Template file for 'python3-referencing' pkgname=python3-referencing version=0.35.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3-attrs python3-rpds-py" diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template index ef4fcf3da12ba0..c0d9f98e93268c 100644 --- a/srcpkgs/python3-reflink/template +++ b/srcpkgs/python3-reflink/template @@ -1,7 +1,7 @@ # Template file for 'python3-reflink' pkgname=python3-reflink version=0.2.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel python3-cffi" diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template index 3539414a7eeb6b..621daf235f8613 100644 --- a/srcpkgs/python3-regex/template +++ b/srcpkgs/python3-regex/template @@ -1,7 +1,7 @@ # Template file for 'python3-regex' pkgname=python3-regex version=2024.9.11 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template index 6f8c856ed2d0a7..4a11ae39dfe156 100644 --- a/srcpkgs/python3-rencode/template +++ b/srcpkgs/python3-rencode/template @@ -1,7 +1,7 @@ # Template file for 'python3-rencode' pkgname=python3-rencode version=1.0.6 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython python3-wheel" makedepends="python3-devel" diff --git a/srcpkgs/python3-reportlab/template b/srcpkgs/python3-reportlab/template index 7b73e5c1ff9d03..35976af161599b 100644 --- a/srcpkgs/python3-reportlab/template +++ b/srcpkgs/python3-reportlab/template @@ -1,7 +1,7 @@ # Template file for 'python3-reportlab' pkgname=python3-reportlab version=3.6.11 -revision=4 +revision=5 build_style=python3-module make_build_args="--use-system-libart" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-repoze.sphinx.autointerface/template b/srcpkgs/python3-repoze.sphinx.autointerface/template index bb44541b247223..3de8d0302f959a 100644 --- a/srcpkgs/python3-repoze.sphinx.autointerface/template +++ b/srcpkgs/python3-repoze.sphinx.autointerface/template @@ -1,7 +1,7 @@ # Template file for 'python3-repoze.sphinx.autointerface' pkgname=python3-repoze.sphinx.autointerface version=0.8 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-zope.interface python3-Sphinx python3-setuptools" diff --git a/srcpkgs/python3-requests-file/template b/srcpkgs/python3-requests-file/template index 06687bf137f541..9e6fdd5749f435 100644 --- a/srcpkgs/python3-requests-file/template +++ b/srcpkgs/python3-requests-file/template @@ -1,7 +1,7 @@ # Template file for 'python3-requests-file' pkgname=python3-requests-file version=1.4.3 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-requests python3-six" diff --git a/srcpkgs/python3-requests-mock/template b/srcpkgs/python3-requests-mock/template index a6b78d741b852c..8ebeff8806fd30 100644 --- a/srcpkgs/python3-requests-mock/template +++ b/srcpkgs/python3-requests-mock/template @@ -1,7 +1,7 @@ # Template file for 'python3-requests-mock' pkgname=python3-requests-mock version=1.8.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-pbr" depends="python3-requests python3-six" diff --git a/srcpkgs/python3-requests-ntlm/template b/srcpkgs/python3-requests-ntlm/template index c1a2f7eb8b6638..b341a045eace40 100644 --- a/srcpkgs/python3-requests-ntlm/template +++ b/srcpkgs/python3-requests-ntlm/template @@ -1,7 +1,7 @@ # Template file for 'python3-requests-ntlm' pkgname=python3-requests-ntlm version=1.3.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3 python3-requests python3-pyspnego" diff --git a/srcpkgs/python3-requests-oauthlib/template b/srcpkgs/python3-requests-oauthlib/template index 9921ec7ac2342d..b93c3acf2b9812 100644 --- a/srcpkgs/python3-requests-oauthlib/template +++ b/srcpkgs/python3-requests-oauthlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-requests-oauthlib' pkgname=python3-requests-oauthlib version=1.3.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-oauthlib" diff --git a/srcpkgs/python3-requests-toolbelt/template b/srcpkgs/python3-requests-toolbelt/template index 0bf9ece02a966a..8d26375a482cb1 100644 --- a/srcpkgs/python3-requests-toolbelt/template +++ b/srcpkgs/python3-requests-toolbelt/template @@ -1,7 +1,7 @@ # Template file for 'python3-requests-toolbelt' pkgname=python3-requests-toolbelt version=1.0.0 -revision=2 +revision=3 build_style=python3-pep517 make_check_args="--ignore tests/test_x509_adapter.py" hostmakedepends="python3-wheel python3-setuptools" diff --git a/srcpkgs/python3-requests-unixsocket/template b/srcpkgs/python3-requests-unixsocket/template index d3a18a0203c0fc..b68212703ad7b2 100644 --- a/srcpkgs/python3-requests-unixsocket/template +++ b/srcpkgs/python3-requests-unixsocket/template @@ -1,7 +1,7 @@ # Template file for 'python3-requests-unixsocket' pkgname=python3-requests-unixsocket version=0.3.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-pbr" depends="python3-requests python3-urllib3" diff --git a/srcpkgs/python3-requests/template b/srcpkgs/python3-requests/template index 4e0827f5783f4d..339b405685a600 100644 --- a/srcpkgs/python3-requests/template +++ b/srcpkgs/python3-requests/template @@ -1,7 +1,7 @@ # Template file for 'python3-requests' pkgname=python3-requests version=2.32.3 -revision=1 +revision=2 build_style=python3-pep517 # test_unicode_header_name hangs with urllib3 < 2.x # see: https://github.com/psf/requests/issues/6734 diff --git a/srcpkgs/python3-resolvelib/template b/srcpkgs/python3-resolvelib/template index 8b4a9f19c9b1ad..c25b50b3c2c782 100644 --- a/srcpkgs/python3-resolvelib/template +++ b/srcpkgs/python3-resolvelib/template @@ -1,7 +1,7 @@ # Template file for 'python3-resolvelib' pkgname=python3-resolvelib version=1.0.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template index ab9599d92a6b37..3f1ad9c0059cf0 100644 --- a/srcpkgs/python3-responses/template +++ b/srcpkgs/python3-responses/template @@ -1,7 +1,7 @@ # Template file for 'python3-responses' pkgname=python3-responses version=0.25.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-requests python3-urllib3 python3-yaml" diff --git a/srcpkgs/python3-rfc3339-validator/template b/srcpkgs/python3-rfc3339-validator/template index 3223f5e662fd4e..f1f48a8a75e2ce 100644 --- a/srcpkgs/python3-rfc3339-validator/template +++ b/srcpkgs/python3-rfc3339-validator/template @@ -1,7 +1,7 @@ # Template file for 'python3-rfc3339-validator' pkgname=python3-rfc3339-validator version=0.1.4 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-six" diff --git a/srcpkgs/python3-rfc3986-validator/template b/srcpkgs/python3-rfc3986-validator/template index 55f3a441f207c2..991311cbc473ed 100644 --- a/srcpkgs/python3-rfc3986-validator/template +++ b/srcpkgs/python3-rfc3986-validator/template @@ -1,7 +1,7 @@ # Template file for 'python3-rfc3986-validator' pkgname=python3-rfc3986-validator version=0.1.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-rfc3986/template b/srcpkgs/python3-rfc3986/template index 1d024cd340670f..a28c9352e649b2 100644 --- a/srcpkgs/python3-rfc3986/template +++ b/srcpkgs/python3-rfc3986/template @@ -1,7 +1,7 @@ # Template file for 'python3-rfc3986' pkgname=python3-rfc3986 version=2.0.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-idna" diff --git a/srcpkgs/python3-rfc3987/template b/srcpkgs/python3-rfc3987/template index 5c89bf53f6cfb5..10d47558bdeda3 100644 --- a/srcpkgs/python3-rfc3987/template +++ b/srcpkgs/python3-rfc3987/template @@ -1,7 +1,7 @@ # Template file for 'python3-rfc3987' pkgname=python3-rfc3987 version=1.3.8 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-rfc6555/template b/srcpkgs/python3-rfc6555/template index 0e55d6efa95392..7163ec2ff19501 100644 --- a/srcpkgs/python3-rfc6555/template +++ b/srcpkgs/python3-rfc6555/template @@ -1,7 +1,7 @@ # Template file for 'python3-rfc6555' pkgname=python3-rfc6555 version=0.1.0 -revision=3 +revision=4 build_style=python3-module make_check_args="--deselect tests/test_ipv6.py::test_ipv6_available" # CI fail hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template index e15d739b7e800a..166d5d9871a4d9 100644 --- a/srcpkgs/python3-rich/template +++ b/srcpkgs/python3-rich/template @@ -1,7 +1,7 @@ # Template file for 'python3-rich' pkgname=python3-rich version=13.9.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-Pygments python3-markdown-it" diff --git a/srcpkgs/python3-ripe-atlas-cousteau/template b/srcpkgs/python3-ripe-atlas-cousteau/template index 51081f0baa72b5..c8e86a2fc7ca69 100644 --- a/srcpkgs/python3-ripe-atlas-cousteau/template +++ b/srcpkgs/python3-ripe-atlas-cousteau/template @@ -1,7 +1,7 @@ # Template file for 'python3-ripe-atlas-cousteau' pkgname=python3-ripe-atlas-cousteau version=1.4.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dateutil python3-socketIO-client" diff --git a/srcpkgs/python3-ripe-atlas-sagan/template b/srcpkgs/python3-ripe-atlas-sagan/template index e8d01ff01897b8..77c491de5afab4 100644 --- a/srcpkgs/python3-ripe-atlas-sagan/template +++ b/srcpkgs/python3-ripe-atlas-sagan/template @@ -1,7 +1,7 @@ # Template file for 'python3-ripe-atlas-sagan' pkgname=python3-ripe-atlas-sagan version=1.3.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dateutil python3-pytz python3-cryptography" diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template index fe585ba5b7c9eb..42ad25af58d632 100644 --- a/srcpkgs/python3-ropgadget/template +++ b/srcpkgs/python3-ropgadget/template @@ -1,7 +1,7 @@ # Template file for 'python3-ropgadget' pkgname=python3-ropgadget version=7.5 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-rpds-py/template b/srcpkgs/python3-rpds-py/template index a99bc759e5c9c6..b209b3158852f5 100644 --- a/srcpkgs/python3-rpds-py/template +++ b/srcpkgs/python3-rpds-py/template @@ -1,7 +1,7 @@ # Template file for 'python3-rpds-py' pkgname=python3-rpds-py version=0.20.0 -revision=1 +revision=2 build_style=python3-pep517 build_helper=rust hostmakedepends="cargo maturin" diff --git a/srcpkgs/python3-rsa/template b/srcpkgs/python3-rsa/template index 129b2332d28158..dd8218526cf04d 100644 --- a/srcpkgs/python3-rsa/template +++ b/srcpkgs/python3-rsa/template @@ -1,7 +1,7 @@ # Template file for 'python3-rsa' pkgname=python3-rsa version=4.6 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-pyasn1" diff --git a/srcpkgs/python3-rss2email/template b/srcpkgs/python3-rss2email/template index 0c19204bc85045..dbedb900b49b8a 100644 --- a/srcpkgs/python3-rss2email/template +++ b/srcpkgs/python3-rss2email/template @@ -1,7 +1,7 @@ # Template file for 'python3-rss2email' pkgname=python3-rss2email version=3.14 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-feedparser python3-html2text" diff --git a/srcpkgs/python3-rst2ansi/template b/srcpkgs/python3-rst2ansi/template index 1dbb73fc119668..f13a577ae4dace 100644 --- a/srcpkgs/python3-rst2ansi/template +++ b/srcpkgs/python3-rst2ansi/template @@ -1,7 +1,7 @@ # Template file for 'python3-rst2ansi' pkgname=python3-rst2ansi version=0.1.5 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-docutils" diff --git a/srcpkgs/python3-rtf_tokenize/template b/srcpkgs/python3-rtf_tokenize/template index 8e5c104f85fc80..69453d2c44a58e 100644 --- a/srcpkgs/python3-rtf_tokenize/template +++ b/srcpkgs/python3-rtf_tokenize/template @@ -1,7 +1,7 @@ # Template file for 'python3-rtf_tokenize' pkgname=python3-rtf_tokenize version=1.0.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-rtree/template b/srcpkgs/python3-rtree/template index 4714005a91e332..b1ee20100bbc69 100644 --- a/srcpkgs/python3-rtree/template +++ b/srcpkgs/python3-rtree/template @@ -1,7 +1,7 @@ # Template file for 'python3-rtree' pkgname=python3-rtree version=1.0.0 -revision=3 +revision=4 build_style=python3-module make_check_target="tests" hostmakedepends="python3-setuptools libspatialindex-devel python3-wheel" diff --git a/srcpkgs/python3-ruamel.yaml.clib/template b/srcpkgs/python3-ruamel.yaml.clib/template index 919fa2fb51780b..1357b113842594 100644 --- a/srcpkgs/python3-ruamel.yaml.clib/template +++ b/srcpkgs/python3-ruamel.yaml.clib/template @@ -1,7 +1,7 @@ # Template file for 'python3-ruamel.yaml.clib' pkgname=python3-ruamel.yaml.clib version=0.2.12 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-ruamel.yaml/template b/srcpkgs/python3-ruamel.yaml/template index 1b6673f2740de5..291286e1525fa0 100644 --- a/srcpkgs/python3-ruamel.yaml/template +++ b/srcpkgs/python3-ruamel.yaml/template @@ -1,7 +1,7 @@ # Template file for 'python3-ruamel.yaml' pkgname=python3-ruamel.yaml version=0.17.21 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-rx/template b/srcpkgs/python3-rx/template index 05faa7a90e9d13..0bb4f1b4a1411d 100644 --- a/srcpkgs/python3-rx/template +++ b/srcpkgs/python3-rx/template @@ -1,7 +1,7 @@ # Template file for 'python3-rx' pkgname=python3-rx version=3.1.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools python3-pytest" depends="python3" diff --git a/srcpkgs/python3-s-tui/template b/srcpkgs/python3-s-tui/template index 33190064502bd8..311bace76faad4 100644 --- a/srcpkgs/python3-s-tui/template +++ b/srcpkgs/python3-s-tui/template @@ -1,7 +1,7 @@ # Template file for 'python3-s-tui' pkgname=python3-s-tui version=1.1.4 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="stress-ng python3-urwid python3-psutil" diff --git a/srcpkgs/python3-s3transfer/template b/srcpkgs/python3-s3transfer/template index a605212ea24fcf..9fdbf083028de7 100644 --- a/srcpkgs/python3-s3transfer/template +++ b/srcpkgs/python3-s3transfer/template @@ -1,7 +1,7 @@ # Template file for 'python3-s3transfer' pkgname=python3-s3transfer version=0.5.0 -revision=3 +revision=4 build_style=python3-module # integration tests want aws credentials make_check_target="tests/unit tests/functional" diff --git a/srcpkgs/python3-sabctools/template b/srcpkgs/python3-sabctools/template index 734b18fcc2f993..3cfe4ab6801a43 100644 --- a/srcpkgs/python3-sabctools/template +++ b/srcpkgs/python3-sabctools/template @@ -1,7 +1,7 @@ # Template file for 'python3-sabctools' pkgname=python3-sabctools version=8.2.5 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" makedepends="python3-devel" diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template index 7be8b7ccac3567..7f23e62572cd65 100644 --- a/srcpkgs/python3-saml2/template +++ b/srcpkgs/python3-saml2/template @@ -1,7 +1,7 @@ # Template file for 'python3-saml2' pkgname=python3-saml2 version=7.5.0 -revision=1 +revision=2 build_style=python3-pep517 # require unpackaged pymongo make_check_args="--ignore=tests/test_36_mdbcache.py \ diff --git a/srcpkgs/python3-scandir/template b/srcpkgs/python3-scandir/template index 1b85a7bbe34363..89851d7abf1889 100644 --- a/srcpkgs/python3-scandir/template +++ b/srcpkgs/python3-scandir/template @@ -1,7 +1,7 @@ # Template file for 'python3-scandir' pkgname=python3-scandir version=1.10.0 -revision=10 +revision=11 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-scikit-build-core/template b/srcpkgs/python3-scikit-build-core/template index 43f9f95378f2a8..3925a64436cc4b 100644 --- a/srcpkgs/python3-scikit-build-core/template +++ b/srcpkgs/python3-scikit-build-core/template @@ -1,7 +1,7 @@ # Template file for 'python3-scikit-build-core' pkgname=python3-scikit-build-core version=0.10.7 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3-packaging python3-pathspec cmake" diff --git a/srcpkgs/python3-scikit-build/template b/srcpkgs/python3-scikit-build/template index a1de6792fd3743..fe6df7241f9ea2 100644 --- a/srcpkgs/python3-scikit-build/template +++ b/srcpkgs/python3-scikit-build/template @@ -1,7 +1,7 @@ # Template file for 'python3-scikit-build' pkgname=python3-scikit-build version=0.18.1 -revision=1 +revision=2 build_style=python3-pep517 # test requires setuptools_scm to not be installed make_check_args="-k not(nosetuptoolsscm)" diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template index 914aa23ce673f2..1b93a773d5f15a 100644 --- a/srcpkgs/python3-scikit-image/template +++ b/srcpkgs/python3-scikit-image/template @@ -1,7 +1,7 @@ # Template file for 'python3-scikit-image' pkgname=python3-scikit-image version=0.24.0 -revision=2 +revision=3 build_style=python3-pep517 build_helper="meson numpy" hostmakedepends="python3-build python3-installer python3-meson-python diff --git a/srcpkgs/python3-scikit-learn/template b/srcpkgs/python3-scikit-learn/template index c0983fe4624dd3..f80a5eb549e7f0 100644 --- a/srcpkgs/python3-scikit-learn/template +++ b/srcpkgs/python3-scikit-learn/template @@ -1,7 +1,7 @@ # Template file for 'python3-scikit-learn' pkgname=python3-scikit-learn version=1.5.0 -revision=1 +revision=2 build_style=python3-pep517 build_helper="numpy meson" hostmakedepends="python3-Cython python3-numpy python3-scipy diff --git a/srcpkgs/python3-scipy/template b/srcpkgs/python3-scipy/template index 00aa693110b985..61ec0f8fa66d1f 100644 --- a/srcpkgs/python3-scipy/template +++ b/srcpkgs/python3-scipy/template @@ -1,7 +1,7 @@ # Template file for 'python3-scipy' pkgname=python3-scipy version=1.14.1 -revision=1 +revision=2 build_style=python3-pep517 build_helper="meson numpy" # SciPy imposes strict and unnecessary restrictions on build dependencies diff --git a/srcpkgs/python3-scour/template b/srcpkgs/python3-scour/template index ced65fd69973ac..6fc98f75e2d4d0 100644 --- a/srcpkgs/python3-scour/template +++ b/srcpkgs/python3-scour/template @@ -1,7 +1,7 @@ # Template file for 'python3-scour' pkgname=python3-scour version=0.38.2 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-six" diff --git a/srcpkgs/python3-scruffy/template b/srcpkgs/python3-scruffy/template index 313d6f6b95bed3..a3d6dc1be12fdf 100644 --- a/srcpkgs/python3-scruffy/template +++ b/srcpkgs/python3-scruffy/template @@ -1,17 +1,17 @@ # Template file for 'python3-scruffy' pkgname=python3-scruffy version=0.3.8.2 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-six python3-yaml" -checkdepends="python3-nose" short_desc="Framework for boilerplate in Python apps" maintainer="Andrew Benson " license="MIT" homepage="https://github.com/snare/scruffy" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=36bd10f44a5329590e4ea7a6746645c1f9fa05d03b62c8c713676c65dbff2392 +make_check=no # Tests require removed python3-nose post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template index bc85ca82a7ff58..a6439c27b14152 100644 --- a/srcpkgs/python3-scrypt/template +++ b/srcpkgs/python3-scrypt/template @@ -1,7 +1,7 @@ # Template file for 'python3-scrypt' pkgname=python3-scrypt version=0.8.17 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel openssl-devel" diff --git a/srcpkgs/python3-seaborn/template b/srcpkgs/python3-seaborn/template index c35eb206e9c3ea..f4ce6369ebfc1a 100644 --- a/srcpkgs/python3-seaborn/template +++ b/srcpkgs/python3-seaborn/template @@ -1,7 +1,7 @@ # Template file for 'python3-seaborn' pkgname=python3-seaborn version=0.13.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3-numpy python3-matplotlib python3-pandas" diff --git a/srcpkgs/python3-semanticversion/template b/srcpkgs/python3-semanticversion/template index 766fe0185cc5d7..a85f7107bf8da3 100644 --- a/srcpkgs/python3-semanticversion/template +++ b/srcpkgs/python3-semanticversion/template @@ -1,7 +1,7 @@ # Template file for 'python3-semanticversion' pkgname=python3-semanticversion version=2.8.5 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-semver/template b/srcpkgs/python3-semver/template index 0df01aedd7c256..40e5b5517b4d7e 100644 --- a/srcpkgs/python3-semver/template +++ b/srcpkgs/python3-semver/template @@ -1,7 +1,7 @@ # Template file for 'python3-semver' pkgname=python3-semver version=3.0.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-send2trash/template b/srcpkgs/python3-send2trash/template index a6ec94b897ec30..423fce83b1e972 100644 --- a/srcpkgs/python3-send2trash/template +++ b/srcpkgs/python3-send2trash/template @@ -1,7 +1,7 @@ # Template file for 'python3-send2trash' pkgname=python3-send2trash version=1.8.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-sentry/template b/srcpkgs/python3-sentry/template index ae4a99019ddc90..81488b850d7d95 100644 --- a/srcpkgs/python3-sentry/template +++ b/srcpkgs/python3-sentry/template @@ -1,7 +1,7 @@ # Template file for 'python3-sentry' pkgname=python3-sentry version=1.0.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends=python3-setuptools depends="python3-certifi python3-urllib3" diff --git a/srcpkgs/python3-serpent/template b/srcpkgs/python3-serpent/template index 27587283554101..63e10e3f9cc706 100644 --- a/srcpkgs/python3-serpent/template +++ b/srcpkgs/python3-serpent/template @@ -1,7 +1,7 @@ # Template file for 'python3-serpent' pkgname=python3-serpent version=1.41 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-service_identity/template b/srcpkgs/python3-service_identity/template index 6189cb7cd280a7..b09edb6c89f2a1 100644 --- a/srcpkgs/python3-service_identity/template +++ b/srcpkgs/python3-service_identity/template @@ -1,7 +1,7 @@ # Template file for 'python3-service_identity' pkgname=python3-service_identity version=23.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs hatch-fancy-pypi-readme" depends="python3-attrs python3-pyasn1-modules python3-cryptography python3-six" diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template index 1d0bf67e7fc35a..ce2dbee76d4c98 100644 --- a/srcpkgs/python3-setproctitle/template +++ b/srcpkgs/python3-setproctitle/template @@ -1,7 +1,7 @@ # Template file for 'python3-setproctitle' pkgname=python3-setproctitle version=1.3.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template index 6223c9b84626b6..73a2d79e7f51b2 100644 --- a/srcpkgs/python3-setuptools-rust/template +++ b/srcpkgs/python3-setuptools-rust/template @@ -1,7 +1,7 @@ # Template file for 'python3-setuptools-rust' pkgname=python3-setuptools-rust version=1.10.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-semanticversion python3-setuptools python3-typing_extensions" diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template index 8371d90e00ce01..790553c87dce06 100644 --- a/srcpkgs/python3-setuptools/template +++ b/srcpkgs/python3-setuptools/template @@ -1,6 +1,6 @@ # Template file for 'python3-setuptools' pkgname=python3-setuptools -version=75.1.0 +version=75.6.0 revision=1 build_style=python3-module hostmakedepends="python3-devel" @@ -11,7 +11,7 @@ license="MIT" homepage="https://github.com/pypa/setuptools" changelog="https://setuptools.pypa.io/en/stable/history.html" distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz" -checksum=d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538 +checksum=8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6 provides="python3-distribute-${version}_1" replaces="python3-distribute>=0" # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged; diff --git a/srcpkgs/python3-setuptools_scm/template b/srcpkgs/python3-setuptools_scm/template index 6534c46113b893..44c844513a6cc8 100644 --- a/srcpkgs/python3-setuptools_scm/template +++ b/srcpkgs/python3-setuptools_scm/template @@ -1,7 +1,7 @@ # Template file for 'python3-setuptools_scm' pkgname=python3-setuptools_scm version=8.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-setuptools python3-packaging python3-typing_extensions" diff --git a/srcpkgs/python3-sgmllib/template b/srcpkgs/python3-sgmllib/template index 71a8a1ec9ec05d..a6ec8042b18ab7 100644 --- a/srcpkgs/python3-sgmllib/template +++ b/srcpkgs/python3-sgmllib/template @@ -1,7 +1,7 @@ # Template file for 'python3-sgmllib' pkgname=python3-sgmllib version=1.0.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-sh/template b/srcpkgs/python3-sh/template index fdc394ebe2cd0c..82b4dfd322bc15 100644 --- a/srcpkgs/python3-sh/template +++ b/srcpkgs/python3-sh/template @@ -1,7 +1,7 @@ # Template file for 'python3-sh' pkgname=python3-sh version=1.14.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template index 16d9131b2c630e..ddc691dfb72924 100644 --- a/srcpkgs/python3-shapely/template +++ b/srcpkgs/python3-shapely/template @@ -1,10 +1,10 @@ # Template file for 'python3-shapely' pkgname=python3-shapely -version=2.0.5 +version=2.0.6 revision=1 build_style=python3-module build_helper=numpy -hostmakedepends="python3-setuptools python3-Cython0.29 geos" +hostmakedepends="python3-setuptools python3-Cython geos" makedepends="python3-devel python3-numpy geos-devel" depends="python3" checkdepends="python3-pytest-xdist" @@ -13,7 +13,7 @@ maintainer="Karl Nilsson " license="BSD-3-Clause" homepage="https://github.com/shapely/shapely" distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz" -checksum=56c0aee11b31a9dd18120423d350fa6109663d4e46bccc58550bc7d735f18005 +checksum=71f1830bd1aa42d0493c8beb48c2e80712450af43376af4ba3bf40f0d9064120 pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/python3-shellingham/template b/srcpkgs/python3-shellingham/template index 551360a29e31f4..97141314ddf0d5 100644 --- a/srcpkgs/python3-shellingham/template +++ b/srcpkgs/python3-shellingham/template @@ -1,7 +1,7 @@ # Template file for 'python3-shellingham' pkgname=python3-shellingham version=1.5.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-shodan/template b/srcpkgs/python3-shodan/template index 8b1d3d5888cd74..993b4adacd575f 100644 --- a/srcpkgs/python3-shodan/template +++ b/srcpkgs/python3-shodan/template @@ -1,7 +1,7 @@ # Template file for 'python3-shodan' pkgname=python3-shodan version=1.28.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-click python3-click-plugins python3-colorama diff --git a/srcpkgs/python3-shxparser/template b/srcpkgs/python3-shxparser/template index 61f1c4aee3e01e..4f5172391c4f6c 100644 --- a/srcpkgs/python3-shxparser/template +++ b/srcpkgs/python3-shxparser/template @@ -1,7 +1,7 @@ # Template file for 'python3-shxparser' pkgname=python3-shxparser version=0.0.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" checkdepends="python3-pytest python3-svgelements" diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template index 61412174b11130..eb3e322433bfaf 100644 --- a/srcpkgs/python3-signedjson/template +++ b/srcpkgs/python3-signedjson/template @@ -1,7 +1,7 @@ # Template file for 'python3-signedjson' pkgname=python3-signedjson version=1.1.4 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3-canonicaljson python3-unpaddedbase64 python3-pynacl diff --git a/srcpkgs/python3-simber/template b/srcpkgs/python3-simber/template index 7f029b018de784..8df685efa63c6d 100644 --- a/srcpkgs/python3-simber/template +++ b/srcpkgs/python3-simber/template @@ -1,7 +1,7 @@ # Template file for 'python3-simber' pkgname=python3-simber version=0.2.6 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-colorama" diff --git a/srcpkgs/python3-simplebayes/template b/srcpkgs/python3-simplebayes/template index ff3547d196721d..58def0e40773a5 100644 --- a/srcpkgs/python3-simplebayes/template +++ b/srcpkgs/python3-simplebayes/template @@ -1,7 +1,7 @@ # Template file for 'python3-simplebayes' pkgname=python3-simplebayes version=1.5.8 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-simplegeneric/template b/srcpkgs/python3-simplegeneric/template index 10606a0eda3b1c..7184a96c91590e 100644 --- a/srcpkgs/python3-simplegeneric/template +++ b/srcpkgs/python3-simplegeneric/template @@ -1,7 +1,7 @@ # Template file for 'python3-simplegeneric' pkgname=python3-simplegeneric version=0.8.1 -revision=10 +revision=11 build_style=python3-module hostmakedepends="unzip python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-simplejson/template b/srcpkgs/python3-simplejson/template index 78c145bf175ddc..1c173ddc400a70 100644 --- a/srcpkgs/python3-simplejson/template +++ b/srcpkgs/python3-simplejson/template @@ -1,7 +1,7 @@ # Template file for 'python3-simplejson' pkgname=python3-simplejson version=3.18.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-sip-PyQt5/template b/srcpkgs/python3-sip-PyQt5/template index f271189ac1e0b5..8cf2bdaa8d19ef 100644 --- a/srcpkgs/python3-sip-PyQt5/template +++ b/srcpkgs/python3-sip-PyQt5/template @@ -1,7 +1,7 @@ # Template file for 'python3-sip-PyQt5' pkgname=python3-sip-PyQt5 version=12.13.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-devel python3-setuptools sip" makedepends="python3-devel" diff --git a/srcpkgs/python3-six/template b/srcpkgs/python3-six/template index c89f81f3f89e38..2299770fb153c2 100644 --- a/srcpkgs/python3-six/template +++ b/srcpkgs/python3-six/template @@ -1,7 +1,7 @@ # Template file for 'python3-six' pkgname=python3-six version=1.16.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-slixmpp/template b/srcpkgs/python3-slixmpp/template index 260d28bc491637..0f784d2d17ca66 100644 --- a/srcpkgs/python3-slixmpp/template +++ b/srcpkgs/python3-slixmpp/template @@ -1,7 +1,7 @@ # Template file for 'python3-slixmpp' pkgname=python3-slixmpp version=1.8.5 -revision=1 +revision=2 build_style=python3-module hostmakedepends="pkg-config python3-setuptools python3-Cython" makedepends="python3-devel libidn-devel" diff --git a/srcpkgs/python3-slugify/template b/srcpkgs/python3-slugify/template index 96e7318f8b80af..daae83ff13358f 100644 --- a/srcpkgs/python3-slugify/template +++ b/srcpkgs/python3-slugify/template @@ -1,7 +1,7 @@ # Template file for 'python3-slugify' pkgname=python3-slugify version=6.1.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-text-unidecode python3-Unidecode" diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template index ca6c7caefc708b..7a5fb54e00b60f 100644 --- a/srcpkgs/python3-smartypants/template +++ b/srcpkgs/python3-smartypants/template @@ -1,7 +1,7 @@ # Template file for 'python3-smartypants' pkgname=python3-smartypants version=2.0.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-smbc/template b/srcpkgs/python3-smbc/template index 7c384d121bbffd..6264f6cbc4a20a 100644 --- a/srcpkgs/python3-smbc/template +++ b/srcpkgs/python3-smbc/template @@ -1,7 +1,7 @@ # Template file for 'python3-smbc' pkgname=python3-smbc version=1.0.25.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="pkg-config python3-devel python3-setuptools" makedepends="python3-devel samba-devel" diff --git a/srcpkgs/python3-smmap/template b/srcpkgs/python3-smmap/template index 389b32a00d3a12..377470d86c50e5 100644 --- a/srcpkgs/python3-smmap/template +++ b/srcpkgs/python3-smmap/template @@ -1,7 +1,7 @@ # Template file for 'python3-smmap' pkgname=python3-smmap version=5.0.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template index a416145409f949..f6d6b757dc7d74 100644 --- a/srcpkgs/python3-snakeoil/template +++ b/srcpkgs/python3-snakeoil/template @@ -1,7 +1,7 @@ # Template file for 'python3-snakeoil' pkgname=python3-snakeoil version=0.10.5 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3-lazy-object-proxy" diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template index 4840af6230d128..1dd47dcc772a24 100644 --- a/srcpkgs/python3-snappy/template +++ b/srcpkgs/python3-snappy/template @@ -2,7 +2,7 @@ pkgname=python3-snappy _pkgname=python-snappy version=0.6.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel snappy-devel python3-cffi libffi-devel" diff --git a/srcpkgs/python3-sniffio/template b/srcpkgs/python3-sniffio/template index ac5989243e8c54..8e06d2f57941fc 100644 --- a/srcpkgs/python3-sniffio/template +++ b/srcpkgs/python3-sniffio/template @@ -1,7 +1,7 @@ # Template file for 'python3-sniffio' pkgname=python3-sniffio version=1.3.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3" diff --git a/srcpkgs/python3-snowballstemmer/template b/srcpkgs/python3-snowballstemmer/template index ad0c115248fe71..da9c945dfe75fc 100644 --- a/srcpkgs/python3-snowballstemmer/template +++ b/srcpkgs/python3-snowballstemmer/template @@ -1,7 +1,7 @@ # Template file for 'python3-snowballstemmer' pkgname=python3-snowballstemmer version=2.2.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-socketIO-client/template b/srcpkgs/python3-socketIO-client/template index d5606f93639407..54721378653b9e 100644 --- a/srcpkgs/python3-socketIO-client/template +++ b/srcpkgs/python3-socketIO-client/template @@ -1,7 +1,7 @@ # Template file for 'python3-socketIO-client' pkgname=python3-socketIO-client version=0.7.2 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-six python3-websocket-client" diff --git a/srcpkgs/python3-socks/template b/srcpkgs/python3-socks/template index 2fd397ccf8a716..ff300cd5279cb0 100644 --- a/srcpkgs/python3-socks/template +++ b/srcpkgs/python3-socks/template @@ -1,7 +1,7 @@ # Template file for 'python3-socks' pkgname=python3-socks version=2.4.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-socksio/template b/srcpkgs/python3-socksio/template index 22011122e516cb..cc9b0dca82b835 100644 --- a/srcpkgs/python3-socksio/template +++ b/srcpkgs/python3-socksio/template @@ -1,7 +1,7 @@ # Template file for 'python3-socksio' pkgname=python3-socksio version=1.0.0 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-flit_core" short_desc="Sans-I/O implementation of SOCKS4/5" diff --git a/srcpkgs/python3-sortedcontainers/template b/srcpkgs/python3-sortedcontainers/template index 81dc04a3797311..d7c314578c9236 100644 --- a/srcpkgs/python3-sortedcontainers/template +++ b/srcpkgs/python3-sortedcontainers/template @@ -1,7 +1,7 @@ # Template file for 'python3-sortedcontainers' pkgname=python3-sortedcontainers version=2.4.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template index 3a2b61f70d8537..107604fec169b0 100644 --- a/srcpkgs/python3-soupsieve/template +++ b/srcpkgs/python3-soupsieve/template @@ -1,7 +1,7 @@ # Template file for 'python3-soupsieve' pkgname=python3-soupsieve version=2.4.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/python3-spake2/template b/srcpkgs/python3-spake2/template index 90a755a1482d40..e4bf27fc958508 100644 --- a/srcpkgs/python3-spake2/template +++ b/srcpkgs/python3-spake2/template @@ -1,7 +1,7 @@ # Template file for 'python3-spake2' pkgname=python3-spake2 version=0.8 -revision=7 +revision=8 build_style=python3-module pycompile_module="spake2" hostmakedepends="python3 python3-setuptools" diff --git a/srcpkgs/python3-sphinx-automodapi/template b/srcpkgs/python3-sphinx-automodapi/template index 17a5cfb3560971..e2fad1962f96b0 100644 --- a/srcpkgs/python3-sphinx-automodapi/template +++ b/srcpkgs/python3-sphinx-automodapi/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinx-automodapi' pkgname=python3-sphinx-automodapi version=0.16.0 -revision=2 +revision=3 build_style=python3-pep517 # Something wrong with relative filepaths make_check_args=" diff --git a/srcpkgs/python3-sphinx-copybutton/template b/srcpkgs/python3-sphinx-copybutton/template index a2d47b4553bd6e..52739de3da2dea 100644 --- a/srcpkgs/python3-sphinx-copybutton/template +++ b/srcpkgs/python3-sphinx-copybutton/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinx-copybutton' pkgname=python3-sphinx-copybutton version=0.5.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Sphinx" diff --git a/srcpkgs/python3-sphinx-markdown-tables/template b/srcpkgs/python3-sphinx-markdown-tables/template index 4771d47f81461a..5377ab598aab95 100644 --- a/srcpkgs/python3-sphinx-markdown-tables/template +++ b/srcpkgs/python3-sphinx-markdown-tables/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinx-markdown-tables' pkgname=python3-sphinx-markdown-tables version=0.0.17 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-Markdown" makedepends="" diff --git a/srcpkgs/python3-sphinx-tabs/template b/srcpkgs/python3-sphinx-tabs/template index ed46fef81256e7..f4766c37a3f5d7 100644 --- a/srcpkgs/python3-sphinx-tabs/template +++ b/srcpkgs/python3-sphinx-tabs/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinx-tabs' pkgname=python3-sphinx-tabs version=3.4.7 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" # https://github.com/executablebooks/sphinx-tabs/issues/159 diff --git a/srcpkgs/python3-sphinx_rtd_theme/template b/srcpkgs/python3-sphinx_rtd_theme/template index 1df3a05abe0d9a..8dd166212459c6 100644 --- a/srcpkgs/python3-sphinx_rtd_theme/template +++ b/srcpkgs/python3-sphinx_rtd_theme/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinx_rtd_theme' pkgname=python3-sphinx_rtd_theme version=1.1.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Sphinx" diff --git a/srcpkgs/python3-sphinxcontrib-applehelp/template b/srcpkgs/python3-sphinxcontrib-applehelp/template index 96009d43646cfe..1c45ab30dfe2f2 100644 --- a/srcpkgs/python3-sphinxcontrib-applehelp/template +++ b/srcpkgs/python3-sphinxcontrib-applehelp/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinxcontrib-applehelp' pkgname=python3-sphinxcontrib-applehelp version=1.0.4 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core python3-pyproject-hooks python3-setuptools python3-wheel" diff --git a/srcpkgs/python3-sphinxcontrib-devhelp/template b/srcpkgs/python3-sphinxcontrib-devhelp/template index 0ef390e5be5edc..bef5b87f7053c3 100644 --- a/srcpkgs/python3-sphinxcontrib-devhelp/template +++ b/srcpkgs/python3-sphinxcontrib-devhelp/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinxcontrib-devhelp' pkgname=python3-sphinxcontrib-devhelp version=1.0.2 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-sphinxcontrib-htmlhelp/template b/srcpkgs/python3-sphinxcontrib-htmlhelp/template index b3dc3be038daaa..8d3bc3e6bf2c4c 100644 --- a/srcpkgs/python3-sphinxcontrib-htmlhelp/template +++ b/srcpkgs/python3-sphinxcontrib-htmlhelp/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinxcontrib-htmlhelp' pkgname=python3-sphinxcontrib-htmlhelp version=2.0.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core python3-pyproject-hooks python3-setuptools python3-wheel" diff --git a/srcpkgs/python3-sphinxcontrib-jsmath/template b/srcpkgs/python3-sphinxcontrib-jsmath/template index 2a801832c950ae..f2dc93af44e618 100644 --- a/srcpkgs/python3-sphinxcontrib-jsmath/template +++ b/srcpkgs/python3-sphinxcontrib-jsmath/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinxcontrib-jsmath' pkgname=python3-sphinxcontrib-jsmath version=1.0.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-sphinxcontrib-qthelp/template b/srcpkgs/python3-sphinxcontrib-qthelp/template index 8ac63fef7e4843..e653a9d02b4bc7 100644 --- a/srcpkgs/python3-sphinxcontrib-qthelp/template +++ b/srcpkgs/python3-sphinxcontrib-qthelp/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinxcontrib-qthelp' pkgname=python3-sphinxcontrib-qthelp version=1.0.3 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-sphinxcontrib-serializinghtml/template b/srcpkgs/python3-sphinxcontrib-serializinghtml/template index 3d3420813fcb0b..56b2eaed295478 100644 --- a/srcpkgs/python3-sphinxcontrib-serializinghtml/template +++ b/srcpkgs/python3-sphinxcontrib-serializinghtml/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinxcontrib-serializinghtml' pkgname=python3-sphinxcontrib-serializinghtml version=1.1.9 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-sphinxcontrib/template b/srcpkgs/python3-sphinxcontrib/template index 8e61ddfef07ff3..337ca4c10ef052 100644 --- a/srcpkgs/python3-sphinxcontrib/template +++ b/srcpkgs/python3-sphinxcontrib/template @@ -1,7 +1,7 @@ # Template file for 'python3-sphinxcontrib' pkgname=python3-sphinxcontrib version=1.0 -revision=8 +revision=9 create_wrksrc=yes hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-spinners/template b/srcpkgs/python3-spinners/template index d0c83ed5c02c5b..c1b518ebf296ce 100644 --- a/srcpkgs/python3-spinners/template +++ b/srcpkgs/python3-spinners/template @@ -1,7 +1,7 @@ # Template file for 'python3-spinners' pkgname=python3-spinners version=0.0.24 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-spotipy/template b/srcpkgs/python3-spotipy/template index 4a4cdf3d32f68b..1aaa7071421123 100644 --- a/srcpkgs/python3-spotipy/template +++ b/srcpkgs/python3-spotipy/template @@ -1,7 +1,7 @@ # Template file for 'python3-spotipy' pkgname=python3-spotipy version=2.22.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="pkg-config python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template index d5f1b24fec59b9..e9f407185bada7 100644 --- a/srcpkgs/python3-sqlparse/template +++ b/srcpkgs/python3-sqlparse/template @@ -1,7 +1,7 @@ # Template file for 'python3-sqlparse' pkgname=python3-sqlparse version=0.4.4 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-stack_data/template b/srcpkgs/python3-stack_data/template index aef0f2485c48e9..b4ace72e40f1a0 100644 --- a/srcpkgs/python3-stack_data/template +++ b/srcpkgs/python3-stack_data/template @@ -1,7 +1,7 @@ # Template file for 'python3-stack_data' pkgname=python3-stack_data version=0.6.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3-executing python3-asttokens python3-pure_eval" diff --git a/srcpkgs/python3-starlette/template b/srcpkgs/python3-starlette/template index 77c5ae1da3dd2d..3a17e7a5f6ddfa 100644 --- a/srcpkgs/python3-starlette/template +++ b/srcpkgs/python3-starlette/template @@ -1,7 +1,7 @@ # Template file for 'python3-starlette' pkgname=python3-starlette version=0.38.5 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3" diff --git a/srcpkgs/python3-stem/template b/srcpkgs/python3-stem/template index 3546a33b34d5ea..6965c7d17b2ed7 100644 --- a/srcpkgs/python3-stem/template +++ b/srcpkgs/python3-stem/template @@ -1,7 +1,7 @@ # Template file for 'python3-stem' pkgname=python3-stem version=1.8.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-cryptography" diff --git a/srcpkgs/python3-stevedore/template b/srcpkgs/python3-stevedore/template index e7f9f188f20bde..c7e20a537d877e 100644 --- a/srcpkgs/python3-stevedore/template +++ b/srcpkgs/python3-stevedore/template @@ -1,7 +1,7 @@ # Template file for 'python3-stevedore' pkgname=python3-stevedore version=5.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-pbr" depends="python3-six" diff --git a/srcpkgs/python3-straight.plugin/template b/srcpkgs/python3-straight.plugin/template index 6ed1bd3c725956..e88d63c8c74047 100644 --- a/srcpkgs/python3-straight.plugin/template +++ b/srcpkgs/python3-straight.plugin/template @@ -1,7 +1,7 @@ # Template file for 'python3-straight.plugin' pkgname=python3-straight.plugin version=1.5.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-strict-rfc3339/template b/srcpkgs/python3-strict-rfc3339/template index f2897c5b0a400e..0fc4b3f7a44cdb 100644 --- a/srcpkgs/python3-strict-rfc3339/template +++ b/srcpkgs/python3-strict-rfc3339/template @@ -1,7 +1,7 @@ # Template file for 'python3-strict-rfc3339' pkgname=python3-strict-rfc3339 version=0.7 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template index f0539ac1737da9..02b359b57670cf 100644 --- a/srcpkgs/python3-subprocess-tee/template +++ b/srcpkgs/python3-subprocess-tee/template @@ -1,7 +1,7 @@ # Template file for 'python3-subprocess-tee' pkgname=python3-subprocess-tee version=0.4.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-subunit/template b/srcpkgs/python3-subunit/template index 225d9a1db25d04..178c255bfd5ba2 100644 --- a/srcpkgs/python3-subunit/template +++ b/srcpkgs/python3-subunit/template @@ -1,7 +1,7 @@ # Template file for 'python3-subunit' pkgname=python3-subunit version=1.4.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-testtools" diff --git a/srcpkgs/python3-suds/template b/srcpkgs/python3-suds/template index cb396e5142ef4a..dc85a233afa5d3 100644 --- a/srcpkgs/python3-suds/template +++ b/srcpkgs/python3-suds/template @@ -1,7 +1,7 @@ # Template file for 'python3-suds' pkgname=python3-suds -version=1.1.2 -revision=2 +version=1.2.0 +revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3" @@ -10,4 +10,4 @@ maintainer="Emil Miler " license="LGPL-3.0-or-later" homepage="https://github.com/suds-community/suds/" distfiles="${PYPI_SITE}/s/suds/suds-${version}.tar.gz" -checksum=1d5cfa74117193b244a4233f246c483d9f41198b448c5f14a8bad11c4f649f2b +checksum=83b162c3d2355374e11d8b9acf15eeaa158b416b4625821844f9f628d679deaf diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template index 9b7ad281e4b49b..35d15ecba15c5a 100644 --- a/srcpkgs/python3-svg.path/template +++ b/srcpkgs/python3-svg.path/template @@ -1,7 +1,7 @@ # Template file for 'python3-svg.path' pkgname=python3-svg.path version=6.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-svgelements/template b/srcpkgs/python3-svgelements/template index e073419739d418..5664208f6c984e 100644 --- a/srcpkgs/python3-svgelements/template +++ b/srcpkgs/python3-svgelements/template @@ -1,7 +1,7 @@ # Template file for 'python3-svgelements' pkgname=python3-svgelements version=1.9.6 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" checkdepends="python3-pytest python3-numpy python3-scipy python3-Pillow" diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template index 8ad820d1511fe2..ee253fe52a36d0 100644 --- a/srcpkgs/python3-sympy/template +++ b/srcpkgs/python3-sympy/template @@ -1,7 +1,7 @@ # Template file for 'python3-sympy' pkgname=python3-sympy version=1.13.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-mpmath" diff --git a/srcpkgs/python3-syndom/template b/srcpkgs/python3-syndom/template index 2d1e037ddf3124..906c6a17c086ad 100644 --- a/srcpkgs/python3-syndom/template +++ b/srcpkgs/python3-syndom/template @@ -1,7 +1,7 @@ # Template file for 'python3-syndom' pkgname=python3-syndom version=1.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config python3-pybind11" makedepends="fmt-devel libtidy5-devel pugixml-devel python3-pybind11" diff --git a/srcpkgs/python3-tables/patches/numpy-2.0.patch b/srcpkgs/python3-tables/patches/numpy-2.0.patch deleted file mode 100644 index 58ad624c994975..00000000000000 --- a/srcpkgs/python3-tables/patches/numpy-2.0.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff -ur a/setup.py b/setup.py ---- a/setup.py 2024-07-31 09:34:03.585371800 -0400 -+++ b/setup.py 2024-07-31 09:35:01.472775930 -0400 -@@ -161,7 +161,7 @@ - # https://pip.pypa.io/en/stable/reference/pip_install.html#installation-order - # at this point we can be sure pip has already installed numpy - numpy_incl = pkg_resources.resource_filename( -- "numpy", "core/include" -+ "numpy", "_core/include" - ) - - for ext in self.extensions: -@@ -505,7 +505,7 @@ - - # ----------------------------------------------------------------- - -- def_macros = [("NDEBUG", 1)] -+ def_macros = [("NDEBUG", 1), ("NPY_TARGET_VERSION", "NPY_1_20_API_VERSION"),] - # Define macros for Windows platform - if os.name == "nt": - def_macros.append(("WIN32", 1)) -diff -ur a/src/utils.c b/src/utils.c ---- a/src/utils.c 2024-07-31 09:34:03.588371821 -0400 -+++ b/src/utils.c 2024-07-31 09:36:08.648172551 -0400 -@@ -767,8 +767,8 @@ - return float_id; - } - -- H5Tinsert(complex_id, "r", HOFFSET(npy_complex64, real), float_id); -- H5Tinsert(complex_id, "i", HOFFSET(npy_complex64, imag), float_id); -+ H5Tinsert(complex_id, "r", 0, float_id); -+ H5Tinsert(complex_id, "i", 4, float_id); - H5Tclose(float_id); - return complex_id; - } -@@ -792,8 +792,8 @@ - return float_id; - } - -- H5Tinsert(complex_id, "r", HOFFSET(npy_complex128, real), float_id); -- H5Tinsert(complex_id, "i", HOFFSET(npy_complex128, imag), float_id); -+ H5Tinsert(complex_id, "r", 0, float_id); -+ H5Tinsert(complex_id, "i", 8, float_id); - H5Tclose(float_id); - return complex_id; - } -@@ -824,8 +824,8 @@ - return err; - } - -- H5Tinsert(complex_id, "r", HOFFSET(npy_complex192, real), float_id); -- H5Tinsert(complex_id, "i", HOFFSET(npy_complex192, imag), float_id); -+ H5Tinsert(complex_id, "r", 0, float_id); -+ H5Tinsert(complex_id, "i", 12, float_id); - H5Tclose(float_id); - return complex_id; - } -@@ -856,8 +856,8 @@ - return err; - } - -- H5Tinsert(complex_id, "r", HOFFSET(npy_complex256, real), float_id); -- H5Tinsert(complex_id, "i", HOFFSET(npy_complex256, imag), float_id); -+ H5Tinsert(complex_id, "r", 0, float_id); -+ H5Tinsert(complex_id, "i", 16, float_id); - H5Tclose(float_id); - return complex_id; - } -diff -ur a/tables/atom.py b/tables/atom.py ---- a/tables/atom.py 2024-07-31 09:34:03.589371829 -0400 -+++ b/tables/atom.py 2024-07-31 09:36:43.663352202 -0400 -@@ -276,15 +276,15 @@ - >>> atom1 = StringAtom(itemsize=10) # same as ``atom2`` - >>> atom2 = Atom.from_kind('string', 10) # same as ``atom1`` - >>> atom3 = IntAtom() -- >>> atom1 == 'foo' -+ >>> bool(atom1 == 'foo') - False -- >>> atom1 == atom2 -+ >>> bool(atom1 == atom2) - True -- >>> atom2 != atom1 -+ >>> bool(atom2 != atom1) - False -- >>> atom1 == atom3 -+ >>> bool(atom1 == atom3) - False -- >>> atom3 != atom2 -+ >>> bool(atom3 != atom2) - True - - """ -diff -ur a/tables/index.py b/tables/index.py ---- a/tables/index.py 2024-07-31 09:34:03.591371843 -0400 -+++ b/tables/index.py 2024-07-31 09:38:32.692911595 -0400 -@@ -581,7 +581,8 @@ - # Add a second offset in this case - # First normalize the number of rows - offset2 = (nrow % self.nslicesblock) * slicesize // lbucket -- idx += offset2 -+ assert offset2 < 2**(indsize*8) -+ idx += np.asarray(offset2).astype(idx.dtype) - # Add the last row at the beginning of arr & idx (if needed) - if (indsize == 8 and nelementsILR > 0): - # It is possible that the values in LR are already sorted. -@@ -622,11 +623,11 @@ - show_stats("Entering final_idx32", tref) - # Do an upcast first in order to add the offset. - idx = idx.astype('uint64') -- idx += offset -+ idx += np.asarray(offset).astype(idx.dtype) - # The next partition is valid up to table sizes of - # 2**30 * 2**18 = 2**48 bytes, that is, 256 Tera-elements, - # which should be a safe figure, at least for a while. -- idx //= self.lbucket -+ idx //= np.asarray(self.lbucket).astype(idx.dtype) - # After the division, we can downsize the indexes to 'uint32' - idx = idx.astype('uint32') - if profile: -@@ -2002,7 +2003,7 @@ - else: - self.indicesLR._read_index_slice(start, stop, idx) - if indsize == 8: -- idx //= lbucket -+ idx //= np.asarray(lbucket).astype(idx.dtype) - elif indsize == 2: - # The chunkmap size cannot be never larger than 'int_' - idx = idx.astype("int_") -diff -ur a/tables/utils.py b/tables/utils.py ---- a/tables/utils.py 2024-07-31 09:34:03.606371947 -0400 -+++ b/tables/utils.py 2024-07-31 09:39:41.246261430 -0400 -@@ -75,7 +75,7 @@ - # with atom from a generic python type. If copy is stated as True, it - # is assured that it will return a copy of the object and never the same - # object or a new one sharing the same memory. --def convert_to_np_atom(arr, atom, copy=False): -+def convert_to_np_atom(arr, atom, copy=None): - """Convert a generic object into a NumPy object compliant with atom.""" - - # First, convert the object into a NumPy array -@@ -109,7 +109,7 @@ - - # Check whether the object needs to be copied to make the operation - # safe to in-place conversion. -- copy = atom.type in ['time64'] -+ copy = True if atom.type in ['time64'] else None - nparr = convert_to_np_atom(object, atom, copy) - # Finally, check the byteorder and change it if needed - byteorder = byteorders[nparr.dtype.byteorder] diff --git a/srcpkgs/python3-tables/template b/srcpkgs/python3-tables/template deleted file mode 100644 index 38c93292ea4bf8..00000000000000 --- a/srcpkgs/python3-tables/template +++ /dev/null @@ -1,32 +0,0 @@ -# Template file for 'python3-tables' -pkgname=python3-tables -version=3.7.0 -revision=4 -build_style=python3-module -build_helper=numpy -# XXX: c-blosc (using internal for now) -hostmakedepends="python3-wheel python3-Cython0.29 python3-packaging" -makedepends="python3-devel hdf5-devel lzo-devel bzip2-devel" -depends="python3-numpy python3-numexpr python3-packaging" -checkdepends=$depends -short_desc="Hierarchical datasets for Python3" -maintainer="pulux " -license="BSD-3-Clause" -homepage="http://www.pytables.org/" -changelog="http://www.pytables.org/release_notes.html" -distfiles="${PYPI_SITE}/t/tables/tables-${version}.tar.gz" -checksum=e92a887ad6f2a983e564a69902de4a7645c30069fc01abd353ec5da255c5e1fe - -post_extract() { - # Make sure Cython is run during build - rm tables/*.c -} - -do_check() { - python3 setup.py build_ext --inplace - PYTHONPATH="$(cd build/lib* && pwd)" python3 -m tables.tests.test_all -} - -post_install() { - vlicense LICENSE.txt LICENSE -} diff --git a/srcpkgs/python3-tabulate/template b/srcpkgs/python3-tabulate/template index 90778ce5172ae9..afd0d21f1bd794 100644 --- a/srcpkgs/python3-tabulate/template +++ b/srcpkgs/python3-tabulate/template @@ -1,7 +1,7 @@ # Template file for 'python3-tabulate' pkgname=python3-tabulate version=0.9.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-wcwidth" diff --git a/srcpkgs/python3-tasklib/template b/srcpkgs/python3-tasklib/template index 9925087c9d5a90..025bf2162ef2d9 100644 --- a/srcpkgs/python3-tasklib/template +++ b/srcpkgs/python3-tasklib/template @@ -1,7 +1,7 @@ # Template file for 'python3-tasklib' pkgname=python3-tasklib version=2.5.1 -revision=2 +revision=3 build_style=python3-module make_check_target="tasklib/tests.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-telegram/template b/srcpkgs/python3-telegram/template index c8d9621f261620..4b69d033b0e5f7 100644 --- a/srcpkgs/python3-telegram/template +++ b/srcpkgs/python3-telegram/template @@ -1,7 +1,7 @@ # Template file for 'python3-telegram' pkgname=python3-telegram version=0.15.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="libtd python3-setuptools" diff --git a/srcpkgs/python3-tempita/template b/srcpkgs/python3-tempita/template index 4b74979295e906..2842248265c62a 100644 --- a/srcpkgs/python3-tempita/template +++ b/srcpkgs/python3-tempita/template @@ -1,11 +1,10 @@ # Template file for 'python3-tempita' pkgname=python3-tempita version=0.5.2 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" -checkdepends="python3-nose" short_desc="A small text templating language for text substitution (Python3)" maintainer="Orphaned " homepage="http://pythonpaste.org/tempita/" diff --git a/srcpkgs/python3-tempora/template b/srcpkgs/python3-tempora/template index b1bd9f87c34782..c7f1234e044d00 100644 --- a/srcpkgs/python3-tempora/template +++ b/srcpkgs/python3-tempora/template @@ -1,7 +1,7 @@ # Template file for 'python3-tempora' pkgname=python3-tempora version=5.2.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3-pytz python3-jaraco.functools" diff --git a/srcpkgs/python3-tenacity/template b/srcpkgs/python3-tenacity/template index 904439184853b8..6df1cd54cb629e 100644 --- a/srcpkgs/python3-tenacity/template +++ b/srcpkgs/python3-tenacity/template @@ -1,7 +1,7 @@ # Template file for 'python3-tenacity' pkgname=python3-tenacity version=8.2.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-Sphinx python3-tornado python3-typeguard" diff --git a/srcpkgs/python3-term-image/template b/srcpkgs/python3-term-image/template index 6979ac200cb0de..55495d8d61f6c8 100644 --- a/srcpkgs/python3-term-image/template +++ b/srcpkgs/python3-term-image/template @@ -1,7 +1,7 @@ # Template file for 'python3-term-image' pkgname=python3-term-image version=0.7.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-Pillow python3-requests python3-typing_extensions python3-urwid" diff --git a/srcpkgs/python3-termcolor/template b/srcpkgs/python3-termcolor/template index 94eb532f04f5e8..f5b2d8aad82c65 100644 --- a/srcpkgs/python3-termcolor/template +++ b/srcpkgs/python3-termcolor/template @@ -1,7 +1,7 @@ # Template file for 'python3-termcolor' pkgname=python3-termcolor version=1.1.0 -revision=12 +revision=13 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="${hostmakedepends}" diff --git a/srcpkgs/python3-terminado/template b/srcpkgs/python3-terminado/template index 39cee5de9c1b08..0efb9772886beb 100644 --- a/srcpkgs/python3-terminado/template +++ b/srcpkgs/python3-terminado/template @@ -1,7 +1,7 @@ # Template file for 'python3-terminado' pkgname=python3-terminado version=0.17.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-ptyprocess python3-tornado" diff --git a/srcpkgs/python3-terminaltables/template b/srcpkgs/python3-terminaltables/template index 687edaea4d96d1..bb609f5c778532 100644 --- a/srcpkgs/python3-terminaltables/template +++ b/srcpkgs/python3-terminaltables/template @@ -1,7 +1,7 @@ # Template file for 'python3-terminaltables' pkgname=python3-terminaltables version=3.1.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-testpath/template b/srcpkgs/python3-testpath/template index 1b8bc451c8c207..e060948b79cb00 100644 --- a/srcpkgs/python3-testpath/template +++ b/srcpkgs/python3-testpath/template @@ -1,7 +1,7 @@ # Template file for 'python3-testpath' pkgname=python3-testpath version=0.6.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-testtools/template b/srcpkgs/python3-testtools/template index 8e3ef1b44c9132..49ca5032a03db3 100644 --- a/srcpkgs/python3-testtools/template +++ b/srcpkgs/python3-testtools/template @@ -1,7 +1,7 @@ # Template file for 'python3-testtools' pkgname=python3-testtools version=2.4.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools python3-pbr" depends="python3-pbr" diff --git a/srcpkgs/python3-text-unidecode/template b/srcpkgs/python3-text-unidecode/template index c1424caff5558a..345711b30046ab 100644 --- a/srcpkgs/python3-text-unidecode/template +++ b/srcpkgs/python3-text-unidecode/template @@ -1,7 +1,7 @@ # Template file for 'python3-text-unidecode' pkgname=python3-text-unidecode version=1.3 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-texttable/template b/srcpkgs/python3-texttable/template index e648c4c57e8d07..97225fb1e042d3 100644 --- a/srcpkgs/python3-texttable/template +++ b/srcpkgs/python3-texttable/template @@ -1,7 +1,7 @@ # Template file for 'python3-texttable' pkgname=python3-texttable version=1.6.4 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-textual/template b/srcpkgs/python3-textual/template index 1f7155205b6dda..fd16cbb175802a 100644 --- a/srcpkgs/python3-textual/template +++ b/srcpkgs/python3-textual/template @@ -1,7 +1,7 @@ # Template file for 'python3-textual' pkgname=python3-textual version=0.73.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="-k not((snapshot)or(markdown)or(feature)or(language))" hostmakedepends="python3-poetry-core" diff --git a/srcpkgs/python3-thefuzz/template b/srcpkgs/python3-thefuzz/template index 1570203a7520ae..2aeb9126fbeb9a 100644 --- a/srcpkgs/python3-thefuzz/template +++ b/srcpkgs/python3-thefuzz/template @@ -1,7 +1,7 @@ # Template file for 'python3-thefuzz' pkgname=python3-thefuzz version=0.19.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-Levenshtein" diff --git a/srcpkgs/python3-threadpoolctl/template b/srcpkgs/python3-threadpoolctl/template index f1171c60316b78..4f3c9fc5fa604d 100644 --- a/srcpkgs/python3-threadpoolctl/template +++ b/srcpkgs/python3-threadpoolctl/template @@ -1,7 +1,7 @@ # Template file for 'python3-threadpoolctl' pkgname=python3-threadpoolctl version=3.5.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template index 0026331274bbcd..144261eed0ac28 100644 --- a/srcpkgs/python3-tifffile/template +++ b/srcpkgs/python3-tifffile/template @@ -1,7 +1,7 @@ # Template file for 'python3-tifffile' pkgname=python3-tifffile version=2024.9.20 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-numpy" diff --git a/srcpkgs/python3-time-machine/template b/srcpkgs/python3-time-machine/template index 8962b13ede0a66..e27e90dceca55d 100644 --- a/srcpkgs/python3-time-machine/template +++ b/srcpkgs/python3-time-machine/template @@ -1,7 +1,7 @@ # Template file for 'python3-time-machine' pkgname=python3-time-machine version=2.16.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" makedepends="python3-devel" diff --git a/srcpkgs/python3-tinycss/template b/srcpkgs/python3-tinycss/template index dd3c042d5bf841..00f3123a53aa04 100644 --- a/srcpkgs/python3-tinycss/template +++ b/srcpkgs/python3-tinycss/template @@ -1,7 +1,7 @@ # Template file for 'python3-tinycss' pkgname=python3-tinycss version=0.4 -revision=6 +revision=7 build_style=python3-module pycompile_module="tinycss" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-tinycss2/template b/srcpkgs/python3-tinycss2/template index a505ecf742ab4e..f6a82308faa6e2 100644 --- a/srcpkgs/python3-tinycss2/template +++ b/srcpkgs/python3-tinycss2/template @@ -1,7 +1,7 @@ # Template file for 'python3-tinycss2' pkgname=python3-tinycss2 version=1.4.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-flit_core python3-webencodings" depends="python3-webencodings" diff --git a/srcpkgs/python3-tinyhtml5/template b/srcpkgs/python3-tinyhtml5/template index 4b9fa41598cfc3..b7cb21c18c47eb 100644 --- a/srcpkgs/python3-tinyhtml5/template +++ b/srcpkgs/python3-tinyhtml5/template @@ -1,7 +1,7 @@ # Template file for 'python3-tinyhtml5' pkgname=python3-tinyhtml5 version=2.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-flit_core" depends="python3-webencodings" diff --git a/srcpkgs/python3-tkinter/patches/musl-pgo-tests.patch b/srcpkgs/python3-tkinter/patches/musl-pgo-tests.patch new file mode 120000 index 00000000000000..875f5e0c12b284 --- /dev/null +++ b/srcpkgs/python3-tkinter/patches/musl-pgo-tests.patch @@ -0,0 +1 @@ +../../python3/patches/musl-pgo-tests.patch \ No newline at end of file diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template index 607459ff1b445e..73cc637cd89a8b 100644 --- a/srcpkgs/python3-tkinter/template +++ b/srcpkgs/python3-tkinter/template @@ -8,10 +8,10 @@ _desc="Python programming language" pkgname=python3-tkinter -version=3.12.7 +version=3.13.1 revision=1 build_style="gnu-configure" -configure_args="--enable-shared --enable-ipv6 --enable-optimizations +configure_args="--enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions --with-computed-gotos --with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi --without-ensurepip" @@ -28,7 +28,7 @@ maintainer="Andrew J. Hesford " homepage="https://www.python.org" license="Python-2.0" distfiles="https://www.python.org/ftp/python/${version%rc*}/Python-${version}.tar.xz" -checksum=24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550 +checksum=9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then makedepends+=" libxcrypt-devel" @@ -37,6 +37,8 @@ fi if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3" configure_args+=" --with-build-python=python${py3_ver}" +else + configure_args+=" --enable-optimizations" fi post_extract() { diff --git a/srcpkgs/python3-tldextract/template b/srcpkgs/python3-tldextract/template index de3b4c1a2a5c30..6a3f6e0a97715b 100644 --- a/srcpkgs/python3-tldextract/template +++ b/srcpkgs/python3-tldextract/template @@ -1,7 +1,7 @@ # Template file for 'python3-tldextract' pkgname=python3-tldextract version=3.4.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm python3-wheel" makedepends="python3-filelock python3-idna python3-requests python3-requests-file" diff --git a/srcpkgs/python3-tmuxp/template b/srcpkgs/python3-tmuxp/template index 4a96583c3988a4..d134107dba6fb3 100644 --- a/srcpkgs/python3-tmuxp/template +++ b/srcpkgs/python3-tmuxp/template @@ -1,7 +1,7 @@ # Template file for 'python3-tmuxp' pkgname=python3-tmuxp version=1.47.0 -revision=1 +revision=2 build_style=python3-pep517 # XXX: https://github.com/tmux-python/tmuxp/issues/855 make_check_args="--deselect tests/workspace/test_builder.py::test_window_shell" diff --git a/srcpkgs/python3-tokenize-rt/template b/srcpkgs/python3-tokenize-rt/template index 0d1adfb1e65946..8d45a0af6a9dc2 100644 --- a/srcpkgs/python3-tokenize-rt/template +++ b/srcpkgs/python3-tokenize-rt/template @@ -1,7 +1,7 @@ # Template file for 'python3-tokenize-rt' pkgname=python3-tokenize-rt version=5.0.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-toml/template b/srcpkgs/python3-toml/template index 2e20c7318cf82c..d276e72468e567 100644 --- a/srcpkgs/python3-toml/template +++ b/srcpkgs/python3-toml/template @@ -1,7 +1,7 @@ # Template file for 'python3-toml' pkgname=python3-toml version=0.10.2 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-tomli-w/template b/srcpkgs/python3-tomli-w/template index 7b12a90c3325b5..bed635cacdefdd 100644 --- a/srcpkgs/python3-tomli-w/template +++ b/srcpkgs/python3-tomli-w/template @@ -1,7 +1,7 @@ # Template file for 'python3-tomli-w' pkgname=python3-tomli-w version=1.0.0 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-flit_core" depends="python3" diff --git a/srcpkgs/python3-tomli/template b/srcpkgs/python3-tomli/template index 1e1c4dc6bea814..a7e2d88e14517e 100644 --- a/srcpkgs/python3-tomli/template +++ b/srcpkgs/python3-tomli/template @@ -1,6 +1,6 @@ # Template file for 'python3-tomli' pkgname=python3-tomli -version=2.0.2 +version=2.2.1 revision=1 build_style=python3-pep517 hostmakedepends="python3-flit_core" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/hukkin/tomli" distfiles="https://github.com/hukkin/tomli/archive/refs/tags/${version}.tar.gz" -checksum=a3a652f16bf326ba763ada67169165daf87ff9c465e21ad8264f2657beaf5264 +checksum=3af7c4b571d1ccddaba020c558da0ce5b5e24edc830e478a903d82dc2d9013ae post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-tomlkit/template b/srcpkgs/python3-tomlkit/template index b972c88ba3c60b..13481051510ddd 100644 --- a/srcpkgs/python3-tomlkit/template +++ b/srcpkgs/python3-tomlkit/template @@ -1,7 +1,7 @@ # Template file for 'python3-tomlkit' pkgname=python3-tomlkit version=0.12.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3" diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template index 2ae15d98c3739b..3684929c9ccd8c 100644 --- a/srcpkgs/python3-tornado/template +++ b/srcpkgs/python3-tornado/template @@ -1,7 +1,7 @@ # Template file for 'python3-tornado' pkgname=python3-tornado version=6.4.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" makedepends="python3-devel" diff --git a/srcpkgs/python3-tqdm/template b/srcpkgs/python3-tqdm/template index 088f30acf17af0..b7a6f8e1e05117 100644 --- a/srcpkgs/python3-tqdm/template +++ b/srcpkgs/python3-tqdm/template @@ -1,7 +1,7 @@ # Template file for 'python3-tqdm' pkgname=python3-tqdm version=4.66.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools_scm" depends="python3" diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template index 47de3dd9693fbd..f7ca04adc0907d 100644 --- a/srcpkgs/python3-traitlets/template +++ b/srcpkgs/python3-traitlets/template @@ -1,7 +1,7 @@ # Template file for 'python3-traitlets' pkgname=python3-traitlets version=5.14.3 -revision=1 +revision=2 build_style=python3-pep517 # needs python3-pytest-mypy make_check_args="--ignore tests/test_typing.py" diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template index 45fcf7038e663f..0b0ab941c89342 100644 --- a/srcpkgs/python3-treq/template +++ b/srcpkgs/python3-treq/template @@ -1,7 +1,7 @@ # Template file for 'python3-treq' pkgname=python3-treq version=23.11.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-incremental" depends="python3-incremental python3-requests python3-hyperlink diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template index 08e4182dea802b..549812abaa7594 100644 --- a/srcpkgs/python3-trimesh/template +++ b/srcpkgs/python3-trimesh/template @@ -1,7 +1,7 @@ # Template file for 'python3-trimesh' pkgname=python3-trimesh version=4.4.3 -revision=1 +revision=2 build_style=python3-pep517 make_check_target="tests" # Ignored tests require unpackaged dependencies diff --git a/srcpkgs/python3-trio-websocket/template b/srcpkgs/python3-trio-websocket/template index 289d03ec5bcc9b..d504534007dce0 100644 --- a/srcpkgs/python3-trio-websocket/template +++ b/srcpkgs/python3-trio-websocket/template @@ -1,7 +1,7 @@ # Template file for 'python3-trio-websocket' pkgname=python3-trio-websocket version=0.11.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-trio python3-wsproto" diff --git a/srcpkgs/python3-trio/template b/srcpkgs/python3-trio/template index f73daaa4a81915..62788e39dc6e1c 100644 --- a/srcpkgs/python3-trio/template +++ b/srcpkgs/python3-trio/template @@ -1,7 +1,7 @@ # Template file for 'python3-trio' pkgname=python3-trio version=0.26.1 -revision=1 +revision=2 build_style=python3-pep517 # Needs astor (https://pypi.org/project/astor/) make_check_args="--ignore src/trio/_tests/tools/test_gen_exports.py" diff --git a/srcpkgs/python3-trove-classifiers/template b/srcpkgs/python3-trove-classifiers/template index 5d5b4364a6c102..f184b0d13dc087 100644 --- a/srcpkgs/python3-trove-classifiers/template +++ b/srcpkgs/python3-trove-classifiers/template @@ -1,7 +1,7 @@ # Template file for 'python3-trove-classifiers' pkgname=python3-trove-classifiers version=2024.7.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-calver" depends="python3" diff --git a/srcpkgs/python3-trustme/template b/srcpkgs/python3-trustme/template index 0d864362dc8381..632b20c6193810 100644 --- a/srcpkgs/python3-trustme/template +++ b/srcpkgs/python3-trustme/template @@ -1,7 +1,7 @@ # Template file for 'python3-trustme' pkgname=python3-trustme version=1.1.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-cryptography python3-idna" diff --git a/srcpkgs/python3-ttystatus/template b/srcpkgs/python3-ttystatus/template index 010704e824c103..95e91cb7b56814 100644 --- a/srcpkgs/python3-ttystatus/template +++ b/srcpkgs/python3-ttystatus/template @@ -2,7 +2,7 @@ pkgname=python3-ttystatus _pkgname=${pkgname/3/} version=0.38 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-tweepy/template b/srcpkgs/python3-tweepy/template index be3b8f9c4350fc..216c374213492a 100644 --- a/srcpkgs/python3-tweepy/template +++ b/srcpkgs/python3-tweepy/template @@ -1,7 +1,7 @@ # Template file for 'python3-tweepy' pkgname=python3-tweepy version=4.8.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests-oauthlib python3-pysocks" diff --git a/srcpkgs/python3-twitter/template b/srcpkgs/python3-twitter/template index 5435ea8a38763a..0e705e3db151c0 100644 --- a/srcpkgs/python3-twitter/template +++ b/srcpkgs/python3-twitter/template @@ -2,7 +2,7 @@ pkgname=python3-twitter _pkgname=${pkgname/3/} version=3.5 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-future python3-requests python3-requests-oauthlib" diff --git a/srcpkgs/python3-txaio/template b/srcpkgs/python3-txaio/template index 5f0b6434443320..fb883d071890a1 100644 --- a/srcpkgs/python3-txaio/template +++ b/srcpkgs/python3-txaio/template @@ -1,7 +1,7 @@ # Template file for 'python3-txaio' pkgname=python3-txaio version=23.1.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-txredisapi/template b/srcpkgs/python3-txredisapi/template index b06ce2ac258cf4..b091a906d2311d 100644 --- a/srcpkgs/python3-txredisapi/template +++ b/srcpkgs/python3-txredisapi/template @@ -1,7 +1,7 @@ # Template file for 'python3-txredisapi' pkgname=python3-txredisapi version=1.4.10 -revision=2 +revision=3 build_style=python3-module make_check_args="--ignore tests/test_basics.py --ignore tests/test_bitops.py diff --git a/srcpkgs/python3-txtorcon/template b/srcpkgs/python3-txtorcon/template index 43ae4e0fe19c32..0496ed0c10712c 100644 --- a/srcpkgs/python3-txtorcon/template +++ b/srcpkgs/python3-txtorcon/template @@ -1,7 +1,7 @@ # Template file for 'python3-txtorcon' pkgname=python3-txtorcon version=23.11.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="lsof python3-automat python3-cryptography python3-six python3-Twisted diff --git a/srcpkgs/python3-typed-ast/template b/srcpkgs/python3-typed-ast/template deleted file mode 100644 index 905c6cbbeeedac..00000000000000 --- a/srcpkgs/python3-typed-ast/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'python3-typed-ast' -pkgname=python3-typed-ast -version=1.5.4 -revision=3 -build_style=python3-module -hostmakedepends="python3-setuptools" -makedepends="python3-devel" -depends="python3" -checkdepends="python3-pytest" -short_desc="AST module with type comment support" -maintainer="whoami " -license="Apache-2.0" -homepage="https://github.com/python/typed_ast" -distfiles="https://github.com/python/typed_ast/archive/${version}.tar.gz" -checksum=1b2db37247c74594660aa9ad40014394fd765ed7fba90256f472329c06e742ab - -do_check() { - PYTHONPATH="$(cd build/lib* && pwd)" pytest -} diff --git a/srcpkgs/python3-typeguard/template b/srcpkgs/python3-typeguard/template index 12c11d3a183b19..db2d63fc1bafdc 100644 --- a/srcpkgs/python3-typeguard/template +++ b/srcpkgs/python3-typeguard/template @@ -1,7 +1,7 @@ # Template file for 'python3-typeguard' pkgname=python3-typeguard version=4.2.1 -revision=1 +revision=2 build_style=python3-pep517 # mypy checks seem to require that the module be installed make_check_args="--ignore=tests/mypy" diff --git a/srcpkgs/python3-typing_extensions/template b/srcpkgs/python3-typing_extensions/template index 84c966106d7056..c603c52981e941 100644 --- a/srcpkgs/python3-typing_extensions/template +++ b/srcpkgs/python3-typing_extensions/template @@ -1,6 +1,6 @@ # Template file for 'python3-typing_extensions' pkgname=python3-typing_extensions -version=4.10.0 +version=4.12.2 revision=1 build_style=python3-pep517 hostmakedepends="python3-flit_core" @@ -11,7 +11,7 @@ license="Python-2.0" homepage="https://github.com/python/typing_extensions" changelog="https://github.com/python/typing_extensions/raw/main/CHANGELOG.md" distfiles="${PYPI_SITE}/t/typing_extensions/typing_extensions-${version}.tar.gz" -checksum=b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb +checksum=1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8 # Depends on the `test` module, which is intentionally not included in the # `python3` package. make_check=no diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template index 5b50f139b4fe3e..8f170fe2aecb3c 100644 --- a/srcpkgs/python3-typogrify/template +++ b/srcpkgs/python3-typogrify/template @@ -1,7 +1,7 @@ # Template file for 'python3-typogrify' pkgname=python3-typogrify version=2.0.7 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-smartypants" diff --git a/srcpkgs/python3-tzlocal/template b/srcpkgs/python3-tzlocal/template index ef80ac118bffda..63e7005f354e4a 100644 --- a/srcpkgs/python3-tzlocal/template +++ b/srcpkgs/python3-tzlocal/template @@ -1,7 +1,7 @@ # Template file for 'python3-tzlocal' pkgname=python3-tzlocal version=5.0.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3" diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template index 1f0d3d3f18e8ae..08e19173dda999 100644 --- a/srcpkgs/python3-ultrajson/template +++ b/srcpkgs/python3-ultrajson/template @@ -1,7 +1,7 @@ # Template file for 'python3-ultrajson' pkgname=python3-ultrajson version=5.10.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" diff --git a/srcpkgs/python3-unittest-mixins/template b/srcpkgs/python3-unittest-mixins/template index 72e018168ea0c7..684ccb7855b306 100644 --- a/srcpkgs/python3-unittest-mixins/template +++ b/srcpkgs/python3-unittest-mixins/template @@ -1,7 +1,7 @@ # Template file for 'python3-unittest-mixins' pkgname=python3-unittest-mixins version=1.6 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" diff --git a/srcpkgs/python3-unpaddedbase64/template b/srcpkgs/python3-unpaddedbase64/template index fecaf29d41306b..3a680701d20c4d 100644 --- a/srcpkgs/python3-unpaddedbase64/template +++ b/srcpkgs/python3-unpaddedbase64/template @@ -1,7 +1,7 @@ # Template file for 'python3-unpaddedbase64' pkgname=python3-unpaddedbase64 version=2.1.0 -revision=3 +revision=4 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3" diff --git a/srcpkgs/python3-urbandict/template b/srcpkgs/python3-urbandict/template index d2bb6a211c185f..37015ab10958ec 100644 --- a/srcpkgs/python3-urbandict/template +++ b/srcpkgs/python3-urbandict/template @@ -1,7 +1,7 @@ # Template file for 'python3-urbandict' pkgname=python3-urbandict version=0.6.1 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template index 748a1d07b6b9aa..747fb439f15f21 100644 --- a/srcpkgs/python3-uritemplate/template +++ b/srcpkgs/python3-uritemplate/template @@ -1,7 +1,7 @@ # Template file for 'python3-uritemplate' pkgname=python3-uritemplate version=3.0.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-uritools/template b/srcpkgs/python3-uritools/template index 3454f2346318b2..e5527353c3cf39 100644 --- a/srcpkgs/python3-uritools/template +++ b/srcpkgs/python3-uritools/template @@ -1,7 +1,7 @@ # Template file for 'python3-uritools' pkgname=python3-uritools version=3.0.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-urlgrabber/template b/srcpkgs/python3-urlgrabber/template index b883ca5888bd7f..826cf9ea07b520 100644 --- a/srcpkgs/python3-urlgrabber/template +++ b/srcpkgs/python3-urlgrabber/template @@ -1,7 +1,7 @@ # Template file for 'python3-urlgrabber' pkgname=python3-urlgrabber version=4.0.0 -revision=6 +revision=7 build_style=python3-module pycompile_module="urlgrabber" hostmakedepends="python3-setuptools python3-six" diff --git a/srcpkgs/python3-urllib3/template b/srcpkgs/python3-urllib3/template index c5e6bf84397578..35198b4844c4f3 100644 --- a/srcpkgs/python3-urllib3/template +++ b/srcpkgs/python3-urllib3/template @@ -1,7 +1,7 @@ # Template file for 'python3-urllib3' pkgname=python3-urllib3 version=1.26.12 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six" diff --git a/srcpkgs/python3-urwid/template b/srcpkgs/python3-urwid/template index 12503516cc4178..e585bb7409882c 100644 --- a/srcpkgs/python3-urwid/template +++ b/srcpkgs/python3-urwid/template @@ -1,7 +1,7 @@ # Template file for 'python3-urwid' pkgname=python3-urwid version=2.2.3 -revision=1 +revision=2 build_style=python3-pep517 # "vterm" tests do pipe writes that hang make_check_args="--ignore=tests/test_vterm.py" diff --git a/srcpkgs/python3-urwid_readline/template b/srcpkgs/python3-urwid_readline/template index 7a8645104e1cf2..b57c6e37400507 100644 --- a/srcpkgs/python3-urwid_readline/template +++ b/srcpkgs/python3-urwid_readline/template @@ -1,7 +1,7 @@ # Template file for 'python3-urwid_readline' pkgname=python3-urwid_readline version=0.14 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-urwid" diff --git a/srcpkgs/python3-urwidgets/template b/srcpkgs/python3-urwidgets/template index d09bc37323da5b..e41a03a882978e 100644 --- a/srcpkgs/python3-urwidgets/template +++ b/srcpkgs/python3-urwidgets/template @@ -1,7 +1,7 @@ # Template file for 'python3-urwidgets' pkgname=python3-urwidgets version=0.2.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-urwid" diff --git a/srcpkgs/python3-urwidtrees/template b/srcpkgs/python3-urwidtrees/template index 2e0f18e37c7baa..27dcb578da1f1c 100644 --- a/srcpkgs/python3-urwidtrees/template +++ b/srcpkgs/python3-urwidtrees/template @@ -1,7 +1,7 @@ # Template file for 'python3-urwidtrees' pkgname=python3-urwidtrees version=1.0.3 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-urwid" diff --git a/srcpkgs/python3-usb/template b/srcpkgs/python3-usb/template index 157530ded262cd..65d3072e19314f 100644 --- a/srcpkgs/python3-usb/template +++ b/srcpkgs/python3-usb/template @@ -1,7 +1,7 @@ # Template file for 'python3-usb' pkgname=python3-usb version=1.2.1 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3 libusb" diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template index e36a8632992922..561b02844e0f80 100644 --- a/srcpkgs/python3-userpath/template +++ b/srcpkgs/python3-userpath/template @@ -1,7 +1,7 @@ # Template file for 'python3-userpath' pkgname=python3-userpath version=1.9.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling python3-wheel" depends="python3-click" diff --git a/srcpkgs/python3-utils/template b/srcpkgs/python3-utils/template index 9a842617e23966..b6551163fb502f 100644 --- a/srcpkgs/python3-utils/template +++ b/srcpkgs/python3-utils/template @@ -1,7 +1,7 @@ # Template file for 'python3-utils' pkgname=python3-utils version=3.8.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-typing_extensions" diff --git a/srcpkgs/python3-uvicorn/template b/srcpkgs/python3-uvicorn/template index 355cfe27b191b8..7f0cccfc03835d 100644 --- a/srcpkgs/python3-uvicorn/template +++ b/srcpkgs/python3-uvicorn/template @@ -1,7 +1,7 @@ # Template file for 'python3-uvicorn' pkgname=python3-uvicorn version=0.30.6 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-asgiref python3-uvloop python3-click python3-h11" diff --git a/srcpkgs/python3-uvloop/template b/srcpkgs/python3-uvloop/template index 071d8431f8cbc3..12cbfad978eae0 100644 --- a/srcpkgs/python3-uvloop/template +++ b/srcpkgs/python3-uvloop/template @@ -1,10 +1,10 @@ # Template file for 'python3-uvloop' pkgname=python3-uvloop -version=0.20.0 +version=0.21.0 revision=1 build_style=python3-pep517 make_check_target="../tests" -hostmakedepends="python3 python3-setuptools python3-wheel python3-Cython0.29" +hostmakedepends="python3 python3-setuptools python3-wheel python3-Cython" makedepends="libuv-devel python3-devel" depends="python3" checkdepends="flake8 python3-pytest-xdist python3-openssl python3-psutil" @@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford " license="Apache-2.0, MIT" homepage="https://github.com/MagicStack/uvloop" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=9fa2458b6aa280aa4268bc0054ef53cefb624463f2b5ff09db3ce406ea581f94 +checksum=1edc1301832851833dd19bbacd9dddfe3180473b963b58c9c58a1823927fc204 # Must not be in wrksrc to avoid failed imports from current directory make_check_pre="env -C .xbps-testdir" diff --git a/srcpkgs/python3-validators/template b/srcpkgs/python3-validators/template index 8e5da74afffaaa..1cb983185f3e07 100644 --- a/srcpkgs/python3-validators/template +++ b/srcpkgs/python3-validators/template @@ -1,7 +1,7 @@ # Template file for 'python3-validators' pkgname=python3-validators version=0.14.2 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-decorator python3-six" diff --git a/srcpkgs/python3-vdf/template b/srcpkgs/python3-vdf/template index 27600325c46279..bfa47b3c02bd6e 100644 --- a/srcpkgs/python3-vdf/template +++ b/srcpkgs/python3-vdf/template @@ -1,7 +1,7 @@ # Template file for 'python3-vdf' pkgname=python3-vdf version=3.4 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-setuptools" diff --git a/srcpkgs/python3-versioneer/template b/srcpkgs/python3-versioneer/template index 132643116ca3bd..3d1f51618d934d 100644 --- a/srcpkgs/python3-versioneer/template +++ b/srcpkgs/python3-versioneer/template @@ -1,7 +1,7 @@ # Template file for 'python3-versioneer' pkgname=python3-versioneer version=0.29 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools python3-wheel" depends="python3" diff --git a/srcpkgs/python3-versioningit/template b/srcpkgs/python3-versioningit/template index 764b81ba76694a..d5c7edf54c074b 100644 --- a/srcpkgs/python3-versioningit/template +++ b/srcpkgs/python3-versioningit/template @@ -1,7 +1,7 @@ # Template file for 'python3-versioningit' pkgname=python3-versioningit version=2.2.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-packaging" diff --git a/srcpkgs/python3-vint/template b/srcpkgs/python3-vint/template index 3e55db027ae86b..ac3afa3c590113 100644 --- a/srcpkgs/python3-vint/template +++ b/srcpkgs/python3-vint/template @@ -1,7 +1,7 @@ # Template file for 'python3-vint' pkgname=python3-vint version=0.3.21 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-ansicolor python3-chardet python3-yaml" diff --git a/srcpkgs/python3-virtualenv-clone/template b/srcpkgs/python3-virtualenv-clone/template index 7f490f33897154..f2ff5403565f44 100644 --- a/srcpkgs/python3-virtualenv-clone/template +++ b/srcpkgs/python3-virtualenv-clone/template @@ -1,7 +1,7 @@ # Template file for 'python3-virtualenv-clone' pkgname=python3-virtualenv-clone version=0.5.4 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-virtualenv/template b/srcpkgs/python3-virtualenv/template index 9ef3ceca19e849..ec5857829d5e99 100644 --- a/srcpkgs/python3-virtualenv/template +++ b/srcpkgs/python3-virtualenv/template @@ -1,7 +1,7 @@ # Template file for 'python3-virtualenv' pkgname=python3-virtualenv version=20.27.1 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--ignore tests/unit/seed/wheels/test_periodic_update.py --ignore tests/unit/create/via_global_ref/test_build_c_ext.py diff --git a/srcpkgs/python3-virustotal-api/template b/srcpkgs/python3-virustotal-api/template index e428eee7381c4c..32682112af97af 100644 --- a/srcpkgs/python3-virustotal-api/template +++ b/srcpkgs/python3-virustotal-api/template @@ -1,7 +1,7 @@ # Template file for 'python3-virustotal-api' pkgname=python3-virustotal-api version=1.1.11 -revision=6 +revision=7 build_style=python3-module pycompile_module="virus_total_apis" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-vispy/template b/srcpkgs/python3-vispy/template index 6411756abc3b71..5b81d0afaea611 100644 --- a/srcpkgs/python3-vispy/template +++ b/srcpkgs/python3-vispy/template @@ -1,7 +1,7 @@ # Template file for 'python3-vispy' pkgname=python3-vispy version=0.6.1 -revision=9 +revision=10 build_style=python3-module build_helper=numpy hostmakedepends="python3-setuptools python3-Cython python3-numpy" diff --git a/srcpkgs/python3-vlc/template b/srcpkgs/python3-vlc/template index b12377fa580084..188551ac940987 100644 --- a/srcpkgs/python3-vlc/template +++ b/srcpkgs/python3-vlc/template @@ -1,7 +1,7 @@ # Template file for 'python3-vlc' pkgname=python3-vlc version=3.0.20123 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 libvlc" diff --git a/srcpkgs/python3-vobject/template b/srcpkgs/python3-vobject/template index f366fc0c1a12fc..f8672757cb96da 100644 --- a/srcpkgs/python3-vobject/template +++ b/srcpkgs/python3-vobject/template @@ -1,7 +1,7 @@ # Template file for 'python3-vobject' pkgname=python3-vobject version=0.9.6.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-dateutil python3-six" diff --git a/srcpkgs/python3-voluptuous/template b/srcpkgs/python3-voluptuous/template index fa4e1cbe7ffebf..620f624ebeca40 100644 --- a/srcpkgs/python3-voluptuous/template +++ b/srcpkgs/python3-voluptuous/template @@ -1,7 +1,7 @@ # Template file for 'python3-voluptuous' pkgname=python3-voluptuous version=0.11.5 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template index 66cbf3aedb4b98..e8143968d25f4f 100644 --- a/srcpkgs/python3-waitress/template +++ b/srcpkgs/python3-waitress/template @@ -1,7 +1,7 @@ # Template file for 'python3-waitress' pkgname=python3-waitress version=3.0.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-watchdog/template b/srcpkgs/python3-watchdog/template index 04daa9ed452cf3..4aae6632e2de2f 100644 --- a/srcpkgs/python3-watchdog/template +++ b/srcpkgs/python3-watchdog/template @@ -1,7 +1,7 @@ # Template file for 'python3-watchdog' pkgname=python3-watchdog version=4.0.0 -revision=1 +revision=2 build_style=python3-module make_check_args="--deselect tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template index 66837aa706aed6..dfe4abd43267e9 100644 --- a/srcpkgs/python3-watchman/template +++ b/srcpkgs/python3-watchman/template @@ -1,7 +1,7 @@ # Template file for 'python3-watchman' pkgname=python3-watchman version=1.4.1 -revision=10 +revision=11 create_wrksrc=yes build_wrksrc="pywatchman-${version}" build_style=python3-module diff --git a/srcpkgs/python3-wcmatch/template b/srcpkgs/python3-wcmatch/template index 4978d7b50a956b..b3a93135c0b4f5 100644 --- a/srcpkgs/python3-wcmatch/template +++ b/srcpkgs/python3-wcmatch/template @@ -1,7 +1,7 @@ # Template file for 'python3-wcmatch' pkgname=python3-wcmatch version=8.5 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_realpath --deselect tests/test_globmatch.py::TestTilde::test_tilde_globmatch_no_tilde" hostmakedepends="hatchling" diff --git a/srcpkgs/python3-wcwidth/template b/srcpkgs/python3-wcwidth/template index c68e3363903a7b..00e305b7158874 100644 --- a/srcpkgs/python3-wcwidth/template +++ b/srcpkgs/python3-wcwidth/template @@ -1,7 +1,7 @@ # Template file for 'python3-wcwidth' pkgname=python3-wcwidth version=0.2.13 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-webassets/template b/srcpkgs/python3-webassets/template index 8788f21c0bf9a7..723e08882c0cb5 100644 --- a/srcpkgs/python3-webassets/template +++ b/srcpkgs/python3-webassets/template @@ -1,7 +1,7 @@ # Template file for 'python3-webassets' pkgname=python3-webassets version=0.12.1 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template index 2fca51b222d848..996bfb0a45c606 100644 --- a/srcpkgs/python3-webencodings/template +++ b/srcpkgs/python3-webencodings/template @@ -1,7 +1,7 @@ # Template file for 'python3-webencodings' pkgname=python3-webencodings version=0.5.1 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-websocket-client/template b/srcpkgs/python3-websocket-client/template index b176022f616009..b858a4f86452a7 100644 --- a/srcpkgs/python3-websocket-client/template +++ b/srcpkgs/python3-websocket-client/template @@ -1,7 +1,7 @@ # Template file for 'python3-websocket-client' pkgname=python3-websocket-client version=1.7.0 -revision=1 +revision=2 build_style=python3-pep517 make_check_target="websocket/tests" hostmakedepends="python3-setuptools python3-wheel" diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template index 5b4fd30497a3f1..f825992b7a485e 100644 --- a/srcpkgs/python3-websockets/template +++ b/srcpkgs/python3-websockets/template @@ -1,6 +1,6 @@ # Template file for 'python3-websockets' pkgname=python3-websockets -version=13.1 +version=14.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://websockets.readthedocs.io/en/stable/" changelog="https://websockets.readthedocs.io/en/stable/project/changelog.html" distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz" -checksum=a3b3366087c1bc0a2795111edcadddb8b3b59509d5db5d7ea3fdd69f954a8878 +checksum=398b10c77d471c0aab20a845e7a60076b6390bfdaac7a6d2edb0d2c59d75e8d8 # Package ships no tests make_check=no diff --git a/srcpkgs/python3-wheel/template b/srcpkgs/python3-wheel/template index 8e3de24433383f..b998020da1ba52 100644 --- a/srcpkgs/python3-wheel/template +++ b/srcpkgs/python3-wheel/template @@ -1,6 +1,6 @@ # Template file for 'python3-wheel' pkgname=python3-wheel -version=0.44.0 +version=0.45.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/pypa/wheel" distfiles="${PYPI_SITE}/w/wheel/wheel-${version}.tar.gz" -checksum=a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49 +checksum=661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 conflicts="python-wheel>=0" do_check() { diff --git a/srcpkgs/python3-wikipedia/template b/srcpkgs/python3-wikipedia/template index ed6606b37f093f..87a31c4669e6cc 100644 --- a/srcpkgs/python3-wikipedia/template +++ b/srcpkgs/python3-wikipedia/template @@ -1,7 +1,7 @@ # Template file for 'python3-wikipedia' pkgname=python3-wikipedia version=1.4.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-BeautifulSoup4 python3-requests" diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template index 85d8ba32661623..22494dfe4e28f3 100644 --- a/srcpkgs/python3-wrapt/template +++ b/srcpkgs/python3-wrapt/template @@ -1,7 +1,7 @@ # Template file for 'python3-wrapt' pkgname=python3-wrapt version=1.14.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-wsproto/template b/srcpkgs/python3-wsproto/template index dfa95cc913fedd..45b6fb59cfd95c 100644 --- a/srcpkgs/python3-wsproto/template +++ b/srcpkgs/python3-wsproto/template @@ -1,7 +1,7 @@ # Template file for 'python3-wsproto' pkgname=python3-wsproto version=1.2.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-h11" diff --git a/srcpkgs/python3-xapp/template b/srcpkgs/python3-xapp/template index 2004e9d7223b32..01d255986695f7 100644 --- a/srcpkgs/python3-xapp/template +++ b/srcpkgs/python3-xapp/template @@ -1,7 +1,7 @@ # Template file for 'python3-xapp' pkgname=python3-xapp version=2.4.1 -revision=2 +revision=3 build_style=meson hostmakedepends="python3" depends="python3 python3-psutil xapps" diff --git a/srcpkgs/python3-xcffib/patches/fix-build.patch b/srcpkgs/python3-xcffib/patches/fix-build.patch new file mode 100644 index 00000000000000..c150eb91329053 --- /dev/null +++ b/srcpkgs/python3-xcffib/patches/fix-build.patch @@ -0,0 +1,30 @@ +These changes are cargo-culted from + + https://github.com/tych0/xcffib/commit/7e2650fd21b157402cd26bff129a81a0b5ddc60c + +--- a/generator/Data/XCB/Python/Parse.hs ++++ b/generator/Data/XCB/Python/Parse.hs +@@ -309,12 +309,12 @@ + -> BitCase + -> (Expr (), [GenStructElem Type]) + mkSwitch cmp (BitCase Nothing bcCmp _ elems) = +- let cmpVal = xExpressionToPyExpr id bcCmp ++ let cmpVal = xExpressionToPyExpr id (head bcCmp) + equality = BinaryOp (P.BinaryAnd ()) cmp cmpVal () + in (equality, elems) + + mkSwitch cmp (BitCase (Just _) bcCmp _ elems) = +- let cmpVal = xExpressionToPyExpr id bcCmp ++ let cmpVal = xExpressionToPyExpr id (head bcCmp) + equality = BinaryOp (P.Equality ()) cmp cmpVal () + in (equality, elems) + +@@ -373,7 +373,7 @@ + -> BitCase + -> (Expr (), [GenStructElem Type]) + mkSwitch cmp (BitCase _ bcCmp _ elems') = +- let cmpVal = xExpressionToPyExpr accessor bcCmp ++ let cmpVal = xExpressionToPyExpr accessor (head bcCmp) + equality = BinaryOp (P.BinaryAnd ()) cmp cmpVal () + in (equality, elems') + structElemToPyPack ext m accessor (SField n typ _ _) = diff --git a/srcpkgs/python3-xcffib/template b/srcpkgs/python3-xcffib/template index cb66bb641a8514..47d8c8c5df28c8 100644 --- a/srcpkgs/python3-xcffib/template +++ b/srcpkgs/python3-xcffib/template @@ -1,7 +1,7 @@ # Template file for 'python3-xcffib' pkgname=python3-xcffib version=1.5.0 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-setuptools pkg-config cabal-install parallel xcb-proto python3-cffi python3-wheel" makedepends="python3-devel libffi-devel libxcb-devel python3-six" diff --git a/srcpkgs/python3-xdg-base-dirs/template b/srcpkgs/python3-xdg-base-dirs/template index 1b2d1269a8e64d..077d6d7a32c045 100644 --- a/srcpkgs/python3-xdg-base-dirs/template +++ b/srcpkgs/python3-xdg-base-dirs/template @@ -1,7 +1,7 @@ # Template file for 'python3-xdg-base-dirs' pkgname=python3-xdg-base-dirs version=6.0.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3" diff --git a/srcpkgs/python3-xdg/template b/srcpkgs/python3-xdg/template index 0904db59a7e04d..dc0178037489ad 100644 --- a/srcpkgs/python3-xdg/template +++ b/srcpkgs/python3-xdg/template @@ -1,7 +1,7 @@ # Template file for 'python3-xdg' pkgname=python3-xdg version=0.28 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-xkbcommon/template b/srcpkgs/python3-xkbcommon/template index 80cd844b2aa423..8acd43919b00e4 100644 --- a/srcpkgs/python3-xkbcommon/template +++ b/srcpkgs/python3-xkbcommon/template @@ -1,7 +1,7 @@ # Template file for 'python3-xkbcommon' pkgname=python3-xkbcommon version=0.8 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-cffi python3-setuptools python3-wheel" makedepends="libxkbcommon-devel python3-devel" diff --git a/srcpkgs/python3-xlib/template b/srcpkgs/python3-xlib/template index 1d948042453140..8a3c17c24272c2 100644 --- a/srcpkgs/python3-xlib/template +++ b/srcpkgs/python3-xlib/template @@ -1,7 +1,7 @@ # Template file for 'python3-xlib' pkgname=python3-xlib version=0.33 -revision=2 +revision=3 build_style=python3-module make_check_target="test" hostmakedepends="python3-setuptools_scm" diff --git a/srcpkgs/python3-xlrd/template b/srcpkgs/python3-xlrd/template index 3075ff724b1920..2e129552b59c78 100644 --- a/srcpkgs/python3-xlrd/template +++ b/srcpkgs/python3-xlrd/template @@ -1,7 +1,7 @@ # Template file for 'python3-xlrd' pkgname=python3-xlrd version=2.0.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-xmlschema/template b/srcpkgs/python3-xmlschema/template index 37a3e42cf58f1c..0b6ac358c91b31 100644 --- a/srcpkgs/python3-xmlschema/template +++ b/srcpkgs/python3-xmlschema/template @@ -1,7 +1,7 @@ # Template file for 'python3-xmlschema' pkgname=python3-xmlschema version=2.5.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-elementpath" depends="python3-elementpath" diff --git a/srcpkgs/python3-xmltodict/template b/srcpkgs/python3-xmltodict/template index 96a94f7e91f86a..cf444ee312210f 100644 --- a/srcpkgs/python3-xmltodict/template +++ b/srcpkgs/python3-xmltodict/template @@ -1,7 +1,7 @@ # Template file for 'python3-xmltodict' pkgname=python3-xmltodict version=0.13.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-xvfbwrapper/template b/srcpkgs/python3-xvfbwrapper/template index 1029cc0890ade1..8627d6c34ae672 100644 --- a/srcpkgs/python3-xvfbwrapper/template +++ b/srcpkgs/python3-xvfbwrapper/template @@ -1,7 +1,7 @@ # Template file for 'python3-xvfbwrapper' pkgname=python3-xvfbwrapper version=0.2.9 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="xorg-server-xvfb" diff --git a/srcpkgs/python3-xxhash/template b/srcpkgs/python3-xxhash/template index b3711c8c990632..9327dc530e61e4 100644 --- a/srcpkgs/python3-xxhash/template +++ b/srcpkgs/python3-xxhash/template @@ -1,7 +1,7 @@ # Template file for 'python3-xxhash' pkgname=python3-xxhash version=3.2.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel xxHash-devel" diff --git a/srcpkgs/python3-xyzservices/template b/srcpkgs/python3-xyzservices/template index 6ac42a42e65ebd..5ff10bfb5c5938 100644 --- a/srcpkgs/python3-xyzservices/template +++ b/srcpkgs/python3-xyzservices/template @@ -1,7 +1,7 @@ # Template file for 'python3-xyzservices' pkgname=python3-xyzservices version=2024.9.0 -revision=1 +revision=2 build_style=python3-module # Provider tests require unpackaged 'mercantile' make_check_args="--ignore=xyzservices/tests/test_providers.py" diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template index 1effb28b61794a..73269ae2f8256d 100644 --- a/srcpkgs/python3-yaml/template +++ b/srcpkgs/python3-yaml/template @@ -1,7 +1,7 @@ # Template file for 'python3-yaml' pkgname=python3-yaml version=6.0.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="libyaml-devel python3-devel" diff --git a/srcpkgs/python3-yamllint/template b/srcpkgs/python3-yamllint/template index 4fe0ed626b98ac..6d89f2ef3fed51 100644 --- a/srcpkgs/python3-yamllint/template +++ b/srcpkgs/python3-yamllint/template @@ -1,7 +1,7 @@ # Template file for 'python3-yamllint' pkgname=python3-yamllint version=1.35.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-pathspec python3-yaml" diff --git a/srcpkgs/python3-yapf/template b/srcpkgs/python3-yapf/template index e560cbd900c0ce..0eaa2df1c79ee3 100644 --- a/srcpkgs/python3-yapf/template +++ b/srcpkgs/python3-yapf/template @@ -1,7 +1,7 @@ # Template file for 'python3-yapf' pkgname=python3-yapf version=0.40.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-importlib_metadata python3-platformdirs python3-tomli" diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template index 1bdd32fdb128c4..92f4e381191857 100644 --- a/srcpkgs/python3-yara/template +++ b/srcpkgs/python3-yara/template @@ -1,7 +1,7 @@ # Template file for 'python3-yara' pkgname=python3-yara version=4.5.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="yara-devel python3-devel" diff --git a/srcpkgs/python3-yarl/template b/srcpkgs/python3-yarl/template index 185ae14854b49b..5a1a63a2835606 100644 --- a/srcpkgs/python3-yarl/template +++ b/srcpkgs/python3-yarl/template @@ -1,7 +1,7 @@ # Template file for 'python3-yarl' pkgname=python3-yarl version=1.9.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-Cython" makedepends="python3-devel" diff --git a/srcpkgs/python3-yattag/template b/srcpkgs/python3-yattag/template index 42351221da17d5..b60834132a3699 100644 --- a/srcpkgs/python3-yattag/template +++ b/srcpkgs/python3-yattag/template @@ -1,7 +1,7 @@ # Template file for 'python3-yattag' pkgname=python3-yattag version=1.16.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-youtube-search/template b/srcpkgs/python3-youtube-search/template index 7a43e6e85919cc..0ee4dba144701f 100644 --- a/srcpkgs/python3-youtube-search/template +++ b/srcpkgs/python3-youtube-search/template @@ -1,7 +1,7 @@ # Template file for 'python3-youtube-search' pkgname=python3-youtube-search version=2.1.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests" diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template index 1dc8277be8f8fc..b68362dc5d6428 100644 --- a/srcpkgs/python3-youtubesearch/template +++ b/srcpkgs/python3-youtubesearch/template @@ -1,7 +1,7 @@ # Template file for 'python3-youtubesearch' pkgname=python3-youtubesearch version=1.6.6 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-httpx" diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template index 31e0980167a9fe..04852f4244dec8 100644 --- a/srcpkgs/python3-ytmusicapi/template +++ b/srcpkgs/python3-ytmusicapi/template @@ -1,7 +1,7 @@ # Template file for 'python3-ytmusicapi' pkgname=python3-ytmusicapi version=1.8.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-requests" diff --git a/srcpkgs/python3-zc.lockfile/template b/srcpkgs/python3-zc.lockfile/template index 4187351f0639b8..6f1da85238e34f 100644 --- a/srcpkgs/python3-zc.lockfile/template +++ b/srcpkgs/python3-zc.lockfile/template @@ -1,7 +1,7 @@ # Template file for 'python3-zc.lockfile' pkgname=python3-zc.lockfile version=2.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template index f21d246dba525d..d207f351b1dc63 100644 --- a/srcpkgs/python3-zeroconf/template +++ b/srcpkgs/python3-zeroconf/template @@ -1,7 +1,7 @@ # Template file for 'python3-zeroconf' pkgname=python3-zeroconf version=0.39.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-ifaddr python3-async-timeout" diff --git a/srcpkgs/python3-zipfile-deflate64/template b/srcpkgs/python3-zipfile-deflate64/template index 8e329865acb6e5..f1961f8779814c 100644 --- a/srcpkgs/python3-zipfile-deflate64/template +++ b/srcpkgs/python3-zipfile-deflate64/template @@ -1,7 +1,7 @@ # Template file for 'python3-zipfile-deflate64' pkgname=python3-zipfile-deflate64 version=0.2.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="python3-devel" diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python3-zipp/template index f8cebdf3873575..b9d70b31d53660 100644 --- a/srcpkgs/python3-zipp/template +++ b/srcpkgs/python3-zipp/template @@ -1,7 +1,7 @@ # Template file for 'python3-zipp' pkgname=python3-zipp version=3.20.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3" diff --git a/srcpkgs/python3-zipstream-ng/template b/srcpkgs/python3-zipstream-ng/template index b24c2b5d0c86db..3a6a87967be48d 100644 --- a/srcpkgs/python3-zipstream-ng/template +++ b/srcpkgs/python3-zipstream-ng/template @@ -1,7 +1,7 @@ # Template file for 'python3-zipstream-ng' pkgname=python3-zipstream-ng version=1.8.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-zipstream/template b/srcpkgs/python3-zipstream/template index 1bb76631434ff0..5042219010f235 100644 --- a/srcpkgs/python3-zipstream/template +++ b/srcpkgs/python3-zipstream/template @@ -1,7 +1,7 @@ # Template file for 'python3-zipstream' pkgname=python3-zipstream version=1.1.4 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-zope.cachedescriptors/template b/srcpkgs/python3-zope.cachedescriptors/template index 83e2881cd5b047..5321b47e7ea75f 100644 --- a/srcpkgs/python3-zope.cachedescriptors/template +++ b/srcpkgs/python3-zope.cachedescriptors/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.cachedescriptors' pkgname=python3-zope.cachedescriptors version=4.4 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-setuptools" diff --git a/srcpkgs/python3-zope.component/template b/srcpkgs/python3-zope.component/template index 238c8af4470407..a780cc6b8dafab 100644 --- a/srcpkgs/python3-zope.component/template +++ b/srcpkgs/python3-zope.component/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.component' pkgname=python3-zope.component version=5.0.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-zope.deferredimport python3-zope.deprecation diff --git a/srcpkgs/python3-zope.configuration/template b/srcpkgs/python3-zope.configuration/template index d9bfe3618ef4b6..e6b97943da7c46 100644 --- a/srcpkgs/python3-zope.configuration/template +++ b/srcpkgs/python3-zope.configuration/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.configuration' pkgname=python3-zope.configuration version=4.4.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools python3-Sphinx" depends="python3-zope.i18nmessageid python3-zope.interface python3-zope.schema" diff --git a/srcpkgs/python3-zope.copy/template b/srcpkgs/python3-zope.copy/template index 3d959f00476205..0c737c5a8e6361 100644 --- a/srcpkgs/python3-zope.copy/template +++ b/srcpkgs/python3-zope.copy/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.copy' pkgname=python3-zope.copy version=4.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-zope.deferredimport/template b/srcpkgs/python3-zope.deferredimport/template index f22ed86b5dc0e3..2f667f28f301bf 100644 --- a/srcpkgs/python3-zope.deferredimport/template +++ b/srcpkgs/python3-zope.deferredimport/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.deferredimport' pkgname=python3-zope.deferredimport version=4.3.1 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-zope.proxy" diff --git a/srcpkgs/python3-zope.deprecation/template b/srcpkgs/python3-zope.deprecation/template index ea1c81c578c18d..2e204ae88e0977 100644 --- a/srcpkgs/python3-zope.deprecation/template +++ b/srcpkgs/python3-zope.deprecation/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.deprecation' pkgname=python3-zope.deprecation version=4.4.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends=python3 diff --git a/srcpkgs/python3-zope.event/template b/srcpkgs/python3-zope.event/template index 864699d07be05a..6b1f6ba8a15ff7 100644 --- a/srcpkgs/python3-zope.event/template +++ b/srcpkgs/python3-zope.event/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.event' pkgname=python3-zope.event version=4.5.0 -revision=4 +revision=5 build_style=python3-module pycompile_module="zope/event" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-zope.exceptions/template b/srcpkgs/python3-zope.exceptions/template index 22801aff90d9a2..c8bef07b86528a 100644 --- a/srcpkgs/python3-zope.exceptions/template +++ b/srcpkgs/python3-zope.exceptions/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.exceptions' pkgname=python3-zope.exceptions version=4.4 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools python3-repoze.sphinx.autointerface python3-Sphinx" diff --git a/srcpkgs/python3-zope.hookable/template b/srcpkgs/python3-zope.hookable/template index 33260dcd1a7d80..baa7e06d66c6c9 100644 --- a/srcpkgs/python3-zope.hookable/template +++ b/srcpkgs/python3-zope.hookable/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.hookable' pkgname=python3-zope.hookable version=5.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-zope.i18nmessageid/template b/srcpkgs/python3-zope.i18nmessageid/template index 43b03f1b56d63c..503d1f578ac82d 100644 --- a/srcpkgs/python3-zope.i18nmessageid/template +++ b/srcpkgs/python3-zope.i18nmessageid/template @@ -1,15 +1,15 @@ # Template file for 'python3-zope.i18nmessageid' pkgname=python3-zope.i18nmessageid version=5.0.1 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools python3-Sphinx" makedepends="python3-devel" depends="python3-six" -checkdepends="python3-nose python3-coverage" short_desc="Message identifiers for internalization" maintainer="Alex Childs " license="ZPL-2.1" homepage="https://github.com/zopefoundation/zope.i18nmessageid/" distfiles="${PYPI_SITE}/z/zope.i18nmessageid/zope.i18nmessageid-${version}.tar.gz" checksum=9534142b684c986f5303f469573978e5a340f05ba2eee4f872933f1c38b1b059 +make_check=no # Tests require removed python3-nose diff --git a/srcpkgs/python3-zope.interface/template b/srcpkgs/python3-zope.interface/template index 9335fcd634f80f..018530d1847cff 100644 --- a/srcpkgs/python3-zope.interface/template +++ b/srcpkgs/python3-zope.interface/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.interface' pkgname=python3-zope.interface version=6.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/python3-zope.location/template b/srcpkgs/python3-zope.location/template index e2928f4eced51e..e124563f2c7e57 100644 --- a/srcpkgs/python3-zope.location/template +++ b/srcpkgs/python3-zope.location/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.location' pkgname=python3-zope.location version=4.2 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools python3-repoze.sphinx.autointerface python3-Sphinx" diff --git a/srcpkgs/python3-zope.proxy/template b/srcpkgs/python3-zope.proxy/template index 876e662f692ccf..f024ec1356dda5 100644 --- a/srcpkgs/python3-zope.proxy/template +++ b/srcpkgs/python3-zope.proxy/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.proxy' pkgname=python3-zope.proxy version=4.4.0 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-Sphinx" makedepends="python3-devel" diff --git a/srcpkgs/python3-zope.schema/template b/srcpkgs/python3-zope.schema/template index 226e11fd20c7c0..58fff19b0f24e3 100644 --- a/srcpkgs/python3-zope.schema/template +++ b/srcpkgs/python3-zope.schema/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.schema' pkgname=python3-zope.schema version=6.0.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-zope.interface python3-zope.event" diff --git a/srcpkgs/python3-zope.security/template b/srcpkgs/python3-zope.security/template index 38f5e95a009aa1..88cab87359f775 100644 --- a/srcpkgs/python3-zope.security/template +++ b/srcpkgs/python3-zope.security/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.security' pkgname=python3-zope.security -version=5.1.1 -revision=6 +version=7.3 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-zope.proxy" makedepends="python3-devel" @@ -11,5 +11,5 @@ short_desc="Zope security framework" maintainer="Alex Childs " license="ZPL-2.1" homepage="https://github.com/zopefoundation/zope.security/" -distfiles="${PYPI_SITE}/z/zope.security/zope.security-${version}.tar.gz" -checksum=10d4489fa88a24e67163aef44fc4910c8bbf591f461696ba724cbfc88ee18e86 +distfiles="${PYPI_SITE}/z/zope_security/zope_security-${version}.tar.gz" +checksum=5db5f79195321f2450ba49b3e1e47ba54364f966fdfc6d39df723043fe6c5549 diff --git a/srcpkgs/python3-zope.testing/template b/srcpkgs/python3-zope.testing/template index 8076ff1e59afa0..419157f3d552a8 100644 --- a/srcpkgs/python3-zope.testing/template +++ b/srcpkgs/python3-zope.testing/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.testing' pkgname=python3-zope.testing version=4.7 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3-zope.testrunner/template b/srcpkgs/python3-zope.testrunner/template index 2ba09ded0eb246..7f30ac42df419e 100644 --- a/srcpkgs/python3-zope.testrunner/template +++ b/srcpkgs/python3-zope.testrunner/template @@ -1,7 +1,7 @@ # Template file for 'python3-zope.testrunner' pkgname=python3-zope.testrunner version=5.2 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools python3-Sphinx python3-sphinxcontrib" depends="python3-zope.exceptions python3-zope.interface python3-six" diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template index 36907f76c111c1..417422372fcfd1 100644 --- a/srcpkgs/python3-zstandard/template +++ b/srcpkgs/python3-zstandard/template @@ -1,7 +1,7 @@ # Template file for 'python3-zstandard' pkgname=python3-zstandard version=0.22.0 -revision=1 +revision=2 build_style=python3-module make_build_args="--system-zstd" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/python3-zulip/template b/srcpkgs/python3-zulip/template index a73001c2f30ca0..7ee0b9067ef3b5 100644 --- a/srcpkgs/python3-zulip/template +++ b/srcpkgs/python3-zulip/template @@ -1,7 +1,7 @@ # Template file for 'python3-zulip' pkgname=python3-zulip version=0.9.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-click python3-distro python3-requests python3-typing_extensions" diff --git a/srcpkgs/python3-zxcvbn/template b/srcpkgs/python3-zxcvbn/template index 41ead4a4d4ceec..0c3c27b73133f0 100644 --- a/srcpkgs/python3-zxcvbn/template +++ b/srcpkgs/python3-zxcvbn/template @@ -1,7 +1,7 @@ # Template file for 'python3-zxcvbn' pkgname=python3-zxcvbn version=4.4.28 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/python3/patches/musl-pgo-tests.patch b/srcpkgs/python3/patches/musl-pgo-tests.patch new file mode 100644 index 00000000000000..61a6e06f122aed --- /dev/null +++ b/srcpkgs/python3/patches/musl-pgo-tests.patch @@ -0,0 +1,44 @@ +diff -ur a/Lib/test/test_math.py b/Lib/test/test_math.py +--- a/Lib/test/test_math.py 2024-10-07 01:02:14.000000000 -0400 ++++ b/Lib/test/test_math.py 2024-11-24 21:10:44.322603023 -0500 +@@ -2707,7 +2707,8 @@ + # properly: it doesn't use the right sign when the result is zero. + @unittest.skipIf( + sys.platform.startswith(("freebsd", "wasi", "netbsd")) +- or (sys.platform == "android" and platform.machine() == "x86_64"), ++ or (sys.platform == "android" and platform.machine() == "x86_64") ++ or platform.libc_ver()[0] != 'glibc', + f"this platform doesn't implement IEE 754-2008 properly") + def test_fma_zero_result(self): + nonnegative_finites = [0.0, 1e-300, 2.3, 1e300] +diff -ur a/Lib/test/test_re.py b/Lib/test/test_re.py +--- a/Lib/test/test_re.py 2024-10-07 01:02:14.000000000 -0400 ++++ b/Lib/test/test_re.py 2024-11-24 21:11:47.190747775 -0500 +@@ -4,6 +4,7 @@ + warnings_helper, SHORT_TIMEOUT, CPUStopwatch, requires_resource) + import locale + import re ++import platform + import string + import sys + import time +@@ -2016,7 +2017,8 @@ + self.assertEqual(re.fullmatch('[a-c]+', 'ABC', re.I).span(), (0, 3)) + + @unittest.skipIf( +- is_emscripten or is_wasi, ++ is_emscripten or is_wasi ++ or platform.libc_ver()[0] != 'glibc', + "musl libc issue on Emscripten/WASI, bpo-46390" + ) + def test_locale_caching(self): +@@ -2056,7 +2058,8 @@ + self.assertIsNone(re.match(b'(?Li)\xe5', b'\xc5')) + + @unittest.skipIf( +- is_emscripten or is_wasi, ++ is_emscripten or is_wasi ++ or platform.libc_ver()[0] != 'glibc', + "musl libc issue on Emscripten/WASI, bpo-46390" + ) + def test_locale_compiled(self): diff --git a/srcpkgs/python3/patches/ppc-fixes.patch b/srcpkgs/python3/patches/ppc-fixes.patch deleted file mode 100644 index fc5937725162e7..00000000000000 --- a/srcpkgs/python3/patches/ppc-fixes.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ur a/configure b/configure ---- a/configure -+++ b/configure -@@ -5952,6 +5952,14 @@ - printf "%s\n" "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - -+if test x$MULTIARCH = xpowerpc-linux-musl -+then -+ MULTIARCH="powerpc-linux-gnu" -+fi -+if test x$MULTIARCH = xpowerpcle-linux-musl -+then -+ MULTIARCH="powerpcle-linux-gnu" -+fi - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CC compiler name" >&5 -@@ -6859,7 +6867,11 @@ - powerpc64-linux-gnu - # endif - # elif defined(__powerpc__) -+# if defined(__LITTLE_ENDIAN__) -+ powerpcle-linux-gnu -+# else - powerpc-linux-gnu -+# endif - # elif defined(__s390x__) - s390x-linux-gnu - # elif defined(__s390__) -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1039,7 +1039,11 @@ - powerpc64-linux-gnu - # endif - # elif defined(__powerpc__) -+# if defined(__LITTLE_ENDIAN__) -+ powerpcle-linux-gnu -+# else - powerpc-linux-gnu -+# endif - # elif defined(__s390x__) - s390x-linux-gnu - # elif defined(__s390__) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 460d07bb6c516d..be4added325b5a 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -3,12 +3,12 @@ # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter". # pkgname=python3 -version=3.12.7 +version=3.13.1 revision=1 build_style="gnu-configure" -configure_args="--enable-shared --enable-ipv6 --enable-optimizations +configure_args="--enable-shared --enable-ipv6 --enable-loadable-sqlite-extensions --with-computed-gotos - --with-dbmliborder=gdbm:ndbm --with-system-expat --with-system-ffi + --with-dbmliborder=gdbm:ndbm --with-system-expat --without-ensurepip ac_cv_working_tzset=yes" pycompile_dirs="usr/lib/python${version%.*}" hostmakedepends="pkgconf autoconf-archive automake" @@ -20,13 +20,13 @@ short_desc="Python programming language (${version%.*} series)" maintainer="Andrew J. Hesford " license="Python-2.0" homepage="https://www.python.org" -_bluez="bluez-5.64" +_bluez="bluez-5.76" distfiles=" https://www.python.org/ftp/python/${version%rc*}/Python-${version}.tar.xz ${KERNEL_SITE}/bluetooth/${_bluez}.tar.xz " -checksum="24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550 - ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34" +checksum="9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9 + 55e2c645909ad82d833c42ce85ec20434e0ef0070941b1eab73facdd240bbd63" skip_extraction="${_bluez}.tar.xz" alternatives=" @@ -44,6 +44,8 @@ if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3" configure_args+=" --with-build-python=python${py3_ver}" configure_args+=" ac_cv_broken_sem_getvalue=no" +else + configure_args+=" --enable-optimizations" fi post_extract() { diff --git a/srcpkgs/pythran/patches/gast-0.6.patch b/srcpkgs/pythran/patches/gast-0.6.patch deleted file mode 100644 index 87dfcdcf450bce..00000000000000 --- a/srcpkgs/pythran/patches/gast-0.6.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 840a0e706ec39963aec6bcd1f118bf33177c20b4 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Sat, 29 Jun 2024 19:13:02 +0200 -Subject: [PATCH] Bump gast requirement to 0.6.0 - -This mostly helps for harmonious behavior wrt. gast.dump ---- - docs/TUTORIAL.rst | 8 ++++---- - pythran/utils.py | 2 +- - requirements.txt | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/docs/TUTORIAL.rst b/docs/TUTORIAL.rst -index 09f6902f9..7692547eb 100644 ---- a/docs/TUTORIAL.rst -+++ b/docs/TUTORIAL.rst -@@ -20,7 +20,7 @@ Python ships a standard module, ``ast`` to turn Python code into an AST. For ins - >>> code = "a=1" - >>> tree = ast.parse(code) # turn the code into an AST - >>> print(ast.dump(tree)) # view it as a string -- Module(body=[Assign(targets=[Name(id='a', ctx=Store(), annotation=None, type_comment=None)], value=Constant(value=1, kind=None), type_comment=None)], type_ignores=[]) -+ Module(body=[Assign(targets=[Name(id='a', ctx=Store())], value=Constant(value=1, kind=None))]) - - Deciphering the above line, one learns that the single assignment is parsed as - a module containing a single statement, which is an assignment to a single -@@ -33,7 +33,7 @@ Eventually, one needs to parse more complex codes, and things get a bit more cry - ... return n if n< 2 else fib(n-1) + fib(n-2)""" - >>> tree = ast.parse(fib_src) - >>> print(ast.dump(tree)) -- Module(body=[FunctionDef(name='fib', args=arguments(args=[Name(id='n', ctx=Param(), annotation=None, type_comment=None)], posonlyargs=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Return(value=IfExp(test=Compare(left=Name(id='n', ctx=Load(), annotation=None, type_comment=None), ops=[Lt()], comparators=[Constant(value=2, kind=None)]), body=Name(id='n', ctx=Load(), annotation=None, type_comment=None), orelse=BinOp(left=Call(func=Name(id='fib', ctx=Load(), annotation=None, type_comment=None), args=[BinOp(left=Name(id='n', ctx=Load(), annotation=None, type_comment=None), op=Sub(), right=Constant(value=1, kind=None))], keywords=[]), op=Add(), right=Call(func=Name(id='fib', ctx=Load(), annotation=None, type_comment=None), args=[BinOp(left=Name(id='n', ctx=Load(), annotation=None, type_comment=None), op=Sub(), right=Constant(value=2, kind=None))], keywords=[]))))], decorator_list=[], returns=None, type_comment=None)], type_ignores=[]) -+ Module(body=[FunctionDef(name='fib', args=arguments(args=[Name(id='n', ctx=Param())]), body=[Return(value=IfExp(test=Compare(left=Name(id='n', ctx=Load()), ops=[Lt()], comparators=[Constant(value=2, kind=None)]), body=Name(id='n', ctx=Load()), orelse=BinOp(left=Call(func=Name(id='fib', ctx=Load()), args=[BinOp(left=Name(id='n', ctx=Load()), op=Sub(), right=Constant(value=1, kind=None))]), op=Add(), right=Call(func=Name(id='fib', ctx=Load()), args=[BinOp(left=Name(id='n', ctx=Load()), op=Sub(), right=Constant(value=2, kind=None))]))))])]) - - The idea remains the same. The whole Python syntax is described in - http://docs.python.org/2/library/ast.html and is worth a glance, otherwise -@@ -199,7 +199,7 @@ constant expressions. In the previous code, there is only two constant - - >>> ce = pm.gather(analyses.ConstantExpressions, tree) - >>> sorted(map(ast.dump, ce)) -- ["Attribute(value=Name(id='math', ctx=Load(), annotation=None, type_comment=None), attr='cos', ctx=Load())", 'Constant(value=3, kind=None)'] -+ ["Attribute(value=Name(id='math', ctx=Load()), attr='cos', ctx=Load())", 'Constant(value=3, kind=None)'] - - One of the most critical analyse of Pythran is the points-to analysis. There - are two flavors of this analyse, one that computes an over-set of the aliased -@@ -210,7 +210,7 @@ variable, and one that computes an under set. ``Aliases`` computes an over-set:: - >>> al = pm.gather(analyses.Aliases, tree) - >>> returned = tree.body[-1].body[-1].value - >>> print(ast.dump(returned)) -- Name(id='b', ctx=Load(), annotation=None, type_comment=None) -+ Name(id='b', ctx=Load()) - >>> sorted(a.id for a in al[returned]) - ['c', 'd'] - -diff --git a/pythran/utils.py b/pythran/utils.py -index 2d7a67327..55a7e8ad6 100644 ---- a/pythran/utils.py -+++ b/pythran/utils.py -@@ -106,7 +106,7 @@ def get_variable(assignable): - ... slice=ast.Name('j', ast.Load(), None, None), - ... ctx=ast.Load()) - >>> ast.dump(get_variable(ref)) -- "Name(id='a', ctx=Load(), annotation=None, type_comment=None)" -+ "Name(id='a', ctx=Load())" - """ - msg = "Only name and subscript can be assigned." - assert isinstance(assignable, (ast.Name, ast.Subscript)), msg -diff --git a/requirements.txt b/requirements.txt -index fd6a738e5..c7a25c52a 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,5 +1,5 @@ - ply>=3.4 - setuptools --gast~=0.5.0 -+gast~=0.6.0 - numpy - beniget~=0.4.0 diff --git a/srcpkgs/pythran/template b/srcpkgs/pythran/template index 9a8761a767f67e..918517d0b5041e 100644 --- a/srcpkgs/pythran/template +++ b/srcpkgs/pythran/template @@ -1,7 +1,7 @@ # Template file for 'pythran' pkgname=pythran -version=0.16.1 -revision=2 +version=0.17.0 +revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-ply python3-gast python3-beniget python3-numpy @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://pythran.readthedocs.io/" distfiles="${PYPI_SITE}/p/pythran/pythran-${version}.tar.gz" -checksum=861748c0f9c7d422b32724b114b3817d818ed4eab86c09781aa0a3f7ceabb7f9 +checksum=3b77d6d970a6cf5b448facc7d4f6229c3e73909ac27ea2480c843afdadbad0fb # Upstream defines no tests make_check=no diff --git a/srcpkgs/pywal/template b/srcpkgs/pywal/template index 8d18d29503d1d7..66ddb4c75c30c2 100644 --- a/srcpkgs/pywal/template +++ b/srcpkgs/pywal/template @@ -1,7 +1,7 @@ # Template file for 'pywal' pkgname=pywal version=3.3.0 -revision=6 +revision=7 build_style=python3-module pycompile_module="pywal" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template index 552dfcd1c4ef4b..b1ec814b341161 100644 --- a/srcpkgs/qgis/template +++ b/srcpkgs/qgis/template @@ -1,7 +1,7 @@ # Template file for 'qgis' pkgname=qgis version=3.38.3 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass" diff --git a/srcpkgs/qmk/template b/srcpkgs/qmk/template index 2e709ab38b5ed1..dea1b179b9586c 100644 --- a/srcpkgs/qmk/template +++ b/srcpkgs/qmk/template @@ -1,7 +1,7 @@ # Template file for 'qmk' pkgname=qmk version=1.1.5 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel" # This includes the requirements from requirements.txt in the qmk_firmware diff --git a/srcpkgs/qomui/template b/srcpkgs/qomui/template index 22ec9a7816bb56..b970118a4cc511 100644 --- a/srcpkgs/qomui/template +++ b/srcpkgs/qomui/template @@ -1,7 +1,7 @@ # Template file for 'qomui' pkgname=qomui version=0.8.2 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-PyQt5 python3-dbus python3-psutil diff --git a/srcpkgs/qtile/template b/srcpkgs/qtile/template index 7626614a390dff..c8024c41172d84 100644 --- a/srcpkgs/qtile/template +++ b/srcpkgs/qtile/template @@ -1,7 +1,7 @@ # Template file for 'qtile' pkgname=qtile version=0.29.0 -revision=1 +revision=2 build_style=python3-pep517 _wlroots=0.17 hostmakedepends="python3-setuptools_scm python3-cairocffi python3-xcffib python3-wheel diff --git a/srcpkgs/quodlibet/template b/srcpkgs/quodlibet/template index ab4a1f73f26219..8b399b49527231 100644 --- a/srcpkgs/quodlibet/template +++ b/srcpkgs/quodlibet/template @@ -1,7 +1,7 @@ # Template file for 'quodlibet' pkgname=quodlibet version=4.6.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="intltool python3-devel python3-setuptools" depends="desktop-file-utils gst-plugins-bad1 gst-plugins-base1 gst-plugins-good1 diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template index 305ae603be9091..6a67116947852b 100644 --- a/srcpkgs/qutebrowser/template +++ b/srcpkgs/qutebrowser/template @@ -1,7 +1,7 @@ # Template file for 'qutebrowser' pkgname=qutebrowser version=3.3.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools asciidoc" depends="python3-Jinja2 python3-yaml" diff --git a/srcpkgs/qytdl/template b/srcpkgs/qytdl/template index 8a9638971e49cf..1e4185cd75bb82 100644 --- a/srcpkgs/qytdl/template +++ b/srcpkgs/qytdl/template @@ -1,7 +1,7 @@ # Template file for 'qytdl' pkgname=qytdl version=1.6 -revision=3 +revision=4 pycompile_dirs="usr/share/qytdl/src" depends="desktop-file-utils python3-PyQt5 yt-dlp" short_desc="Simple Qt (PyQt5) frontend to Youtube-DL" diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index 69280f239d6f3c..ff1b546f08f214 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -1,7 +1,7 @@ # Template file for 'radicale' pkgname=radicale version=3.3.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools" depends="python3-vobject python3-dateutil python3-passlib python3-bcrypt diff --git a/srcpkgs/ranger/template b/srcpkgs/ranger/template index 4db2989795fdd4..b868e07748d33d 100644 --- a/srcpkgs/ranger/template +++ b/srcpkgs/ranger/template @@ -1,7 +1,7 @@ # Template file for 'ranger' pkgname=ranger version=1.9.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3 python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/rdiff-backup/template b/srcpkgs/rdiff-backup/template index 75e46cc331581f..b1ab0434d88abb 100644 --- a/srcpkgs/rdiff-backup/template +++ b/srcpkgs/rdiff-backup/template @@ -1,7 +1,7 @@ # Template file for 'rdiff-backup' pkgname=rdiff-backup version=2.2.6 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3 python3-setuptools_scm python3-pip" makedepends="python3-devel librsync-devel" diff --git a/srcpkgs/recoll/patches/musl.patch b/srcpkgs/recoll/patches/musl.patch index 5d061a05789650..9caa9382501f52 100644 --- a/srcpkgs/recoll/patches/musl.patch +++ b/srcpkgs/recoll/patches/musl.patch @@ -23,20 +23,3 @@ index 3a1f8f5..dcb93fc 100644 #define HAS_NO_XATTR #endif -diff --git a/common/conf_post.h b/common/conf_post.h -index 7093ead..0ecd56b 100644 ---- a/common/conf_post.h -+++ b/common/conf_post.h -@@ -74,12 +74,4 @@ typedef int ssize_t; - #define REAL_GCC __GNUC__ // probably - #endif - --#if defined(REAL_GCC) && defined(HAVE_FEATURES_H) --// Older gcc versions pretended to supply std::regex, but the resulting programs mostly crashed. --#include --#if ! __GNUC_PREREQ(6,0) --#define NO_STD_REGEX 1 --#endif --#endif -- - #endif /* INCLUDED */ diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index 7b33d23df03a59..83ec7fc677eca9 100644 --- a/srcpkgs/recoll/template +++ b/srcpkgs/recoll/template @@ -1,18 +1,18 @@ # Template file for 'recoll' pkgname=recoll -version=1.37.4 -revision=1 -build_style=gnu-configure -build_helper="qmake python3" -configure_args="--enable-recollq --disable-python-chm --disable-x11mon - --disable-webkit --without-systemd --disable-rpath" +version=1.40.4 +revision=2 +build_style=meson +build_helper="qmake" +configure_args="-Drecollq=true -Dpython-chm=false -Dx11mon=false + -Dwebkit=false -Dsystemd=false" hostmakedepends="pkg-config gettext-devel qt5-qmake qt5-host-tools - which python3-setuptools" + python3-setuptools which" makedepends="libxslt-devel xapian-core-devel zlib-devel qt5-devel - python3-devel aspell-devel" + python3-devel aspell-devel file-devel" short_desc="Full text search tool based on Xapian backend" maintainer="Rui Abreu Ferreira " license="GPL-2.0-or-later" homepage="https://www.lesbonscomptes.com/recoll/" distfiles="https://www.lesbonscomptes.com/recoll/recoll-${version}.tar.gz" -checksum=3109d76a65bb2f887231b643994ed701c2efe6ba0771f8451b39e2f186c3b6ad +checksum=a48503c4b0040dc1a476340cb7a1afb34366c21ae665bdad3c9ef8958845c1fa diff --git a/srcpkgs/rednotebook/template b/srcpkgs/rednotebook/template index b78aeee13d7432..8283688e9d7cf1 100644 --- a/srcpkgs/rednotebook/template +++ b/srcpkgs/rednotebook/template @@ -1,7 +1,7 @@ # Template file for 'rednotebook' pkgname=rednotebook version=2.35 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools gettext" depends="desktop-file-utils gtksourceview hicolor-icon-theme python3-enchant diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template index c81b2624305f40..5a9a9cabe55ac1 100644 --- a/srcpkgs/redshift/template +++ b/srcpkgs/redshift/template @@ -1,7 +1,7 @@ # Template file for 'redshift' pkgname=redshift version=1.12 -revision=8 +revision=9 build_style=gnu-configure configure_args="--enable-gui --enable-geoclue2" hostmakedepends="gettext-devel intltool pkg-config python3-devel" diff --git a/srcpkgs/remhind/template b/srcpkgs/remhind/template index 0b1eef7473e2c1..3942eb67e32566 100644 --- a/srcpkgs/remhind/template +++ b/srcpkgs/remhind/template @@ -1,7 +1,7 @@ # Template file for 'remhind' pkgname=remhind version=0.1.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools python3-gobject-devel python3-cairo-devel" depends="python3-icalendar python3-dateutil python3-gobject python3-toml diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index 77576f0de186a5..378b32b1e2125a 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,7 +1,7 @@ # Template file for 'remmina' pkgname=remmina version=1.4.31 -revision=4 +revision=5 build_style=cmake configure_args="-DCMAKE_USE_PTHREADS_INIT=ON -DWITH_KF5WALLET=on" hostmakedepends="glib-devel intltool pkg-config shared-mime-info qt5-host-tools qt5-qmake" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 1f5199d6f8bd07..fee5d69f35b672 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -706,6 +706,7 @@ replaces=" python-xlib<=0.29_1 python-zipp<=1.2.0_2 python-zope.interface<=5.5.2_1 + python3-Cython0.29<=0.29.37_1 python3-Django<=3.0.7_2 python3-Flask-Assets<=0.12_9 python3-Flask-Mail<=0.9.1_5 @@ -718,14 +719,19 @@ replaces=" python3-aiohttp2<=2.3.10_4 python3-bluez<=0.23_2 python3-boto<=2.49.0_5 + python3-changelogs<=0.15.0_4 python3-docker-pycreds<=0.4.0_4 + python3-efl<=1.23.0_7 python3-eliot<=1.12.0_5 + python3-gitchangelog<=3.0.4_7 python3-grako<=3.99.9_7 python3-idna-ssl<=1.1.0_3 python3-jaraco<=1.0_4 python3-jsonrpc-server<=0.4.0_2 python3-keepalive<=0.5_6 python3-lockfile<=0.12.2_7 + python3-nose<=1.3.7_10 + python3-nose-random<=1.0.0_6 python3-pgpdump<=1.5_10 python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 @@ -735,6 +741,7 @@ replaces=" python3-pyside2<=5.15.10_1 python3-pyside<=5.15.0_2 python3-pyspotify<=2.1.3_5 + python3-pystache<=0.5.4_8 python3-sabyenc3<=5.4.4_2 python3-scikit-video<=1.1.11_6 python3-shiboken2<=5.15.10_2 @@ -742,7 +749,9 @@ replaces=" python3-snakeoil-devel<=0.8.8_4 python3-sqlalchemy-migrate<=0.12.0_6 python3-stormssh<=0.7.0_7 + python3-tables<=3.7.0_4 python3-txacme<=0.9.3_3 + python3-typed-ast<=1.5.4_3 qimageblitz<=0.0.6_4 qqc2-desktop-style<=5.115.0_1 qt-designer-devel<=4.8.7_29 diff --git a/srcpkgs/renderdoc/patches/python-3.13.patch b/srcpkgs/renderdoc/patches/python-3.13.patch new file mode 100644 index 00000000000000..6e17cf58902c6b --- /dev/null +++ b/srcpkgs/renderdoc/patches/python-3.13.patch @@ -0,0 +1,11 @@ +--- a/qrenderdoc/Code/pyrenderdoc/renderdoc.i ++++ b/qrenderdoc/Code/pyrenderdoc/renderdoc.i +@@ -469,7 +469,7 @@ + // for basic types, return the repr directly + if(obj == (PyObject *)&_Py_TrueStruct || + obj == (PyObject *)&_Py_FalseStruct || +- PyObject_IsInstance(obj, (PyObject*)&_PyNone_Type) || ++ obj == (PyObject *)Py_None || + PyObject_IsInstance(obj, (PyObject*)&PyFloat_Type) || + PyObject_IsInstance(obj, (PyObject*)&PyLong_Type) || + PyObject_IsInstance(obj, (PyObject*)&PyBytes_Type) || diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template index 3a283e693359d1..f40eb3fb87938e 100644 --- a/srcpkgs/renderdoc/template +++ b/srcpkgs/renderdoc/template @@ -1,7 +1,7 @@ # Template file for 'renderdoc' pkgname=renderdoc version=1.21 -revision=4 +revision=5 _plt_ver=dbadbe14d601913b81a4a7533b284b6ccd7351d8 build_style=cmake configure_args="-DENABLE_GL=ON -DENABLE_GLES=ON -DENABLE_QRENDERDOC=ON diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template index 958d7efa6c7712..2fde7e12c89235 100644 --- a/srcpkgs/reuse/template +++ b/srcpkgs/reuse/template @@ -1,7 +1,7 @@ # Template file for 'reuse' pkgname=reuse version=3.0.1 -revision=1 +revision=2 build_style=python3-pep517 # These tests pass on local machine but don't pass in CI. make_check_args="--deselect tests/test_lint.py::test_lint_read_errors diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index d576789bf74b26..d50ed05752595b 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -1,7 +1,7 @@ # Template file for 'rhythmbox' pkgname=rhythmbox version=3.4.7 -revision=2 +revision=3 build_style=meson build_helper=gir configure_args="-Dgudev=enabled $(vopt_feature gir plugins_vala) -Ddaap=enabled" diff --git a/srcpkgs/ripe-atlas-tools/template b/srcpkgs/ripe-atlas-tools/template index c93e0e9ecb47b5..0ad19ff4ac1dd5 100644 --- a/srcpkgs/ripe-atlas-tools/template +++ b/srcpkgs/ripe-atlas-tools/template @@ -1,7 +1,7 @@ # Template file for 'ripe-atlas-tools' pkgname=ripe-atlas-tools version=3.0.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-tzlocal python3-yaml python3-dateutil python3-openssl diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template index 2113c56e1cee70..5b8684944e1ec4 100644 --- a/srcpkgs/rmlint/template +++ b/srcpkgs/rmlint/template @@ -1,7 +1,7 @@ # Template file for 'rmlint' pkgname=rmlint version=2.10.2 -revision=2 +revision=3 build_style=scons make_build_args="VERBOSE=1" hostmakedepends="pkg-config python3-Sphinx python3-setuptools glib-devel" diff --git a/srcpkgs/rofi-rbw/template b/srcpkgs/rofi-rbw/template index cd2569befcf0df..60ee82c779a9f6 100644 --- a/srcpkgs/rofi-rbw/template +++ b/srcpkgs/rofi-rbw/template @@ -1,7 +1,7 @@ # Template file for 'rofi-rbw' pkgname=rofi-rbw version=1.4.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3 python3-ConfigArgParse rbw" diff --git a/srcpkgs/rofimoji/template b/srcpkgs/rofimoji/template index af616efbb0862a..d588d679568928 100644 --- a/srcpkgs/rofimoji/template +++ b/srcpkgs/rofimoji/template @@ -1,7 +1,7 @@ # Template file for 'rofimoji' pkgname=rofimoji version=6.5.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-ConfigArgParse" diff --git a/srcpkgs/root/template b/srcpkgs/root/template index 678d1b7fa031f3..81dc77f668340e 100644 --- a/srcpkgs/root/template +++ b/srcpkgs/root/template @@ -1,7 +1,7 @@ # Template file for 'root' pkgname=root version=6.30.06 -revision=1 +revision=2 # Only i686 and x86_64 seem to be officially supported archs="i686* x86_64*" build_style=cmake diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index c7c5e7a628955f..693efa0cb63ddc 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -1,7 +1,7 @@ # Template file for 'rpm' pkgname=rpm version=4.18.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-cap --with-acl --enable-python PYTHON=python3 --sharedstatedir=/var/lib" diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template index 20a0bafe77acda..9421005da7fad7 100644 --- a/srcpkgs/rrdtool/template +++ b/srcpkgs/rrdtool/template @@ -1,7 +1,7 @@ # Template file for 'rrdtool' pkgname=rrdtool version=1.8.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-perl --enable-perl-site-install --with-perl-options=INSTALLDIRS=vendor --enable-ruby diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template index baa6f8c54f69fd..d791e2a739b6c1 100644 --- a/srcpkgs/rtags/template +++ b/srcpkgs/rtags/template @@ -1,13 +1,12 @@ # Template file for 'rtags' pkgname=rtags version=2.38 -revision=7 +revision=8 build_style=cmake # Don't run tests in do_install, please. configure_args="-DSKIP_CTEST=TRUE" hostmakedepends="pkg-config clang" makedepends="llvm17-devel openssl-devel zlib-devel" -checkdepends="perl python3-PyHamcrest python3-nose" short_desc="C/C++ indexer with integration for Emacs based on clang" maintainer="Alexander Egorenkov " license="GPL-3.0-or-later" @@ -15,3 +14,4 @@ homepage="https://github.com/Andersbakken/rtags" distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=e19d9cf5823cccc43266ca57c19ae0bb879cbe138511cb3f0343958860481a5d nocross=yes +make_check=no # Tests require removed python3-nose diff --git a/srcpkgs/rtslib-fb/template b/srcpkgs/rtslib-fb/template index 1a085c717b6395..cc211218428880 100644 --- a/srcpkgs/rtslib-fb/template +++ b/srcpkgs/rtslib-fb/template @@ -1,7 +1,7 @@ # Template file for 'rtslib-fb' pkgname=rtslib-fb version=2.1.74 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-six python3-pyudev" diff --git a/srcpkgs/rubber/template b/srcpkgs/rubber/template index daf04d3315e287..1bd86faae66cb3 100644 --- a/srcpkgs/rubber/template +++ b/srcpkgs/rubber/template @@ -1,7 +1,7 @@ # Template file for 'rubber' pkgname=rubber version=1.5.1 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3 python3-setuptools" depends="python3 virtual?tex" diff --git a/srcpkgs/ruff/template b/srcpkgs/ruff/template index 021bd57e5b28e6..7ecb5832495811 100644 --- a/srcpkgs/ruff/template +++ b/srcpkgs/ruff/template @@ -1,7 +1,7 @@ # Template file for 'ruff' pkgname=ruff version=0.7.2 -revision=1 +revision=2 build_style=python3-pep517 build_helper="rust qemu" hostmakedepends="maturin cargo pkg-config" diff --git a/srcpkgs/s3cmd/template b/srcpkgs/s3cmd/template index fabee38c6cd3f8..8699f41d03104d 100644 --- a/srcpkgs/s3cmd/template +++ b/srcpkgs/s3cmd/template @@ -1,7 +1,7 @@ # Template file for 's3cmd' pkgname=s3cmd version=2.4.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dateutil" diff --git a/srcpkgs/sabnzbd/template b/srcpkgs/sabnzbd/template index a9192057457643..07e73324fe3c17 100644 --- a/srcpkgs/sabnzbd/template +++ b/srcpkgs/sabnzbd/template @@ -1,7 +1,7 @@ # Template file for 'sabnzbd' pkgname=sabnzbd version=4.3.3 -revision=2 +revision=3 pycompile_dirs="/usr/share/sabnzbd" hostmakedepends="python3 gettext" depends="par2cmdline python3-cheetah3 python3-cryptography diff --git a/srcpkgs/safeeyes/template b/srcpkgs/safeeyes/template index fcdfc63d67aa46..8f3e4fd3dc33de 100644 --- a/srcpkgs/safeeyes/template +++ b/srcpkgs/safeeyes/template @@ -1,7 +1,7 @@ # Template file for 'safeeyes' pkgname=safeeyes version=2.1.6 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-devel pkg-config" makedepends="python3-devel cairo-devel libgirepository-devel" diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template index b116e62bc67a5a..b3835fb2276dcb 100644 --- a/srcpkgs/sagemath/template +++ b/srcpkgs/sagemath/template @@ -1,7 +1,7 @@ # Template file for 'sagemath' pkgname=sagemath version=10.4 -revision=3 +revision=4 _pypi_version=${version/.beta/b} _pypi_version=${_pypi_version/.rc/rc} build_style=python3-pep517 diff --git a/srcpkgs/salt/template b/srcpkgs/salt/template index 1061a338803e4e..c3d1e4a8515a48 100644 --- a/srcpkgs/salt/template +++ b/srcpkgs/salt/template @@ -1,7 +1,7 @@ # Template file for 'salt' pkgname=salt version=3006.8 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 7753f947c05bf0..bb08c562f7e961 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba version=4.20.1 -revision=2 +revision=3 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" diff --git a/srcpkgs/sc-controller/template b/srcpkgs/sc-controller/template index bcf71f921b707c..7559b2580818a7 100644 --- a/srcpkgs/sc-controller/template +++ b/srcpkgs/sc-controller/template @@ -1,7 +1,7 @@ # Template file for 'sc-controller' pkgname=sc-controller version=0.4.8.10 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel zlib-devel" diff --git a/srcpkgs/scapy/template b/srcpkgs/scapy/template index dce2838349b84c..ffb6dd3293ec45 100644 --- a/srcpkgs/scapy/template +++ b/srcpkgs/scapy/template @@ -1,7 +1,7 @@ # Template file for 'scapy' pkgname=scapy version=2.5.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="tcpdump python3" diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template index 4d82ec02737c4e..241c34cfe13c93 100644 --- a/srcpkgs/scons/template +++ b/srcpkgs/scons/template @@ -1,7 +1,7 @@ # Template file for 'scons' pkgname=scons version=4.8.1 -revision=1 +revision=2 build_style="python3-module" make_install_args="--install-data=/usr/share/man/man1/" hostmakedepends="python3 python3-setuptools" diff --git a/srcpkgs/screenkey/template b/srcpkgs/screenkey/template index 47c192607ad6f6..ed697b7ac271f3 100644 --- a/srcpkgs/screenkey/template +++ b/srcpkgs/screenkey/template @@ -1,7 +1,7 @@ # Template file for 'screenkey' pkgname=screenkey version=1.5 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools python3-Babel" depends="gtk+3 libX11 python3-gobject python3-cairo python3-dbus" diff --git a/srcpkgs/screenplain/template b/srcpkgs/screenplain/template index ec20b881d2efce..46f50972f14343 100644 --- a/srcpkgs/screenplain/template +++ b/srcpkgs/screenplain/template @@ -1,7 +1,7 @@ # Template file for 'screenplain' pkgname=screenplain version=0.10.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-reportlab" diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index a8e9e186b2fd75..9570625dad0927 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,7 +1,7 @@ # Template file for 'scribus' pkgname=scribus version=1.6.2 -revision=1 +revision=2 build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP20=ON" diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index 811655363a32cb..efe12034c580ec 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -1,7 +1,7 @@ # Template file for 'seafile-libclient' pkgname=seafile-libclient version=8.0.10 -revision=3 +revision=4 _distname="${pkgname/-libclient/}" build_style=gnu-configure configure_args="PYTHON=python3 --disable-static" diff --git a/srcpkgs/setconf/template b/srcpkgs/setconf/template index 11c6e9579d3257..d69fcd9cf01c6e 100644 --- a/srcpkgs/setconf/template +++ b/srcpkgs/setconf/template @@ -1,7 +1,7 @@ # Template file for 'setconf' pkgname=setconf version=0.7.7 -revision=5 +revision=6 build_style=python3-module pycompile_module="setconf.py" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template index 3b6673e735e2fc..fdcb0c9fdff980 100644 --- a/srcpkgs/setzer/template +++ b/srcpkgs/setzer/template @@ -1,7 +1,7 @@ # Template file for 'setzer' pkgname=setzer version=65 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext" depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview5 python3-pexpect diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template index 59ad1910ab0f9f..0929ed3f95bc1e 100644 --- a/srcpkgs/sigil/template +++ b/srcpkgs/sigil/template @@ -1,7 +1,7 @@ # Template file for 'sigil' pkgname=sigil version=1.9.10 -revision=3 +revision=4 build_style=cmake pycompile_dirs="usr/share/sigil/python3lib" # Can use system zlib, minizip and hunspell; can't use system pcre diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template index f5fcf48750aafe..2a57c60054032e 100644 --- a/srcpkgs/sip/template +++ b/srcpkgs/sip/template @@ -1,7 +1,7 @@ # Template file for 'sip' pkgname=sip version=6.8.6 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-packaging" depends="python3-setuptools python3-packaging" diff --git a/srcpkgs/sip4/template b/srcpkgs/sip4/template index b29b1aedac32a7..1d1e8fb89c3c48 100644 --- a/srcpkgs/sip4/template +++ b/srcpkgs/sip4/template @@ -1,7 +1,7 @@ # Template file for 'sip4' pkgname=sip4 version=4.19.25 -revision=4 +revision=5 hostmakedepends="python3-devel python3-setuptools" makedepends="${hostmakedepends}" short_desc="Python extension module generator for C/C++ libraries" diff --git a/srcpkgs/sonata/template b/srcpkgs/sonata/template index b3ff24636e27de..b6b4e65f947d66 100644 --- a/srcpkgs/sonata/template +++ b/srcpkgs/sonata/template @@ -3,7 +3,7 @@ pkgname=sonata # allow updating to 1.7.0, xbps considers 1.7a1 and 1.7b1 to be newer than 1.7.0 reverts="1.7a2_1 1.7a2_2 1.7a2_3 1.7b1_1 1.7b1_2 1.7b1_3 1.7b1_4" version=1.7.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="gettext python3-setuptools" depends="python3-mpd2 python3-gobject gtk+3" diff --git a/srcpkgs/soundconverter/template b/srcpkgs/soundconverter/template index a6d45ab9276fe7..f1147993d4686e 100644 --- a/srcpkgs/soundconverter/template +++ b/srcpkgs/soundconverter/template @@ -1,7 +1,7 @@ # Template file for 'soundconverter' pkgname=soundconverter version=4.0.3 -revision=2 +revision=3 build_style=python3-module pycompile_dirs="/usr/lib/${pkgname}/python/${pkgname}" hostmakedepends="glib intltool pkg-config python3-gobject python3-distutils-extra" diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template index 55e64f030c1a45..b087a2e326e893 100644 --- a/srcpkgs/speech-dispatcher/template +++ b/srcpkgs/speech-dispatcher/template @@ -1,7 +1,7 @@ # Template file for 'speech-dispatcher' pkgname=speech-dispatcher version=0.11.5 -revision=1 +revision=2 build_style=gnu-configure # Disable support for sundry non-free TTS systems (said support causes # the pre-pkg step to fail on account of missing shlibs). diff --git a/srcpkgs/speedtest-cli/template b/srcpkgs/speedtest-cli/template index c4ccb25ea9afe1..025cc24bbecf43 100644 --- a/srcpkgs/speedtest-cli/template +++ b/srcpkgs/speedtest-cli/template @@ -1,7 +1,7 @@ # Template file for 'speedtest-cli' pkgname=speedtest-cli version=2.1.3 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template index db8e84d1b08f3a..64e86ab0a28c8a 100644 --- a/srcpkgs/sqlmap/template +++ b/srcpkgs/sqlmap/template @@ -1,7 +1,7 @@ # Template file for 'sqlmap' pkgname=sqlmap version=1.8.12 -revision=1 +revision=2 pycompile_dirs="usr/libexec/sqlmap" depends="python3" short_desc="Automatic SQL injection and database takeover tool" diff --git a/srcpkgs/ssh-audit/template b/srcpkgs/ssh-audit/template index 3ce1fe43810a09..e51fe27a1d84f4 100644 --- a/srcpkgs/ssh-audit/template +++ b/srcpkgs/ssh-audit/template @@ -1,7 +1,7 @@ # Template file for 'ssh-audit' pkgname=ssh-audit version=3.3.0 -revision=1 +revision=2 build_style="python3-module" hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template index dd8b1b43e7d504..0560a6e8092926 100644 --- a/srcpkgs/sshuttle/template +++ b/srcpkgs/sshuttle/template @@ -1,7 +1,7 @@ # Template file for 'sshuttle' pkgname=sshuttle version=1.1.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core python3-Sphinx" depends="python3-psutil" diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template index 76eb9866b12829..aac23b21782dd7 100644 --- a/srcpkgs/sssd/template +++ b/srcpkgs/sssd/template @@ -1,7 +1,7 @@ # Template file for 'sssd' pkgname=sssd version=2.8.2 -revision=4 +revision=5 # upstream explicitly hardcodes to use glibc: # https://github.com/SSSD/sssd/blob/2.8.2/src/util/nss_dl_load.c archs="~*-musl" diff --git a/srcpkgs/stcgal/template b/srcpkgs/stcgal/template index ebe4adfe355fc2..3c9c6361fac8de 100644 --- a/srcpkgs/stcgal/template +++ b/srcpkgs/stcgal/template @@ -1,7 +1,7 @@ # Template file for 'stcgal' pkgname=stcgal version=1.6 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pyserial python3-setuptools python3-tqdm" diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template index c7680b4412dab8..34fcad901c2cdd 100644 --- a/srcpkgs/stig/template +++ b/srcpkgs/stig/template @@ -1,7 +1,7 @@ # Template file for 'stig' pkgname=stig version=0.12.10a0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-blinker python3-natsort python3-xdg python3-aiohttp diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template index 757a76a6693a45..7d99f3df68011f 100644 --- a/srcpkgs/streamlink/template +++ b/srcpkgs/streamlink/template @@ -1,7 +1,7 @@ # Template file for 'streamlink' pkgname=streamlink version=7.0.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-versioningit" depends="python3-lxml python3-pycryptodome python3-pycountry diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template index 4e736e393ba458..18b8256673caae 100644 --- a/srcpkgs/subliminal/template +++ b/srcpkgs/subliminal/template @@ -1,7 +1,7 @@ # Template file for 'subliminal' pkgname=subliminal version=2.1.0 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3 python3-guessit python3-babelfish python3-enzyme diff --git a/srcpkgs/subuser/template b/srcpkgs/subuser/template index 8acc15c8f0b0a1..f604a286078fc9 100644 --- a/srcpkgs/subuser/template +++ b/srcpkgs/subuser/template @@ -1,7 +1,7 @@ # Template file for 'subuser' pkgname=subuser version=0.6.2 -revision=7 +revision=8 archs="x86_64*" build_style=python3-module hostmakedepends="python3-setuptools" diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 309d6b1142065a..6b6cea450e5de6 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -4,7 +4,7 @@ # pkgname=subversion version=1.14.2 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-javahl --disable-static --config-cache --with-gnome-keyring --with-editor=vi --disable-mod-activation diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template index f5475ac9b5c00a..0feb84944d305b 100644 --- a/srcpkgs/sumo/template +++ b/srcpkgs/sumo/template @@ -1,7 +1,7 @@ # Template file for 'sumo' pkgname=sumo version=1.12.0 -revision=8 +revision=9 build_style=cmake hostmakedepends="libgdal-tools pkg-config swig python3-setuptools" makedepends="python3-devel ffmpeg6-devel fox-devel gl2ps-devel libgdal-devel diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template index 92ba9d254e45c1..45e4f974b434b6 100644 --- a/srcpkgs/synapse/template +++ b/srcpkgs/synapse/template @@ -1,7 +1,7 @@ # Template file for 'synapse' pkgname=synapse version=1.120.0 -revision=1 +revision=2 build_style=python3-pep517 build_helper=rust make_check_target=tests diff --git a/srcpkgs/syncplay/template b/srcpkgs/syncplay/template index 1feb6f504fad29..c74fbb54b703c3 100644 --- a/srcpkgs/syncplay/template +++ b/srcpkgs/syncplay/template @@ -1,7 +1,7 @@ # Template file for 'syncplay' pkgname=syncplay version=1.7.3 -revision=1 +revision=2 build_style=gnu-makefile pycompile_dirs="usr/lib/syncplay/syncplay" depends="desktop-file-utils python3-pyside6 python3-Twisted diff --git a/srcpkgs/syncthing-gtk/template b/srcpkgs/syncthing-gtk/template index a9d4262b1d3dbf..1a55f055902c10 100644 --- a/srcpkgs/syncthing-gtk/template +++ b/srcpkgs/syncthing-gtk/template @@ -2,7 +2,7 @@ pkgname=syncthing-gtk reverts="0.14.36_1 0.9.4.4+ds+git20220108+9023143f8b93_1 0.9.4.4+ds+git20220108+9023143f8b93_2" version=0.9.4.4 -revision=8 +revision=9 _debianver="ds+git20221205+12a9702d29ab" build_style=python3-module hostmakedepends="python3-setuptools gettext" diff --git a/srcpkgs/system-config-printer/template b/srcpkgs/system-config-printer/template index 3bcaa3ecd34903..69b24c07350796 100644 --- a/srcpkgs/system-config-printer/template +++ b/srcpkgs/system-config-printer/template @@ -1,7 +1,7 @@ # Template file for 'system-config-printer' pkgname=system-config-printer version=1.5.18 -revision=3 +revision=4 build_style=gnu-configure pycompile_dirs="usr/share/system-config-printer" configure_args="--with-udev-rules" diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template index f4555bfee4d058..1b296c44ab4ebb 100644 --- a/srcpkgs/talloc/template +++ b/srcpkgs/talloc/template @@ -1,7 +1,7 @@ # Template file for 'talloc' pkgname=talloc version=2.4.2 -revision=1 +revision=2 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" diff --git a/srcpkgs/targetcli-fb/template b/srcpkgs/targetcli-fb/template index 922120e59cb7fb..9cd3ff69e70ddf 100644 --- a/srcpkgs/targetcli-fb/template +++ b/srcpkgs/targetcli-fb/template @@ -1,7 +1,7 @@ # Template file for 'targetcli-fb' pkgname=targetcli-fb version=2.1.54 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="configshell-fb python3-six rtslib-fb python3-parsing python3-gobject" diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template index 43efffc527d909..b9306e9b387fa3 100644 --- a/srcpkgs/tbb/template +++ b/srcpkgs/tbb/template @@ -1,7 +1,7 @@ # Template file for 'tbb' pkgname=tbb version=2022.0.0 -revision=1 +revision=2 build_style=cmake configure_args="-DTBB_STRICT=OFF -DTBB_TEST=OFF" makedepends="libgomp-devel libhwloc-devel" diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template index 6d1c3039ed914f..0b5d722c3199f8 100644 --- a/srcpkgs/tdb/template +++ b/srcpkgs/tdb/template @@ -1,7 +1,7 @@ # Template file for 'tdb' pkgname=tdb version=1.4.10 -revision=1 +revision=2 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" diff --git a/srcpkgs/telegram-tg/template b/srcpkgs/telegram-tg/template index 0484cc6efd9d86..8610ba565ea451 100644 --- a/srcpkgs/telegram-tg/template +++ b/srcpkgs/telegram-tg/template @@ -1,7 +1,7 @@ # Template file for 'telegram-tg' pkgname=telegram-tg version=0.19.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-telegram" diff --git a/srcpkgs/telepresence/patches/python3.12.patch b/srcpkgs/telepresence/patches/python3.12.patch deleted file mode 100644 index 5e9025a5d6f8bb..00000000000000 --- a/srcpkgs/telepresence/patches/python3.12.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./versioneer.py.orig 2023-09-29 10:02:24.403985079 -0400 -+++ ./versioneer.py 2023-09-29 10:02:36.679060444 -0400 -@@ -339,9 +339,9 @@ - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . - setup_cfg = os.path.join(root, "setup.cfg") -- parser = configparser.SafeConfigParser() -+ parser = configparser.ConfigParser() - with open(setup_cfg, "r") as f: -- parser.readfp(f) -+ parser.read_file(f) - VCS = parser.get("versioneer", "VCS") # mandatory - - def get(parser, name): diff --git a/srcpkgs/telepresence/template b/srcpkgs/telepresence/template index 51547ee340e137..fd9f4750417b98 100644 --- a/srcpkgs/telepresence/template +++ b/srcpkgs/telepresence/template @@ -1,24 +1,18 @@ # Template file for 'telepresence' pkgname=telepresence -version=0.107 -revision=5 +version=2.20.3 +revision=1 archs="x86_64* ppc64le*" -build_style=python3-module -hostmakedepends="python3-pip python3-setuptools git" -depends="kubectl fuse-sshfs torsocks openssh conntrack-tools iptables" +build_style=go +go_import_path=github.com/telepresenceio/telepresence/v2 +go_package="${go_import_path}/cmd/telepresence" +go_ldflags="-X ${go_import_path}/pkg/version.Version=${version}" +depends="kubectl fuse-sshfs openssh conntrack-tools iptables" short_desc="Local development against a remote Kubernetes or OpenShift cluster" maintainer="Orphaned " license="Apache-2.0" homepage="https://www.telepresence.io" -changelog="https://raw.githubusercontent.com/telepresenceio/telepresence/master/docs/reference/changelog.md" -distfiles="https://github.com/datawire/telepresence/archive/${version}.tar.gz" -checksum=e2db257bf7f4f8b833912bcb2fe02ab42cc61429b61a0071dd8f61deb1001cb8 +changelog="https://raw.githubusercontent.com/telepresenceio/telepresence/refs/heads/release/v2/CHANGELOG.yml" +distfiles="https://github.com/telepresenceio/telepresence/archive/v${version}.tar.gz" +checksum=b55e55374504c6b950ed7af6ac3f2ea0123b1c8b52caa73d11259fd84d343526 nocross=kubectl - -post_build() { - packaging/build-sshuttle.py -} - -post_install() { - vbin dist/sshuttle-telepresence -} diff --git a/srcpkgs/termdown/template b/srcpkgs/termdown/template index 7a6549cbb06a4f..160529b87aee4c 100644 --- a/srcpkgs/termdown/template +++ b/srcpkgs/termdown/template @@ -1,7 +1,7 @@ # Template file for 'termdown' pkgname=termdown version=1.18.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-dateutil python3-click python3-pyfiglet" diff --git a/srcpkgs/terminator/template b/srcpkgs/terminator/template index 93f757651b7829..e3bd24f39dd019 100644 --- a/srcpkgs/terminator/template +++ b/srcpkgs/terminator/template @@ -1,7 +1,7 @@ # Template file for 'terminator' pkgname=terminator version=2.1.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="intltool python3-setuptools" depends="desktop-file-utils gsettings-desktop-schemas libkeybinder3 libnotify diff --git a/srcpkgs/termtosvg/template b/srcpkgs/termtosvg/template index a25f2b4a557410..e2a6161ce61c35 100644 --- a/srcpkgs/termtosvg/template +++ b/srcpkgs/termtosvg/template @@ -1,7 +1,7 @@ # Template file for 'termtosvg' pkgname=termtosvg version=1.1.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pyte python3-lxml python3-wcwidth" diff --git a/srcpkgs/tevent/template b/srcpkgs/tevent/template index 1a3f49d8bb8d0b..f481f52736f28c 100644 --- a/srcpkgs/tevent/template +++ b/srcpkgs/tevent/template @@ -1,7 +1,7 @@ # Template file for 'tevent' pkgname=tevent version=0.16.1 -revision=1 +revision=2 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" diff --git a/srcpkgs/texworks/template b/srcpkgs/texworks/template index 220826510a8b36..d413730ec3bb4b 100644 --- a/srcpkgs/texworks/template +++ b/srcpkgs/texworks/template @@ -1,7 +1,7 @@ # Template file for 'texworks' pkgname=texworks version=0.6.6 -revision=3 +revision=4 build_style=cmake configure_args="-DTW_BUILD_ID=Void -DWITH_LUA=ON -DWITH_PYTHON=ON -DDESIRED_QT_VERSION:STRING=5" diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template index dd7f1356e28f5f..377e816781ec79 100644 --- a/srcpkgs/thefuck/template +++ b/srcpkgs/thefuck/template @@ -1,7 +1,7 @@ # Template file for 'thefuck' pkgname=thefuck version=3.32 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-colorama python3-decorator python3-psutil python3-pyte diff --git a/srcpkgs/thinkpad-scripts/template b/srcpkgs/thinkpad-scripts/template index a5f806cde523d8..8f65c8698fa840 100644 --- a/srcpkgs/thinkpad-scripts/template +++ b/srcpkgs/thinkpad-scripts/template @@ -1,7 +1,7 @@ # Template file for 'thinkpad-scripts' pkgname=thinkpad-scripts version=4.12.0 -revision=6 +revision=7 build_style=python3-module pycompile_module="tps" hostmakedepends="gettext python3-setuptools" diff --git a/srcpkgs/timer-cli/template b/srcpkgs/timer-cli/template index 6dd183c61885f2..8aa76a1c1f5ee2 100644 --- a/srcpkgs/timer-cli/template +++ b/srcpkgs/timer-cli/template @@ -1,7 +1,7 @@ # Template file for 'timer-cli' pkgname=timer-cli version=0.1.2 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="python3-rich python3-click python3-art" diff --git a/srcpkgs/tlpui/template b/srcpkgs/tlpui/template index 6b1c4b31386b86..1ec1ab4efc809d 100644 --- a/srcpkgs/tlpui/template +++ b/srcpkgs/tlpui/template @@ -1,7 +1,7 @@ # Template file for 'tlpui' pkgname=tlpui version=1.7.1 -revision=1 +revision=2 build_style="python3-pep517" hostmakedepends="python3-poetry-core" depends="gtk+3 tlp python3-gobject python3-yaml" diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template index 93aa04df486c9f..a2b7650826b678 100644 --- a/srcpkgs/tlsh/template +++ b/srcpkgs/tlsh/template @@ -1,7 +1,7 @@ # Template file for 'tlsh' pkgname=tlsh version=4.8.2 -revision=1 +revision=2 build_style=cmake build_helper=python3 hostmakedepends="python3-setuptools" diff --git a/srcpkgs/todoman/template b/srcpkgs/todoman/template index 47e5b747d4faba..a236a9ca44c556 100644 --- a/srcpkgs/todoman/template +++ b/srcpkgs/todoman/template @@ -1,7 +1,7 @@ # Template file for 'todoman' pkgname=todoman version=4.4.0 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-icalendar python3-urwid python3-xdg python3-parsedatetime diff --git a/srcpkgs/toot/template b/srcpkgs/toot/template index 8a36272f912dd0..fc7a98234fcd3a 100644 --- a/srcpkgs/toot/template +++ b/srcpkgs/toot/template @@ -1,7 +1,7 @@ # Template file for 'toot' pkgname=toot version=0.47.1 -revision=1 +revision=2 build_style=python3-pep517 _depends="python3-click python3-requests python3-BeautifulSoup4 python3-wcwidth python3-urwid python3-urwidgets python3-tomlkit python3-Pillow python3-term-image" diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template index 199f6740c25f0a..6e826498d5167c 100644 --- a/srcpkgs/torbrowser-launcher/template +++ b/srcpkgs/torbrowser-launcher/template @@ -1,7 +1,7 @@ # Template file for 'torbrowser-launcher' pkgname=torbrowser-launcher version=0.3.7 -revision=1 +revision=2 archs="i686 x86_64" # limited by Tor Browser itself build_style=python3-module hostmakedepends="gettext python3-distro python3-setuptools" diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 24fd3c2e83a084..7e479c157efb64 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,7 +1,7 @@ # Template file for 'totem' pkgname=totem version=43.0 -revision=3 +revision=4 build_style=meson build_helper="gir" configure_args="-Denable-python=yes" diff --git a/srcpkgs/tox/template b/srcpkgs/tox/template index 1177bd1f436aa2..f1614396534274 100644 --- a/srcpkgs/tox/template +++ b/srcpkgs/tox/template @@ -1,7 +1,7 @@ # Template file for 'tox' pkgname=tox version=4.23.2 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3-cachetools python3-chardet python3-colorama python3-filelock diff --git a/srcpkgs/trackma/template b/srcpkgs/trackma/template index dc8a40d9bebd36..0ef65c114eea62 100644 --- a/srcpkgs/trackma/template +++ b/srcpkgs/trackma/template @@ -1,7 +1,7 @@ # Template file for 'trackma' pkgname=trackma version=0.8.4 -revision=4 +revision=5 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-urwid python3-gobject" diff --git a/srcpkgs/transifex-cli/template b/srcpkgs/transifex-cli/template index 2c39abd896a966..64fb4ab8c68254 100644 --- a/srcpkgs/transifex-cli/template +++ b/srcpkgs/transifex-cli/template @@ -1,7 +1,7 @@ # Template file for 'transifex-cli' pkgname=transifex-cli version=1.6.6 -revision=5 +revision=6 build_style=go go_import_path="github.com/transifex/cli" go_ldflags="-X github.com/transifex/cli/internal/txlib.Version=${version}" diff --git a/srcpkgs/trash-cli/template b/srcpkgs/trash-cli/template index 455f27211e8a75..c711e7249493ff 100644 --- a/srcpkgs/trash-cli/template +++ b/srcpkgs/trash-cli/template @@ -1,7 +1,7 @@ # Template file for 'trash-cli' pkgname=trash-cli version=0.24.5.26 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="--ignore=tests/test_put/cmd/e2e/test_on_links_to_dirs.py" hostmakedepends="python3-wheel" diff --git a/srcpkgs/treeline/template b/srcpkgs/treeline/template index ea9cb07b1980a3..a60f6cab2fee85 100644 --- a/srcpkgs/treeline/template +++ b/srcpkgs/treeline/template @@ -1,7 +1,7 @@ # Template file for 'treeline' pkgname=treeline version=3.1.6 -revision=2 +revision=3 pycompile_dirs="usr/share/treeline" hostmakedepends="python3" depends="python3-PyQt5" diff --git a/srcpkgs/tryton/template b/srcpkgs/tryton/template index 5ec0cce61218ba..a25c297fdcb95a 100644 --- a/srcpkgs/tryton/template +++ b/srcpkgs/tryton/template @@ -1,7 +1,7 @@ # Template file for 'tryton' pkgname=tryton version=7.2.8 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="gtk+3 python3-dateutil python3-gobject" diff --git a/srcpkgs/tuimoji/template b/srcpkgs/tuimoji/template index c5421ecdaada12..d83c37741f0dc7 100644 --- a/srcpkgs/tuimoji/template +++ b/srcpkgs/tuimoji/template @@ -1,7 +1,7 @@ # Template file for 'tuimoji' pkgname=tuimoji version=1.0.0 -revision=7 +revision=8 build_style=python3-module pycompile_module="tuimoji" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/tuir/template b/srcpkgs/tuir/template index c431c4cf9b99eb..3ce8e0391c4a2a 100644 --- a/srcpkgs/tuir/template +++ b/srcpkgs/tuir/template @@ -1,7 +1,7 @@ # Template file for 'tuir' pkgname=tuir version=1.29.0 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="ncurses python3-BeautifulSoup4 python3-decorator python3-kitchen diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template index acde04498f69f6..c962b052e1a252 100644 --- a/srcpkgs/txt2tags/template +++ b/srcpkgs/txt2tags/template @@ -1,7 +1,7 @@ # Template file for 'txt2tags' pkgname=txt2tags version=3.9 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-wheel python3-setuptools" depends="python3" diff --git a/srcpkgs/tzupdate/template b/srcpkgs/tzupdate/template index a5b3c5aebd153a..ede6223a6f4b85 100644 --- a/srcpkgs/tzupdate/template +++ b/srcpkgs/tzupdate/template @@ -1,7 +1,7 @@ # Template file for 'tzupdate' pkgname=tzupdate version=2.1.0 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" diff --git a/srcpkgs/udiskie/patches/setuptools.patch b/srcpkgs/udiskie/patches/setuptools.patch new file mode 100644 index 00000000000000..29d9f443e0288a --- /dev/null +++ b/srcpkgs/udiskie/patches/setuptools.patch @@ -0,0 +1,45 @@ +udiskie tries to monkey-patch entry-point generation to improve performance, +but it relies on context that is not available in setuptools 75. + +--- a/setup.py ++++ b/setup.py +@@ -1,5 +1,4 @@ + from setuptools import setup, Command +-from setuptools.command.easy_install import ScriptWriter + from setuptools.command.install import install as orig_install + from distutils.command.build import build as orig_build + +@@ -68,33 +67,6 @@ + pass + + +-def fast_entrypoint_script_template(): +- """ +- Replacement for ``easy_install.ScriptWriter.template`` to generate faster +- entry points that don't depend on and import pkg_resources. +- +- NOTE: `pip install` already does the right thing (at least for pip 19.0) +- without our help, but this is still needed for setuptools install, i.e. +- ``python setup.py install`` or develop. +- """ +- SCRIPT_TEMPLATE = dedent(r''' +- # encoding: utf-8 +- import sys +- from {ep.module_name} import {ep.attrs[0]} +- +- if __name__ == '__main__': +- sys.exit({func}()) +- ''').lstrip() +- +- class ScriptTemplate(str): +- def __mod__(self, context): +- func = '.'.join(context['ep'].attrs) +- return self.format(func=func, **context) +- +- return ScriptTemplate(SCRIPT_TEMPLATE) +- +- +-ScriptWriter.template = fast_entrypoint_script_template() + setup( + cmdclass={ + 'install': install, diff --git a/srcpkgs/udiskie/template b/srcpkgs/udiskie/template index 0814514e52621f..04ad1102281fcf 100644 --- a/srcpkgs/udiskie/template +++ b/srcpkgs/udiskie/template @@ -1,6 +1,6 @@ # Template file for 'udiskie' pkgname=udiskie -version=2.5.2 +version=2.5.3 revision=1 build_style=python3-module hostmakedepends="gettext asciidoc python3-setuptools" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/coldfix/udiskie" changelog="https://raw.githubusercontent.com/coldfix/udiskie/master/CHANGES.rst" distfiles="https://github.com/coldfix/udiskie/archive/refs/tags/v${version}.tar.gz" -checksum=fb81930ac046e90c8a03135c5ca93454653c23f57ef5659f6eaed87a9098754d +checksum=6971adaa00dcd6b799b8a0b62c47103e0ad9a3f1880112c51ccc662316d2b306 make_check=ci-skip # privilege issue with keyring in container post_build() { diff --git a/srcpkgs/ueberzug/template b/srcpkgs/ueberzug/template index a34f94361e1dc4..f3ded48231ec9d 100644 --- a/srcpkgs/ueberzug/template +++ b/srcpkgs/ueberzug/template @@ -1,7 +1,7 @@ # Template file for 'ueberzug' pkgname=ueberzug version=18.1.9 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel libX11-devel libXext-devel" diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template index cf5f2bbe804450..18a0821401cf45 100644 --- a/srcpkgs/ufw/template +++ b/srcpkgs/ufw/template @@ -1,7 +1,7 @@ # Template file for 'ufw' pkgname=ufw version=0.36.2 -revision=2 +revision=3 _major_minor="${version%.*}" build_style=python3-module conf_files=" diff --git a/srcpkgs/ulauncher/template b/srcpkgs/ulauncher/template index 64723a69b80d60..b26b3ced7b81c3 100644 --- a/srcpkgs/ulauncher/template +++ b/srcpkgs/ulauncher/template @@ -1,7 +1,7 @@ # Template file for 'ulauncher' pkgname=ulauncher version=5.15.7 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-distutils-extra intltool python3-Levenshtein python3-dbus python3-gobject python3-inotify python3-websocket-client diff --git a/srcpkgs/unicorn/template b/srcpkgs/unicorn/template index a1ec4a1f5a426a..56a2e5f32d1157 100644 --- a/srcpkgs/unicorn/template +++ b/srcpkgs/unicorn/template @@ -1,7 +1,7 @@ # Template file for 'unicorn' pkgname=unicorn version=1.0.2 -revision=4 +revision=5 hostmakedepends="python3-devel python3-setuptools" short_desc="Lightweight multi-platform, multi-architecture CPU emulator framework" maintainer="Piraty " diff --git a/srcpkgs/unknown-horizons/template b/srcpkgs/unknown-horizons/template index 0b1325526ad965..4b1b13a9120824 100644 --- a/srcpkgs/unknown-horizons/template +++ b/srcpkgs/unknown-horizons/template @@ -1,7 +1,7 @@ # Template file for 'unknown-horizons' pkgname=unknown-horizons version=2019.1 -revision=9 +revision=10 build_style=python3-module hostmakedepends="python3 python3-setuptools intltool git python3-Pillow" depends="fifengine python3-yaml" diff --git a/srcpkgs/urh/patches/numpy.patch b/srcpkgs/urh/patches/numpy.patch new file mode 100644 index 00000000000000..76dd552a9d0dd6 --- /dev/null +++ b/srcpkgs/urh/patches/numpy.patch @@ -0,0 +1,22 @@ +Either urh works with numpy >= 2.0, or it has been long broken anyway. + +--- a/setup.py ++++ b/setup.py +@@ -142,7 +142,7 @@ + return "" + + +-install_requires = ["numpy<2.0.0", "psutil", "cython", "setuptools"] ++install_requires = ["numpy", "psutil", "cython", "setuptools"] + if IS_RELEASE: + install_requires.append("pyqt5") + else: +@@ -168,7 +168,7 @@ + license="GNU General Public License (GPL)", + download_url="https://github.com/jopohl/urh/tarball/v" + str(version.VERSION), + install_requires=install_requires, +- setup_requires=["numpy<2.0.0"], ++ setup_requires=["numpy"], + packages=get_packages(), + ext_modules=get_extensions(), + cmdclass={"build_ext": build_ext}, diff --git a/srcpkgs/urh/template b/srcpkgs/urh/template index 7c109b044b1462..64c93f19ccc224 100644 --- a/srcpkgs/urh/template +++ b/srcpkgs/urh/template @@ -1,12 +1,12 @@ # Template file for 'urh' pkgname=urh -version=2.9.6 -revision=2 +version=2.9.8 +revision=1 build_style=python3-module -hostmakedepends="python3-setuptools python3-Cython0.29 python3-numpy" +hostmakedepends="python3-setuptools python3-Cython python3-numpy" makedepends="python3-devel python3-PyQt5 libairspy-devel librtlsdr-devel libhackrf-devel uhd-devel libgomp-devel" -depends="python3-numpy python3-PyQt5 python3-Cython0.29 python3-psutil +depends="python3-numpy python3-PyQt5 python3-Cython python3-psutil python3-setuptools" checkdepends="$depends" short_desc="Universal Radio Hacker: investigate unknown wireless protocols" @@ -15,8 +15,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/jopohl/urh" changelog="https://github.com/jopohl/urh/releases" distfiles="https://github.com/jopohl/urh/archive/refs/tags/v${version}.tar.gz" -checksum=34128f15bf57b21241fd629938826e17bc6fb32c1662665fda8b1d4c14a74559 -make_check=no # Test suite is taking too long and CI times out +checksum=6d564cbcf1dd5fd0bd86a349826b4ae4a6bc95ff0ec77b0e1027f2f2260fb9fd post_install() { vinstall data/urh.desktop 644 usr/share/applications diff --git a/srcpkgs/urlscan/template b/srcpkgs/urlscan/template index b074db15115887..02265568634ccf 100644 --- a/srcpkgs/urlscan/template +++ b/srcpkgs/urlscan/template @@ -1,7 +1,7 @@ # Template file for 'urlscan' pkgname=urlscan version=1.0.1 -revision=2 +revision=3 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3-urwid" diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template index 9a2dd7e4ec1701..f50a6bf0b172c7 100644 --- a/srcpkgs/urlwatch/template +++ b/srcpkgs/urlwatch/template @@ -1,7 +1,7 @@ # Template file for 'urlwatch' pkgname=urlwatch version=2.28 -revision=2 +revision=3 build_style=python3-module # skip the tests that require python modules that aren't packaged # (pdftotext & pytesseract) diff --git a/srcpkgs/uv/template b/srcpkgs/uv/template index 542bf2ca7247e1..1d96fa4087f4db 100644 --- a/srcpkgs/uv/template +++ b/srcpkgs/uv/template @@ -1,7 +1,7 @@ # Template file for 'uv' pkgname=uv version=0.5.4 -revision=1 +revision=2 build_style=python3-pep517 build_helper="rust qemu" hostmakedepends="maturin cargo cmake pkg-config" diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template index 51fd1c54934515..f7ad06a481cc65 100644 --- a/srcpkgs/uwsgi/template +++ b/srcpkgs/uwsgi/template @@ -1,7 +1,7 @@ # Template file for 'uwsgi' pkgname=uwsgi version=2.0.28 -revision=1 +revision=2 hostmakedepends="python3-setuptools" makedepends="python3-devel openssl-devel" short_desc="Fast, self-healing application container server" diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template index 4d88a90f4d2574..219a9e3fc2b7f9 100644 --- a/srcpkgs/vapoursynth/template +++ b/srcpkgs/vapoursynth/template @@ -1,7 +1,7 @@ # Template file for 'vapoursynth' pkgname=vapoursynth version=R66 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool nasm pkg-config python3-Cython" makedepends="python3-devel zimg-devel" diff --git a/srcpkgs/variety/template b/srcpkgs/variety/template index cd9ff256b16be5..4faaf1adf648af 100644 --- a/srcpkgs/variety/template +++ b/srcpkgs/variety/template @@ -1,7 +1,7 @@ # Template file for 'variety' pkgname=variety version=0.8.12 -revision=1 +revision=2 build_style=python3-module pycompile_dirs="usr/share/variety/plugins" hostmakedepends="python3-setuptools python3-distutils-extra intltool" diff --git a/srcpkgs/vdirsyncer/template b/srcpkgs/vdirsyncer/template index 7f295a73cd24d9..61d3884d2fc276 100644 --- a/srcpkgs/vdirsyncer/template +++ b/srcpkgs/vdirsyncer/template @@ -1,7 +1,7 @@ # Template file for 'vdirsyncer' pkgname=vdirsyncer version=0.19.3 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools_scm" depends="python3-atomicwrites python3-click python3-click-log python3-requests diff --git a/srcpkgs/vidcutter/patches/mpv-0.35-1.patch b/srcpkgs/vidcutter/patches/mpv-0.35-1.patch deleted file mode 100644 index 759b787f7a69bf..00000000000000 --- a/srcpkgs/vidcutter/patches/mpv-0.35-1.patch +++ /dev/null @@ -1,387 +0,0 @@ -https://github.com/ozmartian/vidcutter/commit/1d88825feb5a73a50d019914ba9d0008562a58ce.patch - -From 1d88825feb5a73a50d019914ba9d0008562a58ce Mon Sep 17 00:00:00 2001 -From: Pete Alexandrou -Date: Tue, 22 Feb 2022 11:29:00 +1100 -Subject: [PATCH] Patches to pympv to workaround opengl_cb deprecation from - libmpv - ---- - vidcutter/libs/pympv/client.pxd | 54 +- - vidcutter/libs/pympv/mpv.pyx | 192 +- - 3 files changed, 21832 insertions(+), 24808 deletions(-) - -diff --git a/vidcutter/libs/pympv/client.pxd b/vidcutter/libs/pympv/client.pxd -index befe219e..d9a8816f 100644 ---- a/vidcutter/libs/pympv/client.pxd -+++ b/vidcutter/libs/pympv/client.pxd -@@ -112,9 +112,9 @@ cdef extern from "mpv/client.h": - - int mpv_load_config_file(mpv_handle *ctx, const char *filename) nogil - -- void mpv_suspend(mpv_handle *ctx) nogil -+ # void mpv_suspend(mpv_handle *ctx) nogil - -- void mpv_resume(mpv_handle *ctx) nogil -+ # void mpv_resume(mpv_handle *ctx) nogil - - int64_t mpv_get_time_us(mpv_handle *ctx) nogil - -@@ -200,21 +200,21 @@ cdef extern from "mpv/client.h": - MPV_EVENT_START_FILE - MPV_EVENT_END_FILE - MPV_EVENT_FILE_LOADED -- MPV_EVENT_TRACKS_CHANGED -- MPV_EVENT_TRACK_SWITCHED -+ # MPV_EVENT_TRACKS_CHANGED -+ # MPV_EVENT_TRACK_SWITCHED - MPV_EVENT_IDLE -- MPV_EVENT_PAUSE -- MPV_EVENT_UNPAUSE -+ # MPV_EVENT_PAUSE -+ # MPV_EVENT_UNPAUSE - MPV_EVENT_TICK -- MPV_EVENT_SCRIPT_INPUT_DISPATCH -+ # MPV_EVENT_SCRIPT_INPUT_DISPATCH - MPV_EVENT_CLIENT_MESSAGE - MPV_EVENT_VIDEO_RECONFIG - MPV_EVENT_AUDIO_RECONFIG -- MPV_EVENT_METADATA_UPDATE -+ # MPV_EVENT_METADATA_UPDATE - MPV_EVENT_SEEK - MPV_EVENT_PLAYBACK_RESTART - MPV_EVENT_PROPERTY_CHANGE -- MPV_EVENT_CHAPTER_CHANGE -+ # MPV_EVENT_CHAPTER_CHANGE - - const char *mpv_event_name(mpv_event_id event) nogil - -@@ -249,9 +249,9 @@ cdef extern from "mpv/client.h": - int reason - int error - -- cdef struct mpv_event_script_input_dispatch: -- int arg0 -- const char *type -+ # cdef struct mpv_event_script_input_dispatch: -+ # int arg0 -+ # const char *type - - cdef struct mpv_event_client_message: - int num_args -@@ -282,27 +282,27 @@ cdef extern from "mpv/client.h": - - void *mpv_get_sub_api(mpv_handle *ctx, mpv_sub_api sub_api) nogil - --cdef extern from "mpv/opengl_cb.h": -- struct mpv_opengl_cb_context: -- pass -+# cdef extern from "mpv/opengl_cb.h": -+# struct mpv_opengl_cb_context: -+# pass - -- ctypedef void (*mpv_opengl_cb_update_fn)(void *cb_ctx) nogil -- ctypedef void *(*mpv_opengl_cb_get_proc_address_fn)(void *fn_ctx, -- const char *name) nogil -+# ctypedef void (*mpv_opengl_cb_update_fn)(void *cb_ctx) nogil -+# ctypedef void *(*mpv_opengl_cb_get_proc_address_fn)(void *fn_ctx, -+# const char *name) nogil - -- void mpv_opengl_cb_set_update_callback(mpv_opengl_cb_context *ctx, -- mpv_opengl_cb_update_fn callback, -- void *callback_ctx) nogil -+# void mpv_opengl_cb_set_update_callback(mpv_opengl_cb_context *ctx, -+# mpv_opengl_cb_update_fn callback, -+# void *callback_ctx) nogil - -- int mpv_opengl_cb_init_gl(mpv_opengl_cb_context *ctx, const char *exts, -- mpv_opengl_cb_get_proc_address_fn get_proc_address, -- void *get_proc_address_ctx) nogil -+# int mpv_opengl_cb_init_gl(mpv_opengl_cb_context *ctx, const char *exts, -+# mpv_opengl_cb_get_proc_address_fn get_proc_address, -+# void *get_proc_address_ctx) nogil - -- int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int w, int h) nogil -+# int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int w, int h) nogil - -- int mpv_opengl_cb_report_flip(mpv_opengl_cb_context *ctx, int64_t time) nogil -+# int mpv_opengl_cb_report_flip(mpv_opengl_cb_context *ctx, int64_t time) nogil - -- int mpv_opengl_cb_uninit_gl(mpv_opengl_cb_context *ctx) nogil -+# int mpv_opengl_cb_uninit_gl(mpv_opengl_cb_context *ctx) nogil - - - cdef extern from "mpv/render.h": -diff --git a/vidcutter/libs/pympv/mpv.pyx b/vidcutter/libs/pympv/mpv.pyx -index 540ea649..8af2dcc7 100644 ---- a/vidcutter/libs/pympv/mpv.pyx -+++ b/vidcutter/libs/pympv/mpv.pyx -@@ -30,8 +30,8 @@ from client cimport * - __version__ = "0.3.0" - __author__ = "Andre D" - --_REQUIRED_CAPI_MAJOR = 1 --_MIN_CAPI_MINOR = 9 -+_REQUIRED_CAPI_MAJOR = 2 -+_MIN_CAPI_MINOR = 0 - - cdef unsigned long _CAPI_VERSION - with nogil: -@@ -47,7 +47,7 @@ if _CAPI_MAJOR != _REQUIRED_CAPI_MAJOR or _CAPI_MINOR < _MIN_CAPI_MINOR: - ) - - cdef extern from "Python.h": -- void PyEval_InitThreads() -+ void Py_Initialize() - - _is_py3 = sys.version_info >= (3,) - _strdec_err = "surrogateescape" if _is_py3 else "strict" -@@ -67,7 +67,7 @@ def _strenc(s): - # In python2, assume bytes and walk right through - return s - --PyEval_InitThreads() -+Py_Initialize() - - class Errors: - """Set of known error codes from MpvError and Event responses. -@@ -114,21 +114,21 @@ class Events: - start_file = MPV_EVENT_START_FILE - end_file = MPV_EVENT_END_FILE - file_loaded = MPV_EVENT_FILE_LOADED -- tracks_changed = MPV_EVENT_TRACKS_CHANGED -- tracks_switched = MPV_EVENT_TRACK_SWITCHED -+ # tracks_changed = MPV_EVENT_TRACKS_CHANGED -+ # tracks_switched = MPV_EVENT_TRACK_SWITCHED - idle = MPV_EVENT_IDLE -- pause = MPV_EVENT_PAUSE -- unpause = MPV_EVENT_UNPAUSE -+ # pause = MPV_EVENT_PAUSE -+ # unpause = MPV_EVENT_UNPAUSE - tick = MPV_EVENT_TICK -- script_input_dispatch = MPV_EVENT_SCRIPT_INPUT_DISPATCH -+ # script_input_dispatch = MPV_EVENT_SCRIPT_INPUT_DISPATCH - client_message = MPV_EVENT_CLIENT_MESSAGE - video_reconfig = MPV_EVENT_VIDEO_RECONFIG - audio_reconfig = MPV_EVENT_AUDIO_RECONFIG -- metadata_update = MPV_EVENT_METADATA_UPDATE -+ # metadata_update = MPV_EVENT_METADATA_UPDATE - seek = MPV_EVENT_SEEK - playback_restart = MPV_EVENT_PLAYBACK_RESTART - property_change = MPV_EVENT_PROPERTY_CHANGE -- chapter_change = MPV_EVENT_CHAPTER_CHANGE -+ # chapter_change = MPV_EVENT_CHAPTER_CHANGE - - - class LogLevels: -@@ -166,17 +166,17 @@ cdef class EndOfFileReached(object): - return self - - --cdef class InputDispatch(object): -- """Data field for MPV_EVENT_SCRIPT_INPUT_DISPATCH events. -+# cdef class InputDispatch(object): -+# """Data field for MPV_EVENT_SCRIPT_INPUT_DISPATCH events. - -- Wraps: mpv_event_script_input_dispatch -- """ -- cdef public object arg0, type -+# Wraps: mpv_event_script_input_dispatch -+# """ -+# cdef public object arg0, type - -- cdef _init(self, mpv_event_script_input_dispatch* input): -- self.arg0 = input.arg0 -- self.type = _strdec(input.type) -- return self -+# cdef _init(self, mpv_event_script_input_dispatch* input): -+# self.arg0 = input.arg0 -+# self.type = _strdec(input.type) -+# return self - - - cdef class LogMessage(object): -@@ -276,8 +276,8 @@ cdef class Event(object): - return Property()._init(data) - elif self.id == MPV_EVENT_LOG_MESSAGE: - return LogMessage()._init(data) -- elif self.id == MPV_EVENT_SCRIPT_INPUT_DISPATCH: -- return InputDispatch()._init(data) -+ # elif self.id == MPV_EVENT_SCRIPT_INPUT_DISPATCH: -+ # return InputDispatch()._init(data) - elif self.id == MPV_EVENT_CLIENT_MESSAGE: - climsg = data - args = [] -@@ -396,17 +396,17 @@ cdef class Context(object): - time = mpv_get_time_us(self._ctx) - return time - -- def suspend(self): -- """Wraps: mpv_suspend""" -- assert self._ctx -- with nogil: -- mpv_suspend(self._ctx) -+ # def suspend(self): -+ # """Wraps: mpv_suspend""" -+ # assert self._ctx -+ # with nogil: -+ # mpv_suspend(self._ctx) - -- def resume(self): -- """Wraps: mpv_resume""" -- assert self._ctx -- with nogil: -- mpv_resume(self._ctx) -+ # def resume(self): -+ # """Wraps: mpv_resume""" -+ # assert self._ctx -+ # with nogil: -+ # mpv_resume(self._ctx) - - @_errors - def request_event(self, event, enable): -@@ -798,17 +798,17 @@ cdef class Context(object): - self.reply_userdata = None - self._ctx = NULL - -- def opengl_cb_api(self): -- cdef void *cb -+ # def opengl_cb_api(self): -+ # cdef void *cb - -- _ctx = mpv_get_sub_api(self._ctx, MPV_SUB_API_OPENGL_CB) -- if not _ctx: -- raise MPVError("OpenGL API not available") -+ # _ctx = mpv_get_sub_api(self._ctx, MPV_SUB_API_OPENGL_CB) -+ # if not _ctx: -+ # raise MPVError("OpenGL API not available") - -- ctx = OpenGLContext() -- ctx._ctx = _ctx -+ # ctx = OpenGLContext() -+ # ctx._ctx = _ctx - -- return ctx -+ # return ctx - - def __dealloc__(self): - self.shutdown() -@@ -819,62 +819,62 @@ cdef void *_c_getprocaddress(void *ctx, const char *name) with gil: - cdef void _c_updatecb(void *ctx) with gil: - (ctx)() - --cdef class OpenGLContext(object): -- cdef: -- mpv_opengl_cb_context *_ctx -- bint inited -- object update_cb -- -- def __init__(self): -- self.inited = False -- warnings.warn("OpenGLContext is deprecated, please switch to RenderContext", DeprecationWarning) -- -- def init_gl(self, exts, get_proc_address): -- exts = _strenc(exts) if exts is not None else None -- cdef char* extsc = NULL -- if exts is not None: -- extsc = exts -- with nogil: -- err = mpv_opengl_cb_init_gl(self._ctx, extsc, &_c_getprocaddress, -- get_proc_address) -- if err < 0: -- raise MPVError(err) -- -- self.inited = True -- -- def set_update_callback(self, cb): -- self.update_cb = cb -- with nogil: -- mpv_opengl_cb_set_update_callback(self._ctx, &_c_updatecb, cb) -- -- def draw(self, fbo, w, h): -- cdef: -- int fboc = fbo -- int wc = w -- int hc = h -- with nogil: -- err = mpv_opengl_cb_draw(self._ctx, fboc, wc, hc) -- if err < 0: -- raise MPVError(err) -- -- def report_flip(self, time): -- cdef int64_t ctime = time -- with nogil: -- err = mpv_opengl_cb_report_flip(self._ctx, ctime) -- if err < 0: -- raise MPVError(err) -- -- def uninit_gl(self): -- if not self.inited: -- return -- with nogil: -- err = mpv_opengl_cb_uninit_gl(self._ctx) -- if err < 0: -- raise MPVError(err) -- self.inited = False -- -- def __dealloc__(self): -- self.uninit_gl() -+# cdef class OpenGLContext(object): -+# cdef: -+# mpv_opengl_cb_context *_ctx -+# bint inited -+# object update_cb -+ -+# def __init__(self): -+# self.inited = False -+# warnings.warn("OpenGLContext is deprecated, please switch to RenderContext", DeprecationWarning) -+ -+# def init_gl(self, exts, get_proc_address): -+# exts = _strenc(exts) if exts is not None else None -+# cdef char* extsc = NULL -+# if exts is not None: -+# extsc = exts -+# with nogil: -+# err = mpv_opengl_cb_init_gl(self._ctx, extsc, &_c_getprocaddress, -+# get_proc_address) -+# if err < 0: -+# raise MPVError(err) -+ -+# self.inited = True -+ -+# def set_update_callback(self, cb): -+# self.update_cb = cb -+# with nogil: -+# mpv_opengl_cb_set_update_callback(self._ctx, &_c_updatecb, cb) -+ -+# def draw(self, fbo, w, h): -+# cdef: -+# int fboc = fbo -+# int wc = w -+# int hc = h -+# with nogil: -+# err = mpv_opengl_cb_draw(self._ctx, fboc, wc, hc) -+# if err < 0: -+# raise MPVError(err) -+ -+# def report_flip(self, time): -+# cdef int64_t ctime = time -+# with nogil: -+# err = mpv_opengl_cb_report_flip(self._ctx, ctime) -+# if err < 0: -+# raise MPVError(err) -+ -+# def uninit_gl(self): -+# if not self.inited: -+# return -+# with nogil: -+# err = mpv_opengl_cb_uninit_gl(self._ctx) -+# if err < 0: -+# raise MPVError(err) -+# self.inited = False -+ -+# def __dealloc__(self): -+# self.uninit_gl() - - DEF MAX_RENDER_PARAMS = 32 - diff --git a/srcpkgs/vidcutter/patches/mpv-0.35-2.patch b/srcpkgs/vidcutter/patches/mpv-0.35-2.patch deleted file mode 100644 index c982ded8475a8b..00000000000000 --- a/srcpkgs/vidcutter/patches/mpv-0.35-2.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/ozmartian/vidcutter/commit/8010f5c64efe68d8130a036f976d2d2ff1c868ad.patch - -From 8010f5c64efe68d8130a036f976d2d2ff1c868ad Mon Sep 17 00:00:00 2001 -From: Pete Alexandrou -Date: Tue, 22 Feb 2022 16:08:24 +1100 -Subject: [PATCH] fix libmpv version number format - ---- - vidcutter/libs/mpvwidget.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vidcutter/libs/mpvwidget.py b/vidcutter/libs/mpvwidget.py -index 239b6c9c..6661ad85 100644 ---- a/vidcutter/libs/mpvwidget.py -+++ b/vidcutter/libs/mpvwidget.py -@@ -247,7 +247,7 @@ def format(self, stream: str='video') -> str: - - def version(self) -> str: - ver = self.mpv.api_version -- return '{0}.{1}'.format(ver[0], ver[1]) -+ return '{0}.{1}'.format(ver[1], ver[0]) - - def option(self, option: str, val): - if isinstance(val, bool): diff --git a/srcpkgs/vidcutter/template b/srcpkgs/vidcutter/template index d06ea51c8a9a4f..424866533b6b0b 100644 --- a/srcpkgs/vidcutter/template +++ b/srcpkgs/vidcutter/template @@ -1,9 +1,9 @@ # Template file for 'vidcutter' pkgname=vidcutter -version=6.0.5.1 -revision=3 +version=6.0.5.3 +revision=1 build_style=python3-module -hostmakedepends="python3-setuptools python3-Cython0.29" +hostmakedepends="python3-setuptools python3-Cython" makedepends="mpv-devel python3-devel" depends="desktop-file-utils hicolor-icon-theme ffmpeg mpv mediainfo python3-PyOpenGL python3-PyQt5 python3-setuptools" @@ -11,15 +11,10 @@ short_desc="Video cutter and joiner based on FFmpeg" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/ozmartian/vidcutter" -# pympv isn't packaged because it will create a package conflicts with -# python3-mpv -distfiles="https://github.com/ozmartian/vidcutter/archive/refs/tags/${version}.tar.gz - https://github.com/marcan/pympv/archive/refs/tags/v0.7.1.tar.gz" -checksum="c6374eaedb845f9e580e555dd12c1db1cf2ffa28d3756b08e2ae28c1a4cd4a96 - 1d262e7fb2531d27633bdc2334fbc1c3ce094457a6a8f3cfc1c6c9799c1ef202" +distfiles="https://github.com/ozmartian/vidcutter/archive/refs/tags/${version}.tar.gz" +checksum=d613eb5e20b4606b416ae21968717027b527939d1aaf591f1044c9efe9552b87 -post_extract() { - mv vidcutter-*/* . - rm -rf vidcutter/libs/pympv - mv pympv-* vidcutter/libs/pympv +post_patch() { + # Version is wrong in github tags + vsed -i -e "s/^__version__ = .*/__version__ = '${version}'/" vidcutter/__init__.py } diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index eba202dff162c2..2daf13eb51e427 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,7 +1,7 @@ # Template file for 'vim' pkgname=vim version=9.1.0772 -revision=1 +revision=2 create_wrksrc=required hostmakedepends="gettext glib-devel pkg-config" makedepends="acl-devel ncurses-devel diff --git a/srcpkgs/vimiv/template b/srcpkgs/vimiv/template index da8bbaa56c7129..8945bee96a13f4 100644 --- a/srcpkgs/vimiv/template +++ b/srcpkgs/vimiv/template @@ -1,7 +1,7 @@ # Template file for 'vimiv' pkgname=vimiv version=0.9.1 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" makedepends="python3-devel" diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template index 6fcf4da68ea3c6..6e4c08baa55af8 100644 --- a/srcpkgs/virt-manager/template +++ b/srcpkgs/virt-manager/template @@ -1,7 +1,7 @@ # Template file for 'virt-manager' pkgname=virt-manager version=4.1.0 -revision=3 +revision=4 build_style=python3-module pycompile_dirs="/usr/share/${pkgname}/virtManager" hostmakedepends="gettext python3-docutils python3-setuptools" diff --git a/srcpkgs/virtme/template b/srcpkgs/virtme/template index 73940395770d47..34c32391c6967f 100644 --- a/srcpkgs/virtme/template +++ b/srcpkgs/virtme/template @@ -1,7 +1,7 @@ # Template file for 'virtme' pkgname=virtme version=0.1.1 -revision=6 +revision=7 build_style=python3-module pycompile_module="virtme" hostmakedepends="python3-setuptools" diff --git a/srcpkgs/virtualenvwrapper/template b/srcpkgs/virtualenvwrapper/template index 280b97b8e89515..45aa0e36de233c 100644 --- a/srcpkgs/virtualenvwrapper/template +++ b/srcpkgs/virtualenvwrapper/template @@ -1,7 +1,7 @@ # Template file for 'virtualenvwrapper' pkgname=virtualenvwrapper version=4.8.4 -revision=7 +revision=8 build_style=python3-module pycompile_module="virtualenvwrapper" hostmakedepends="python3-setuptools python3-pbr" diff --git a/srcpkgs/visidata/template b/srcpkgs/visidata/template index ee80066f8b52c5..cfe89f611485f8 100644 --- a/srcpkgs/visidata/template +++ b/srcpkgs/visidata/template @@ -1,7 +1,7 @@ # Template file for 'visidata' pkgname=visidata version=3.1.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dateutil python3-importlib_metadata python3-setuptools" diff --git a/srcpkgs/vit/template b/srcpkgs/vit/template index 6def6d6c4c6e82..c5ab4e31e3bbf1 100644 --- a/srcpkgs/vit/template +++ b/srcpkgs/vit/template @@ -1,7 +1,7 @@ # Template file for 'vit' pkgname=vit version=2.3.2 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="task python3-urwid python3-tasklib" diff --git a/srcpkgs/volctl/template b/srcpkgs/volctl/template index 7c211032211d2c..ea97d013a7d3aa 100644 --- a/srcpkgs/volctl/template +++ b/srcpkgs/volctl/template @@ -1,7 +1,7 @@ # Template file for 'volctl' pkgname=volctl version=0.9.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-gobject gtk+3 desktop-file-utils python3-cairo python3-pulsectl" diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template index cda7e47c489c31..54d611bcfacc9b 100644 --- a/srcpkgs/volk/template +++ b/srcpkgs/volk/template @@ -1,7 +1,7 @@ # Template file for 'volk' pkgname=volk version=3.1.2 -revision=1 +revision=2 _cpu_features_gitrev="188d0d3c383689cdb6bb70dc6da2469faec84f61" _sse2neon_ver=1.7.0 create_wrksrc=yes diff --git a/srcpkgs/voltron/template b/srcpkgs/voltron/template index c2bf1c656c2e5a..b04d4c66552166 100644 --- a/srcpkgs/voltron/template +++ b/srcpkgs/voltron/template @@ -1,7 +1,7 @@ # Template file for 'voltron' pkgname=voltron version=0.1.7 -revision=8 +revision=9 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-blessed python3-Flask python3-Pygments python3-pysigset diff --git a/srcpkgs/volume_key/template b/srcpkgs/volume_key/template index bcb21a01bcda3b..577f9be9ccc58a 100644 --- a/srcpkgs/volume_key/template +++ b/srcpkgs/volume_key/template @@ -1,7 +1,7 @@ # Template file for 'volume_key' pkgname=volume_key version=0.3.12 -revision=7 +revision=8 build_style=gnu-configure configure_args="--without-python" hostmakedepends="pkg-config python3-setuptools swig" diff --git a/srcpkgs/vpn-slice/template b/srcpkgs/vpn-slice/template index 44977d38b29e00..9b2cd8d2cc7f76 100644 --- a/srcpkgs/vpn-slice/template +++ b/srcpkgs/vpn-slice/template @@ -1,7 +1,7 @@ # Template file for 'vpn-slice' pkgname=vpn-slice version=0.16.1 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-dnspython python3-setproctitle iproute2" diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template index 5d87abde765f37..056d5ed087cf3a 100644 --- a/srcpkgs/vtk/template +++ b/srcpkgs/vtk/template @@ -1,7 +1,7 @@ # Template file for 'vtk' pkgname=vtk version=9.3.1 -revision=1 +revision=2 build_style=cmake # vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON" # Build only the core modules plus python bindings for now diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template index d902226652a95b..7382778fe7a968 100644 --- a/srcpkgs/waydroid/template +++ b/srcpkgs/waydroid/template @@ -1,7 +1,7 @@ # Template file for 'waydroid' pkgname=waydroid version=1.4.2 -revision=1 +revision=2 # https://developer.android.com/ndk/guides/abis#sa archs="aarch64* armv7* i686* x86_64*" build_style=gnu-makefile diff --git a/srcpkgs/weather/template b/srcpkgs/weather/template index 4e77906b2d6537..f50cf2295a9bb1 100644 --- a/srcpkgs/weather/template +++ b/srcpkgs/weather/template @@ -1,7 +1,7 @@ # Template file for 'weather' pkgname=weather version=2.4.1 -revision=5 +revision=6 depends="python3" conf_files="/etc/weatherrc" short_desc="CLI utility for current (METAR) weather conditions and forecasts" diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index cb904fa11da9e4..e01b4fc5a6ce4b 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,7 +1,7 @@ # Template file for 'weechat' pkgname=weechat version=4.4.4 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON diff --git a/srcpkgs/wfuzz/template b/srcpkgs/wfuzz/template index 2a0e81a1547201..bcb0dbc8dd5ea8 100644 --- a/srcpkgs/wfuzz/template +++ b/srcpkgs/wfuzz/template @@ -1,7 +1,7 @@ # Template file for 'wfuzz' pkgname=wfuzz version=3.1.0 -revision=5 +revision=6 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-chardet python3-curl python3-future python3-lxml python3-parse diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template index caa766bbdd7fd3..41b80c4631ba81 100644 --- a/srcpkgs/whipper/template +++ b/srcpkgs/whipper/template @@ -1,7 +1,7 @@ # Template file for 'whipper' pkgname=whipper version=0.10.0 -revision=6 +revision=7 build_style=python3-module hostmakedepends="python3-setuptools_scm" makedepends="libsndfile-devel python3-devel" diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index e376f45988d858..9ff5c6b2c511a6 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -1,7 +1,7 @@ # Template file for 'wicd' pkgname=wicd version=1.7.4 -revision=9 +revision=10 _ver=$version+tb2+2019.09.18git2e0ba579-1 build_style="python3-module" hostmakedepends="python3-setuptools python3-Babel" diff --git a/srcpkgs/wpgtk/template b/srcpkgs/wpgtk/template index 96030043d8cf8f..b14473451d00fc 100644 --- a/srcpkgs/wpgtk/template +++ b/srcpkgs/wpgtk/template @@ -1,7 +1,7 @@ # Template file for 'wpgtk' pkgname=wpgtk version=6.1.3 -revision=7 +revision=8 build_style=python3-module hostmakedepends="python3-setuptools" depends="gtk+3 python3-gobject python3-Pillow pywal libxslt" diff --git a/srcpkgs/wxPython/patches/wxsvg-cython.patch b/srcpkgs/wxPython/patches/wxsvg-cython.patch new file mode 100644 index 00000000000000..0876d61c4295f1 --- /dev/null +++ b/srcpkgs/wxPython/patches/wxsvg-cython.patch @@ -0,0 +1,12 @@ +The only thing preventing use of Cython 3 is an unused, invalid import. + +--- a/wx/svg/_nanosvg.pyx ++++ b/wx/svg/_nanosvg.pyx +@@ -42,7 +42,6 @@ + + import sys + +-cimport cython.object + from cpython.buffer cimport ( + Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE, + PyBuffer_Release) diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template index 0d29630771a48f..0ab2d5a2b9b3e3 100644 --- a/srcpkgs/wxPython/template +++ b/srcpkgs/wxPython/template @@ -1,11 +1,11 @@ # Template file for 'wxPython' pkgname=wxPython version=4.2.1 -revision=5 +revision=6 build_style=python3-module make_build_args="--skip-build" make_install_args="--skip-build" -hostmakedepends="pkg-config python3-setuptools python3-pathlib2 python3-Cython0.29" +hostmakedepends="pkg-config python3-setuptools python3-Cython" makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel gst-plugins-base1-devel" depends="python3-six" @@ -32,6 +32,7 @@ post_patch() { pre_build() { chmod -R go+rX $wrksrc + PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}$wrksrc" if [ "$CROSS_BUILD" ]; then PYPREFIX="$XBPS_CROSS_BASE" @@ -39,9 +40,9 @@ pre_build() { CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS" env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" \ - LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx + PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + python3 build.py build_py --use_syswx else python3 build.py build_py --use_syswx fi diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template index 8c75d7f6eb2aa5..51251dce1510ae 100644 --- a/srcpkgs/xapps/template +++ b/srcpkgs/xapps/template @@ -1,7 +1,7 @@ # Template file for 'xapps' pkgname=xapps version=2.6.1 -revision=3 +revision=4 build_style=meson build_helper="gir" hostmakedepends="glib-devel pkg-config vala python3 gettext" diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template index 72c10afcff38c9..94dd0847e2e277 100644 --- a/srcpkgs/xcb-proto/template +++ b/srcpkgs/xcb-proto/template @@ -1,7 +1,7 @@ # Template file for 'xcb-proto' pkgname=xcb-proto version=1.16.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="python3 automake" makedepends="libxml2" diff --git a/srcpkgs/xdot/template b/srcpkgs/xdot/template index 69fb5ff6dc472c..557cc4929aabae 100644 --- a/srcpkgs/xdot/template +++ b/srcpkgs/xdot/template @@ -1,7 +1,7 @@ # Template file for 'xdot' pkgname=xdot version=1.3 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="graphviz gtk+3 python3-gobject python3-numpy" diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index 52ae2f85c33e33..8ff41345f7189b 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,7 +1,7 @@ # Template file for 'xen' pkgname=xen version=4.14.1 -revision=11 +revision=12 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63 # TODO: arm / aarch64 diff --git a/srcpkgs/xkcdpass/template b/srcpkgs/xkcdpass/template index 5ce320a46789a7..c574c197e2f393 100644 --- a/srcpkgs/xkcdpass/template +++ b/srcpkgs/xkcdpass/template @@ -1,7 +1,7 @@ # Template file for 'xkcdpass' pkgname=xkcdpass version=1.19.9 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" diff --git a/srcpkgs/xml2rfc/template b/srcpkgs/xml2rfc/template index 520d3605a276c7..226bcd68b3e421 100644 --- a/srcpkgs/xml2rfc/template +++ b/srcpkgs/xml2rfc/template @@ -1,7 +1,7 @@ # Template file for 'xml2rfc' pkgname=xml2rfc version=3.25.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-appdirs python3-ConfigArgParse python3-html5lib diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template index 0e266e5681aeeb..a0a4efeea8a41f 100644 --- a/srcpkgs/xmldiff/template +++ b/srcpkgs/xmldiff/template @@ -1,7 +1,7 @@ # Template file for 'xmldiff' pkgname=xmldiff version=2.7.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-lxml python3-setuptools" diff --git a/srcpkgs/xonsh/template b/srcpkgs/xonsh/template index 118c37c3a18bb9..afeec41d531e99 100644 --- a/srcpkgs/xonsh/template +++ b/srcpkgs/xonsh/template @@ -1,7 +1,7 @@ # Template file for 'xonsh' pkgname=xonsh version=0.18.4 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-wheel" depends="python3 python3-Pygments" diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template index ba7447ea317fd5..d76bc897944f8f 100644 --- a/srcpkgs/xpra/template +++ b/srcpkgs/xpra/template @@ -1,6 +1,6 @@ # Template file for 'xpra' pkgname=xpra -version=6.2.1 +version=6.2.2 revision=1 build_style=python3-module make_build_args="--without-cuda_kernels --without-cuda_rebuild @@ -20,7 +20,7 @@ license="GPL-2.0-or-later" homepage="https://xpra.org/" changelog="https://raw.githubusercontent.com/Xpra-org/xpra/master/docs/CHANGELOG.md" distfiles="https://github.com/Xpra-org/xpra/archive/v${version}.tar.gz" -checksum=3b3642053f06bdc76308fd5d3b6f1a8b4797fa3995bb832b0a714a310cea1571 +checksum=a889d00a197a33a79062c786b54badcc6388aa1b28b0c9506f2aee6eab877180 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*" # Tests don't run properly without package installed make_check=no diff --git a/srcpkgs/yewtube/template b/srcpkgs/yewtube/template index 383517705111d2..731e2ff2f07a72 100644 --- a/srcpkgs/yewtube/template +++ b/srcpkgs/yewtube/template @@ -1,7 +1,7 @@ # Template file for 'yewtube' pkgname=yewtube version=2.12.0 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-requests python3-pyperclip python3-youtubesearch python3-pylast yt-dlp diff --git a/srcpkgs/you-get/template b/srcpkgs/you-get/template index 7c06af27bb8dbb..24888a42c41458 100644 --- a/srcpkgs/you-get/template +++ b/srcpkgs/you-get/template @@ -1,7 +1,7 @@ # Template file for 'you-get' pkgname=you-get version=0.4.1650 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pysocks python3-setuptools" diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index f4bf40b1988a45..35b8de68c172d0 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -1,11 +1,10 @@ # Template file for 'youtube-dl' pkgname=youtube-dl version=2021.12.17 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" -checkdepends="flake8 python3-nose" short_desc="CLI program to download videos from YouTube and other sites" maintainer="Orphaned " license="Unlicense" @@ -13,6 +12,7 @@ homepage="http://ytdl-org.github.io/youtube-dl" changelog="https://raw.githubusercontent.com/ytdl-org/youtube-dl/master/ChangeLog" distfiles="https://github.com/ytdl-org/youtube-dl/archive/${version}.tar.gz" checksum=d095479ccdbc5f42d312faf4a42c7bd009a2efb5703120311b7a86ad6a3197f4 +make_check=no # Tests require removed python3-nose do_check() { PYTHON=/usr/bin/python3 make offlinetest diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template index 2ff10af03e7ca6..6f1ad6ce324243 100644 --- a/srcpkgs/yq/template +++ b/srcpkgs/yq/template @@ -1,7 +1,7 @@ # Template file for 'yq' pkgname=yq version=3.4.3 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-setuptools_scm python3-wheel" depends="python3-yaml python3-xmltodict python3-tomlkit python3-argcomplete jq" diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template index 680254b738e5e0..188b572c1512ba 100644 --- a/srcpkgs/yt-dlp/template +++ b/srcpkgs/yt-dlp/template @@ -1,7 +1,7 @@ # Template file for 'yt-dlp' pkgname=yt-dlp version=2024.12.06 -revision=1 +revision=2 build_style=python3-pep517 make_check_args="-k not((download)or(test_socks))" hostmakedepends="hatchling" diff --git a/srcpkgs/ytcc/template b/srcpkgs/ytcc/template index 650bc639c66eba..fa12b04bac43e4 100644 --- a/srcpkgs/ytcc/template +++ b/srcpkgs/ytcc/template @@ -1,7 +1,7 @@ # Template file for 'ytcc' pkgname=ytcc version=2.6.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="mpv yt-dlp python3-click python3-wcwidth" diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template index 76f89d68b05a91..888605a125b45a 100644 --- a/srcpkgs/ytmdl/template +++ b/srcpkgs/ytmdl/template @@ -1,7 +1,7 @@ # Template file for 'ytmdl' pkgname=ytmdl version=2024.08.15.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="ffmpeg yt-dlp python3-mutagen python3-requests python3-colorama diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template index 8880d974e4abb3..a9e496b90aa36d 100644 --- a/srcpkgs/yubikey-manager/template +++ b/srcpkgs/yubikey-manager/template @@ -1,7 +1,7 @@ # Template file for 'yubikey-manager' pkgname=yubikey-manager version=5.2.1 -revision=1 +revision=2 build_style=python3-pep517 hostmakedepends="python3-poetry-core" depends="libfido2 python3-click python3-fido2 python3-cryptography diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index 7e959a658420c0..5398ae63d2a0b8 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,7 +1,7 @@ # Template file for 'z3' pkgname=z3 version=4.13.3 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)" make_build_args="-C build all examples" diff --git a/srcpkgs/zbar/template b/srcpkgs/zbar/template index baf0c766b333a9..a8cef17827e2af 100644 --- a/srcpkgs/zbar/template +++ b/srcpkgs/zbar/template @@ -1,7 +1,7 @@ # Template file for 'zbar' pkgname=zbar version=0.23.1 -revision=7 +revision=8 build_style=gnu-configure build_helper=gir configure_args="$(vopt_with qt) --with-gir --with-python=python3" diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template index 7862b61ad5784b..fec9e050dba047 100644 --- a/srcpkgs/zeek/template +++ b/srcpkgs/zeek/template @@ -1,7 +1,7 @@ # Template file for 'zeek' pkgname=zeek version=7.0.4 -revision=1 +revision=2 archs="x86_64* i686* aarch64* armv7* ppc64*" build_style=cmake build_helper=qemu diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template index 49658d499fe0b5..0612ba596ceba4 100644 --- a/srcpkgs/zeitgeist/template +++ b/srcpkgs/zeitgeist/template @@ -1,7 +1,7 @@ # Template file for 'zeitgeist' pkgname=zeitgeist version=1.0.4 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args="--enable-fts --enable-datahub $(vopt_enable gir introspection)" diff --git a/srcpkgs/zim/template b/srcpkgs/zim/template index 575f024a6bdcd0..1bc600dae39e31 100644 --- a/srcpkgs/zim/template +++ b/srcpkgs/zim/template @@ -1,7 +1,7 @@ # Template file for 'zim' pkgname=zim version=0.75.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-gobject python3-xdg python3-setuptools gtk+3" depends="python3-gobject python3-xdg gtk+3 desktop-file-utils" diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template index 3a0c1e1be133b5..881b400cbb5c10 100644 --- a/srcpkgs/znc/template +++ b/srcpkgs/znc/template @@ -1,7 +1,7 @@ # Template file for 'znc' pkgname=znc version=1.9.1 -revision=1 +revision=2 build_style=cmake configure_args="-DWANT_PYTHON=YES -DWANT_PERL=YES -DWANT_TCL=YES -DWANT_ARGON=YES -DWANT_I18N=YES" diff --git a/srcpkgs/zulip-term/template b/srcpkgs/zulip-term/template index 5c385b37b4b454..48aebb02e16392 100644 --- a/srcpkgs/zulip-term/template +++ b/srcpkgs/zulip-term/template @@ -1,7 +1,7 @@ # Template file for 'zulip-term' pkgname=zulip-term version=0.7.0 -revision=1 +revision=2 build_style=python3-pep517 # these two tests don't expect "pytest" to be called as "pytest3" make_check_target="