build: Updated Lazarus to 3.4.0 and some 3p components

salvadorbs · Sep 28, 2024 · 8d7a144 · 8d7a144
1 parent d945f99
commit 8d7a144
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 30 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ env:
   FPC_URL: 'gitlab'
   FPC_BRANCH: 'release_3_2_2'
   LAZ_URL: 'gitlab'
-  LAZ_BRANCH: 'lazarus_3_2'
+  LAZ_BRANCH: 'lazarus_3_4'
   LAZ_REVISION_2_4: ''
   LAZ_DIR: 'fpcLaz'
   BUILD_MODE: 'Debug_GH_Action'   
@@ -44,7 +44,7 @@ jobs:
 
           - os: windows-latest
             name: 'Windows 64'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-win64.exe'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-win64.exe'
             lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
             dbg2mab: 'dbg2mab.exe'
             build-widgetset: 'win32'
@@ -53,7 +53,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 GTK2'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk2'
@@ -62,7 +62,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 GTK3'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk3'
@@ -71,7 +71,7 @@ jobs:
 
           - os: ubuntu-20.04
             name: 'Linux 64 QT5'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt5'
@@ -80,7 +80,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 QT6'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt6'
@@ -90,7 +90,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.2.0
       with:
         submodules: true
         path: '${{ env.ASUITE_SOURCE }}'
@@ -131,7 +131,7 @@ jobs:
 
     - name: Cache
       id: cache
-      uses: actions/cache@v3.0.11
+      uses: actions/cache@v4.0.2
       env:
         cache-name: cache-laz-v0.6.1
       with:
@@ -168,7 +168,7 @@ jobs:
       run: ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.dbg2mab }} ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.debug_file }}
 
     - name: Upload the Build Artifact
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }}
         path: |

diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml
@@ -15,7 +15,7 @@ env:
   FPC_URL: 'gitlab'
   FPC_BRANCH: 'release_3_2_2'
   LAZ_URL: 'gitlab'
-  LAZ_BRANCH: 'lazarus_3_2'
+  LAZ_BRANCH: 'lazarus_3_4'
   LAZ_REVISION_2_4: ''
   LAZ_DIR: 'fpcLaz'
   BUILD_MODE: 'Debug_GH_Action'   
@@ -40,7 +40,7 @@ jobs:
 
           - os: windows-latest
             name: 'Windows 64'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-win64.exe'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-win64.exe'
             lazbuild: 'fpcLaz/lazarus/lazbuild.exe'
             dbg2mab: 'dbg2mab.exe'
             build-widgetset: 'win32'
@@ -49,7 +49,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 GTK2'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk2'
@@ -58,7 +58,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 GTK3'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'gtk3'
@@ -67,7 +67,7 @@ jobs:
 
           - os: ubuntu-20.04
             name: 'Linux 64 QT5'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt5'
@@ -76,7 +76,7 @@ jobs:
 
           - os: ubuntu-22.04
             name: 'Linux 64 QT6'
-            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0c/fpclazup-x86_64-linux'
+            fpcup-url: 'https://github.com/LongDirtyAnimAlf/Reiniero-fpcup/releases/download/v2.4.0e/fpclazup-x86_64-linux'
             lazbuild: 'fpcLaz/lazarus/lazbuild'
             dbg2mab: 'dbg2mab'
             build-widgetset: 'qt6'
@@ -86,7 +86,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.2.0
       with:
         submodules: true
         path: '${{ env.ASUITE_SOURCE }}'
@@ -127,7 +127,7 @@ jobs:
 
     - name: Cache
       id: cache
-      uses: actions/cache@v3.0.11
+      uses: actions/cache@v4.0.2
       env:
         cache-name: cache-laz-v0.6.1
       with:
@@ -164,7 +164,7 @@ jobs:
       run: ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.dbg2mab }} ${{ env.ASUITE_SOURCE }}/bin/${{ matrix.config.debug_file }}
 
     - name: Upload the Build Artifact
-      uses: actions/upload-artifact@v3.1.1
+      uses: actions/upload-artifact@v4.4.0
       with:
         name: ASuite ${{ env.BUILD_MODE }} build - ${{ matrix.config.build-widgetset }}
         path: |

diff --git a/.gitmodules b/.gitmodules
@@ -22,9 +22,9 @@
 [submodule "3p/bgracontrols"]
 	path = 3p/bgracontrols
 	url = https://github.com/bgrabitmap/bgracontrols.git
-[submodule "3p/IGDIPlusMod"]
-	path = 3p/IGDIPlusMod
-	url = https://github.com/jackdp/IGDIPlusMod
 [submodule "3p/mORMot2"]
 	path = 3p/mORMot2
 	url = https://github.com/synopse/mORMot2.git
+[submodule "3p/GDIPlus-Library-for-Delphi-and-Lazarus"]
+	path = 3p/GDIPlus-Library-for-Delphi-and-Lazarus
+	url = https://github.com/jackdp/GDIPlus-Library-for-Delphi-and-Lazarus
diff --git a/3p/GDIPlus-Library-for-Delphi-and-Lazarus b/3p/GDIPlus-Library-for-Delphi-and-Lazarus
diff --git a/3p/IGDIPlusMod b/3p/IGDIPlusMod
diff --git a/3p/JPLib b/3p/JPLib
diff --git a/3p/JPPack b/3p/JPPack
diff --git a/3p/VirtualTreeView-Lazarus b/3p/VirtualTreeView-Lazarus
diff --git a/3p/bgrabitmap b/3p/bgrabitmap
diff --git a/3p/bgracontrols b/3p/bgracontrols
diff --git a/utils/installPackages.ps1 b/utils/installPackages.ps1
@@ -44,10 +44,8 @@ if ($RemoveSparta) {
 # Install Lazarus Components
 write-output "Installing Lazarus Components for building ASuite"
 InstallPackageLink $LazBuildPath "$ASuiteSource/3p/bgrabitmap/bgrabitmap/bgrabitmappack.lpk"
-InstallPackage $LazBuildPath "$ASuiteSource/3p/bgrabitmap/bglcontrols/bglcontrols.lpk"
 InstallPackage $LazBuildPath "$ASuiteSource/3p/bgracontrols/bgracontrols.lpk"
-InstallPackage $LazBuildPath "$ASuiteSource/3p/bgracontrols/bgrapascalscriptcomponent.lpk"
-InstallPackage $LazBuildPath "$ASuiteSource/3p/IGDIPlusMod/packages/Lazarus/lazigdiplus.lpk"
+InstallPackage $LazBuildPath "$ASuiteSource/3p/GDIPlus-Library-for-Delphi-and-Lazarus/packages/Lazarus/lazgdiplus.lpk"
 InstallPackage $LazBuildPath "$ASuiteSource/3p/JPLib/packages/Lazarus/jplib.lpk"
 InstallPackage $LazBuildPath "$ASuiteSource/3p/JPPack/packages/Lazarus/jppacklcl.lpk"
 InstallPackageLink $LazBuildPath "$ASuiteSource/3p/mORMot2/packages/lazarus/mormot2.lpk"
+11 −1		Base/JPL.ConsoleApp.pas
+44 −34		Base/JPL.Conversion.pas
+22 −3		Base/JPL.Files.pas
+268 −0		Base/JPL.JsonDataObjects.pas
+2 −2		Base/JPL.JsonHelpers.pas
+78 −31		Base/JPL.LangMgr.pas
+158 −1		Base/JPL.MemIniFile.pas
+148 −5		Base/JPL.RTTI.pas
+355 −0		Base/JPL.SimpleZip.pas
+160 −43		Base/JPL.Strings.pas
+13 −0		Base/JPL.TStr.pas
+6 −1		Base/JPL.Win.Dialogs.pas
+600 −0		Base/JPL.Win.Mouse.pas
+16 −2		Base/JPL.Win.System.pas
+168 −71		Base/JPL.Win.VersionInfo.pas
+39 −2		Binary/JPL.Binary.Pe.pas
+44 −22		Containers/JPL.Containers.MultiValueList.pas
+143 −0		Containers/JPL.DefinitionList.pas
+3 −3		Containers/JPL.Win.FileIcons.pas
+465 −0		Graphics/JPL.PixelConv.pas
+794 −0		Graphics/JPL.RoseDiag.BinDataList.pas
+945 −0		Graphics/JPL.RoseDiag.DataFile.pas
+1,335 −0		Graphics/JPL.RoseDiag.Diagram.pas
+94 −0		Hash/JPL.Hash.HL_SHA2_256.pas
+358 −68		IDE/JPL.Delphi.Info.pas
+21 −11		Readme.md
+138 −0		demos/CmdLineParser/Lazarus/src/CmdLineParserDemo.lpi
+141 −0		demos/CmdLineParser/Lazarus/src/CmdLineParserDemo.lpr
+211 −0		demos/CmdLineParser/Readme.md
+ −		demos/CmdLineParser/vx_images/141595801239788.png
+ −		demos/CmdLineParser/vx_images/222530202236343.png
+ −		demos/CmdLineParser/vx_images/36711002249977.png
+ −		demos/CmdLineParser/vx_images/412415601247119.png
+ −		demos/CmdLineParser/vx_images/87980402232097.png
+ −		demos/Mouse/Lazarus/src/MouseDemo.ico
+166 −0		demos/Mouse/Lazarus/src/MouseDemo.lpi
+22 −0		demos/Mouse/Lazarus/src/MouseDemo.lpr
+ −		demos/Mouse/Lazarus/src/MouseDemo.res
+230 −0		demos/Mouse/Lazarus/src/Unit1.lfm
+162 −0		demos/Mouse/Lazarus/src/Unit1.pas
+8 −0		demos/Mouse/Readme.md
+ −		demos/Mouse/vx_images/69085222226952.png
+6 −0		demos/clean_FPC.bat
+1 −0		jp.inc
+16 −0		packages/CodeTyphon/jplib.ctpkg
+5 −6		packages/CodeTyphon/jplib.pas
+5 −1		packages/Delphi_10.0_Seattle/JPLib.dpk
+174 −0		packages/Delphi_10.0_Seattle/JPLib.dproj
+ −		packages/Delphi_10.0_Seattle/JPLib.res
+5 −1		packages/Delphi_10.1_Berlin/JPLib.dpk
+42 −11		packages/Delphi_10.1_Berlin/JPLib.dproj
+ −		packages/Delphi_10.1_Berlin/JPLib.res
+5 −1		packages/Delphi_10.2_Tokyo/JPLib.dpk
+25 −2		packages/Delphi_10.2_Tokyo/JPLib.dproj
+5 −1		packages/Delphi_10.3_Rio/JPLib.dpk
+5 −0		packages/Delphi_10.3_Rio/JPLib.dproj
+22 −4		packages/Delphi_10.4_Sydney/JPLib.dpk
+5 −40		packages/Delphi_10.4_Sydney/JPLib.dproj
+5 −1		packages/Delphi_11.0_Alexandria/JPLib.dpk
+7 −5		packages/Delphi_11.0_Alexandria/JPLib.dproj
+5 −1		packages/Delphi_2009/JPLib.dpk
+5 −1		packages/Delphi_2010/JPLib.dpk
+5 −1		packages/Delphi_XE/JPLib.dpk
+5 −1		packages/Delphi_XE2/JPLib.dpk
+3 −0		packages/Delphi_XE2/JPLib.dproj
+5 −1		packages/Delphi_XE3/JPLib.dpk
+3 −0		packages/Delphi_XE3/JPLib.dproj
+5 −1		packages/Delphi_XE4/JPLib.dpk
+3 −0		packages/Delphi_XE4/JPLib.dproj
+5 −1		packages/Delphi_XE5/JPLib.dpk
+3 −0		packages/Delphi_XE5/JPLib.dproj
+5 −1		packages/Delphi_XE6/JPLib.dpk
+3 −0		packages/Delphi_XE6/JPLib.dproj
+5 −1		packages/Delphi_XE7/JPLib.dpk
+3 −0		packages/Delphi_XE7/JPLib.dproj
+5 −1		packages/Delphi_XE8/JPLib.dpk
+85 −37		packages/Lazarus/jplib.lpk
+6 −4		packages/Lazarus/jplib.pas
+5 −1		packages/_DpkGen/JPLib_TEMPLATE.dpk
+7 −0		packages/_DpkGen/Readme.md
+7 −0		packages/_DpkGen/generate_packages.bat
+3 −0		src_stats_PAS.bat
+7 −0		src_stats_PAS.txt
+6 −2		Readme.md
+19 −4		packages/CodeTyphon/jppacklcl.ctpkg
+5 −5		packages/CodeTyphon/jppacklcl.pas
+200 −0		packages/Delphi_10.0_Seattle/JPPack.dproj
+ −		packages/Delphi_10.0_Seattle/JPPack.res
+23 −27		packages/Lazarus/jppacklcl.lpk
+1 −1		packages/Lazarus/jppacklcl.pas
+2 −0		source/CTJPPackRegister.pas
+32 −10		source/JPP.BasicPngButton.pas
+3 −3		source/JPP.BasicSpeedButton.pas
+1 −0		source/JPP.BrushStyleComboBox.pas
+1 −0		source/JPP.ColorSwatch.pas
+8 −1		source/JPP.ComboBox.pas
+1 −0		source/JPP.ComboBoxEx.pas
+47 −20		source/JPP.Common.Procs.pas
+1 −0		source/JPP.DateTimePicker.pas
+1 −0		source/JPP.Edit.pas
+56 −0		source/JPP.EditEx.pas
+3 −2		source/JPP.GPHatchStyleComboBox.pas
+1 −71		source/JPP.Graphics.pas
+16 −2		source/JPP.Labels.pas
+29 −1		source/JPP.Memo.pas
+2 −3		source/JPP.PenStyleComboBox.pas
+1 −0		source/JPP.ProgressBar.pas
+15 −4		source/jpp.inc
+322 −312		Demos/Advanced/HeaderCustomDrawDemo.pas
+1 −0		Source/VirtualTrees.AccessibilityFactory.pas
+75 −97		Source/VirtualTrees.BaseTree.pas
+10 −1		Source/VirtualTrees.EditLink.pas
+38 −31		Source/VirtualTrees.Header.pas
+11 −10		Source/VirtualTrees.Types.pas
+1 −19		Source/VirtualTrees.pas