Merge branch 'master' of https://github.com/macports/macports-ports

macports · Oct 1, 2024 · 8352754 · 8352754
2 parents 249f909 + c813396
commit 8352754
Show file tree

Hide file tree

Showing 39 changed files with 331 additions and 400 deletions.
diff --git a/.github/workflows/bootstrap.sh b/.github/workflows/bootstrap.sh
@@ -15,7 +15,7 @@ endgroup() {
     printtag "endgroup"
 }
 
-MACPORTS_VERSION=2.10.1
+MACPORTS_VERSION=2.10.2
 
 OS_MAJOR=$(uname -r | cut -f 1 -d .)
 OS_ARCH=$(uname -m)
@@ -80,7 +80,7 @@ begingroup "Selecting Xcode version"
 case "$OS_MAJOR" in
     22) sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
         ;;
-    23) sudo xcode-select --switch /Applications/Xcode_15.3.app/Contents/Developer
+    23) sudo xcode-select --switch /Applications/Xcode_16.app/Contents/Developer
         ;;
 esac
 endgroup

diff --git a/archivers/xar/Portfile b/archivers/xar/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           clang_dependency 1.0
 PortGroup           github 1.0
 
-set apple_version   498
+set apple_version   501
 github.setup        apple-oss-distributions xar ${apple_version} xar-
 version             1.8.0.${apple_version}
 revision            0
@@ -19,9 +19,9 @@ distname            ${name}-${apple_version}
 
 worksrcdir          ${distname}/xar
 
-checksums           rmd160  0471deb9e01c91658feb4ea120772f7478f5c350 \
-                    sha256  34f2e97c6786d2994af30fd72447ff1ac53f4052391a1030424da291f26c44f4 \
-                    size    224456
+checksums           rmd160  9a30fb4730de5bb8d70ff2692d7276d7f586ef50 \
+                    sha256  6a9257017243c78d37e3788717259e53ffd33d93c740c12754e8527943fe892d \
+                    size    224936
 
 depends_build       port:pkgconfig \
                     port:automake

diff --git a/archivers/xar/files/patch-src-xar_internal.h.diff b/archivers/xar/files/patch-src-xar_internal.h.diff
@@ -1,23 +1,16 @@
---- src/xar_internal.h.orig	2022-02-09 16:56:42.000000000 +1100
-+++ src/xar_internal.h	2022-03-18 05:43:14.000000000 +1100
-@@ -8,15 +8,13 @@
- #ifndef _XAR_INTERNAL_H_
- #define _XAR_INTERNAL_H_
-
--#ifdef XARSIG_BUILDING_WITH_XAR
- #include "xar.h"
--#else
--#include <xar/xar.h>
--#endif // XARSIG_BUILDING_WITH_XAR
+--- src/xar_internal.h.orig	2024-09-24 15:39:21
++++ src/xar_internal.h	2024-10-01 07:15:49
+@@ -15,9 +15,9 @@
+ #endif // XARSIG_BUILDING_WITH_XAR
 
  // Undeprecate these for internal usage
 -xar_t xar_open(const char *file, int32_t flags) API_AVAILABLE(macos(10.4));
 -xar_t xar_open_digest_verify(const char *file, int32_t flags, void *expected_toc_digest, size_t expected_toc_digest_len) API_AVAILABLE(macos(10.14.4));
+-xar_t xar_fdopen_digest_verify(int fd, int32_t flags, void *expected_toc_digest, size_t expected_toc_digest_len) API_AVAILABLE(macos(15.0));
 -char *xar_get_path(xar_file_t f) API_AVAILABLE(macos(10.4));
 +xar_t xar_open(const char *file, int32_t flags);
 +xar_t xar_open_digest_verify(const char *file, int32_t flags, void *expected_toc_digest, size_t expected_toc_digest_len);
++xar_t xar_fdopen_digest_verify(int fd, int32_t flags, void *expected_toc_digest, size_t expected_toc_digest_len);
 +char *xar_get_path(xar_file_t f);
-+
-+char *xar_get_safe_path(xar_file_t f);
 
  #endif /* _XAR_INTERNAL_H_ */
diff --git a/audio/cubeb/Portfile b/audio/cubeb/Portfile
@@ -0,0 +1,31 @@
+# -*- 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
+
+PortSystem          1.0
+PortGroup           cmake   1.1
+PortGroup           github  1.0
+
+github.setup        mozilla cubeb 2bee6bcbd37b121ab197193fe466eef0e91b62b1
+version             20240924
+revision            0
+
+description         Cross platform audio library
+
+long_description    {*}${description}
+
+categories          audio
+license             ISC
+maintainers         {gmail.com:herby.gillot @herbygillot} \
+                    openmaintainer
+
+fetch.type          git
+
+depends_build-append \
+                    port:doxygen \
+                    port:python312
+
+post-fetch {
+    system -W ${worksrcpath} "git submodule update --init --recursive"
+}
+
+configure.args-append \
+                    -DBUILD_TESTS=OFF
diff --git a/audio/ncmpc/Portfile b/audio/ncmpc/Portfile
@@ -1,15 +1,18 @@
 # -*- 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
 
 PortSystem          1.0
+PortGroup           compiler_blacklist_versions 1.0
 PortGroup           meson 1.0
 PortGroup           boost 1.0
 
+boost.version       1.81
+
 name                ncmpc
-version             0.49
+version             0.51
 revision            0
-checksums           rmd160  c194047119f7f1131325199bd2727f74d6845a54 \
-                    sha256  65bbec0ede9e6bcf62ac647b0c706485beb2bdd5db70ca8d60103f32f162cf29 \
-                    size    296012
+checksums           rmd160  8ca66ee52204556d1af459e3879dc2073141c9f4 \
+                    sha256  e74be00e69bc3ed1268cafcc87274e78dfbde147f2480ab0aad8260881ec7271 \
+                    size    312732
 
 set branch          [join [lrange [split ${version} .] 0 0] .]
 categories          audio
@@ -21,13 +24,22 @@ homepage            https://www.musicpd.org/clients/${name}/
 master_sites        https://www.musicpd.org/download/${name}/${branch}/
 use_xz              yes
 
+meson.wrap_mode     nodownload
+
+set port_libfmt     libfmt11
+
+configure.pkg_config_path-prepend \
+                    ${prefix}/lib/${port_libfmt}/pkgconfig
+
 depends_build-append \
-                    port:pkgconfig
-depends_lib-append  path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:gettext \
+                    path:bin/pkg-config:pkgconfig
+depends_lib-append  path:lib/pkgconfig/glib-2.0.pc:glib2 \
+                    port:gettext-runtime \
+                    port:${port_libfmt} \
                     port:libmpdclient \
                     port:ncurses \
-                    port:pcre
+                    port:pcre2
 
 configure.args-append \
                     -Dcurses=ncurses
@@ -43,7 +55,16 @@ patchfiles-append   0001-Fix-for-missing-u_int32_t-for-macOS.patch \
 # https://github.com/MusicPlayerDaemon/ncmpc/issues/132
 patchfiles-append   0003-Revert-util-Concepts-remove-obsolete-fallbacks.patch
 
-compiler.cxx_standard 2020
+compiler.cxx_standard \
+                    2020
+# Undefined symbols for architecture x86_64:
+# "std::exception_ptr::__from_native_exception_pointer(void*)"
+compiler.blacklist-append \
+                    {clang < 1600}
+if {${os.platform} eq "darwin" && ${os.major} < 23} {
+    compiler.blacklist-append \
+                    {macports-clang-1[8-9]}
+}
 
 livecheck.url       https://www.musicpd.org/download/${name}/${branch}/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)"
diff --git a/databases/sqlcipher/Portfile b/databases/sqlcipher/Portfile
@@ -30,14 +30,11 @@ long_description    SQLCipher extends the SQLite database library to add \
                     an example of how to use the SQLite3 library.
 
 homepage            https://www.zetetic.net/sqlcipher/
-github.setup        sqlcipher sqlcipher 4.6.0 v
+github.setup        sqlcipher sqlcipher 4.6.1 v
 github.tarball_from archive
-checksums           rmd160  c8f74ff03499f1c6fc77d63692f0ef1badcb4d85 \
-                    sha256  879fb030c36bc5138029af6aa3ae3f36c28c58e920af05ac7ca78a5915b2fa3c \
-                    size    19017463
-
-# https://github.com/sqlcipher/sqlcipher/pull/503
-patchfiles          0001-sqliteInt.h-fix-pointer-size-for-ppc64.patch
+checksums           rmd160  01890f5230bdb7a08d7f757b34cfa177a2a8596d \
+                    sha256  d8f9afcbc2f4b55e316ca4ada4425daf3d0b4aab25f45e11a802ae422b9f53a3 \
+                    size    19115004
 
 openssl.configure   build_flags
 

diff --git a/databases/sqlcipher/files/0001-sqliteInt.h-fix-pointer-size-for-ppc64.patch b/databases/sqlcipher/files/0001-sqliteInt.h-fix-pointer-size-for-ppc64.patch
diff --git a/devel/act/Portfile b/devel/act/Portfile
@@ -3,7 +3,7 @@
 PortSystem          1.0
 PortGroup           golang 1.0
 
-go.setup            github.com/nektos/act 0.2.67 v
+go.setup            github.com/nektos/act 0.2.68 v
 go.offline_build    no
 github.tarball_from archive
 revision            0
@@ -20,9 +20,9 @@ maintainers         {gmail.com:herby.gillot @herbygillot} \
                     openmaintainer
 platforms           darwin linux
 
-checksums           rmd160  a24a6ba31996c69313a196310c67f0bc1837da1b \
-                    sha256  1a93acf48f1b8bd3689c8c6c906e42ef0bb695199abfab488f11051e9f855b57 \
-                    size    9296039
+checksums           rmd160  4fad1d5a0e843163448485b247848ade526d8442 \
+                    sha256  45653a9a73c8f5fe4bb6b05b49d3ef22589a6968ccf30a49cc399e7862870303 \
+                    size    9298471
 
 build.cmd           make
 build.pre_args      VERSION=${version}

diff --git a/devel/git-cc/Portfile b/devel/git-cc/Portfile
@@ -3,7 +3,7 @@
 PortSystem          1.0
 PortGroup           golang 1.0
 
-go.setup            github.com/skalt/git-cc 0.0.17 v
+go.setup            github.com/skalt/git-cc 0.2.3 v
 github.tarball_from archive
 revision            0
 
@@ -25,20 +25,15 @@ destroot {
 }
 
 checksums           ${distname}${extract.suffix} \
-                        rmd160  61b3aa164a8832cd3da5b280ba2b2d4d6790ad85 \
-                        sha256  6bc41b4b908ddf7df4d4fa28864bd3b7518f5ad26e41d140e9cb0ec9080d9e7f \
-                        size    1275495
+                        rmd160  59769e0ab1b28df7763349fa5b619d1156bcc0d8 \
+                        sha256  aa4a340de894e786c85bfca42505cfda367eeb2b84b481c9e3d547772039699d \
+                        size    1381116
 
 go.vendors          gopkg.in/yaml.v3 \
                         lock    v3.0.1 \
                         rmd160  e85ac1368fb7f9ef945b7fd7bd608a1f0d261c12 \
                         sha256  f3ea6be3f405ec25f8799773355aba54f8831d11f5315a01155bdc69b92eca7b \
                         size    91208 \
-                    gopkg.in/yaml.v2 \
-                        lock    v2.4.0 \
-                        rmd160  66e9feb7944b3804efa63155ed9b618717b8955c \
-                        sha256  72812077e7f20278003de6ab0d85053d89131d64c443f39115a022114fd032b6 \
-                        size    73231 \
                     gopkg.in/check.v1 \
                         lock    8fa46927fb4f \
                         rmd160  c84f37dc900224c5e9e6e16ed5acc0d625583bc1 \
@@ -75,10 +70,10 @@ go.vendors          gopkg.in/yaml.v3 \
                         sha256  7f41acdcba65b1fab5b9b633947a139f9915b60f94bdab486cdbe9d90c54f61e \
                         size    50815 \
                     github.com/spf13/cobra \
-                        lock    v1.5.0 \
-                        rmd160  18a2771699cf666feee7566f27bf7122143209fd \
-                        sha256  64c60a9946f3daf9d26ed266ec31b81afa07357058b602b463fef82155430dad \
-                        size    104886 \
+                        lock    v1.7.0 \
+                        rmd160  2d0592a4c5aca1ba5daa45cd1d4e662adadd0703 \
+                        sha256  913afd358ab699baf7773e7a5661c9f6436c6f825da2a1d61623e69d2c0b4b2d \
+                        size    187188 \
                     github.com/russross/blackfriday \
                         lock    v2.1.0 \
                         rmd160  c42a9332a2c2f3074c6f7e8d37a58d6148d2af08 \
@@ -150,10 +145,10 @@ go.vendors          gopkg.in/yaml.v3 \
                         sha256  2f2e21ac8a9d523e88cbba4039441defc4a66bfaa78811c900a88fcf28729c4c \
                         size    8702 \
                     github.com/inconshreveable/mousetrap \
-                        lock    v1.0.0 \
-                        rmd160  5c617a09f1432fc543672a0e0c1e13d3752030c2 \
-                        sha256  0e6bae2849f13d12fe361ecac087728e4e97f3482f4cec44f6e7a2c53bb9cd0c \
-                        size    2291 \
+                        lock    v1.1.0 \
+                        rmd160  88f9577df93ac0f8801d8960adc7f28e38867f3e \
+                        sha256  f69af10ff08c0e87f92dac3ee5172d8ed02463725b74edfc8943ef018a1a632d \
+                        size    5343 \
                     github.com/davecgh/go-spew \
                         lock    v1.1.1 \
                         rmd160  7c02883aa81f81aca14e13a27fdca9e7fbc136f7 \