FPC: Dependency on the SPARTA_GENERICS package has been removed. Mini…

…mum FPC version required: 3.2.0
jackdp · May 16, 2022 · a6267c0 · a6267c0
1 parent 8a3385d
commit a6267c0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/Binary/JPL.Binary.Elf.pas b/Binary/JPL.Binary.Elf.pas
@@ -2,7 +2,7 @@
 
 {
   Jacek Pazera
-  http://www.pazera-software.com
+  https://www.pazera-software.com
   https://github.com/jackdp
 
   Links:
@@ -14,7 +14,7 @@
 {$I .\..\jp.inc}
 
 {$IFDEF FPC}
-  {$IFNDEF HAS_SPARTA_GENERICS}For FPC 3.0.4 or newer only!{$ENDIF}
+  {$IFNDEF HAS_RTL_GENERICS}For FPC 3.2.0 or newer only!{$ENDIF}
   {$MODE DELPHI}
 {$ENDIF}
 

diff --git a/Binary/JPL.Binary.MachFat.pas b/Binary/JPL.Binary.MachFat.pas
@@ -10,7 +10,7 @@
 {$I .\..\jp.inc}
 
 {$IFDEF FPC}
-  {$IFNDEF HAS_SPARTA_GENERICS}For FPC 3.0.4 or newer only!{$ENDIF}
+  {$IFNDEF HAS_RTL_GENERICS}For FPC 3.2.0 or newer only!{$ENDIF}
   {$MODE DELPHI}
 {$ENDIF}
 

diff --git a/Binary/JPL.Binary.MachO.pas b/Binary/JPL.Binary.MachO.pas
@@ -10,7 +10,7 @@
 {$I .\..\jp.inc}
 
 {$IFDEF FPC}
-  {$IFNDEF HAS_SPARTA_GENERICS}For FPC 3.0.4 or newer only!{$ENDIF}
+  {$IFNDEF HAS_RTL_GENERICS}For FPC 3.2.0 or newer only!{$ENDIF}
   {$MODE DELPHI}
 {$ENDIF}
 

diff --git a/Containers/JPL.Win.FileIcons.pas b/Containers/JPL.Win.FileIcons.pas
@@ -18,7 +18,7 @@ interface
 {$I .\..\jp.inc}
 
 {$IFDEF FPC}
-  {$IFNDEF HAS_SPARTA_GENERICS}For FPC 3.0.4 or newer only!{$ENDIF}
+  {$IFNDEF HAS_RTL_GENERICS}For FPC 3.2.0 or newer only!{$ENDIF}
   {$MODE DELPHI}
 {$ENDIF}
 

diff --git a/Readme.md b/Readme.md
@@ -1,9 +1,9 @@
-# JPLib
+# JPLib
 
 Small library of Pascal units needed to compile my projects published on GitHub.
 
 Supported Delphi versions: **2009**, **2010**, **XE**, **XE2**, **XE3**, **XE4**, **XE5**, **XE6**, **XE7**, **XE8**, **10.0 Seattle**, **10.1 Berlin**, **10.2 Tokyo**, **10.3 Rio**, **10.4 Sydney**, **11.0 Alexandria**.  
-**Lazarus**: Required FPC version **3.0.4** or newer.  
+**Lazarus**: Required FPC version ~~3.0.4~~ **3.2.0** or newer.  
 **CodeTyphon**: Tested on CodeTyphon 7.00, 7.10, 7.20 with FPC 3.3.1
 
 ---

diff --git a/jp.inc b/jp.inc
@@ -24,7 +24,7 @@
   {$UNDEF HAS_WINCONTROL_WITH_PARENTDOUBLEBUFFERED}
   {$UNDEF HAS_RTTI}
   {$UNDEF HAS_UINTTOSTR}
-  {$UNDEF HAS_SPARTA_GENERICS}
+  {$UNDEF HAS_RTL_GENERICS}
 
   {$DEFINE HAS_FORMATSETTINGS}
 
@@ -40,7 +40,7 @@
   {$IF DEFINED(FPC_FULLVERSION) and (FPC_FULLVERSION >= 30004)}
     {$DEFINE HAS_PANEL_WITH_PARENTBACKGROUND}
     {$DEFINE HAS_WINCONTROL_WITH_PARENTDOUBLEBUFFERED}
-    {$DEFINE HAS_SPARTA_GENERICS}
+    //{$DEFINE HAS_RTL_GENERICS}
     {$DEFINE FPC304_OR_ABOVE}
   {$IFEND}
 
@@ -56,7 +56,8 @@
     {$DEFINE HAS_SAVE_WITH_ENCODING}
     {$DEFINE HAS_INIFILE_WITH_ENCODING}
     {$DEFINE HAS_RTTI}
-    {$DEFINE HAS_UINTTOSTR}
+    {$DEFINE HAS_UINTTOSTR}    
+    {$DEFINE HAS_RTL_GENERICS}
     {$DEFINE FPC320_OR_ABOVE}
   {$IFEND}
 

diff --git a/packages/Lazarus/jplib.lpk b/packages/Lazarus/jplib.lpk
@@ -188,16 +188,13 @@
         <UnitName Value="JPL.Win.Registry"/>
       </Item43>
     </Files>
-    <RequiredPkgs Count="3">
+    <RequiredPkgs Count="2">
       <Item1>
-        <PackageName Value="sparta_generics"/>
+        <PackageName Value="LCLBase"/>
       </Item1>
       <Item2>
-        <PackageName Value="LCLBase"/>
-      </Item2>
-      <Item3>
         <PackageName Value="FCL"/>
-      </Item3>
+      </Item2>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>