From 3ca24bf4efd3603484dc3ede446460b455b9c38d Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 19 Aug 2021 16:24:16 +0100
Subject: [PATCH] Fix CI links and a typo

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml                 | 8 ++++++++
 .github/workflows/wine.yml                  | 4 ++--
 source/bridges-ui/CarlaBridgeToolkitGtk.cpp | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 00f676916..8e2b3d127 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,6 +64,10 @@ jobs:
         run: |
           sudo apt-get update -qq
           sudo apt-get install -yq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libqt4-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev
+          # Fix 32bit bridge build
+          sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
+          sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so
+          sudo ln -s /usr/lib/i386-linux-gnu/libfreetype.so.6 /usr/lib/i386-linux-gnu/libfreetype.so
       - name: make features
         run: make features
       - name: make
@@ -79,6 +83,10 @@ jobs:
         run: |
           sudo apt-get update -qq
           sudo apt-get install -yq g++-multilib libasound2-dev libfluidsynth-dev libgl1-mesa-dev libgtk2.0-dev libgtk-3-dev liblo-dev libmagic-dev libpulse-dev libsndfile1-dev libx11-dev pkg-config pyqt5-dev-tools qtbase5-dev
+          # Fix 32bit bridge build
+          sudo ln -s /usr/lib/i386-linux-gnu/libX11.so.6 /usr/lib/i386-linux-gnu/libX11.so
+          sudo ln -s /usr/lib/i386-linux-gnu/libXext.so.6 /usr/lib/i386-linux-gnu/libXext.so
+          sudo ln -s /usr/lib/i386-linux-gnu/libfreetype.so.6 /usr/lib/i386-linux-gnu/libfreetype.so
       - name: make features
         run: make features
       - name: make
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
index 49d427f9c..18446bd13 100644
--- a/.github/workflows/wine.yml
+++ b/.github/workflows/wine.yml
@@ -22,7 +22,7 @@ jobs:
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
-          sudo apt-get install -yq g++-multilib pkg-config wine-stable
+          sudo apt-get install -yq g++-multilib pkg-config wine-stable wine64-development-tools
           sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64
       - name: make wine32
         run: make wine32 -j $(nproc)
@@ -47,7 +47,7 @@ jobs:
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
-          sudo apt-get install -yq g++-multilib pkg-config wine-stable
+          sudo apt-get install -yq g++-multilib pkg-config wine-stable wine64-development-tools
           sudo apt-get install -yq binutils-mingw-w64-i686 binutils-mingw-w64-x86-64 g++-mingw-w64-i686 g++-mingw-w64-x86-64 mingw-w64
       - name: make wine32
         run: make wine32 -j $(nproc)
diff --git a/source/bridges-ui/CarlaBridgeToolkitGtk.cpp b/source/bridges-ui/CarlaBridgeToolkitGtk.cpp
index 786f88164..ea4b95010 100644
--- a/source/bridges-ui/CarlaBridgeToolkitGtk.cpp
+++ b/source/bridges-ui/CarlaBridgeToolkitGtk.cpp
@@ -229,9 +229,9 @@ struct GtkLoader {
                 break;
         }
 
-        if (glib == nullptr)
+        if (golib == nullptr)
         {
-            fprintf(stderr, "Failed to load glib, reason:\n%s\n", lib_error(gofilename));
+            fprintf(stderr, "Failed to load gobject, reason:\n%s\n", lib_error(gofilename));
             return;
         }
         else