git: 4c43f6327f1c - main - editors/cudatext: Update to 1.220.6.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Sat, 25 Jan 2025 00:34:45 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4c43f6327f1c47b00e13cd558421dc06dd248383

commit 4c43f6327f1c47b00e13cd558421dc06dd248383
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-01-24 21:54:03 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-01-25 00:19:15 +0000

    editors/cudatext: Update to 1.220.6.1
    
    - Add support for aarch64
    
    ChangeLog at:   https://github.com/Alexey-T/CudaText/blob/master/app/readme/history.txt
---
 editors/cudatext/Makefile                          | 11 ++--
 editors/cudatext/distinfo                          | 14 ++---
 editors/cudatext/files/patch-app-proc_globdata.pas | 61 ++++++++++++++++------
 3 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 50e4995e67f8..abf94a92651f 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cudatext
-PORTVERSION=	1.220.0.3
+PORTVERSION=	1.220.6.1
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -9,7 +9,7 @@ WWW=		https://uvviewsoft.com/
 
 LICENSE=	MPL20
 
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors python xorg
 USE_XORG=	x11
@@ -19,9 +19,9 @@ GH_PROJECT=	CudaText
 GH_TUPLE=	bgrabitmap:bgrabitmap:d2a9b15:bgrabitmap/bgrabitmap \
 		Alexey-T:Python-for-Lazarus:fda3fdb:python4lazarus/python4lazarus \
 		Alexey-T:ATFlatControls:b42bf82:atflatcontrols/atflatcontrols  \
-		Alexey-T:ATSynEdit:07c7cda:atsynedit/atsynedit \
+		Alexey-T:ATSynEdit:57d40d8:atsynedit/atsynedit \
 		Alexey-T:Emmet-Pascal:df69312:emmet/emmet \
-		Alexey-T:EControl:0a70b9e:econtrol/econtrol \
+		Alexey-T:EControl:4c0ab4c:econtrol/econtrol \
 		Alexey-T:ATSynEdit_Ex:f98242d:atsyneditex/atsyneditex \
 		Alexey-T:ATSynEdit_Cmp:a35a75d:atsyneditcmp/atsyneditcmp \
 		Alexey-T:ATBinHex-Lazarus:f043a0e:atbinhex/atbinhex \
@@ -58,7 +58,8 @@ USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 post-patch:
 	${REINPLACE_CMD} 's|-512||g' ${WRKSRC}/setup/debfiles/${PORTNAME}.desktop
-	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/app/proc_globdata.pas
+	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/app/proc_globdata.pas
 	${REINPLACE_CMD} 's|TEncoding.UTF8|True|g' ${WRKSRC}/app/formmain_py_pluginwork.inc
 	${REINPLACE_CMD} 's|ifdef LCLGTK2|if defined(LCLGTK2) and not defined(freebsd)|g' ${WRKSRC}/atsynedit/atsynedit/atsynedit.pas
 
diff --git a/editors/cudatext/distinfo b/editors/cudatext/distinfo
index a1ab368c5d9f..3ddae4c4d0e2 100644
--- a/editors/cudatext/distinfo
+++ b/editors/cudatext/distinfo
@@ -1,18 +1,18 @@
-TIMESTAMP = 1734765185
-SHA256 (Alexey-T-CudaText-1.220.0.3_GH0.tar.gz) = 54509be7cae9e738d5c45c7582cfd2002da133ccf4120406f0ebf5a4ab5b1506
-SIZE (Alexey-T-CudaText-1.220.0.3_GH0.tar.gz) = 6273271
+TIMESTAMP = 1737752686
+SHA256 (Alexey-T-CudaText-1.220.6.1_GH0.tar.gz) = a04e8b5e84eee4d004f41dc4a94c3963a49a2dd1c22fe5cf18cd2aba30d45c41
+SIZE (Alexey-T-CudaText-1.220.6.1_GH0.tar.gz) = 6273118
 SHA256 (bgrabitmap-bgrabitmap-d2a9b15_GH0.tar.gz) = bf831ada3e9562dfc9653e0b1d46dca2bbe5409f8406ae4db7f52299e09fe4c6
 SIZE (bgrabitmap-bgrabitmap-d2a9b15_GH0.tar.gz) = 6657935
 SHA256 (Alexey-T-Python-for-Lazarus-fda3fdb_GH0.tar.gz) = 7243d0eb6d2f1924447fa575621474f043ec54ad258f770d230489bfeecb9cf5
 SIZE (Alexey-T-Python-for-Lazarus-fda3fdb_GH0.tar.gz) = 98693
 SHA256 (Alexey-T-ATFlatControls-b42bf82_GH0.tar.gz) = c7b6a8bbc1b930c67d84cfa733025a919b494241cda53890820a2f77016296cc
 SIZE (Alexey-T-ATFlatControls-b42bf82_GH0.tar.gz) = 539018
-SHA256 (Alexey-T-ATSynEdit-07c7cda_GH0.tar.gz) = f654b4548dcd0acd8fef60ea0875bf384b7840cf3ae170f653833de49121555f
-SIZE (Alexey-T-ATSynEdit-07c7cda_GH0.tar.gz) = 1415066
+SHA256 (Alexey-T-ATSynEdit-57d40d8_GH0.tar.gz) = f957e2021d923b3703a6ae073d8563238ab7933c2206ec1875c7cbb73e833265
+SIZE (Alexey-T-ATSynEdit-57d40d8_GH0.tar.gz) = 1415487
 SHA256 (Alexey-T-Emmet-Pascal-df69312_GH0.tar.gz) = 1be587529c0487175a26f4a2a1abe1435b8c289f0351d39d8b9063ed2c6367e1
 SIZE (Alexey-T-Emmet-Pascal-df69312_GH0.tar.gz) = 83643
-SHA256 (Alexey-T-EControl-0a70b9e_GH0.tar.gz) = a26149d8910b7be1bf1e064c27627d72e6f4525e1f08be1171b0e6d87201313b
-SIZE (Alexey-T-EControl-0a70b9e_GH0.tar.gz) = 69422
+SHA256 (Alexey-T-EControl-4c0ab4c_GH0.tar.gz) = e1525a5216f5a780c3e274bd954da38f1372236c84ec9b7ba049c7dd79a796af
+SIZE (Alexey-T-EControl-4c0ab4c_GH0.tar.gz) = 69561
 SHA256 (Alexey-T-ATSynEdit_Ex-f98242d_GH0.tar.gz) = 29cef18da2f5bd8caa1eda08594e54976dac7f3edcd9f4dd277314b8e28b61bb
 SIZE (Alexey-T-ATSynEdit_Ex-f98242d_GH0.tar.gz) = 49852
 SHA256 (Alexey-T-ATSynEdit_Cmp-a35a75d_GH0.tar.gz) = ee9e449d9f777e37c3d85c5d298d932089227dfa4b33f2e5b3af1dd2a7ac1701
diff --git a/editors/cudatext/files/patch-app-proc_globdata.pas b/editors/cudatext/files/patch-app-proc_globdata.pas
index 964052c714e3..7c868b2acb70 100644
--- a/editors/cudatext/files/patch-app-proc_globdata.pas
+++ b/editors/cudatext/files/patch-app-proc_globdata.pas
@@ -1,6 +1,15 @@
---- app/proc_globdata.pas	2020-05-11 23:45:28.000000000 -0500
-+++ app/proc_globdata.pas	2020-05-13 18:40:54.377841000 -0500
-@@ -909,6 +909,10 @@
+--- app/proc_globdata.pas.orig	2025-01-12 09:06:24.000000000 -0800
++++ app/proc_globdata.pas	2025-01-24 13:45:23.584690000 -0800
+@@ -1406,7 +1406,7 @@
+   {$endif}
+ 
+   {$ifdef freebsd}
+-  exit('/usr/local/lib/libpython3.6m.so');
++  exit('%%LOCALBASE%%/lib/libpython3.11.so');
+   {$endif}
+ 
+   {$ifdef openbsd}
+@@ -1456,6 +1456,10 @@
    exit(ExtractFileDir(OpDirExe)+'/Resources');
    {$endif}
  
@@ -11,21 +20,39 @@
    Result:= '';
  end;
  
-@@ -973,6 +977,10 @@
-   OpDirLocal:= AppDir_Home+'Library/Application Support/CudaText';
-   CreateDirUTF8(OpDirLocal);
-   {$endif}
-+  {$ifdef freebsd}
-+  OpDirLocal:= AppDir_Home + '.config/' + 'cudatext';
-+  CreateDirUTF8(OpDirLocal);
-+  {$endif}
+@@ -1597,6 +1601,16 @@
+   CreateDir(OpDirLocal);
+ end;
  
-   AppDir_Settings:= OpDirLocal+DirectorySeparator+'settings';
-   CreateDirUTF8(AppDir_Settings);
-@@ -1000,6 +1008,15 @@
-         OpDirPrecopy+'/',
-         OpDirLocal
-         ], S);
++procedure InitDirs_FreeBSD;
++var
++  HomeConfig: string;
++begin
++  AppDir_Home:= GetEnvironmentVariable('HOME');
++  HomeConfig:= AppDir_Home+'/.config';
++  OpDirLocal:= HomeConfig+'/cudatext';
++  CreateDir(OpDirLocal);
++end;
++
+ procedure InitDirs_UnixCommon;
+ var
+   HomeConfig: string;
+@@ -1656,8 +1670,10 @@
+     {$ifdef darwin}
+     InitDirs_macOS;
+     {$else}
+-      {$ifdef haiku}
++      {$if defined(haiku)}
+       InitDirs_Haiku;
++      {$elseif defined(freebsd)}
++      InitDirs_FreeBSD;
+       {$else}
+       InitDirs_UnixCommon;
+       {$endif}
+@@ -1726,6 +1742,15 @@
+       MsgLogConsole('ERROR: Cannot find pre-copy folder: '+OpDirPrecopy);
+     end;
+   end;
 +  {$endif}
 +  {$ifdef freebsd}
 +    RunCommand('cp', ['-R',