From 4af7ab2584edf50c215eaa7e677cf86361744186 Mon Sep 17 00:00:00 2001 From: hamlibdk Date: Sun, 6 Nov 2022 03:53:13 +1100 Subject: [PATCH] To 3.2.2.6 - Fix for Qt 6.3.2 --- README.md | 36 +- config/Versions.ini | 15 +- docs/DG-Build-FFTW.html | 10 +- docs/DG.html | 10 +- docs/UG.html | 8 +- jtsdk-base-3.2.2.iss | 2 +- jtsdk-tools-3.2.2.6.iss | 53 +++ tools/pkgconfig/1.8.0/bin/msys-pkgconf-3.dll | Bin 0 -> 56476 bytes tools/pkgconfig/1.8.0/bin/pkg-config.exe | Bin 0 -> 39133 bytes tools/pkgconfig/1.8.0/bin/pkgconf.exe | Bin 0 -> 39133 bytes .../1.8.0/bin/x86_64-pc-msys-pkg-config.exe | Bin 0 -> 39133 bytes .../include/pkgconf/libpkgconf/bsdstubs.h | 33 ++ .../1.8.0/include/pkgconf/libpkgconf/iter.h | 105 +++++ .../pkgconf/libpkgconf/libpkgconf-api.h | 20 + .../include/pkgconf/libpkgconf/libpkgconf.h | 393 ++++++++++++++++++ .../1.8.0/include/pkgconf/libpkgconf/stdinc.h | 69 +++ tools/pkgconfig/1.8.0/lib/libpkgconf.dll.a | Bin 0 -> 63322 bytes .../1.8.0/lib/pkgconfig/libpkgconf.pc | 10 + tools/pkgconfig/1.8.0/share/aclocal/pkg.m4 | 343 +++++++++++++++ .../pkgconfig/1.8.0/share/doc/pkgconf/AUTHORS | 41 ++ .../1.8.0/share/doc/pkgconf/README.md | 141 +++++++ .../1.8.0/share/man/man1/pkgconf.1.gz | Bin 0 -> 2870 bytes tools/pkgconfig/1.8.0/share/man/man5/pc.5.gz | Bin 0 -> 2164 bytes .../share/man/man5/pkgconf-personality.5.gz | Bin 0 -> 1418 bytes .../1.8.0/share/man/man7/pkg.m4.7.gz | Bin 0 -> 1517 bytes tools/setup/qt/Generate-JSQt.ps1 | 121 +++--- ver.jtsdk | 2 +- 27 files changed, 1311 insertions(+), 101 deletions(-) create mode 100644 jtsdk-tools-3.2.2.6.iss create mode 100644 tools/pkgconfig/1.8.0/bin/msys-pkgconf-3.dll create mode 100644 tools/pkgconfig/1.8.0/bin/pkg-config.exe create mode 100644 tools/pkgconfig/1.8.0/bin/pkgconf.exe create mode 100644 tools/pkgconfig/1.8.0/bin/x86_64-pc-msys-pkg-config.exe create mode 100644 tools/pkgconfig/1.8.0/include/pkgconf/libpkgconf/bsdstubs.h create mode 100644 tools/pkgconfig/1.8.0/include/pkgconf/libpkgconf/iter.h create mode 100644 tools/pkgconfig/1.8.0/include/pkgconf/libpkgconf/libpkgconf-api.h create mode 100644 tools/pkgconfig/1.8.0/include/pkgconf/libpkgconf/libpkgconf.h create mode 100644 tools/pkgconfig/1.8.0/include/pkgconf/libpkgconf/stdinc.h create mode 100644 tools/pkgconfig/1.8.0/lib/libpkgconf.dll.a create mode 100644 tools/pkgconfig/1.8.0/lib/pkgconfig/libpkgconf.pc create mode 100644 tools/pkgconfig/1.8.0/share/aclocal/pkg.m4 create mode 100644 tools/pkgconfig/1.8.0/share/doc/pkgconf/AUTHORS create mode 100644 tools/pkgconfig/1.8.0/share/doc/pkgconf/README.md create mode 100644 tools/pkgconfig/1.8.0/share/man/man1/pkgconf.1.gz create mode 100644 tools/pkgconfig/1.8.0/share/man/man5/pc.5.gz create mode 100644 tools/pkgconfig/1.8.0/share/man/man5/pkgconf-personality.5.gz create mode 100644 tools/pkgconfig/1.8.0/share/man/man7/pkg.m4.7.gz diff --git a/README.md b/README.md index 88b0360..437fd6c 100644 --- a/README.md +++ b/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/ diff --git a/config/Versions.ini b/config/Versions.ini index 5d2cf20..2083b23 100644 --- a/config/Versions.ini +++ b/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 diff --git a/docs/DG-Build-FFTW.html b/docs/DG-Build-FFTW.html index efb494c..8fb2e4b 100644 --- a/docs/DG-Build-FFTW.html +++ b/docs/DG-Build-FFTW.html @@ -165,16 +165,16 @@

Step 4: Download the Source

Step 5: Drop in a special build helper file

@@ -189,7 +189,7 @@

Step 6: Configure and build the FFTW libraries

The above command places a .ZIP file containing the built FFTW 3.3.10 libraries in the source directory.

diff --git a/docs/DG.html b/docs/DG.html index ccf3461..1f97dd2 100644 --- a/docs/DG.html +++ b/docs/DG.html @@ -98,7 +98,7 @@

Step 1: Deploy the JTSDK64-Base-3.2.2.exe Installer and the latest "Too

Note that these instructions assumes a fresh Windows 10 Virtual Machine is used.

@@ -121,7 +121,7 @@

Preparation: Disable Antivirus Real Time Scanning

-

Special Note for Windows 11, Tools 3.2.2.5 and VC Runtimes Deployment

+

Special Note for Windows 11, Tools 3.2.2.6 and VC Runtimes Deployment