commit 752ac9e2d32b8fc5414822b1ed6a8efb7ac47d02 Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 20 18:40:00 2024 +0100 weechat: added back patch for ruby 3.3 diff --git a/weechat/.signature b/weechat/.signature index 251cbe15a..fc9182863 100644 --- a/weechat/.signature +++ b/weechat/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/rue61SV2VQ8l9gx28UNMBNJA0ga2ZwXqk7rftLwWKBeWIc3ty5qHa+hrmcAEUF1rwAPwRNopAqny/9vI6zyw4= -SHA256 (Pkgfile) = 7ca3436e7df0dd06e27ea2df3cd136e11dfb4c9180003cf0ea384f4b5a3df99c +RWSagIOpLGJF35pGhJVROmDGxBdKZQCSdSrH0r87ywdxvZ14+MhdmCdvzYamPjOTtlRWmBCbALQFbvLtXAcbkCQdGCDTEaNqIg8= +SHA256 (Pkgfile) = b083582aaf4a3a7d4ddec570399bcf0566d6a5221fdf6aa7328a81444fa20c8f SHA256 (.footprint) = bf93c2a3f2add49d5bac54856d28b1fb8c54377089b6ba7319de4c1da192c416 SHA256 (weechat-4.1.3.tar.xz) = db1e57bd7786d66859666d306b0646baad337238319a005362ad0d78615710ef +SHA256 (ruby.patch) = e003c844ccf7fe154a4568d11f78886f2f4ba1b77641a0cfde21107dbc36850b diff --git a/weechat/Pkgfile b/weechat/Pkgfile index 8cfd3ba04..3da75a682 100644 --- a/weechat/Pkgfile +++ b/weechat/Pkgfile @@ -7,9 +7,12 @@ name=weechat version=4.1.3 release=1 -source=(https://weechat.org/files/src/$name-$version.tar.xz) +source=(https://weechat.org/files/src/$name-$version.tar.xz + ruby.patch) 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 new file mode 100644 index 000000000..ff5d46eab --- /dev/null +++ b/weechat/ruby.patch @@ -0,0 +1,13 @@ +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") +