editors/lazarus-*: update to 2.2.0

- Bump PORTREVISION
- archivers/peazip update to 8.4.0
- editors/cudatext update to 1.155.3
- russian/emkatic update to 0.41
- x11-toolkits/qt5pas to latest version included into lazarus 2.2.0

ChangeLog at:	https://wiki.lazarus.freepascal.org/Lazarus_2.2.0_release_notes

4 files changed, 10 insertions, 52 deletions

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;