<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/32506e83d07b9ab62de124b57496c95cdb7587fa">https://github.com/macports/macports-ports/commit/32506e83d07b9ab62de124b57496c95cdb7587fa</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 32506e83d07 weechat: update to 3.8, fix ruby variant build, update {python,ruby} variants (#17422)
</span>32506e83d07 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 32506e83d07b9ab62de124b57496c95cdb7587fa
</span>Author: calvin ardi <calvin@isi.edu>
AuthorDate: Sun Jan 22 00:35:39 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> weechat: update to 3.8, fix ruby variant build, update {python,ruby} variants (#17422)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * adds variants for ruby 3.0 (+ruby30), 3.1 (+ruby31), and 3.2 (+ruby32)
</span><span style='display:block; white-space:pre;color:#404040;'> and updates +ruby variant to use ruby 3.2 (+ruby32)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * adds +python311 variant for python 3.11, and updates +python variant
</span><span style='display:block; white-space:pre;color:#404040;'> to use python 3.11 (+python311)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * adds a patchfile to fix a build error (`error: invalid arch name
</span><span style='display:block; white-space:pre;color:#404040;'> '-arch -lx86_64'`) when installing the ruby variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the patch to one of the CMake files removes the hardcoded paths that
</span><span style='display:block; white-space:pre;color:#404040;'> ruby is assumed to be installed to, and removes the `-arch ${os.arch}`
</span><span style='display:block; white-space:pre;color:#404040;'> in RUBY_LDFLAGS provided by pkg-config as the space in between `-arch`
</span><span style='display:block; white-space:pre;color:#404040;'> and `${os.arch}` led to string substitution errors during the build
</span><span style='display:block; white-space:pre;color:#404040;'> process
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see the corresponding trac ticket for details
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65100
</span>---
irc/weechat/Portfile | 68 +++++++++++++++++++++++++++--------
irc/weechat/files/FindRuby.cmake.diff | 18 ++++++++++
2 files changed, 71 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/weechat/Portfile b/irc/weechat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd9f91f4fc6..0db1e0c891b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/weechat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/weechat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,11 +9,11 @@ PortGroup legacysupport 1.0
</span> legacysupport.newest_darwin_requires_legacy 10
name weechat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 726a83435e4678a8ee9059c24ad5b598227146ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ea904e4cec8edd0bd24f3ea17f6d6dff97ca00ee0571ee972e79e54c8c08170c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2693072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7fc2a475998a1dbcdc25ae2ba939c8b85fd5f3ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f7cb65c200f8c090c56f2cf98c0b184051e516e5f7099a4308cacf86f174bf28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2777420
</span>
master_sites https://weechat.org/files/src/
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,29 +75,62 @@ configure.args-append \
</span> -DENABLE_TCL=OFF \
-DENABLE_TESTS=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python requires python310 description {Compatibility variant, requires +python310} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python requires python311 description {Compatibility variant, requires +python311} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 description "Bindings for Python 3.7 plugins" conflicts python38 python39 python310 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 description "Bindings for Python 3.7 plugins" conflicts python38 python39 python310 python311 {
</span> configure.args-replace -DENABLE_PYTHON=OFF -DENABLE_PYTHON=ON
depends_lib-append port:python37
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 description "Bindings for Python 3.8 plugins" conflicts python37 python39 python310 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 description "Bindings for Python 3.8 plugins" conflicts python37 python39 python310 python311 {
</span> configure.args-replace -DENABLE_PYTHON=OFF -DENABLE_PYTHON=ON
depends_lib-append port:python38
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 description "Bindings for Python 3.9 plugins" conflicts python37 python38 python310 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 description "Bindings for Python 3.9 plugins" conflicts python37 python38 python310 python311 {
</span> configure.args-replace -DENABLE_PYTHON=OFF -DENABLE_PYTHON=ON
depends_lib-append port:python39
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 description "Bindings for Python 3.10 plugins" conflicts python37 python38 python39 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 description "Bindings for Python 3.10 plugins" conflicts python37 python38 python39 python311 {
</span> configure.args-replace -DENABLE_PYTHON=OFF -DENABLE_PYTHON=ON
depends_lib-append port:python310
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 description "Bindings for Python 3.11 plugins" conflicts python37 python38 python39 python310 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_PYTHON=OFF -DENABLE_PYTHON=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby requires ruby32 description {Compatibility variant, requires +ruby32} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby30 description "Bindings for Ruby 3.0 plugins" conflicts ruby31 ruby32 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_RUBY=OFF -DENABLE_RUBY=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ruby30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles FindRuby.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby31 description "Bindings for Ruby 3.1 plugins" conflicts ruby30 ruby32 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_RUBY=OFF -DENABLE_RUBY=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ruby31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles FindRuby.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ruby32 description "Bindings for Ruby 3.2 plugins" conflicts ruby30 ruby31 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_RUBY=OFF -DENABLE_RUBY=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PKG_CONFIG_PATH=${prefix}/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ruby32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles FindRuby.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specify Python version for CMake to find and use
</span> set patchfile ${worksrcpath}/cmake/FindPython.cmake
if {[variant_isset python37]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,6 +142,17 @@ post-patch {
</span> } elseif {[variant_isset python310]} {
reinplace -E "s|PYTHON python3|PYTHON python-3.10|g" ${patchfile}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specify Ruby version for CMake to find and use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set patchfile ${worksrcpath}/cmake/FindRuby.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset ruby30]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s|pkg_search_module\(RUBY (.*)\)|pkg_search_module\(RUBY ruby-3.0\)|g} ${patchfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset ruby31]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s|pkg_search_module\(RUBY (.*)\)|pkg_search_module\(RUBY ruby-3.1\)|g} ${patchfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset ruby32]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s|pkg_search_module\(RUBY (.*)\)|pkg_search_module\(RUBY ruby-3.2\)|g} ${patchfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant aspell description {Support for Spellcheck (aspell)} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,12 +178,6 @@ variant perl description {Bindings for Perl plugins} {
</span> depends_lib-append path:bin/perl:perl5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ruby description {Bindings for Ruby plugins} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_RUBY=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_RUBY=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant scheme description {Bindings for Scheme (guile) plugins} {
configure.args-delete -DENABLE_GUILE=OFF
configure.args-append -DENABLE_GUILE=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/weechat/files/FindRuby.cmake.diff b/irc/weechat/files/FindRuby.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..097beb5da86
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/weechat/files/FindRuby.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/FindRuby.cmake.orig 2023-01-21 17:57:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/FindRuby.cmake 2023-01-21 19:29:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,13 +33,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(PkgConfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(PKG_CONFIG_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # set specific search path for macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/ruby/lib/pkgconfig")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_search_module(RUBY ruby-3.2 ruby-3.1 ruby-3.0 ruby-2.7 ruby-2.6 ruby-2.5 ruby-2.4 ruby-2.3 ruby-2.2 ruby-2.1 ruby-2.0 ruby-1.9 ruby)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(RUBY_FOUND AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # FIXME: weird hack: hardcoding the Ruby lib location on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(RUBY_LDFLAGS "${RUBY_LDFLAGS} -L/usr/local/opt/ruby/lib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # remove "-arch;xxx;" on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ STRING(REGEX REPLACE "-arch;(arm64|i386|ppc|ppc64|x86_64);" "" RUBY_LDFLAGS "${RUBY_LDFLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>
</pre>