<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e04723440e083295b7389547561e7dff8d3ee58a">https://github.com/macports/macports-ports/commit/e04723440e083295b7389547561e7dff8d3ee58a</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 e04723440e0 weechat: update to 4.5.0
</span>e04723440e0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e04723440e083295b7389547561e7dff8d3ee58a
</span>Author: Calvin Ardi <cardi@acm.org>
AuthorDate: Wed Dec 18 11:41:00 2024 -0800
<span style='display:block; white-space:pre;color:#404040;'> weechat: update to 4.5.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * remove Ruby-related patches, as upstream now uses CMake to natively
</span><span style='display:block; white-space:pre;color:#404040;'> detect Ruby versions (previously used a custom script that we had to
</span><span style='display:block; white-space:pre;color:#404040;'> subsequently patch).
</span>---
irc/weechat/Portfile | 30 +++++-------------------------
irc/weechat/files/FindRuby.cmake.diff | 18 ------------------
2 files changed, 5 insertions(+), 43 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 64d5b31e4eb..d47239690a4 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 4.4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e4d6451236846719acf3e9e5805b9609ae7fcb51 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 295612f8dc24af28c918257d3014eb53342a5d077d5e3d9a3eadf303bd8febfa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2730188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 322aba1c2fffc882ceb34c21c08183d1ef6139c5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b85e800af0f7c9f2d60d72c0f7e56abbaa60274a4d47be17407907292da30398 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2745516
</span>
master_sites https://weechat.org/files/src/
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,36 +118,16 @@ variant ruby requires ruby33 description {Compatibility variant, requires +ruby3
</span> variant ruby31 description "Bindings for Ruby 3.1 plugins" conflicts ruby32 ruby33 {
configure.args-replace -DENABLE_RUBY=OFF -DENABLE_RUBY=ON
depends_lib-append port:ruby31
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append FindRuby.cmake.diff
</span> }
variant ruby32 description "Bindings for Ruby 3.2 plugins" conflicts ruby31 ruby33 {
configure.args-replace -DENABLE_RUBY=OFF -DENABLE_RUBY=ON
depends_lib-append port:ruby32
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append FindRuby.cmake.diff
</span> }
variant ruby33 description "Bindings for Ruby 3.3 plugins" conflicts ruby31 ruby32 {
configure.args-replace -DENABLE_RUBY=OFF -DENABLE_RUBY=ON
depends_lib-append port:ruby33
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append FindRuby.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # specify Ruby version for CMake to find and use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set patchfile ${worksrcpath}/cmake/FindRuby.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset ruby31]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- } elseif {[variant_isset ruby32]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- } elseif {[variant_isset ruby33]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|pkg_search_module\(RUBY (.*)\)|pkg_search_module\(RUBY ruby-3.3\)|g} ${patchfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
variant aspell description {Support for Spellcheck (aspell)} {
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 097beb5da86..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/weechat/files/FindRuby.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/FindRuby.cmake.orig 2023-01-21 17:57:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindRuby.cmake 2023-01-21 19:29:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,13 +33,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(PkgConfig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(PKG_CONFIG_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # set specific search path for macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/ruby/lib/pkgconfig")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- if(RUBY_FOUND AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # FIXME: weird hack: hardcoding the Ruby lib location on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(RUBY_LDFLAGS "${RUBY_LDFLAGS} -L/usr/local/opt/ruby/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # remove "-arch;xxx;" on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ STRING(REGEX REPLACE "-arch;(arm64|i386|ppc|ppc64|x86_64);" "" RUBY_LDFLAGS "${RUBY_LDFLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span></pre><pre style='margin:0'>
</pre>