Update astyle to 3.4.12

as astyle 3.1 is no longer available in the latest FreeBSD.

Also, astyle upstream repository has been moved to GitLab. Switched git
to obtain astyle source.

https://gitlab.com/saalen/astyle

.github/workflows/build.yml

@@ -194,8 +194,8 @@ jobs:
       CC: gcc
       # This is required to use a version of astyle other than that
       # supplied with the operating system
-      ASTYLE_VER: 3.1
+      ASTYLE_VER: 3.4.12
-      ASTYLE_REPO: https://svn.code.sf.net/p/astyle/code/tags
+      ASTYLE_REPO: https://gitlab.com/saalen/astyle.git
     steps:
       # Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')
       - name: Get operating system name and version.

scripts/install_astyle.sh

@@ -15,8 +15,8 @@ INSTALL_ROOT=~/astyle.local
 # ----------------------------------------------------------------------------
 usage()
 {
-    echo "** Usage: $0 <svn-tags-url> <tag-name>"
+    echo "** Usage: $0 <git-repo> <version-tag>"
-    echo "   e.g. $0 https://svn.code.sf.net/p/astyle/code/tags 3.1"
+    echo "   e.g. $0 https://gitlab.com/saalen/astyle.git 3.4.12"
 } >&2
 
 # ----------------------------------------------------------------------------
@@ -80,9 +80,12 @@ fi
     # Put everything in this directory
     FILESDIR=$INSTALL_ROOT/$ASTYLE_VER
 
-    svn checkout ${REPO_URL}/${ASTYLE_VER}/AStyle "$workdir"
+    git clone --sparse ${REPO_URL} "$workdir"
-
     cd "$workdir"
+    git sparse-checkout set AStyle
+    git checkout tags/${ASTYLE_VER}
+
+    cd "AStyle"
 
     make_args="DESTDIR=$FILESDIR"
 

scripts/run_astyle.sh

@@ -7,7 +7,7 @@
 # Note: the script must be run from the root directory of the xrdp repository
 
 INSTALL_ROOT=~/astyle.local
-ASTYLE_FROM_XRDP=$INSTALL_ROOT/3.1/usr/bin/astyle
+ASTYLE_FROM_XRDP=$INSTALL_ROOT/3.4.12/usr/bin/astyle
 MIN_ASTYLE_VER="3.1"
 
 # ----------------------------------------------------------------------------