summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/cudatext/Makefile8
-rw-r--r--editors/cudatext/distinfo18
-rw-r--r--editors/cudatext/pkg-plist2
-rw-r--r--editors/lazarus/Makefile9
-rw-r--r--editors/lazarus/distinfo6
-rw-r--r--editors/lazarus/files/patch-ide_lazbuild.lpr33
-rw-r--r--editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas14
-rw-r--r--editors/picpas/Makefile2
8 files changed, 26 insertions, 66 deletions
diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index bdad2b033413..64a05730deb5 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -1,5 +1,5 @@
PORTNAME= cudatext
-PORTVERSION= 1.151.0
+PORTVERSION= 1.155.3
CATEGORIES= editors
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
@@ -17,10 +17,10 @@ GH_PROJECT= CudaText
GH_TUPLE= bgrabitmap:bgrabitmap:ace7e0e:bgrabitmap/bgrabitmap \
Alexey-T:Python-for-Lazarus:24d15bb:python4lazarus/python4lazarus \
Alexey-T:ATFlatControls:c536aa6:atflatcontrols/atflatcontrols \
- Alexey-T:ATSynEdit:dd39ef6:atsynedit/atsynedit \
+ Alexey-T:ATSynEdit:12d0a60:atsynedit/atsynedit \
Alexey-T:Emmet-Pascal:fb5b116:emmet/emmet \
- Alexey-T:EControl:f59bc3a:econtrol/econtrol \
- Alexey-T:ATSynEdit_Ex:4b17f2e:atsyneditex/atsyneditex \
+ Alexey-T:EControl:6debc32:econtrol/econtrol \
+ Alexey-T:ATSynEdit_Ex:c32f515:atsyneditex/atsyneditex \
Alexey-T:ATSynEdit_Cmp:58c613e:atsyneditcmp/atsyneditcmp \
Alexey-T:ATBinHex-Lazarus:c63346b:atbinhex/atbinhex \
Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance \
diff --git a/editors/cudatext/distinfo b/editors/cudatext/distinfo
index 6f6b1f5e80a2..c54daf7aba89 100644
--- a/editors/cudatext/distinfo
+++ b/editors/cudatext/distinfo
@@ -1,20 +1,20 @@
-TIMESTAMP = 1638926794
-SHA256 (Alexey-T-CudaText-1.151.0_GH0.tar.gz) = 1b314972e0208979adb67950f6cb8718291653c1ae9a1573e713f6790a8598b9
-SIZE (Alexey-T-CudaText-1.151.0_GH0.tar.gz) = 6702164
+TIMESTAMP = 1643863343
+SHA256 (Alexey-T-CudaText-1.155.3_GH0.tar.gz) = 251eb9c19a32054663aab4e5b32f7534ccc8e33adaef687bef93e08ced89b8ec
+SIZE (Alexey-T-CudaText-1.155.3_GH0.tar.gz) = 6728801
SHA256 (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = ae3f28596c2a5f44bc468f6c3380fc1ceb27e95afea579f09b1d340c781bbef2
SIZE (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = 6983967
SHA256 (Alexey-T-Python-for-Lazarus-24d15bb_GH0.tar.gz) = 5ee4a511e6c4cbd8d5105203acbcb04fbeb180160b9cdff7dac2ce0e3cce04f4
SIZE (Alexey-T-Python-for-Lazarus-24d15bb_GH0.tar.gz) = 94717
SHA256 (Alexey-T-ATFlatControls-c536aa6_GH0.tar.gz) = e829704a18fa2f6c1133ea27d97ea04824e3e3bc8e9f045373f0565da1ebd672
SIZE (Alexey-T-ATFlatControls-c536aa6_GH0.tar.gz) = 532112
-SHA256 (Alexey-T-ATSynEdit-dd39ef6_GH0.tar.gz) = 17501f0585fdc1f2634c46a5b23cf05aa712e49f7543b550010ce6c26a04cefa
-SIZE (Alexey-T-ATSynEdit-dd39ef6_GH0.tar.gz) = 1391495
+SHA256 (Alexey-T-ATSynEdit-12d0a60_GH0.tar.gz) = 5c6cf0c439adf13337401f76a0e5f764d1b41a787e2ba8a0ff7c192679dc29ad
+SIZE (Alexey-T-ATSynEdit-12d0a60_GH0.tar.gz) = 1393022
SHA256 (Alexey-T-Emmet-Pascal-fb5b116_GH0.tar.gz) = 295598366827234dedf7338d2e5878cdd7058fde6117e8c7cd65e7a3aa81a671
SIZE (Alexey-T-Emmet-Pascal-fb5b116_GH0.tar.gz) = 82395
-SHA256 (Alexey-T-EControl-f59bc3a_GH0.tar.gz) = d189f28e7b220318669500975ccf2f0777cd82f0feefd0a58eb0607270cb0927
-SIZE (Alexey-T-EControl-f59bc3a_GH0.tar.gz) = 67131
-SHA256 (Alexey-T-ATSynEdit_Ex-4b17f2e_GH0.tar.gz) = 142c2b9155e107060cb78a2b03cc41aa838b8071db411f203f6d904a0b1ee2ff
-SIZE (Alexey-T-ATSynEdit_Ex-4b17f2e_GH0.tar.gz) = 42919
+SHA256 (Alexey-T-EControl-6debc32_GH0.tar.gz) = fe9c12fe6435628015db314a3613d2c0d0e6f65c8d7d642724573ee873c766d8
+SIZE (Alexey-T-EControl-6debc32_GH0.tar.gz) = 66502
+SHA256 (Alexey-T-ATSynEdit_Ex-c32f515_GH0.tar.gz) = 7039a37b4d73ed08d4d7417fb876e121a9b4597662f7313487066c50a456b3d5
+SIZE (Alexey-T-ATSynEdit_Ex-c32f515_GH0.tar.gz) = 43425
SHA256 (Alexey-T-ATSynEdit_Cmp-58c613e_GH0.tar.gz) = 7c58161b5b6bd8b0af6727271afd4ed6ba2f958f377b7e2386cac753c4f96475
SIZE (Alexey-T-ATSynEdit_Cmp-58c613e_GH0.tar.gz) = 19083
SHA256 (Alexey-T-ATBinHex-Lazarus-c63346b_GH0.tar.gz) = e37ccd44148a7a1e9af8d6588b8f199e53efb271938b8a7d5514c2183ceb172a
diff --git a/editors/cudatext/pkg-plist b/editors/cudatext/pkg-plist
index 8ddb6327aca1..95a82cdc827c 100644
--- a/editors/cudatext/pkg-plist
+++ b/editors/cudatext/pkg-plist
@@ -357,6 +357,8 @@ share/applications/cudatext.desktop
%%DATADIR%%/data/lexlib/C.lcf
%%DATADIR%%/data/lexlib/CSS.cuda-lexmap
%%DATADIR%%/data/lexlib/CSS.lcf
+%%DATADIR%%/data/lexlib/HTML style.cuda-lexmap
+%%DATADIR%%/data/lexlib/HTML style.lcf
%%DATADIR%%/data/lexlib/HTML.cuda-lexmap
%%DATADIR%%/data/lexlib/HTML.lcf
%%DATADIR%%/data/lexlib/Ini files.cuda-lexmap
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index f88473a75e7e..03511a031bbb 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -1,6 +1,6 @@
PORTNAME= lazarus
-PORTVERSION= 2.0.12
-#DISTVERSIONSUFFIX= -2
+PORTVERSION= 2.2.0
+DISTVERSIONSUFFIX= -0
PKGNAMESUFFIX?= -gtk2
PORTREVISION?= 0
CATEGORIES= editors devel
@@ -17,6 +17,7 @@ BUILD_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \
fpcres:lang/fpc-utils
RUN_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \
gmake:devel/gmake \
+ ${PPNAME}:lang/fpc \
fpcres:lang/fpc-utils \
${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc-source
@@ -81,6 +82,10 @@ post-build:
@cd ${WRKSRC} && \
${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
ide/Makefile*.orig ide/Makefile*.bak lcl/interfaces/qt5/qtobjects.pas.orig
+ @cd ${WRKDIR} && \
+ ${RM} -R docs/chm/.gitignore docs/html/.gitignore lazarus/tools/install/rpm/.gitignore \
+ lazarus/tools/.gitignore lazarus/components/chmhelp/lhelp/.gitignore \
+ lazarus/.git*
pre-install:
@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo
index 80348a92039a..13f5c4351ea2 100644
--- a/editors/lazarus/distinfo
+++ b/editors/lazarus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627717078
-SHA256 (freepascal/lazarus-2.0.12.tar.gz) = ba6cef7f823a2d28166229982efc926039d42313c40e22fe0c6776c13d0015b2
-SIZE (freepascal/lazarus-2.0.12.tar.gz) = 69560778
+TIMESTAMP = 1642785718
+SHA256 (freepascal/lazarus-2.2.0-0.tar.gz) = b6b5d516511e3dfb34910d7656db068d4bba80f009692500aebbcae79cb12160
+SIZE (freepascal/lazarus-2.2.0-0.tar.gz) = 76777421
diff --git a/editors/lazarus/files/patch-ide_lazbuild.lpr b/editors/lazarus/files/patch-ide_lazbuild.lpr
deleted file mode 100644
index f41760802e71..000000000000
--- a/editors/lazarus/files/patch-ide_lazbuild.lpr
+++ /dev/null
@@ -1,33 +0,0 @@
---- ide/lazbuild.lpr 2018-07-28 08:38:06.000000000 -0500
-+++ ide/lazbuild.lpr 2020-11-19 20:38:27.421396000 -0500
-@@ -372,7 +372,7 @@
- if not FileExistsUTF8(Filename) then
- begin
- // Check for packages if the specified name is a valid identifier
-- if LazIsValidIdent(OriginalFileName) then begin
-+ if PackageFileNameIsValid(OriginalFileName) then begin
- if PackageAction=lpaAddPkgLinks then begin
- Error(ErrorFileNotFound,'lpk file expected, but '+OriginalFilename+' found');
- Exit;
-@@ -487,11 +487,10 @@
- XMLConfig.Free;
- end;
- // check Package Name
-- if (Result.Name='') or (not LazIsValidIdent(Result.Name)) then begin
-+ if (Result.Name='') or (not IsValidPkgName(Result.Name)) then
- Error(ErrorPackageNameInvalid,
- Format(lisPkgMangThePackageNameOfTheFileIsInvalid,
- [Result.Name, LineEnding, Result.Filename]));
-- end;
- // check if Package with same name is already loaded
- ConflictPkg:=PackageGraph.FindPackageWithName(Result.Name,nil);
- if ConflictPkg<>nil then begin
-@@ -1051,7 +1050,7 @@
- PkgFilename:='';
- if CompareFileExt(PackageNamesOrFiles[i],'.lpk')=0 then
- PkgFilename:=ExpandFileNameUTF8(PackageNamesOrFiles[i])
-- else if LazIsValidIdent(PackageNamesOrFiles[i]) then begin
-+ else if IsValidPkgName(PackageNamesOrFiles[i]) then begin
- PackageLink:=TLazPackageLink(LazPackageLinks.FindLinkWithPkgName(PackageNamesOrFiles[i]));
- if PackageLink=nil then
- begin
diff --git a/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas b/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas
deleted file mode 100644
index bc4c5e0c9957..000000000000
--- a/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas
+++ /dev/null
@@ -1,14 +0,0 @@
---- lcl/interfaces/qt5/qtobjects.pas 2020-11-23 21:01:09.916716000 -0500
-+++ lcl/interfaces/qt5/qtobjects.pas 2020-11-23 21:02:33.484592000 -0500
-@@ -3115,8 +3115,9 @@
- SelFont := AFont;
- if (AFont.FHandle <> nil) and (Widget <> nil) then
- begin
-- QFnt := QPainter_font(Widget);
-- AssignQtFont(AFont.FHandle, QFnt);
-+ QFnt := QFont_Create(AFont.FHandle);
-+ QPainter_setFont(Widget, QFnt);
-+ QFont_destroy(QFnt);
- vFont.Angle := AFont.Angle;
- end;
- end;
diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
index 331cc39714f3..fd0bcbe2f9d5 100644
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -1,6 +1,6 @@
PORTNAME= picpas
PORTVERSION= 0.9.0
-PORTREVISION= 3
+PORTREVISION= 4
DISTVERSIONPREFIX= v
CATEGORIES= editors
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}