<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ceb560896d734cf29b3a7659b3315de76b8a144a">https://github.com/macports/macports-ports/commit/ceb560896d734cf29b3a7659b3315de76b8a144a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ceb560896d734cf29b3a7659b3315de76b8a144a
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Thu Dec 14 00:45:26 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> brotli: update to 1.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add muniversal portgroup
</span><span style='display:block; white-space:pre;color:#404040;'> - disable CMake min version check to support use of cmake-bootstrap
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64784
</span>---
archivers/brotli/Portfile | 22 ++++++++-------
.../files/no-runtime-linker-path-in-pc-files.patch | 32 ----------------------
...tch-disable-cmake-ver-check-CmakeLists.txt.diff | 12 ++++++++
3 files changed, 24 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/brotli/Portfile b/archivers/brotli/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f6341af112..2f45c6d7841 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/brotli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/brotli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,27 +4,26 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup clang_dependency 1.0
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.1
</span>
# keep this in sync with port py-brotli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup google brotli 1.0.9 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup google brotli 1.1.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories archivers
maintainers {raimue @raimue} \
openmaintainer
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Brotli compression format
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Brotli compression format
</span>
long_description \
Brotli is a generic-purpose lossless compression algorithm that is similar \
in speed with deflate but offers more dense compression. This port installs \
the bro tool, see also port py-brotli for python modules.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3e2402d137fd75f898007d3730773b32025a4857 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b56a4371636e063ad3695f7c53aed5c18fc2303034564534981e7d6a11b75138 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 487046
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles no-runtime-linker-path-in-pc-files.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cb6909cbcc7c0bb19b8e985dbd7fcbca1b651772 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 10973f4b4199eafa1d5735ef661ddb2ec2f97319ee9fd1824d4aabe08cff5265 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 512036
</span>
# use cmake-bootstrap to avoid circular dependency:
# cmake depends on curl which depends on brotli.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +31,14 @@ depends_build-replace \
</span> path:bin/cmake:cmake port:cmake-bootstrap
configure.cmd ${prefix}/libexec/cmake-bootstrap/bin/cmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable the minimum version check of CMake to allow running cmake-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-disable-cmake-ver-check-CmakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 640 {*}[glob ${worksrcpath}/docs/*.1] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0640 {*}[glob ${worksrcpath}/docs/*.1] \
</span> ${destroot}${prefix}/share/man/man1/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 640 {*}[glob ${worksrcpath}/docs/*.3] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0640 {*}[glob ${worksrcpath}/docs/*.3] \
</span> ${destroot}${prefix}/share/man/man3/
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/brotli/files/no-runtime-linker-path-in-pc-files.patch b/archivers/brotli/files/no-runtime-linker-path-in-pc-files.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4ee7b064ad2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/brotli/files/no-runtime-linker-path-in-pc-files.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Revert "Add runtime linker path to pkg-config files (#740)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/google/brotli/issues/836
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/google/brotli/pull/838
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/libbrotlicommon.pc.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/libbrotlicommon.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,5 +7,5 @@ Name: libbrotlicommon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: https://github.com/google/brotli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Brotli common dictionary library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @PACKAGE_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L${libdir} -R${libdir} -lbrotlicommon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L${libdir} -lbrotlicommon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/libbrotlidec.pc.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/libbrotlidec.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,6 @@ Name: libbrotlidec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: https://github.com/google/brotli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Brotli decoder library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @PACKAGE_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L${libdir} -R${libdir} -lbrotlidec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L${libdir} -lbrotlidec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires.private: libbrotlicommon >= 1.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/libbrotlienc.pc.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/libbrotlienc.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,6 @@ Name: libbrotlienc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: https://github.com/google/brotli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Brotli encoder library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @PACKAGE_VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Libs: -L${libdir} -R${libdir} -lbrotlienc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs: -L${libdir} -lbrotlienc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires.private: libbrotlicommon >= 1.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/brotli/files/patch-disable-cmake-ver-check-CmakeLists.txt.diff b/archivers/brotli/files/patch-disable-cmake-ver-check-CmakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9476499ae30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/brotli/files/patch-disable-cmake-ver-check-CmakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2023-12-14 01:10:33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-12-14 01:10:58
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Available CMake versions:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # - Ubuntu 20.04 LTS : 3.16.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # - Solaris 11.4 SRU 15 : 3.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cmake_minimum_required(VERSION 3.15)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Disable minimum CMake version check to allow use of cmake-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# cmake_minimum_required(VERSION 3.15)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Since this project's version is loaded from other files, this policy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # will help suppress the warning generated by cmake.
</span></pre><pre style='margin:0'>
</pre>