To 3.2.2.6 - Fix for Qt 6.3.2

README.md

@@ -47,7 +47,7 @@ being hopefully required.
 
 This base stream now comes with basic **[MSYS2][]** and **mingw64** compilers and tools pre-deployed.
 
-### Release Notes: Tools 3.2.2.x to Tools 3.2.2.5 (current)
+### Release Notes: Tools 3.2.2.x to Tools 3.2.2.6 (current)
 
 **It is recommended that any legacy v3.2.2.1 deployments be updated ASAP.**
 
@@ -80,12 +80,12 @@ The [Tools 3.2.2.4](JTSDK64-Tools-3.2.2.4) package has been required to be relea
 longer is released in 32bit/x86 versions. This candidate updates references in the [Qt][] deployment 
 scripts to update x86 references to x64references. 
 
-The [Tools 3.2.2.5](JTSDK64-Tools-3.2.2.5) package fixes a long term legacy bug with Hamlib 
-configuration and LibUSB. Note that [Tools 3.2.2.5](JTSDK64-Tools-3.2.2.5) also packages maintainer-built 
+The [Tools 3.2.2.6](JTSDK64-Tools-3.2.2.6) package fixes a long term legacy bug with Hamlib 
+configuration and LibUSB. Note that [Tools 3.2.2.6](JTSDK64-Tools-3.2.2.6) also packages maintainer-built 
 versions of LibUSB.
 
-**Note:** The [Tools 3.2.2.5](JTSDK64-Tools-3.2.2.5) update should NOT be needed by most "ongoing" users 
-with working deployments. The [Tools 3.2.2.5](JTSDK64-Tools-3.2.2.5) update is essential for new deployments to 
+**Note:** The [Tools 3.2.2.6](JTSDK64-Tools-3.2.2.6) update should NOT be needed by most "ongoing" users 
+with working deployments. The [Tools 3.2.2.6](JTSDK64-Tools-3.2.2.6) update is essential for new deployments to 
 work properly.
 
 ************************************************************************************
@@ -106,19 +106,19 @@ been met (i.e. [PowerShell][] conversion, Ability to compile latest source code
 bleeding-edge Hamlib code). 
 
 Future kits will be much smaller in distribution size. You will be required to 
-build libraries (i.e. [Boost 1.79](Boost-1.79.0) ) as part of the learning process.
+build libraries (i.e. [Boost 1.80](Boost-1.80.0) ) as part of the learning process.
 
 Current packaging preempts known cases of proposed licence and delivery condition changes. 
 
 ************************************************************************************
-Precompiled drop-in packages for [Boost-1.74.0][], [Boost-1.77.0][], [Boost-1.78.0][] and [Boost-1.79.0][] are available - saving many hours.. 
+Precompiled drop-in packages for [Boost-1.74.0][], [Boost-1.77.0][], [Boost-1.78.0][], [Boost-1.79.0][] and [Boost-1.80.0][]are available - saving many hours.. 
 
 - [Boost-1.74.0][], [Boost-1.77.0][] and [Boost-1.78.0][] are built with and supplied under Qt's [MinGW 7.3](MinGW) and [MinGW 8.1](MinGW) environs.
-- [Boost-1.79.0][] is built with and supplied under Qt's [MinGW 8.1](MinGW) and [MinGW 11.3](MinGW) environs. 
+- [Boost-1.79.0][] and [Boost-1.80.0][] are built with and supplied under Qt's [MinGW 8.1](MinGW) and [MinGW 11.3](MinGW) environs. 
 
 Extract the folder for the Boost version-package that you want to use into **x:\JTSDK64-Tools\tools\boost** (create the directory if it does not exist) and then remove the -7.3, -8.1 or -11.2 suffix ! 
 ************************************************************************************
-The recommended development environment should be [Qt][] 5.15.2 and [Boost-1.79.0][] 
+The recommended development environment should be [Qt][] 5.15.2 and [Boost-1.80.0][] 
 working with [MinGW 8.1](MinGW) under the **mingw64** [MSYS2][] environment.
 ************************************************************************************ 
 
@@ -221,7 +221,7 @@ If you need to revert back to your old deployment then all you need do is rename
 Maintenance updates will be applied in the form of "Tools" packages. These packages 
 are designed to be deployed to an existing "Base" package and/or Base package with earlier Tools Package applied.
 
-A Tools package can only be applied to a matching Base release. i.e. You cannot apply a [Tools 3.2.2.5](JTSDK64-Tools-3.2.2.5) 
+A Tools package can only be applied to a matching Base release. i.e. You cannot apply a [Tools 3.2.2.6](JTSDK64-Tools-3.2.2.6) 
 package to a JTSDK64-Base-3.2.1][] - based deployment.
 
 ### Application of Maintenance "Tools" packages
@@ -233,7 +233,7 @@ package to a JTSDK64-Base-3.2.1][] - based deployment.
 - Download any "Tools" packages from https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/ 
 
 ************************************************************************************
-**Note:** The current "Tools" package is  [JTSDK64-Tools-3.2.2.5.exe](JTSDK64-Tools-3.2.2.5).
+**Note:** The current "Tools" package is  [JTSDK64-Tools-3.2.2.6.exe](JTSDK64-Tools-3.2.2.6).
 ************************************************************************************
 
 - Deploy the tools package to your JTSDK install directory.
@@ -242,7 +242,7 @@ Updates may apply to the [MSYS2][] environment. Therefore the "profile" director
 [MSYS2][] may be deleted and re-created.
 
 ************************************************************************************
-The current "Tools" package [JTSDK64-Tools-3.2.2.5.exe](JTSDK64-Tools-3.2.2.5) does not delete the profile nor update [MSYS2][] scripts.
+The current "Tools" package [JTSDK64-Tools-3.2.2.6.exe](JTSDK64-Tools-3.2.2.6) does not delete the profile nor update [MSYS2][] scripts.
 ************************************************************************************
 
 Before any updates (manual from "[Tests][]" or from a "Tools" package) you should backup your [MSYS2][] Environment:
@@ -292,7 +292,7 @@ These Virtual machines should have a lifetime of at least 30 days.
 ** Note that these instructions assumes a fresh Windows 10 Virtual Machine is used **
 
 - Deploy the installer [JTSDK64-Base-3.2.2][] inside a FRESH, FULLY UPDATED WINDOWS 10 or 11 VM.
-- Deploy the latest "Tools" Packages if they exist ( i.e. [JTSDK64-Tools-3.2.2.5][] ) to your Base Deployment.
+- Deploy the latest "Tools" Packages if they exist ( i.e. [JTSDK64-Tools-3.2.2.6][] ) to your Base Deployment.
 
 It is recommended to use all the initial default settings and file locations.
 
@@ -302,7 +302,7 @@ It is recommended to use all the initial default settings and file locations.
 
 ```
 -------------------------------------------
-           JTSDK Setup v3.2.2.5
+           JTSDK Setup v3.2.2.6
 -------------------------------------------
 
   Required Tool Status
@@ -552,7 +552,7 @@ In the JTSDK64-Tools environment:
 Around 90 minutes later you should now have a deployment of Boost based at the recommended v1.74.0 (configurable in **C:\JTSDK64-Tools\config\Versions.ini**) that is suitable to build JT-software under your selected Qt version on your machine.
 
 ************************************************************************************
-Pre-compiled drop-in Packages for [Boost-1.74.0][], [Boost-1.77.0][], [Boost-1.78.0][] and [Boost-1.79.0][] are available at the time of writing.
+Pre-compiled drop-in Packages for [Boost-1.74.0][], [Boost-1.77.0][], [Boost-1.78.0][], [Boost-1.79.0][] and [Boost-1.80.0][] are available at the time of writing.
 
 Each “drop-in” package has folders i.e. 1.74.0-7.3 for [MinGW 7.3](MinGW) (pre-Qt 5.15) and 1.74.0-8.1 (for post-Qt 5.15 including the 6.x.x streams). 
 
@@ -564,8 +564,8 @@ A Windows symbolic link will work too: i.e.: Assume that both the 1.74.0-7.3 and
 
 Examples:
 
-- Cmd:** mklink /D 1.74.0 1.74.0-8.1 **
-- [PowerShell][]:** New-Item -ItemType SymbolicLink -Path C:\JTSDK64-Tools\tools\boost\boost-1.74.0 -Value C:\JTSDK64-Tools\tools\boost\boost-1.74.0-8.1 **
+- Cmd:** mklink /D 1.80.0 1.80.0-8.1 **
+- [PowerShell][]:** New-Item -ItemType SymbolicLink -Path C:\JTSDK64-Tools\tools\boost\boost-1.80.0 -Value C:\JTSDK64-Tools\tools\boost\boost-1.80.0-8.1 **
 
 The preference is to build your own Boost package and NOT use these ! ** Warning: Boost does not build 100% properly and to full capability under MinGW/[MSYS2][] environments that we use – yet its good enough for our purposes !**
 ************************************************************************************
@@ -743,7 +743,7 @@ Base ref: https://sourceforge.net/projects/jtsdk/files/win64/3.1.0/README.md
 [JTSDK64-Tools-3.2.2.2]: https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.2.exe
 [JTSDK64-Tools-3.2.2.3]: https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.3.exe
 [JTSDK64-Tools-3.2.2.4]: https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.4.exe
-[JTSDK64-Tools-3.2.2.5]: https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.5.exe
+[JTSDK64-Tools-3.2.2.6]: https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.6.exe
 [Git]: https://git-scm.com/
 [VS Code]: https://code.visualstudio.com/Download
 [Issue Tracker]: https://sourceforge.net/p/hamlib-sdk/tickets/

config/Versions.ini

@@ -2,22 +2,23 @@
 # Set versions of packages that jtsdk64.ps1 will use
 # This data is no longer set in jtsdk64.ps1 directly
 fftwv=3.3.10
-libusbv=1.0.24
-# Next can also be /MinGW64/dll
-libusbdll=/VS2019/MS64/dll
+libusbv=1.0.26
+# Next can also be /MinGW64/dll, /VS2019/MS64/dll
+libusbdll=/bin
 # Next specifies path of VC runtimes
 vcrunurl=https://aka.ms/vs/17/release
+# Next specifies the name of the Qt Installer
 qtinstprog=qt-unified-windows-x64-online.exe
-#qtsource=http://www.nic.funet.fi/pub/mirrors/download.qt-project.org
-qtsource=
+# Next specifies the Qt download mirror to use. Nothing after = means use pool
+qtsource=http://www.nic.funet.fi/pub/mirrors/download.qt-project.org
 nsisv=3.07
-pkgconfigv=0.28.1
+pkgconfigv=1.8.0
 rubyv=3.0.2-1
 svnv=1.14.1
 #cmakev can be qtcmake for Qt deployed cmake - qtcmake - or set version number if deployed standalone i.e. 3.19.3
 cmakev=qtcmake
 sqlitev=3.36
-boostv=1.79.0
+boostv=1.80.0
 unixtools=disabled
 cleanfirst=No
 reconfigure=No

docs/DG-Build-FFTW.html

@@ -165,16 +165,16 @@ <h3>Step 4: Download the  Source</h3>
 <h3>Step 5: Drop in a special build helper file</h3>
 
 	<ul>
-		<p>A stated at the start of this page, a script <a href="https://fftw.org/pub/fftw/BUILD-MINGW64.sh">BUILD-MINGW64.sh</a> from  <a href="http://www.fftw.org/install/windows.html">http://www.fftw.org/install/windows.html</a> needs to be dropped into into the source directory to assist with the Windows build of FFTW.</p>
+		<p>A  script <a href="https://fftw.org/pub/fftw/BUILD-MINGW64.sh">BUILD-MINGW64.sh</a> from  <a href="http://www.fftw.org/install/windows.html">http://www.fftw.org/install/windows.html</a> needs to be dropped into into the source directory to assist with the Windows build of FFTW. If you are developing from a <strong>mingw32</strong> environment then there is a 32-bit script needed.&nbsp; &nbsp;</p>
 	  <ul>
 		  <li>Execute  the following commands at the MSYS2 terminal prompt:</li>
 
 			<ul>
 				<li><strong>cd ~/src/fftw-3.3.10</strong></li>
 
-				<li><strong>wget https://fftw.org/pub/fftw/BUILD-MINGW64.sh</strong></li>
-
-			</ul>
+			<li><strong>wget https://fftw.org/pub/fftw/BUILD-MINGW64.sh</strong>&nbsp;[ or <strong>wget https://fftw.org/pub/fftw/BUILD-MINGW32.sh </strong> ]</li>
+			<li><strong>Note:</strong> If you are using <strong>mingw32.exe</strong> then slight modifications to <strong>BUILD-MINGW32.sh</strong> may be needed as some tool nomenclature may have changed since the script was originally written i.e.&nbsp;<strong>i686-w64-mingw32-nm</strong> is now just <strong>nm</strong> .</li>
+</ul>
 		</ul>
 	</ul>
 
@@ -189,7 +189,7 @@ <h3>Step 6: Configure and  build the FFTW libraries</h3>
 		<ul>
 			<li><strong>cd fftw-3.3.10</strong></li>
 
-			<li><strong>./BUILD-MINGW64.sh</strong></li>
+			<li><strong>./BUILD-MINGW64.sh</strong> [ or<strong> ./BUILD-MINGW32.sh </strong>]</li>
 		</ul>
 	</ul>
 	<p>The above command places a .ZIP file containing the built <strong>FFTW 3.3.10</strong> libraries in the source directory.</p>

docs/DG.html

@@ -98,7 +98,7 @@ <h3>Step 1: Deploy the JTSDK64-Base-3.2.2.exe Installer and the latest &quot;Too
 		<p><strong> Note that these instructions assumes a fresh Windows 10 Virtual Machine is used. </strong></p>
 		<ul>
 			<li>Download and deploy the installer ( i.e. <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Base-3.2.2.exe">JTSDK-Base-3.2.2</a> ) inside a FRESH VM.</li>	
-			<li>Deploy the latest &quot;Tools&quot; Packages ( i.e. <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.5.exe">JTSDK64-Tools-3.2.2.5</a> ) to your "Base" deployment if there is a "Tools" package available.&nbsp; &nbsp;&nbsp;</li>
+			<li>Deploy the latest &quot;Tools&quot; Packages ( i.e. <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.6.exe">JTSDK64-Tools-3.2.2.6</a> ) to your "Base" deployment if there is a "Tools" package available.&nbsp; &nbsp;&nbsp;</li>
 		</ul>
 	</ul>
 	<table width="*" align="center" border="1">
@@ -121,15 +121,15 @@ <h4>Preparation: Disable Antivirus Real Time Scanning</h4>
     </ul>	
 
 
-    <h4>Special Note for Windows 11, Tools 3.2.2.5 and VC Runtimes Deployment</h4>   
+    <h4>Special Note for Windows 11, Tools 3.2.2.6 and VC Runtimes Deployment</h4>   
 
     <ul>
     <p>When you start up the <em>JTSDK64-Setup</em> environment in <strong>Windows 11</strong> you may notice the following:</p>
     </ul>
 	<div class="reducewidth">
 <pre>
 -------------------------------------------
-           JTSDK Setup v3.2.2.5
+           JTSDK Setup v3.2.2.6
 -------------------------------------------
 
   Required Tool Status
@@ -608,13 +608,13 @@ <h4>Application of Maintenance &quot;Tools&quot; packages</h4>
 		<p>&quot;Tools&quot; packages are updates to the <strong></strong>&quot;Base&quot; environments.</p>
 		<p>A &quot;Tools&quot; package can only be applied to matching &quot;Base&quot; deployments</p>
 		<ul>
-			<li>You can only apply a &quot;Tools 3.2.2.5&quot; package to deployments based on &quot;Base 3.2.2&quot;. It does not matter what 
+			<li>You can only apply a &quot;Tools 3.2.2.6&quot; package to deployments based on &quot;Base 3.2.2&quot;. It does not matter what 
 		&quot;Tools&quot; versions are deployed to &quot;Base 3.2.2&quot; - the latest &quot;Tools&quot; package can always be applied to it.
 		      <p><em>These steps assume that you have a deployed base environment</em></p>
 		<ul>
 			<li>Download any &quot;Tools&quot; packages from <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/">https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/</a> </li>
 		</ul>
-		<p><strong>Note:</strong> The current package is <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.5.exe">JTSDK64-Tools-3.2.2.5.exe</a>.</p>
+		<p><strong>Note:</strong> The current package is <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.6.exe">JTSDK64-Tools-3.2.2.6.exe</a>.</p>
 		<ul>
 			<li>Deploy the tools package to your JTSDK install directory.</li>
 		</ul>

docs/UG.html

@@ -191,7 +191,7 @@ <h2>Maintenance Updates: &quot;Tools&quot; Packages</h2>
 	<ul>
 	<li>Download any &quot;Tools&quot; packages from <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/">https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/</a></li>
 	</ul>
-	<p><strong>Note:</strong> The current &quot;Tools&quot; package is <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.5.exe">JTSDK64-Tools-3.2.2.5.exe</a>.</p>
+	<p><strong>Note:</strong> The current &quot;Tools&quot; package is <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.6.exe">JTSDK64-Tools-3.2.2.6.exe</a>.</p>
 	<ul>
 	<li>Deploy the tools package to your JTSDK install directory.</li>
 	</ul>
@@ -241,20 +241,20 @@ <h3>Step 1: Deploy the JTSDK64-Base-3.2.2.exe Installer and any &quot;Tools&quot
 	<p><strong> Note that these instructions assumes a fresh Windows 10 Virtual Machine is used </strong></p>
 	<ul>
 	<li>Download and deploy the installer ( i.e. <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Base-3.2.2.exe">JTSDK-Base-3.2.2</a> ) inside a FRESH VM.</li>
-	<li>Deploy any &quot;Tools&quot; Packages ( i.e. <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.5.exe">JTSDK64-Tools-3.2.2.5</a> ) to your Base Deployment.</li>
+	<li>Deploy any &quot;Tools&quot; Packages ( i.e. <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/JTSDK64-Tools-3.2.2.6.exe">JTSDK64-Tools-3.2.2.6</a> ) to your Base Deployment.</li>
 	</ul>
 	<p>It is recommended to use all the default settings and file locations provided by the installer.</p>
 </ul>
 <h3>Step 2: Launch the Installation Environment</h3>
-    <h4>Special Note for Windows 11, Tools 3.2.2.5 and VC Runtimes Deployment</h4>   
+    <h4>Special Note for Windows 11, Tools 3.2.2.6 and VC Runtimes Deployment</h4>   
 
     <ul>
     <p>When you start up the <em>JTSDK64-Setup</em> environment in <strong>Windows 11</strong> you may notice the following:</p>
     </ul>
 	<div class="reducewidth">
 <pre>
 -------------------------------------------
-           JTSDK Setup v3.2.2.5
+           JTSDK Setup v3.2.2.6
 -------------------------------------------
 
   Required Tool Status

jtsdk-base-3.2.2.iss

@@ -1,7 +1,7 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "JTSDK Base 3.2.2"
+#define MyAppName "JTSDK Base 3.2.2u13"
 #define MyAppVersion "3.2.2"
 #define MyAppPublisher "(c)2020 - 2022 JTSDK Contributors based on concepts and code 2013-2021 (c) Greg Beam KI7MT"
 #define MyAppURL "https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/"