<pre style='margin:0'>
Haren S (harens) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/50922427d5e9430a5a2a10dc85ef421c7f543e66">https://github.com/macports/macports-ports/commit/50922427d5e9430a5a2a10dc85ef421c7f543e66</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 50922427d5e lite-xl: update to 2.0.0
</span>50922427d5e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 50922427d5e9430a5a2a10dc85ef421c7f543e66
</span>Author: harens <harensdeveloper@gmail.com>
AuthorDate: Tue Aug 17 12:32:45 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> lite-xl: update to 2.0.0
</span>---
editors/lite-xl/Portfile | 31 ++++++++--------
editors/lite-xl/files/patch-bundle-resources.diff | 7 ++--
editors/lite-xl/files/patch-macos-keyboard.diff | 4 +--
editors/lite-xl/files/patch-meson-build.diff | 44 +++++++++++++++++------
4 files changed, 54 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/lite-xl/Portfile b/editors/lite-xl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7cdab588e3a..b47793f215f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/lite-xl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/lite-xl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,36 +5,35 @@ PortGroup github 1.0
</span> PortGroup app 1.0
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup lite-xl lite-xl 1.16.12 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup lite-xl lite-xl 2.0.0 v
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> maintainers {harens @harens} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories editors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories editors lua
</span> description A lightweight text editor written in Lua
long_description {*}${description}, adapted from lite. It aims to provide \
something practical, pretty, small and fast. Easy to modify and \
extend, or to use without doing either.
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://lite-xl.github.io/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://${name}.github.io/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9b0d06bc275d571239afa6ef9126a5161bb48429 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 83760c880d83666d5043723b61db0964147184e2c91dba7285ec6f2075f6e602 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 352476
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3e32adad11e9942bd9bf5e4020b0c3a07af2136e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3492ff0da20f4c3ae1d182e34d20dca9ff1b214eb7be21661247798189367364 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 415442
</span>
# Leave the first letter as lowercase
app.name ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.executable lite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.icon icon.ico
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon resources/icons/${name}.svg
</span> app.retina yes
app.hide_dock_icon yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 1) Allow meson to find lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - https://github.com/mesonbuild/meson/issues/4553
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Also puts docs in its own directory (not the global one)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - https://github.com/lite-xl/lite-xl/commit/7ea096247ce0c96a4c04c5fe2ce87e256d1a8c63
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 2) Allow the lite executable to find start.lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 1) Allow the lite executable to find start.lua
</span> # - https://github.com/lite-xl/lite-xl/issues/344
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 2) Allow meson to find lua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://github.com/mesonbuild/meson/issues/4553
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use MacPorts-based reproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't create a macOS bundle
</span>
patchfiles patch-bundle-resources.diff \
patch-meson-build.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,5 +61,7 @@ depends_build-append \
</span> depends_lib-append port:antigraingeometry \
port:freetype \
port:libsdl2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libX11.dylib:xorg-libX11 \
</span> port:lua52 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libX11.dylib:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:reproc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/lite-xl/files/patch-bundle-resources.diff b/editors/lite-xl/files/patch-bundle-resources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cdc3e57b384..b90959d4a6f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/lite-xl/files/patch-bundle-resources.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/lite-xl/files/patch-bundle-resources.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,17 +2,16 @@
</span> +++ src/main.c 2021-07-23 10:38:46.000000000 +0100
@@ -104,7 +104,6 @@
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifdef __APPLE__
-void set_macos_bundle_resources(lua_State *L);
void enable_momentum_scroll();
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> @@ -164,7 +163,6 @@
lua_setglobal(L, "EXEFILE");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifdef __APPLE__
- set_macos_bundle_resources(L);
enable_momentum_scroll();
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/lite-xl/files/patch-macos-keyboard.diff b/editors/lite-xl/files/patch-macos-keyboard.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dae5418a8bc..5cc79186ca1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/lite-xl/files/patch-macos-keyboard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/lite-xl/files/patch-macos-keyboard.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,9 @@
</span> @@ -5,7 +5,7 @@
keymap.map = {}
keymap.reverse_map = {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -local macos = rawget(_G, "MACOS_RESOURCES")
+local macos = true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -- Thanks to mathewmariani, taken from his lite-macos github repository.
local modkeys_os = require("core.modkeys-" .. (macos and "macos" or "generic"))
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/lite-xl/files/patch-meson-build.diff b/editors/lite-xl/files/patch-meson-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b478a8a1d05..4e6e16cb50d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/lite-xl/files/patch-meson-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/lite-xl/files/patch-meson-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,42 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2021-07-24 17:23:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2021-07-24 17:23:08.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2021-08-16 17:18:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-08-17 10:34:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,9 +54,10 @@
</span> libm = cc.find_library('m', required : false)
libdl = cc.find_library('dl', required : false)
libx11 = dependency('x11', required : false)
-lua_dep = dependency('lua5.2', required : false)
+lua_dep = dependency('lua-5.2', required : false)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcre2_dep = dependency('libpcre2-8')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sdl_dep = dependency('sdl2', method: 'config-tool')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++reproc_dep = dependency('reproc')
</span>
if not lua_dep.found()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_subproject = subproject('lua', default_options: ['shared=false', 'use_readline=false', 'app=false'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lite_docdir = 'doc'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lite_datadir = 'data'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lite_docdir = 'share/doc'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lite_docdir = 'share/doc/lite-xl'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lite_datadir = 'share/lite-xl'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_subproject = subproject('lua',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,14 +66,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lua_dep = lua_subproject.get_variable('lua_dep')
</span> endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-reproc_subproject = subproject('reproc',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- default_options: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'default_library=static', 'multithreaded=false',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'reproc-cpp=false', 'examples=false'
</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;'>+-reproc_dep = reproc_subproject.get_variable('reproc_dep')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl, libx11]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if host_machine.system() == 'windows'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,12 +80,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lite_bindir = '/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lite_docdir = '/doc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lite_datadir = '/data'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif host_machine.system() == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lite_bindir = 'Contents/MacOS'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lite_docdir = 'Contents/Resources'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- lite_datadir = 'Contents/Resources'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_data('resources/icons/icon.icns', install_dir : 'Contents/Resources')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_data('resources/macos/Info.plist', install_dir : 'Contents')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lite_bindir = 'bin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lite_docdir = 'share/doc/lite-xl'
</span></pre><pre style='margin:0'>
</pre>