Merge pull request #3396 from matt335672/fix_32bit_build

Fix 32-bit CI build
neutrinolabs · Jan 15, 2025 · 0bef59a · 0bef59a
2 parents 30b47ba + 3657b5a
commit 0bef59a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -134,9 +134,9 @@ jobs:
                   --enable-painter --enable-pixman --enable-utmp
                   --with-imlib2 --with-freetype2 --enable-tests --with-x264
                   --enable-openh264"
-      CONF_FLAGS_i386_max: "--enable-ibus --enable-ipv6 --enable-jpeg
+      CONF_FLAGS_i386_max: "--enable-ipv6 --enable-jpeg
                   --enable-mp3lame --enable-opus --enable-rfxcodec
-                  --enable-painter --disable-pixman --with-imlib2
+                  --enable-painter --disable-pixman
                   --with-freetype2 --host=i686-linux --enable-tests"
 
       PKG_CONFIG_PATH_i386: "/usr/lib/i386-linux-gnu/pkgconfig"

diff --git a/scripts/install_xrdp_build_dependencies_with_apt.sh b/scripts/install_xrdp_build_dependencies_with_apt.sh
@@ -116,15 +116,15 @@ in
         # build support tool.
         # - Ubuntu 18.04 -> 20.04
         #       Removed fdk-aac-dev:i386 and libfuse-dev:i386
+        # - Ubuntu 24.04.1
+        #       Removed libibus-1.0-dev:i386 and libimlib2-dev:i386
         PACKAGES="$PACKAGES \
             g++-multilib \
             gcc-multilib \
             $LIBFREETYPE_DEV:i386 \
             libgl1-mesa-dev:i386 \
             libglu1-mesa-dev:i386 \
-            libibus-1.0-dev:i386 \
             libjpeg-dev:i386 \
-            libimlib2-dev:i386 \
             libmp3lame-dev:i386 \
             libopus-dev:i386 \
             libpam0g-dev:i386 \