<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/7b8f526a285822dbef20a3d0ec45af55bc7e1cbb">https://github.com/macports/macports-ports/commit/7b8f526a285822dbef20a3d0ec45af55bc7e1cbb</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 7b8f526a285 lite-xl: update to 2.0.1
</span>7b8f526a285 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7b8f526a285822dbef20a3d0ec45af55bc7e1cbb
</span>Author: harens <harensdeveloper@gmail.com>
AuthorDate: Sat Aug 28 16:14:28 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> lite-xl: update to 2.0.1
</span>---
editors/lite-xl/Portfile | 32 +++++++----------------
editors/lite-xl/files/patch-bundle-resources.diff | 17 ------------
editors/lite-xl/files/patch-macos-keyboard.diff | 11 --------
editors/lite-xl/files/patch-meson-build.diff | 25 +++++-------------
4 files changed, 15 insertions(+), 70 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 be69908c526..a85940cfeec 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;'>@@ -9,7 +9,7 @@ PortGroup legacysupport 1.1
</span> # clock_gettime required by reproc dependency
legacysupport.newest_darwin_requires_legacy 15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup lite-xl lite-xl 2.0.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup lite-xl lite-xl 2.0.1 v
</span> github.tarball_from archive
revision 0
maintainers {harens @harens} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,31 +22,18 @@ platforms darwin
</span> license MIT
homepage https://${name}.github.io/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3e32adad11e9942bd9bf5e4020b0c3a07af2136e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3492ff0da20f4c3ae1d182e34d20dca9ff1b214eb7be21661247798189367364 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 415442
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b16189ed8ad34efb2fdfbbd5c36d597d4fdb8978 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 688765ec81cd76b7c0748c20ace9b2ac6645d19cc868f7fbf2f0762388b04fa0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 415241
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Leave the first letter as lowercase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-app.name ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.name Lite XL
</span> app.icon resources/icons/${name}.svg
app.retina yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.hide_dock_icon yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 1) Allow the lite executable to find start.lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# - https://github.com/lite-xl/lite-xl/issues/344
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 2) 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;'>-# Use MacPorts-based reproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't create a macOS bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-bundle-resources.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-meson-build.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use macOS keyboard shortcuts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-macos-keyboard.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 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;'>+patchfiles patch-meson-build.diff
</span>
# Do not download any subprojects (https://mesonbuild.com/Subprojects.html#commandline-options)
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +52,6 @@ depends_build-append \
</span> depends_lib-append port:antigraingeometry \
port:freetype \
port:libsdl2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libX11.dylib:xorg-libX11 \
</span> port:lua52 \
port:pcre2 \
port:reproc
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b90959d4a6f..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main.c.orig 2021-07-23 10:31:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main.c 2021-07-23 10:38:46.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void set_macos_bundle_resources(lua_State *L);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void enable_momentum_scroll();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -164,7 +163,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lua_setglobal(L, "EXEFILE");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_macos_bundle_resources(L);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_momentum_scroll();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5cc79186ca1..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- data/core/keymap.lua.orig 2021-07-23 14:32:24.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ data/core/keymap.lua 2021-07-23 14:41:01.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- keymap.map = {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- keymap.reverse_map = {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--local macos = rawget(_G, "MACOS_RESOURCES")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+local macos = true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- Thanks to mathewmariani, taken from his lite-macos github repository.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- local modkeys_os = require("core.modkeys-" .. (macos and "macos" or "generic"))
</span><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 4e6e16cb50d..20934d0f8b4 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,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2021-08-16 17:18:20.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2021-08-17 10:34:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,9 +54,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2021-08-28 15:52:46.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-08-28 15:53:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,9 +51,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #===============================================================================
</span> libm = cc.find_library('m', required : false)
libdl = cc.find_library('dl', required : false)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libx11 = dependency('x11', required : false)
</span> -lua_dep = dependency('lua5.2', required : false)
+lua_dep = dependency('lua-5.2', required : false)
pcre2_dep = dependency('libpcre2-8')
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span>
if not lua_dep.found()
lua_subproject = subproject('lua',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,14 +66,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,14 +63,6 @@
</span> lua_dep = lua_subproject.get_variable('lua_dep')
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,19 +24,6 @@
</span> -)
-reproc_dep = reproc_subproject.get_variable('reproc_dep')
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl, libx11]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lite_deps = [lua_dep, sdl_dep, reproc_dep, pcre2_dep, libm, libdl]
</span>
if host_machine.system() == 'windows'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,12 +80,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lite_bindir = '/'
</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;'>--elif host_machine.system() == 'darwin'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lite_bindir = 'Contents/MacOS'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lite_docdir = 'Contents/Resources'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lite_datadir = 'Contents/Resources'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install_data('resources/icons/icon.icns', install_dir : 'Contents/Resources')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install_data('resources/macos/Info.plist', install_dir : 'Contents')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lite_bindir = 'bin'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lite_docdir = 'share/doc/lite-xl'
</span></pre><pre style='margin:0'>
</pre>