<pre style='margin:0'>
Vadim-Valdis Yudaev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2bc0500b9cf2ab99d561a22b08f21fb9943135e3">https://github.com/macports/macports-ports/commit/2bc0500b9cf2ab99d561a22b08f21fb9943135e3</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 2bc0500b9cf lua-language-server: Update to 2.4.3
</span>2bc0500b9cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2bc0500b9cf2ab99d561a22b08f21fb9943135e3
</span>Author: Vadim-Valdis Yudaev <judaew@outlook.de>
AuthorDate: Thu Oct 14 17:51:45 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> lua-language-server: Update to 2.4.3
</span>---
lua/lua-language-server/Portfile | 24 ++++++----
...-disable-filesystem-test_appdata_path-test.diff | 56 ++++++++++++++++++++++
lua/lua-language-server/files/wrapper | 4 +-
3 files changed, 73 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-language-server/Portfile b/lua/lua-language-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e52a30548b..8e9f1e4b473 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-language-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-language-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup sumneko lua-language-server 2.3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup sumneko lua-language-server 2.4.3
</span> fetch.type git
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,16 @@ post-fetch {
</span> ${worksrcpath}/3rd/luamake/compile/ninja/macos.ninja
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable `filesystem.test_appdata_path`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This test is to run the application as expected uses the user's ${HOME}. But
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# it looks like the environment in which MacPorts builds port is not compatible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# with the test. In any case, the application will not run from the `macports`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# user.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://github.com/actboy168/bee.lua/issues/21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-disable-filesystem-test_appdata_path-test.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build port:ninja
use_configure no
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,19 +50,15 @@ destroot {
</span> xinstall -m 0755 ${worksrcpath}/wrapper ${destroot}${prefix}/bin/${name}
xinstall -d ${destroot}${prefix}/lib/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/bin/macOS/lua-language-server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 {*}[glob ${worksrcpath}/bin/macOS/*.so] \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/bin ${destroot}${prefix}/lib/${name}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/${name}
</span> move \
${worksrcpath}/debugger.lua \
${worksrcpath}/main.lua \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/platform.lua \
</span> ${worksrcpath}/locale \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/meta ${worksrcpath}/script \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/meta \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/script \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/${name}
</span> }
notes "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-language-server/files/patch-disable-filesystem-test_appdata_path-test.diff b/lua/lua-language-server/files/patch-disable-filesystem-test_appdata_path-test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2801426846a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-language-server/files/patch-disable-filesystem-test_appdata_path-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3rd/bee.lua/test/test_filesystem.lua.orig 2021-10-14 16:35:08.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ 3rd/bee.lua/test/test_filesystem.lua 2021-10-14 16:35:36.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -777,15 +777,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -- assertPathEquals(fs.dll_path(), fs.absolute(getdll()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-function test_fs:test_appdata_path()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if platform.OS == 'Windows' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assertPathEquals(fs.appdata_path(), os.getenv "LOCALAPPDATA")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif platform.OS == 'Linux' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assertPathEquals(fs.appdata_path(), os.getenv "XDG_DATA_HOME" or (os.getenv "HOME" .. "/.local/share"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif platform.OS == 'macOS' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assertPathEquals(fs.appdata_path(), os.getenv "HOME" .. "/Library/Caches")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++--function test_fs:test_appdata_path()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- if platform.OS == 'Windows' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- assertPathEquals(fs.appdata_path(), os.getenv "LOCALAPPDATA")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- elseif platform.OS == 'Linux' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- assertPathEquals(fs.appdata_path(), os.getenv "XDG_DATA_HOME" or (os.getenv "HOME" .. "/.local/share"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- elseif platform.OS == 'macOS' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- assertPathEquals(fs.appdata_path(), os.getenv "HOME" .. "/Library/Caches")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++--end
</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;'>+ function test_fs:test_filelock_1()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3rd/luamake/3rd/bee.lua/test/test_filesystem.lua.orig 2021-10-14 16:35:08.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ 3rd/luamake/3rd/bee.lua/test/test_filesystem.lua 2021-10-14 16:35:36.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -777,15 +777,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -- assertPathEquals(fs.dll_path(), fs.absolute(getdll()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-function test_fs:test_appdata_path()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if platform.OS == 'Windows' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assertPathEquals(fs.appdata_path(), os.getenv "LOCALAPPDATA")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif platform.OS == 'Linux' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assertPathEquals(fs.appdata_path(), os.getenv "XDG_DATA_HOME" or (os.getenv "HOME" .. "/.local/share"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif platform.OS == 'macOS' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assertPathEquals(fs.appdata_path(), os.getenv "HOME" .. "/Library/Caches")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++--function test_fs:test_appdata_path()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- if platform.OS == 'Windows' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- assertPathEquals(fs.appdata_path(), os.getenv "LOCALAPPDATA")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- elseif platform.OS == 'Linux' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- assertPathEquals(fs.appdata_path(), os.getenv "XDG_DATA_HOME" or (os.getenv "HOME" .. "/.local/share"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- elseif platform.OS == 'macOS' then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- assertPathEquals(fs.appdata_path(), os.getenv "HOME" .. "/Library/Caches")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-- end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++--end
</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;'>+ function test_fs:test_filelock_1()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lua/lua-language-server/files/wrapper b/lua/lua-language-server/files/wrapper
</span><span style='display:block; white-space:pre;color:#808080;'>index 9874dfdd568..c0d1d437e59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lua/lua-language-server/files/wrapper
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lua/lua-language-server/files/wrapper
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ TMPPATH=$(mktemp -d "/tmp/lua-language-server.XXXX")
</span> DEFAULT_LOGPATH="$TMPPATH/log"
DEFAULT_METAPATH="$TMPPATH/meta"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-exec @@PREFIX@@/lib/lua-language-server/lua-language-server \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -E @@PREFIX@@/share/lua-language-server/main.lua \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec @@PREFIX@@/lib/lua-language-server/bin/macOS/lua-language-server \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -E @@PREFIX@@/lib/lua-language-server/main.lua \
</span> --logpath="$DEFAULT_LOGPATH" \
--metapath="$DEFAULT_METAPATH" \
"$@"
</pre><pre style='margin:0'>
</pre>