From 526e05e9b1e9efbbedb99167c334ee7e98d23541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Tue, 31 Oct 2023 09:56:06 +0100 Subject: [PATCH] update MacPorts --- tools/MacPorts/graphics/libraw/Portfile.orig | 1 + tools/MacPorts/graphics/libraw/Portfile.patch | 25 ++++---- tools/MacPorts/lang/libomp/Portfile | 41 +++++++++--- tools/MacPorts/lang/libomp/Portfile.orig | 26 +++++--- tools/MacPorts/lang/libomp/Portfile.patch | 62 ++++--------------- tools/MacPorts/multimedia/ffmpeg/Portfile | 11 +++- .../MacPorts/multimedia/ffmpeg/Portfile.orig | 11 +++- tools/MacPorts/multimedia/libvpx/Portfile | 4 +- .../MacPorts/multimedia/libvpx/Portfile.orig | 4 +- tools/MacPorts/net/curl/Portfile | 40 ++++++++---- tools/MacPorts/net/curl/Portfile.orig | 40 ++++++++---- tools/MacPorts/net/curl/files/configure.patch | 2 +- tools/MacPorts/python/py-pyside2/Portfile | 16 +++-- .../MacPorts/python/py-pyside2/Portfile.orig | 16 +++-- 14 files changed, 169 insertions(+), 130 deletions(-) diff --git a/tools/MacPorts/graphics/libraw/Portfile.orig b/tools/MacPorts/graphics/libraw/Portfile.orig index c7939c92fc..af45080db2 100644 --- a/tools/MacPorts/graphics/libraw/Portfile.orig +++ b/tools/MacPorts/graphics/libraw/Portfile.orig @@ -29,6 +29,7 @@ depends_lib port:jasper \ port:lcms2 use_autoreconf yes +autoreconf.args -fvi # libraw_datastream.h:125:8: error: no template named 'unique_ptr' in namespace 'std' compiler.cxx_standard 2011 diff --git a/tools/MacPorts/graphics/libraw/Portfile.patch b/tools/MacPorts/graphics/libraw/Portfile.patch index a803fecbc7..93c7cbe155 100644 --- a/tools/MacPorts/graphics/libraw/Portfile.patch +++ b/tools/MacPorts/graphics/libraw/Portfile.patch @@ -1,18 +1,18 @@ ---- Portfile.orig 2023-01-28 18:14:47.000000000 -0800 -+++ Portfile 2023-01-28 18:14:55.000000000 -0800 -@@ -3,47 +3,67 @@ +--- Portfile.orig 2023-10-31 09:50:57 ++++ Portfile 2023-07-04 02:43:05 +@@ -3,50 +3,69 @@ PortSystem 1.0 name libraw -version 0.21.1 -revision 0 -- --checksums rmd160 be36d8709eb2e8578f07b63ea8632eb6ed1d7775 \ -- sha256 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd \ -- size 1638461 +version 0.18.13 +set demosaicversion 0.18.8 +-checksums rmd160 be36d8709eb2e8578f07b63ea8632eb6ed1d7775 \ +- sha256 630a6bcf5e65d1b1b40cdb8608bdb922316759bfb981c65091fec8682d1543cd \ +- size 1638461 +- description Library for RAW image manipulation long_description A library for reading RAW files obtained from digital photo \ cameras (CRW/CR2, NEF, RAF, DNG, and others). @@ -50,6 +50,7 @@ port:lcms2 -use_autoreconf yes +-autoreconf.args -fvi - -# libraw_datastream.h:125:8: error: no template named 'unique_ptr' in namespace 'std' -compiler.cxx_standard 2011 @@ -70,8 +71,8 @@ + reinplace -E {s|-lstdc|-lc|g} ${destroot}${prefix}/lib/pkgconfig/libraw.pc + reinplace -E {s|-lstdc|-lc|g} ${destroot}${prefix}/lib/pkgconfig/libraw_r.pc + } -+} -+ + } + +variant gpl2 description {Enable GPL demosaic pack, license will be GPL-2+} { + distfiles-append \ + LibRaw-demosaic-pack-GPL2-${demosaicversion}${extract.suffix} \ @@ -84,6 +85,8 @@ + LibRaw-demosaic-pack-GPL3-${demosaicversion}${extract.suffix} + + license GPL-3+ - } - ++} ++ livecheck.type regex + livecheck.url ${homepage}/download/ + livecheck.regex "LibRaw-(\\d+(?:\\.\\d+)*)${extract.suffix}" diff --git a/tools/MacPorts/lang/libomp/Portfile b/tools/MacPorts/lang/libomp/Portfile index 4a73068959..ee3ca04161 100644 --- a/tools/MacPorts/lang/libomp/Portfile +++ b/tools/MacPorts/lang/libomp/Portfile @@ -29,21 +29,30 @@ epoch 1 subport libomp-devel {} if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} { + + version 17.0.3 + revision 0 + if { ${subport} eq "libomp-devel" } { - version 11.1.0 - checksums rmd160 8869b60844901466aed4e462ae8dac831bf519c3 \ - sha256 d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \ - size 971628 - livecheck.regex {"llvmorg-([0-9.rc-]+)".*} + # Marked obsolete 10/25/2022 + PortGroup obsolete 1.0 + replaced_by libomp } else { - version 11.1.0 - checksums rmd160 8869b60844901466aed4e462ae8dac831bf519c3 \ - sha256 d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \ - size 971628 livecheck.regex {"llvmorg-([0-9.]+)".*} } - revision 0 + distname openmp-${version}.src + distfiles ${distname}.tar.xz cmake-${version}.src.tar.xz + + checksums \ + openmp-${version}.src.tar.xz \ + rmd160 a79350f38202f4e9819373a433b1b19cef631eb2 \ + sha256 e04172c067f256d06cd8112abb49bc65f4e1d986a4b49b36cd837dfee3cdd274 \ + size 1273276 \ + cmake-${version}.src.tar.xz \ + rmd160 2f419efae4d3f8c9d87943cf1873031468a19bd7 \ + sha256 54fc534f0da09088adbaa6c3bfc9899a500153b96e60c2fb9322a7aa37b1027a \ + size 8712 if {${os.major} <= 12} { # kmp_alloc.c includes but libc++ is not the default on @@ -95,6 +104,18 @@ cmake.out_of_source yes # According to documentation builds with clang >= 3.3 compiler.blacklist-append {clang < 500} *gcc* +# https://trac.macports.org/ticket/68490# +# Use clang-11-bootstrap on OSX10.11 and older +if {${os.major} <= 15} { + compiler.blacklist-append clang *gcc* + depends_build-append port:clang-11-bootstrap + depends_skip_archcheck-append clang-11-bootstrap + pre-configure { + configure.cc ${prefix}/libexec/clang-11-bootstrap/bin/clang + configure.cxx ${prefix}/libexec/clang-11-bootstrap/bin/clang++ + } +} + if {${os.major} <= 17} { default_variants +universal } diff --git a/tools/MacPorts/lang/libomp/Portfile.orig b/tools/MacPorts/lang/libomp/Portfile.orig index a417389801..64a4e6f308 100644 --- a/tools/MacPorts/lang/libomp/Portfile.orig +++ b/tools/MacPorts/lang/libomp/Portfile.orig @@ -30,7 +30,7 @@ subport libomp-devel {} if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} { - version 16.0.6 + version 17.0.3 revision 0 if { ${subport} eq "libomp-devel" } { @@ -46,13 +46,13 @@ if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} { checksums \ openmp-${version}.src.tar.xz \ - rmd160 de7bc41e8207077aee79e3ff45c782f489f8f383 \ - sha256 a2536f06373774f2829d892b72eea5f97bab20e69b26b03042d947f992eb8e38 \ - size 1278072 \ + rmd160 a79350f38202f4e9819373a433b1b19cef631eb2 \ + sha256 e04172c067f256d06cd8112abb49bc65f4e1d986a4b49b36cd837dfee3cdd274 \ + size 1273276 \ cmake-${version}.src.tar.xz \ - rmd160 94ead500d749de031894e9a14c51ed17951c8fd7 \ - sha256 39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 \ - size 9008 + rmd160 2f419efae4d3f8c9d87943cf1873031468a19bd7 \ + sha256 54fc534f0da09088adbaa6c3bfc9899a500153b96e60c2fb9322a7aa37b1027a \ + size 8712 if {${os.major} <= 12} { # kmp_alloc.c includes but libc++ is not the default on @@ -98,6 +98,18 @@ cmake.out_of_source yes # According to documentation builds with clang >= 3.3 compiler.blacklist-append {clang < 500} *gcc* +# https://trac.macports.org/ticket/68490# +# Use clang-11-bootstrap on OSX10.11 and older +if {${os.major} <= 15} { + compiler.blacklist-append clang *gcc* + depends_build-append port:clang-11-bootstrap + depends_skip_archcheck-append clang-11-bootstrap + pre-configure { + configure.cc ${prefix}/libexec/clang-11-bootstrap/bin/clang + configure.cxx ${prefix}/libexec/clang-11-bootstrap/bin/clang++ + } +} + if {${os.major} <= 17} { default_variants +universal } diff --git a/tools/MacPorts/lang/libomp/Portfile.patch b/tools/MacPorts/lang/libomp/Portfile.patch index 83df784f52..7b318430ad 100644 --- a/tools/MacPorts/lang/libomp/Portfile.patch +++ b/tools/MacPorts/lang/libomp/Portfile.patch @@ -1,5 +1,5 @@ ---- Portfile.orig 2023-07-03 17:37:19.000000000 -0700 -+++ Portfile 2023-04-04 12:02:53.000000000 -0700 +--- Portfile.orig 2023-10-31 09:50:26 ++++ Portfile 2023-10-31 09:50:26 @@ -1,7 +1,7 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 @@ -18,48 +18,7 @@ components required to build an executing OpenMP\ program that are outside the compiler itself. \ This port works with MacPorts' clang-3.7+ (optionally \ -@@ -29,30 +29,21 @@ - subport libomp-devel {} - - if {${os.platform} eq "darwin" && ${configure.cxx_stdlib} ne "libstdc++"} { -- -- version 16.0.6 -- revision 0 -- - if { ${subport} eq "libomp-devel" } { -- # Marked obsolete 10/25/2022 -- PortGroup obsolete 1.0 -- replaced_by libomp -+ version 11.1.0 -+ checksums rmd160 8869b60844901466aed4e462ae8dac831bf519c3 \ -+ sha256 d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \ -+ size 971628 -+ livecheck.regex {"llvmorg-([0-9.rc-]+)".*} - } else { -+ version 11.1.0 -+ checksums rmd160 8869b60844901466aed4e462ae8dac831bf519c3 \ -+ sha256 d187483b75b39acb3ff8ea1b7d98524d95322e3cb148842957e9b0fbb866052e \ -+ size 971628 - livecheck.regex {"llvmorg-([0-9.]+)".*} - } - -- distname openmp-${version}.src -- distfiles ${distname}.tar.xz cmake-${version}.src.tar.xz -- -- checksums \ -- openmp-${version}.src.tar.xz \ -- rmd160 de7bc41e8207077aee79e3ff45c782f489f8f383 \ -- sha256 a2536f06373774f2829d892b72eea5f97bab20e69b26b03042d947f992eb8e38 \ -- size 1278072 \ -- cmake-${version}.src.tar.xz \ -- rmd160 94ead500d749de031894e9a14c51ed17951c8fd7 \ -- sha256 39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 \ -- size 9008 -+ revision 0 - - if {${os.major} <= 12} { - # kmp_alloc.c includes but libc++ is not the default on -@@ -62,34 +53,40 @@ +@@ -62,34 +62,40 @@ # Build requires std::atomic configure.cxxflags-append -std=c++11 @@ -120,24 +79,25 @@ } depends_build-append port:perl5 -@@ -115,14 +112,8 @@ +@@ -127,15 +133,9 @@ # With this, cmake sets the correct library name in the dylibs for the # final destination we move them to configure.args-append -DCMAKE_INSTALL_RPATH=${prefix}/lib/libomp \ - -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/libomp -- ++ -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/libomp \ ++ -DLIBOMP_OMPT_SUPPORT=FALSE + -if {${os.major} <= 10} { - set hnames {omp.h} - configure.args-append -DLIBOMP_OMPT_SUPPORT=FALSE -} else { - set hnames {omp-tools.h omp.h ompt.h} -} -+ -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib/libomp \ -+ -DLIBOMP_OMPT_SUPPORT=FALSE - +- variant top_level description \ "Install (links to) omp.h and libs into ${prefix}/(include|lib)" {} -@@ -131,30 +122,22 @@ + +@@ -143,30 +143,22 @@ # Patch tool for build with CMAKE_INSTALL_PREFIX reinplace "/bulk.*compatibility/s/s\+/s+.*/" \ ${rtpath}tools/check-depends.pl @@ -172,7 +132,7 @@ foreach p {libiomp5.dylib libomp.dylib libgomp.dylib} { system -W ${instdest}/lib/ \ "ln -s libomp/${p}" -@@ -162,8 +145,8 @@ +@@ -174,8 +166,8 @@ } set fpath ${worksrcpath}/${rtpath} diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile b/tools/MacPorts/multimedia/ffmpeg/Portfile index 68b3b68b01..bd53a007bf 100644 --- a/tools/MacPorts/multimedia/ffmpeg/Portfile +++ b/tools/MacPorts/multimedia/ffmpeg/Portfile @@ -19,7 +19,7 @@ conflicts ffmpeg-devel # Please increase the revision of mpv whenever ffmpeg's version is updated. version 4.4.4 -revision 2 +revision 3 epoch 1 license LGPL-2.1+ @@ -314,6 +314,15 @@ platform darwin { error "Variant rav1e not supported for macOS 10.5 and earlier, or PPC" } } + + # due to the new linker (which was introduced in Xcode 15: https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes), + # this port requires '-ld_classic' to build successfully with the toolchains from Xcode 15 or Command Line Tools 15. + # + # TODO: This is a temporary solution, the classic linker will be removed in a future release by Apple. + if { ( [vercmp ${xcodeversion} 15 ] >= 0 ) || ( [vercmp ${xcodecltversion} 15 ] >= 0 ) } { + configure.ldflags-append \ + -Wl,-ld_classic + } } platform powerpc { diff --git a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig index bc8b828510..4582698a07 100644 --- a/tools/MacPorts/multimedia/ffmpeg/Portfile.orig +++ b/tools/MacPorts/multimedia/ffmpeg/Portfile.orig @@ -19,7 +19,7 @@ conflicts ffmpeg-devel # Please increase the revision of mpv whenever ffmpeg's version is updated. version 4.4.4 -revision 2 +revision 3 epoch 1 license LGPL-2.1+ @@ -302,6 +302,15 @@ platform darwin { error "Variant rav1e not supported for macOS 10.5 and earlier, or PPC" } } + + # due to the new linker (which was introduced in Xcode 15: https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes), + # this port requires '-ld_classic' to build successfully with the toolchains from Xcode 15 or Command Line Tools 15. + # + # TODO: This is a temporary solution, the classic linker will be removed in a future release by Apple. + if { ( [vercmp ${xcodeversion} 15 ] >= 0 ) || ( [vercmp ${xcodecltversion} 15 ] >= 0 ) } { + configure.ldflags-append \ + -Wl,-ld_classic + } } platform powerpc { diff --git a/tools/MacPorts/multimedia/libvpx/Portfile b/tools/MacPorts/multimedia/libvpx/Portfile index 1b6f8da30a..6538d5abad 100644 --- a/tools/MacPorts/multimedia/libvpx/Portfile +++ b/tools/MacPorts/multimedia/libvpx/Portfile @@ -7,8 +7,8 @@ PortGroup muniversal 1.0 name libvpx conflicts libvpx-devel set my_name libvpx -version 1.13.0 -revision 1 +version 1.13.1 +revision 0 categories multimedia license Permissive diff --git a/tools/MacPorts/multimedia/libvpx/Portfile.orig b/tools/MacPorts/multimedia/libvpx/Portfile.orig index 089f19b3cd..ecbf5bac35 100644 --- a/tools/MacPorts/multimedia/libvpx/Portfile.orig +++ b/tools/MacPorts/multimedia/libvpx/Portfile.orig @@ -7,8 +7,8 @@ PortGroup muniversal 1.0 name libvpx conflicts libvpx-devel set my_name libvpx -version 1.13.0 -revision 1 +version 1.13.1 +revision 0 categories multimedia license Permissive diff --git a/tools/MacPorts/net/curl/Portfile b/tools/MacPorts/net/curl/Portfile index 0df4d7ffde..03a6e5a340 100644 --- a/tools/MacPorts/net/curl/Portfile +++ b/tools/MacPorts/net/curl/Portfile @@ -6,10 +6,10 @@ PortGroup clang_dependency 1.0 # Increase the revision of p5-www-curl whenever the version of curl gets updated. name curl -version 8.3.0 -checksums rmd160 f5f0aa07f0783cc331fb86c50249037d3524e33f \ - sha256 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 \ - size 2641764 +version 8.4.0 +checksums rmd160 d63bf003f0ef4da208337143a036da835ad9bfb6 \ + sha256 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d \ + size 2658376 categories net www platforms darwin freebsd @@ -47,12 +47,6 @@ if {${name} eq ${subport}} { patchfiles configure.patch - # see https://github.com/curl/curl/issues/11893 - if {${os.platform} eq "darwin" && ${os.major} >= 23} { - incr revision - patchfiles-append patch-sonoma.patch - } - configure.args --disable-silent-rules \ --enable-ipv6 \ --without-gnutls \ @@ -62,7 +56,6 @@ if {${name} eq ${subport}} { --without-libssh2 \ --without-mbedtls \ --without-nghttp2 \ - --without-nss \ --without-openssl \ --without-ssl \ --without-secure-transport \ @@ -127,30 +120,51 @@ if {${name} eq ${subport}} { RELEASE-NOTES \ ${destroot}${docdir} xinstall -m 0644 -W ${worksrcpath}/docs \ + ALTSVC.md \ BINDINGS.md \ + BUFREF.md \ BUGS.md \ + CIPHERS.md \ CODE_OF_CONDUCT.md \ CODE_STYLE.md \ + CONNECTION-FILTERS.md \ CONTRIBUTE.md \ + CURL-DISABLE.md \ + DEPRECATE.md \ + DYNBUF.md \ FAQ \ FEATURES.md \ GOVERNANCE.md \ HELP-US.md \ HISTORY.md \ + HSTS.md \ HTTP-COOKIES.md \ - HTTP2.md \ INTERNALS.md \ KNOWN_BUGS \ MAIL-ETIQUETTE \ + PARALLEL-TRANSFERS.md \ ROADMAP.md \ - SECURITY-PROCESS.md \ + SECURITY-ADVISORY.md \ SSL-PROBLEMS.md \ SSLCERTS.md \ THANKS \ TODO \ TheArtOfHttpScripting.md \ + URL-SYNTAX.md \ VERSIONS.md \ + WEBSOCKET.md \ + VULN-DISCLOSURE-POLICY.md \ ${destroot}${docdir} + if {[variant_isset http2]} { + xinstall -m 0644 -W ${worksrcpath}/docs \ + HTTP2.md \ + ${destroot}${docdir} + } + if {[variant_isset http3]} { + xinstall -m 0644 -W ${worksrcpath}/docs \ + HTTP3.md \ + ${destroot}${docdir} + } xinstall -m 0644 ${worksrcpath}/docs/libcurl/libcurl.m4 \ ${destroot}${prefix}/share/aclocal/ } diff --git a/tools/MacPorts/net/curl/Portfile.orig b/tools/MacPorts/net/curl/Portfile.orig index 0ee35533f5..5dbded285a 100644 --- a/tools/MacPorts/net/curl/Portfile.orig +++ b/tools/MacPorts/net/curl/Portfile.orig @@ -6,10 +6,10 @@ PortGroup clang_dependency 1.0 # Increase the revision of p5-www-curl whenever the version of curl gets updated. name curl -version 8.3.0 -checksums rmd160 f5f0aa07f0783cc331fb86c50249037d3524e33f \ - sha256 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 \ - size 2641764 +version 8.4.0 +checksums rmd160 d63bf003f0ef4da208337143a036da835ad9bfb6 \ + sha256 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d \ + size 2658376 categories net www platforms darwin freebsd @@ -47,12 +47,6 @@ if {${name} eq ${subport}} { patchfiles configure.patch - # see https://github.com/curl/curl/issues/11893 - if {${os.platform} eq "darwin" && ${os.major} >= 23} { - incr revision - patchfiles-append patch-sonoma.patch - } - configure.args --disable-silent-rules \ --enable-ipv6 \ --without-gnutls \ @@ -62,7 +56,6 @@ if {${name} eq ${subport}} { --without-libssh2 \ --without-mbedtls \ --without-nghttp2 \ - --without-nss \ --without-openssl \ --without-ssl \ --without-secure-transport \ @@ -123,30 +116,51 @@ if {${name} eq ${subport}} { RELEASE-NOTES \ ${destroot}${docdir} xinstall -m 0644 -W ${worksrcpath}/docs \ + ALTSVC.md \ BINDINGS.md \ + BUFREF.md \ BUGS.md \ + CIPHERS.md \ CODE_OF_CONDUCT.md \ CODE_STYLE.md \ + CONNECTION-FILTERS.md \ CONTRIBUTE.md \ + CURL-DISABLE.md \ + DEPRECATE.md \ + DYNBUF.md \ FAQ \ FEATURES.md \ GOVERNANCE.md \ HELP-US.md \ HISTORY.md \ + HSTS.md \ HTTP-COOKIES.md \ - HTTP2.md \ INTERNALS.md \ KNOWN_BUGS \ MAIL-ETIQUETTE \ + PARALLEL-TRANSFERS.md \ ROADMAP.md \ - SECURITY-PROCESS.md \ + SECURITY-ADVISORY.md \ SSL-PROBLEMS.md \ SSLCERTS.md \ THANKS \ TODO \ TheArtOfHttpScripting.md \ + URL-SYNTAX.md \ VERSIONS.md \ + WEBSOCKET.md \ + VULN-DISCLOSURE-POLICY.md \ ${destroot}${docdir} + if {[variant_isset http2]} { + xinstall -m 0644 -W ${worksrcpath}/docs \ + HTTP2.md \ + ${destroot}${docdir} + } + if {[variant_isset http3]} { + xinstall -m 0644 -W ${worksrcpath}/docs \ + HTTP3.md \ + ${destroot}${docdir} + } xinstall -m 0644 ${worksrcpath}/docs/libcurl/libcurl.m4 \ ${destroot}${prefix}/share/aclocal/ } diff --git a/tools/MacPorts/net/curl/files/configure.patch b/tools/MacPorts/net/curl/files/configure.patch index 53ce8a7d24..2168572f16 100644 --- a/tools/MacPorts/net/curl/files/configure.patch +++ b/tools/MacPorts/net/curl/files/configure.patch @@ -2,7 +2,7 @@ Prevent curl-config from telling curl's dependents that they have to link with all of curl's dependencies as well. --- configure.orig 2023-09-13 08:41:45 +++ configure 2023-09-13 08:42:48 -@@ -14479,7 +14479,7 @@ +@@ -14477,7 +14477,7 @@ else whole_archive_flag_spec='' fi diff --git a/tools/MacPorts/python/py-pyside2/Portfile b/tools/MacPorts/python/py-pyside2/Portfile index 6eb342a70b..76b9f6af8e 100644 --- a/tools/MacPorts/python/py-pyside2/Portfile +++ b/tools/MacPorts/python/py-pyside2/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup python 1.0 name py-pyside2 -version 5.15.10 +version 5.15.11 revision 0 categories-append devel aqua platforms darwin @@ -18,14 +18,15 @@ master_sites https://download.qt.io/official_releases/QtForPython/pys distname pyside-setup-opensource-src-${version} use_xz yes -checksums rmd160 492396a82a4140e86a81e4235cafa6a781766714 \ - sha256 2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a \ - size 3583764 +checksums rmd160 7f5725800c28998c6600b8360caab88bc137b11d \ + sha256 da567cd3b7854d27a0b4afe3e89de8b2f98b7a6d57393be56f1fc13f770faf29 \ + size 3584760 -python.versions 37 38 39 310 +python.versions 37 38 39 310 311 +python.pep517 no -set llvm_version 16 +set llvm_version 17 if {${name} ne ${subport}} { PortGroup qt5 1.0 @@ -39,9 +40,6 @@ if {${name} ne ${subport}} { # Needed for generating shiboken2 documentation qt5.depends_build_component sqlite-plugin - # undeclared identifier NPY_ARRAY_UPDATEIFCOPY - patchfiles-append patch-shiboken2-numpy-1.23.0.diff - depends_build-append \ path:bin/cmake:cmake \ port:py${python.version}-setuptools \ diff --git a/tools/MacPorts/python/py-pyside2/Portfile.orig b/tools/MacPorts/python/py-pyside2/Portfile.orig index 0f21fa2d37..6c1c7d944c 100644 --- a/tools/MacPorts/python/py-pyside2/Portfile.orig +++ b/tools/MacPorts/python/py-pyside2/Portfile.orig @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup python 1.0 name py-pyside2 -version 5.15.10 +version 5.15.11 revision 0 categories-append devel aqua platforms darwin @@ -18,14 +18,15 @@ master_sites https://download.qt.io/official_releases/QtForPython/pys distname pyside-setup-opensource-src-${version} use_xz yes -checksums rmd160 492396a82a4140e86a81e4235cafa6a781766714 \ - sha256 2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a \ - size 3583764 +checksums rmd160 7f5725800c28998c6600b8360caab88bc137b11d \ + sha256 da567cd3b7854d27a0b4afe3e89de8b2f98b7a6d57393be56f1fc13f770faf29 \ + size 3584760 -python.versions 37 38 39 310 +python.versions 37 38 39 310 311 +python.pep517 no -set llvm_version 16 +set llvm_version 17 if {${name} ne ${subport}} { PortGroup qt5 1.0 @@ -39,9 +40,6 @@ if {${name} ne ${subport}} { # Needed for generating shiboken2 documentation qt5.depends_build_component sqlite-plugin - # undeclared identifier NPY_ARRAY_UPDATEIFCOPY - patchfiles-append patch-shiboken2-numpy-1.23.0.diff - depends_build-append \ path:bin/cmake:cmake \ port:py${python.version}-setuptools \