From 61f0d4accbe24c171fc470360f0e7f80bbdba68f Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Wed, 13 Apr 2022 17:38:08 +0100
Subject: [PATCH] Update changelog, fixup for CI builds

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 14 ++++++++------
 ChangeLog.rst               |  8 ++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9d251b05..edfc0b52 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
       shell: bash
       run: |
         pushd PawPaw && source local.env macos && popd
-        python ./waf configure --platform=darwin --prefix=/usr/local
+        python ./waf configure --platform=darwin --prefix=/usr/local --example-tools
         python ./waf build -j $(sysctl -n hw.logicalcpu)
         python ./waf install --destdir=$(pwd)/destdir
     - name: Set sha8
@@ -90,7 +90,7 @@ jobs:
       shell: bash
       run: |
         pushd PawPaw && source local.env macos-universal && popd
-        python ./waf configure --platform=darwin --prefix=/usr/local
+        python ./waf configure --platform=darwin --prefix=/usr/local --example-tools
         python ./waf build -j $(sysctl -n hw.logicalcpu)
         python ./waf install --destdir=$(pwd)/destdir
     - name: Set sha8
@@ -150,7 +150,7 @@ jobs:
       shell: bash
       run: |
         pushd PawPaw && source local.env win32 && popd
-        ./waf configure --platform=win32 --prefix=$(pwd)/destdir --static
+        ./waf configure --platform=win32 --prefix=$(pwd)/destdir --static --example-tools
         ./waf build -j $(nproc)
         ./waf install
     - name: Generate MSVC lib files
@@ -168,8 +168,9 @@ jobs:
       shell: bash
       run: |
         # Setup wine
+        export WINEDLLOVERRIDES="mscoree,mshtml="
         export WINEPREFIX=$(pwd)/innosetup
-        wineboot -u
+        xvfb-run wineboot -u
         # Download and install innosetup
         curl -L https://jrsoftware.org/download.php/is.exe?site=2 -o is.exe
         xvfb-run wine is.exe /allusers /dir=C:\\InnoSeup /nocancel /norestart /verysilent
@@ -231,7 +232,7 @@ jobs:
         pushd PawPaw && source local.env win64 && popd
         export PATH+=":/usr/i686-w64-mingw32/bin"
         export LDFLAGS+="-L~/PawPawBuilds/targets/win64/lib32"
-        ./waf configure --platform=win32 --prefix=$(pwd)/destdir --static --mixed
+        ./waf configure --platform=win32 --prefix=$(pwd)/destdir --static --mixed --example-tools
         ./waf build -j $(nproc)
         ./waf install
     - name: Generate MSVC lib files
@@ -254,8 +255,9 @@ jobs:
       shell: bash
       run: |
         # Setup wine
+        export WINEDLLOVERRIDES="mscoree,mshtml="
         export WINEPREFIX=$(pwd)/innosetup
-        wineboot -u
+        xvfb-run wineboot -u
         # Download and install innosetup
         curl -L https://jrsoftware.org/download.php/is.exe?site=2 -o is.exe
         xvfb-run wine64 is.exe /allusers /dir=C:\\InnoSeup /nocancel /norestart /verysilent
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 96430ea8..826b18d0 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -6,10 +6,14 @@ ChangeLog
   * The waf autooption ``--example-tools`` introduced in 1.9.20 is now off by default,
     To get the previous behavior back pass ``--example-tools`` during build.
     This flag (and the related tools and their code) are going to be removed in the next release.
-  * 
+  * Fix alignas() on non-packed architectures
+  * Fix build of jack-example-tools man pages (1.9.20 regression)
+  * Fix missing symbols from jack client library (error and info callback pointers)
+  * Fix potential memory corruption in midi_latency_test tool
+  * Use predefined variables in pkg-config file (required for mingw)
 
 External changes, related to macOS/Windows installer:
-  * 
+  * Fix application style in QJackCtl (qwindowsvistastyle.dll was missing)
 
 * 1.9.20 (2022-01-15)