diff --git a/weechat/.signature b/weechat/.signature index fc9182863..be8d575d4 100644 --- a/weechat/.signature +++ b/weechat/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35pGhJVROmDGxBdKZQCSdSrH0r87ywdxvZ14+MhdmCdvzYamPjOTtlRWmBCbALQFbvLtXAcbkCQdGCDTEaNqIg8= -SHA256 (Pkgfile) = b083582aaf4a3a7d4ddec570399bcf0566d6a5221fdf6aa7328a81444fa20c8f +RWSagIOpLGJF3yfhZoWX6gmwpJcYpm5jvrN8mPmYLvduNsURwlDsftCWGweLc8ixke7OeyJth+Ga8XqfXKYiUTFHaKMGTUNH2Qk= +SHA256 (Pkgfile) = 61bf5eacc0f6cf6b4d6f9cf101d8aaa73b8bc544cc66b34fc9930446fa5e5575 SHA256 (.footprint) = bf93c2a3f2add49d5bac54856d28b1fb8c54377089b6ba7319de4c1da192c416 -SHA256 (weechat-4.1.3.tar.xz) = db1e57bd7786d66859666d306b0646baad337238319a005362ad0d78615710ef -SHA256 (ruby.patch) = e003c844ccf7fe154a4568d11f78886f2f4ba1b77641a0cfde21107dbc36850b +SHA256 (weechat-4.2.0.tar.xz) = 32f6a6f213fb634db931e2ab8f01adb9a9b50e77faa1c52ca116efa320575a4a diff --git a/weechat/Pkgfile b/weechat/Pkgfile index 3da75a682..b9f097cd8 100644 --- a/weechat/Pkgfile +++ b/weechat/Pkgfile @@ -5,14 +5,11 @@ # Optional: asciidoc aspell guile lua ninja ruby tcl name=weechat -version=4.1.3 +version=4.2.0 release=1 -source=(https://weechat.org/files/src/$name-$version.tar.xz - ruby.patch) +source=(https://weechat.org/files/src/$name-$version.tar.xz) build() { - patch -Np1 -d $name-$version -i $SRC/ruby.patch - prt-get isinst asciidoc || PKGMK_WEECHAT+=' -D ENABLE_MAN=OFF' prt-get isinst aspell || PKGMK_WEECHAT+=' -D ENABLE_SPELL=OFF' prt-get isinst guile || PKGMK_WEECHAT+=' -D ENABLE_GUILE=OFF' diff --git a/weechat/ruby.patch b/weechat/ruby.patch deleted file mode 100644 index ff5d46eab..000000000 --- a/weechat/ruby.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nru weechat-4.1.2.orig/cmake/FindRuby.cmake weechat-4.1.2/cmake/FindRuby.cmake ---- weechat-4.1.2.orig/cmake/FindRuby.cmake 2023-12-03 13:17:25.000000000 -0500 -+++ weechat-4.1.2/cmake/FindRuby.cmake 2024-01-07 09:29:54.015721232 -0500 -@@ -37,7 +37,7 @@ - # set specific search path for macOS - set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/ruby/lib/pkgconfig") - endif() -- 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) -+ pkg_search_module(RUBY ruby-3.3 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) - if(RUBY_FOUND AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # FIXME: weird hack: hardcoding the Ruby lib location on macOS - set(RUBY_LDFLAGS "${RUBY_LDFLAGS} -L/usr/local/opt/ruby/lib") -