From d09186916d8794766cf009a89de38323f35ad034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Mon, 6 Mar 2023 14:58:07 +0100
Subject: [PATCH] * Dotted filenames for package aspell

---
 packages/aspell/namespaced/Api.Aspell.pp     |  3 +++
 packages/aspell/namespaced/Api.Aspelldyn.pp  |  3 +++
 packages/aspell/namespaced/Api.Spellcheck.pp |  3 +++
 packages/aspell/namespaces.lst               |  5 +++++
 packages/aspell/src/aspell.pp                |  7 +++++++
 packages/aspell/src/aspelldyn.pp             | 17 ++++++++++++++++-
 packages/aspell/src/spellcheck.pp            |  7 +++++++
 7 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 packages/aspell/namespaced/Api.Aspell.pp
 create mode 100644 packages/aspell/namespaced/Api.Aspelldyn.pp
 create mode 100644 packages/aspell/namespaced/Api.Spellcheck.pp
 create mode 100644 packages/aspell/namespaces.lst

diff --git a/packages/aspell/namespaced/Api.Aspell.pp b/packages/aspell/namespaced/Api.Aspell.pp
new file mode 100644
index 0000000000..02591cd1b0
--- /dev/null
+++ b/packages/aspell/namespaced/Api.Aspell.pp
@@ -0,0 +1,3 @@
+unit Api.Aspell;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i aspell.pp}
diff --git a/packages/aspell/namespaced/Api.Aspelldyn.pp b/packages/aspell/namespaced/Api.Aspelldyn.pp
new file mode 100644
index 0000000000..fae88bc61c
--- /dev/null
+++ b/packages/aspell/namespaced/Api.Aspelldyn.pp
@@ -0,0 +1,3 @@
+unit Api.Aspelldyn;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i aspelldyn.pp}
diff --git a/packages/aspell/namespaced/Api.Spellcheck.pp b/packages/aspell/namespaced/Api.Spellcheck.pp
new file mode 100644
index 0000000000..4ecc54e983
--- /dev/null
+++ b/packages/aspell/namespaced/Api.Spellcheck.pp
@@ -0,0 +1,3 @@
+unit Api.Spellcheck;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i spellcheck.pp}
diff --git a/packages/aspell/namespaces.lst b/packages/aspell/namespaces.lst
new file mode 100644
index 0000000000..d4e8a79498
--- /dev/null
+++ b/packages/aspell/namespaces.lst
@@ -0,0 +1,5 @@
+src/aspell.pp=namespaced/Api.Aspell.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/aspelldyn.pp=namespaced/Api.Aspelldyn.pp
+src/spellcheck.pp=namespaced/Api.Spellcheck.pp
diff --git a/packages/aspell/src/aspell.pp b/packages/aspell/src/aspell.pp
index 7b00766e10..52409e9216 100644
--- a/packages/aspell/src/aspell.pp
+++ b/packages/aspell/src/aspell.pp
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit aspell;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { * This file is header translation of The New Aspell
   * Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL
@@ -12,8 +14,13 @@ unit aspell;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   cTypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF UNIX}
   const libaspell = 'aspell';
diff --git a/packages/aspell/src/aspelldyn.pp b/packages/aspell/src/aspelldyn.pp
index bca23c834a..c67b39f93a 100644
--- a/packages/aspell/src/aspelldyn.pp
+++ b/packages/aspell/src/aspelldyn.pp
@@ -1,4 +1,6 @@
-unit aspelldyn;
+{$IFNDEF FPC_DOTTEDUNITS}
+unit aspelldyn;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { * This file is header translation of The New Aspell
   * Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL
@@ -12,8 +14,13 @@
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.CTypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   cTypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF UNIX}
   // TODO: check if it works pathless in beosOB
@@ -443,11 +450,19 @@ var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  {$IFDEF WINDOWS}
+  Windows, SysUtils, Classes,
+  {$ENDIF}
+  System.DynLibs;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   {$IFDEF WINDOWS}
   Windows, SysUtils, Classes,
   {$ENDIF}
   dynlibs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   LibHandle: TLibHandle = 0;
diff --git a/packages/aspell/src/spellcheck.pp b/packages/aspell/src/spellcheck.pp
index 845dd5da55..0cea2c395d 100644
--- a/packages/aspell/src/spellcheck.pp
+++ b/packages/aspell/src/spellcheck.pp
@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit SpellCheck;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { Simple unit to simplify/OOP-ize pascal-style the aspell interface. Currently
   very limited, will be expanded eventually. Use like you wish. }
@@ -7,8 +9,13 @@ unit SpellCheck;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes, Api.Aspell;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes, Aspell;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   TSuggestionArray = array of AnsiString;