git: 25361c4c5ebb - main - editors/lite-xl: the port had been updated to version 2.1.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Tue, 03 Jan 2023 04:07:05 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=25361c4c5ebb910763771b81d2ade58683f3a614

commit 25361c4c5ebb910763771b81d2ade58683f3a614
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-01-03 04:06:22 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-01-03 04:06:22 +0000

    editors/lite-xl: the port had been updated to version 2.1.1
    
    - Pull plugins and color themes to their respective latest commits
    - Clean up the patch after most of it had been integrated upstream
    
    Reported by:    portscout
---
 editors/lite-xl/Makefile               |  7 ++-----
 editors/lite-xl/distinfo               | 16 +++++++--------
 editors/lite-xl/files/patch-src_main.c | 37 +++++-----------------------------
 editors/lite-xl/pkg-plist              | 34 +++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/editors/lite-xl/Makefile b/editors/lite-xl/Makefile
index 04b50a49a3ec..e1935ce0dcf8 100644
--- a/editors/lite-xl/Makefile
+++ b/editors/lite-xl/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	lite-xl
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
@@ -7,9 +7,6 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Lightweight text editor written mostly in Lua
 WWW=		https://lite-xl.com/
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	56e465c35183e5bea6c10fcf346ccba946aa60c1.patch:-p1
-
 LICENSE=	MIT
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
@@ -20,7 +17,7 @@ USE_SDL=	sdl2
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}-colors:colors ${PORTNAME}-plugins:plugins
-GH_TAGNAME=	b245158:colors 62f8740:plugins
+GH_TAGNAME=	b3a9cdd:colors b1eb39c:plugins
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/editors/lite-xl/distinfo b/editors/lite-xl/distinfo
index d79e40728f1c..87d5c561e7c1 100644
--- a/editors/lite-xl/distinfo
+++ b/editors/lite-xl/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1667356738
-SHA256 (lite-xl-lite-xl-v2.1.0_GH0.tar.gz) = 761d390d0ef2706eeed1c685211d8ff5ce63dacd51d561e56c7e0f7ec0e7ea62
-SIZE (lite-xl-lite-xl-v2.1.0_GH0.tar.gz) = 514227
-SHA256 (lite-xl-lite-xl-colors-b245158_GH0.tar.gz) = 50c98b690a9bf3ecb2f0e0d5c8f1d245123d6df7083edb4a05c29d8dc1485004
-SIZE (lite-xl-lite-xl-colors-b245158_GH0.tar.gz) = 14247
-SHA256 (lite-xl-lite-xl-plugins-62f8740_GH0.tar.gz) = cc3ce3272964adf6c78af4c27575120fd2c7664b7a0081e361aff3f71a872e08
-SIZE (lite-xl-lite-xl-plugins-62f8740_GH0.tar.gz) = 141027
-SHA256 (56e465c35183e5bea6c10fcf346ccba946aa60c1.patch) = 6e29d22be9bc9efe779ee9ee65708677b48313e8dd2a18cee855da02004b3a7b
-SIZE (56e465c35183e5bea6c10fcf346ccba946aa60c1.patch) = 1756
+TIMESTAMP = 1672279416
+SHA256 (lite-xl-lite-xl-v2.1.1_GH0.tar.gz) = 75c0cbda2d34a88e86d3aa48abe9f0366093df3019796c03067a7594cc55abe6
+SIZE (lite-xl-lite-xl-v2.1.1_GH0.tar.gz) = 522637
+SHA256 (lite-xl-lite-xl-colors-b3a9cdd_GH0.tar.gz) = 0f956631fe44f2bf458be7ab3515ef924ef8ade28a10df30c477a381f1b43ad0
+SIZE (lite-xl-lite-xl-colors-b3a9cdd_GH0.tar.gz) = 14190
+SHA256 (lite-xl-lite-xl-plugins-b1eb39c_GH0.tar.gz) = 4d3250c35e489bf4a897deaec0fda84be4829936e17e587b371cad61bb46a830
+SIZE (lite-xl-lite-xl-plugins-b1eb39c_GH0.tar.gz) = 166485
diff --git a/editors/lite-xl/files/patch-src_main.c b/editors/lite-xl/files/patch-src_main.c
index bb491c8ac542..33791be0a55c 100644
--- a/editors/lite-xl/files/patch-src_main.c
+++ b/editors/lite-xl/files/patch-src_main.c
@@ -1,39 +1,12 @@
---- src/main.c.orig	2022-11-02 02:38:58 UTC
+--- src/main.c.orig	2022-12-29 02:03:36 UTC
 +++ src/main.c
-@@ -7,11 +7,14 @@
- 
- #ifdef _WIN32
-   #include <windows.h>
--#elif __linux__ || __FreeBSD__
-+#elif __linux__
-   #include <unistd.h>
-   #include <signal.h>
- #elif __APPLE__
-   #include <mach-o/dyld.h>
-+#elif __FreeBSD__
-+  #include <sys/sysctl.h>
-+  #include <signal.h>
- #endif
- 
- 
-@@ -43,6 +46,10 @@ static void get_exe_filename(char *buf, int sz) {
-   char exepath[size];
-   _NSGetExecutablePath(exepath, &size);
-   realpath(exepath, buf);
-+#elif __FreeBSD__
-+  size_t len = sz;
-+  const int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
-+  sysctl(mib, 4, buf, &len, NULL, 0);
- #else
-   strcpy(buf, "./lite");
- #endif
-@@ -91,6 +98,10 @@ void set_macos_bundle_resources(lua_State *L);
+@@ -99,6 +99,10 @@ void set_macos_bundle_resources(lua_State *L);
      #define ARCH_PROCESSOR "aarch64"
-   #elif __arm__
+   #elif defined(__arm__) || defined(_M_ARM)
      #define ARCH_PROCESSOR "arm"
-+  #elif __powerpc64__
++  #elif defined(__powerpc64__)
 +    #define ARCH_PROCESSOR "ppc64"
-+  #elif __powerpc__
++  #elif defined(__powerpc__)
 +    #define ARCH_PROCESSOR "ppc"
    #endif
  
diff --git a/editors/lite-xl/pkg-plist b/editors/lite-xl/pkg-plist
index 0bdba6b4aac0..b124e334b1f1 100644
--- a/editors/lite-xl/pkg-plist
+++ b/editors/lite-xl/pkg-plist
@@ -78,6 +78,7 @@ bin/lite-xl
 %%DATADIR%%/core/tokenizer.lua
 %%DATADIR%%/core/utf8string.lua
 %%DATADIR%%/core/view.lua
+%%DATADIR%%/dirmonitor.lua
 %%DATADIR%%/fonts/FiraSans-Regular.ttf
 %%DATADIR%%/fonts/JetBrainsMono-Regular.ttf
 %%DATADIR%%/fonts/icons.ttf
@@ -97,8 +98,37 @@ bin/lite-xl
 %%DATADIR%%/plugins/extra/centerdoc.lua
 %%DATADIR%%/plugins/extra/colorpreview.lua
 %%DATADIR%%/plugins/extra/copyfilelocation.lua
+%%DATADIR%%/plugins/extra/custom_caret.lua
 %%DATADIR%%/plugins/extra/datetimestamps.lua
 %%DATADIR%%/plugins/extra/dragdropselected.lua
+%%DATADIR%%/plugins/extra/editorconfig/README.md
+%%DATADIR%%/plugins/extra/editorconfig/init.lua
+%%DATADIR%%/plugins/extra/editorconfig/parser.lua
+%%DATADIR%%/plugins/extra/editorconfig/runtest.lua
+%%DATADIR%%/plugins/extra/editorconfig/tests/glob/braces.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/glob/brackets.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/glob/init.lua
+%%DATADIR%%/plugins/extra/editorconfig/tests/glob/question.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/glob/star.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/glob/star_star.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/glob/utf8char.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/init.lua
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/basic.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/bom.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/comments.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/comments_and_newlines.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/comments_only.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/crlf.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/empty.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/init.lua
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/limits.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/newlines_only.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/parser/whitespace.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/properties/indent_size_default.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/properties/init.lua
+%%DATADIR%%/plugins/extra/editorconfig/tests/properties/lowercase_names.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/properties/lowercase_values.in
+%%DATADIR%%/plugins/extra/editorconfig/tests/properties/tab_width_default.in
 %%DATADIR%%/plugins/extra/ephemeral_tabs.lua
 %%DATADIR%%/plugins/extra/eval.lua
 %%DATADIR%%/plugins/extra/exec.lua
@@ -126,6 +156,9 @@ bin/lite-xl
 %%DATADIR%%/plugins/extra/openselected.lua
 %%DATADIR%%/plugins/extra/pdfview.lua
 %%DATADIR%%/plugins/extra/primary_selection.lua
+%%DATADIR%%/plugins/extra/profiler/README.md
+%%DATADIR%%/plugins/extra/profiler/init.lua
+%%DATADIR%%/plugins/extra/profiler/profiler.lua
 %%DATADIR%%/plugins/extra/rainbowparen.lua
 %%DATADIR%%/plugins/extra/regexreplacepreview.lua
 %%DATADIR%%/plugins/extra/restoretabs.lua
@@ -138,6 +171,7 @@ bin/lite-xl
 %%DATADIR%%/plugins/extra/sort.lua
 %%DATADIR%%/plugins/extra/spellcheck.lua
 %%DATADIR%%/plugins/extra/statusclock.lua
+%%DATADIR%%/plugins/extra/tab_switcher.lua
 %%DATADIR%%/plugins/extra/tabnumbers.lua
 %%DATADIR%%/plugins/extra/texcompile.lua
 %%DATADIR%%/plugins/extra/themeselect.lua