From 0c27aa9f2200a3a3bfb894b5244b9be1566022a9 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 25 Sep 2023 16:49:43 +0200
Subject: [PATCH] Fix some python details, more CI things

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/bootstrap.yml               | 60 +++++++++----------
 .../win32/9001-pawpaw-needed-changes.patch    |  2 +-
 patches/aggdraw/01_fix-build.patch            | 12 ++++
 setup/functions.sh                            | 14 +++++
 4 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 5c94aa5..cea6143 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -85,7 +85,7 @@ jobs:
         if: ${{ matrix.installer == 'apt' }}
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq --allow-downgrades autopoint build-essential curl cmake jq meson
+          sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson
           # extra, for using system libraries
           if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then
             sudo dpkg --add-architecture arm64
@@ -95,7 +95,7 @@ jobs:
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-armhf' ]; then
             sudo dpkg --add-architecture armhf
             sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
@@ -104,7 +104,7 @@ jobs:
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-i686' ]; then
             sudo dpkg --add-architecture i386
             sudo apt-get update -qq
@@ -117,7 +117,7 @@ jobs:
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-x86_64' ]; then
             sudo apt-get install -yqq --allow-downgrades libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
           elif [ '${{ matrix.target }}' == 'wasm' ]; then
@@ -143,7 +143,7 @@ jobs:
       - name: (homebrew) Set up dependencies
         if: ${{ matrix.installer == 'homebrew' }}
         run: |
-          brew install cmake jq meson
+          brew install cmake git jq meson
       - name: (apt) Cache debian packages
         if: ${{ matrix.installer == 'apt' }}
         run: |
@@ -242,7 +242,7 @@ jobs:
         if: ${{ matrix.installer == 'apt' }}
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq --allow-downgrades autopoint build-essential curl cmake jq meson
+          sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson
           # extra, for using system libraries
           if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then
             sudo dpkg --add-architecture arm64
@@ -252,7 +252,7 @@ jobs:
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-armhf' ]; then
             sudo dpkg --add-architecture armhf
             sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
@@ -261,7 +261,7 @@ jobs:
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-i686' ]; then
             sudo dpkg --add-architecture i386
             sudo apt-get update -qq
@@ -274,7 +274,7 @@ jobs:
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-x86_64' ]; then
             sudo apt-get install -yqq --allow-downgrades libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
           elif [ '${{ matrix.target }}' == 'wasm' ]; then
@@ -300,7 +300,7 @@ jobs:
       - name: (homebrew) Set up dependencies
         if: ${{ matrix.installer == 'homebrew' }}
         run: |
-          brew install cmake jq meson
+          brew install cmake git jq meson
       - name: (apt) Cache debian packages
         if: ${{ matrix.installer == 'apt' }}
         run: |
@@ -392,7 +392,7 @@ jobs:
         if: ${{ matrix.installer == 'apt' }}
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq --allow-downgrades autopoint build-essential curl cmake jq meson
+          sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson
           # extra, for using system libraries
           if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then
             sudo dpkg --add-architecture arm64
@@ -402,7 +402,7 @@ jobs:
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-armhf' ]; then
             sudo dpkg --add-architecture armhf
             sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
@@ -411,7 +411,7 @@ jobs:
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-i686' ]; then
             sudo dpkg --add-architecture i386
             sudo apt-get update -qq
@@ -424,7 +424,7 @@ jobs:
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-x86_64' ]; then
             sudo apt-get install -yqq --allow-downgrades libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
           elif [ '${{ matrix.target }}' == 'wasm' ]; then
@@ -450,7 +450,7 @@ jobs:
       - name: (homebrew) Set up dependencies
         if: ${{ matrix.installer == 'homebrew' }}
         run: |
-          brew install cmake jq meson
+          brew install cmake git jq meson
       - name: (apt) Cache debian packages
         if: ${{ matrix.installer == 'apt' }}
         run: |
@@ -536,7 +536,7 @@ jobs:
         if: ${{ matrix.installer == 'apt' }}
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq --allow-downgrades autopoint build-essential curl cmake jq meson
+          sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson
           # extra, for using system libraries
           if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then
             sudo dpkg --add-architecture arm64
@@ -546,7 +546,7 @@ jobs:
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-armhf' ]; then
             sudo dpkg --add-architecture armhf
             sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
@@ -555,7 +555,7 @@ jobs:
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-i686' ]; then
             sudo dpkg --add-architecture i386
             sudo apt-get update -qq
@@ -568,7 +568,7 @@ jobs:
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-x86_64' ]; then
             sudo apt-get install -yqq --allow-downgrades libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
           elif [ '${{ matrix.target }}' == 'wasm' ]; then
@@ -594,7 +594,7 @@ jobs:
       - name: (homebrew) Set up dependencies
         if: ${{ matrix.installer == 'homebrew' }}
         run: |
-          brew install cmake jq meson
+          brew install cmake git jq meson
       - name: (apt) Cache debian packages
         if: ${{ matrix.installer == 'apt' }}
         run: |
@@ -677,7 +677,7 @@ jobs:
         if: ${{ matrix.installer == 'apt' }}
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq --allow-downgrades autopoint build-essential curl cmake jq meson
+          sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson
           # extra, for using system libraries
           if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then
             sudo dpkg --add-architecture arm64
@@ -687,7 +687,7 @@ jobs:
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-armhf' ]; then
             sudo dpkg --add-architecture armhf
             sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
@@ -696,7 +696,7 @@ jobs:
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-i686' ]; then
             sudo dpkg --add-architecture i386
             sudo apt-get update -qq
@@ -709,7 +709,7 @@ jobs:
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-x86_64' ]; then
             sudo apt-get install -yqq --allow-downgrades libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
           elif [ '${{ matrix.target }}' == 'wasm' ]; then
@@ -735,7 +735,7 @@ jobs:
       - name: (homebrew) Set up dependencies
         if: ${{ matrix.installer == 'homebrew' }}
         run: |
-          brew install cmake jq meson
+          brew install cmake git jq meson
       - name: (apt) Cache debian packages
         if: ${{ matrix.installer == 'apt' }}
         run: |
@@ -818,7 +818,7 @@ jobs:
         if: ${{ matrix.installer == 'apt' }}
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq --allow-downgrades autopoint build-essential curl cmake jq meson
+          sudo apt-get install -yqq --allow-downgrades autoconf automake autopoint build-essential curl cmake git jq meson
           # extra, for using system libraries
           if [ '${{ matrix.target }}' == 'linux-aarch64' ]; then
             sudo dpkg --add-architecture arm64
@@ -828,7 +828,7 @@ jobs:
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-aarch64-linux-gnu libasound2-dev:arm64 libdbus-1-dev:arm64 libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-armhf' ]; then
             sudo dpkg --add-architecture armhf
             sudo sed -i "s/deb http/deb [arch=amd64] http/" /etc/apt/sources.list
@@ -837,7 +837,7 @@ jobs:
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-arm-linux-gnueabihf libasound2-dev:armhf libdbus-1-dev:armhf libgl1-mesa-dev:armhf libglib2.0-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-i686' ]; then
             sudo dpkg --add-architecture i386
             sudo apt-get update -qq
@@ -850,7 +850,7 @@ jobs:
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             echo "deb [arch=riscv64] http://ports.ubuntu.com/ubuntu-ports focal-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-riscv64.list
             sudo apt-get update -qq
-            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 autoconf automake git gperf qemu-user-static
+            sudo apt-get install -yqq --allow-downgrades g++-riscv64-linux-gnu libasound2-dev:riscv64 libdbus-1-dev:riscv64 libgl1-mesa-dev:riscv64 libglapi-mesa:riscv64 libglvnd0:riscv64 libglib2.0-dev:riscv64 libx11-dev:riscv64 libxcursor-dev:riscv64 libxext-dev:riscv64 libxrandr-dev:riscv64 gperf qemu-user-static
           elif [ '${{ matrix.target }}' == 'linux-x86_64' ]; then
             sudo apt-get install -yqq --allow-downgrades libasound2-dev libdbus-1-dev libgl1-mesa-dev libglib2.0-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev gperf
           elif [ '${{ matrix.target }}' == 'wasm' ]; then
@@ -876,7 +876,7 @@ jobs:
       - name: (homebrew) Set up dependencies
         if: ${{ matrix.installer == 'homebrew' }}
         run: |
-          brew install cmake jq meson
+          brew install cmake git jq meson
       - name: (apt) Cache debian packages
         if: ${{ matrix.installer == 'apt' }}
         run: |
diff --git a/patches/Python/win32/9001-pawpaw-needed-changes.patch b/patches/Python/win32/9001-pawpaw-needed-changes.patch
index 41c6bf1..015edb0 100644
--- a/patches/Python/win32/9001-pawpaw-needed-changes.patch
+++ b/patches/Python/win32/9001-pawpaw-needed-changes.patch
@@ -40,7 +40,7 @@ index f159586..004e89f 100644
  
                  if sys.platform == 'darwin':
                      linker = _osx_support.compiler_fixup(linker, ld_args)
-+                else:
++                elif target_lang == "c++" and self.compiler_cxx:
 +                    ld_args += linker[i+offset+1:]
 +                    linker = [linker[i+offset]]
  
diff --git a/patches/aggdraw/01_fix-build.patch b/patches/aggdraw/01_fix-build.patch
index f11ebb0..4d6d075 100644
--- a/patches/aggdraw/01_fix-build.patch
+++ b/patches/aggdraw/01_fix-build.patch
@@ -24,3 +24,15 @@ index 0ad56c7..b6f1912 100644
  #define WINDOWS_LEAN_AND_MEAN
  #include <windows.h>
  #endif
+diff --git a/agg2/include/agg_array.h b/agg2/include/agg_array.h
+index 3a0f5c0..d00efb8 100644
+--- a/agg2/include/agg_array.h
++++ b/agg2/include/agg_array.h
+@@ -15,6 +15,7 @@
+ #ifndef AGG_ARRAY_INCLUDED
+ #define AGG_ARRAY_INCLUDED
+ 
++#include <stdint.h>
+ #include <string.h>
+ #include "agg_basics.h"
+ 
diff --git a/setup/functions.sh b/setup/functions.sh
index cf8d559..0b6aaae 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -471,6 +471,8 @@ function build_python() {
     # add host/native binaries to path
     if [ "${CROSS_COMPILING}" -eq 1 ]; then
         export PATH="${PAWPAW_PREFIX}-host/bin:${PATH}"
+    elif [ "${LINUX}" -eq 1 ]; then
+        export LD_LIBRARY_PATH="${PAWPAW_PREFIX}/lib"
     fi
 
     touch "${pkgdir}/.stamp_configured"
@@ -491,6 +493,10 @@ function build_python() {
         popd
     fi
 
+    if [ "${CROSS_COMPILING}" -eq 0 ] && [ "${LINUX}" -eq 1 ]; then
+        unset LD_LIBRARY_PATH
+    fi
+
     _postbuild
 }
 
@@ -547,6 +553,10 @@ function build_waf() {
         python=python
     fi
 
+    if [ "${CROSS_COMPILING}" -eq 0 ] && [ "${LINUX}" -eq 1 ]; then
+        export LD_LIBRARY_PATH="${PAWPAW_PREFIX}/lib"
+    fi
+
     _prebuild "${name}" "${pkgdir}"
 
     if [ ! -f "${pkgdir}/.stamp_configured" ]; then
@@ -571,6 +581,10 @@ function build_waf() {
         popd
     fi
 
+    if [ "${CROSS_COMPILING}" -eq 0 ] && [ "${LINUX}" -eq 1 ]; then
+        unset LD_LIBRARY_PATH
+    fi
+
     _postbuild
 }