From 0b674592efc0dfd32e6e2316e6b2bd0403b1816b Mon Sep 17 00:00:00 2001
From: Maksim Bondarenkov <119937608+ognevny@users.noreply.github.com>
Date: Tue, 18 Mar 2025 11:10:11 +0300
Subject: [PATCH] drop some 32-bit librvg rdeps (3/N) (#23709)

---
 mingw-w64-SDL_mixer/PKGBUILD            |  4 +--
 mingw-w64-d-feet/PKGBUILD               |  2 +-
 mingw-w64-gdl/PKGBUILD                  |  2 +-
 mingw-w64-goocanvas/PKGBUILD            |  2 +-
 mingw-w64-granite/PKGBUILD              |  2 +-
 mingw-w64-gtk-elementary-theme/PKGBUILD |  2 +-
 mingw-w64-gtk-engine-murrine/PKGBUILD   |  2 +-
 mingw-w64-gtk-engines/PKGBUILD          |  2 +-
 mingw-w64-gtk4/PKGBUILD                 | 29 ++++++++-----------
 mingw-w64-gtkmm/PKGBUILD                |  2 +-
 mingw-w64-gtkmm3/PKGBUILD               |  2 +-
 mingw-w64-gtksourceview3/PKGBUILD       |  2 +-
 mingw-w64-gtksourceviewmm3/PKGBUILD     |  2 +-
 mingw-w64-libdazzle/PKGBUILD            |  2 +-
 mingw-w64-libgnomecanvas/PKGBUILD       |  2 +-
 mingw-w64-libgxps/PKGBUILD              |  2 +-
 mingw-w64-libnotify/PKGBUILD            |  2 +-
 mingw-w64-smpeg/PKGBUILD                |  2 +-
 mingw-w64-wxwidgets3.2/PKGBUILD         | 37 +++++++++----------------
 19 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/mingw-w64-SDL_mixer/PKGBUILD b/mingw-w64-SDL_mixer/PKGBUILD
index a2b3498a2d..95dd2dad8f 100644
--- a/mingw-w64-SDL_mixer/PKGBUILD
+++ b/mingw-w64-SDL_mixer/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2.12
 pkgrel=9
 pkgdesc="A simple multi-channel audio mixer (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://libsdl.org/projects/SDL_mixer/"
 license=('custom')
 depends=("${MINGW_PACKAGE_PREFIX}-SDL"
@@ -58,7 +58,7 @@ prepare() {
   #    -e "/DEFAULT_PATH/s|/etc/timidity|/etc/timidity++|" \
   #    -e "/DEFAULT_PATH2/s|/usr/local/lib/timidity|/usr/lib/timidity|" \
   #    -i timidity/config.h
-  
+
   autoreconf -fiv
 }
 
diff --git a/mingw-w64-d-feet/PKGBUILD b/mingw-w64-d-feet/PKGBUILD
index 9559b83844..b22ac89b88 100644
--- a/mingw-w64-d-feet/PKGBUILD
+++ b/mingw-w64-d-feet/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.3.16
 pkgrel=7
 pkgdesc="D-Bus debugger for GNOME (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://wiki.gnome.org/Apps/DFeet"
 license=('GPL')
 depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
diff --git a/mingw-w64-gdl/PKGBUILD b/mingw-w64-gdl/PKGBUILD
index d38dcc66a6..0a7b5cdd6a 100644
--- a/mingw-w64-gdl/PKGBUILD
+++ b/mingw-w64-gdl/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.40.0
 pkgrel=2
 pkgdesc="GNOME Docking Library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('LGPL 2')
 url="https://gitlab.gnome.org/GNOME/gdl"
 depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
diff --git a/mingw-w64-goocanvas/PKGBUILD b/mingw-w64-goocanvas/PKGBUILD
index 34668dba84..09be45187b 100644
--- a/mingw-w64-goocanvas/PKGBUILD
+++ b/mingw-w64-goocanvas/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.0.0
 pkgrel=4
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 pkgdesc="Canvas widget for GTK+ that uses the Cairo 2D library (mingw-w64)"
 license=("LGPL 2")
 url="https://www.gnome.org"
diff --git a/mingw-w64-granite/PKGBUILD b/mingw-w64-granite/PKGBUILD
index caf4398b0b..569cd53364 100644
--- a/mingw-w64-granite/PKGBUILD
+++ b/mingw-w64-granite/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=6.2.0
 pkgrel=3
 pkgdesc="git repository viewer for GTK+/GNOME (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/elementary/granite"
 license=('spdx:LGPL-3.0-or-later')
 depends=( "${MINGW_PACKAGE_PREFIX}-libgee"
diff --git a/mingw-w64-gtk-elementary-theme/PKGBUILD b/mingw-w64-gtk-elementary-theme/PKGBUILD
index c589f3c432..01c8fa0c55 100644
--- a/mingw-w64-gtk-elementary-theme/PKGBUILD
+++ b/mingw-w64-gtk-elementary-theme/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=8.2.0
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 msys2_references=(
   'archlinux: gtk-theme-elementary'
 )
diff --git a/mingw-w64-gtk-engine-murrine/PKGBUILD b/mingw-w64-gtk-engine-murrine/PKGBUILD
index 338b513e2e..45137c4536 100644
--- a/mingw-w64-gtk-engine-murrine/PKGBUILD
+++ b/mingw-w64-gtk-engine-murrine/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.98.2
 pkgrel=5
 pkgdesc="GTK2 engine to make your desktop look like a 'murrina', an italian word meaning the art glass works done by Venicians glass blowers (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="http://cimitan.com/murrine/project/murrine"
 license=('LGPL3')
 depends=("${MINGW_PACKAGE_PREFIX}-gtk2")
diff --git a/mingw-w64-gtk-engines/PKGBUILD b/mingw-w64-gtk-engines/PKGBUILD
index 8138f615e1..d1389151bd 100644
--- a/mingw-w64-gtk-engines/PKGBUILD
+++ b/mingw-w64-gtk-engines/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.21.0
 pkgrel=5
 pkgdesc="Theme engines for GTK+ 2 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('GPL' 'LGPL')
 depends=("${MINGW_PACKAGE_PREFIX}-gtk2>=2.22.0")
 makedepends=(
diff --git a/mingw-w64-gtk4/PKGBUILD b/mingw-w64-gtk4/PKGBUILD
index 62293876d5..8c9b709b03 100644
--- a/mingw-w64-gtk4/PKGBUILD
+++ b/mingw-w64-gtk4/PKGBUILD
@@ -3,12 +3,12 @@
 _realname=gtk4
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
-         $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-media-gstreamer"))
+         "${MINGW_PACKAGE_PREFIX}-${_realname}-media-gstreamer")
 pkgver=4.18.2
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v4) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.gtk.org"
 msys2_repository_url="https://gitlab.gnome.org/GNOME/gtk/"
 msys2_references=(
@@ -23,10 +23,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-python-docutils"
              "${MINGW_PACKAGE_PREFIX}-gi-docgen"
-             $([[ ${CARCH} == i686 ]] || echo \
-               "${MINGW_PACKAGE_PREFIX}-gst-plugins-bad-libs" \
-               "${MINGW_PACKAGE_PREFIX}-vulkan-headers" \
-               "${MINGW_PACKAGE_PREFIX}-shaderc"))
+             "${MINGW_PACKAGE_PREFIX}-gst-plugins-bad-libs"
+             "${MINGW_PACKAGE_PREFIX}-vulkan-headers"
+             "${MINGW_PACKAGE_PREFIX}-shaderc")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme"
          "${MINGW_PACKAGE_PREFIX}-cairo"
@@ -36,7 +35,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-json-glib"
          "${MINGW_PACKAGE_PREFIX}-libepoxy"
          "${MINGW_PACKAGE_PREFIX}-pango"
-         $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-vulkan-loader")
+         "${MINGW_PACKAGE_PREFIX}-vulkan-loader"
          "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache"
          "${MINGW_PACKAGE_PREFIX}-shared-mime-info")
 source=("https://download.gnome.org/sources/gtk/${pkgver:0:4}/gtk-${pkgver}.tar.xz"
@@ -67,12 +66,6 @@ build() {
     extra_config+=("--buildtype=debug")
   fi
 
-  if [[ ${CARCH} == i686 ]]; then
-    extra_config+=("-Dmedia-gstreamer=disabled" "-Dvulkan=disabled")
-  else
-    extra_config+=("-Dmedia-gstreamer=enabled" "-Dvulkan=enabled")
-  fi
-
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   ${MINGW_PREFIX}/bin/meson.exe setup \
     --prefix="${MINGW_PREFIX}" \
@@ -84,6 +77,8 @@ build() {
     -Dbuild-testsuite=false \
     -Dman-pages=true \
     -Dmacos-backend=false \
+    -Dmedia-gstreamer=enabled \
+    -Dvulkan=enabled \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \
@@ -98,11 +93,9 @@ package_gtk4() {
 
   install -Dm644 "${srcdir}/gtk-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 
-  if [[ ${CARCH} != i686 ]]; then
-    # split media-gstreamer
-    mkdir -p dest${MINGW_PREFIX}/lib
-    mv "${pkgdir}${MINGW_PREFIX}"/lib/gtk-4.0 dest${MINGW_PREFIX}/lib/gtk-4.0
-  fi
+  # split media-gstreamer
+  mkdir -p dest${MINGW_PREFIX}/lib
+  mv "${pkgdir}${MINGW_PREFIX}"/lib/gtk-4.0 dest${MINGW_PREFIX}/lib/gtk-4.0
 }
 
 package_gtk4-media-gstreamer() {
diff --git a/mingw-w64-gtkmm/PKGBUILD b/mingw-w64-gtkmm/PKGBUILD
index dae84296c9..b3e18679e9 100644
--- a/mingw-w64-gtkmm/PKGBUILD
+++ b/mingw-w64-gtkmm/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.24.5
 pkgrel=4
 pkgdesc="C++ bindings for gtk2 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.gtkmm.org/"
 license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
diff --git a/mingw-w64-gtkmm3/PKGBUILD b/mingw-w64-gtkmm3/PKGBUILD
index 15ceddea73..db1d8338e4 100644
--- a/mingw-w64-gtkmm3/PKGBUILD
+++ b/mingw-w64-gtkmm3/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.24.9
 pkgrel=1
 pkgdesc="C++ bindings for gtk3 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.gtkmm.org/"
 license=("LGPL")
 depends=("${MINGW_PACKAGE_PREFIX}-atkmm"
diff --git a/mingw-w64-gtksourceview3/PKGBUILD b/mingw-w64-gtksourceview3/PKGBUILD
index 2c13df52bc..bcdbf85123 100644
--- a/mingw-w64-gtksourceview3/PKGBUILD
+++ b/mingw-w64-gtksourceview3/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.24.11
 pkgrel=4
 pkgdesc="A text widget adding syntax highlighting and more to GNOME (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.gnome.org"
 license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
diff --git a/mingw-w64-gtksourceviewmm3/PKGBUILD b/mingw-w64-gtksourceviewmm3/PKGBUILD
index 1c75eec8b3..0ec263dd6f 100644
--- a/mingw-w64-gtksourceviewmm3/PKGBUILD
+++ b/mingw-w64-gtksourceviewmm3/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.21.3
 pkgrel=3
 pkgdesc="C++ bindings to gtksourceview3 library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 msys2_references=(
   'archlinux: gtksourceviewmm'
 )
diff --git a/mingw-w64-libdazzle/PKGBUILD b/mingw-w64-libdazzle/PKGBUILD
index 8e15896f60..7989107deb 100644
--- a/mingw-w64-libdazzle/PKGBUILD
+++ b/mingw-w64-libdazzle/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.44.0
 pkgrel=2
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 pkgdesc="A companion library to GObject and Gtk+"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-gtk3")
diff --git a/mingw-w64-libgnomecanvas/PKGBUILD b/mingw-w64-libgnomecanvas/PKGBUILD
index da2607bcb5..a1ec2ed7a0 100644
--- a/mingw-w64-libgnomecanvas/PKGBUILD
+++ b/mingw-w64-libgnomecanvas/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.30.3
 pkgrel=5
 pkgdesc="The GNOME canvas library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 depends=("${MINGW_PACKAGE_PREFIX}-gtk2"
          "${MINGW_PACKAGE_PREFIX}-gettext"
          "${MINGW_PACKAGE_PREFIX}-libart_lgpl"
diff --git a/mingw-w64-libgxps/PKGBUILD b/mingw-w64-libgxps/PKGBUILD
index 5a5b3d4308..b41c6d9f38 100644
--- a/mingw-w64-libgxps/PKGBUILD
+++ b/mingw-w64-libgxps/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.3.2
 pkgrel=4
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 pkgdesc="A library to handling and rendering XPS documents (mingw-w64)"
 depends=("${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-gtk3"
diff --git a/mingw-w64-libnotify/PKGBUILD b/mingw-w64-libnotify/PKGBUILD
index 83e6fa2e2b..fa7ee97d14 100644
--- a/mingw-w64-libnotify/PKGBUILD
+++ b/mingw-w64-libnotify/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.7.12
 pkgrel=2
 pkgdesc="Desktop notification library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://developer.gnome.org/notification-spec/"
 license=('spdx:LGPL-2.1')
 depends=("${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
diff --git a/mingw-w64-smpeg/PKGBUILD b/mingw-w64-smpeg/PKGBUILD
index 4e232f051a..a0405acf56 100644
--- a/mingw-w64-smpeg/PKGBUILD
+++ b/mingw-w64-smpeg/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.4.5
 pkgrel=5
 pkgdesc="SDL MPEG Player Library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://icculus.org/smpeg/"
 license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
diff --git a/mingw-w64-wxwidgets3.2/PKGBUILD b/mingw-w64-wxwidgets3.2/PKGBUILD
index 9f2de9c8e0..156da253f2 100644
--- a/mingw-w64-wxwidgets3.2/PKGBUILD
+++ b/mingw-w64-wxwidgets3.2/PKGBUILD
@@ -11,14 +11,13 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-common"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-common-libs"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw-libs"
          "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-msw"
-         $([[ ${CARCH} == i686 ]] || echo \
-           "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3-libs" \
-           "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3"))
+         "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3-libs"
+         "${MINGW_PACKAGE_PREFIX}-wxwidgets${_wx_basever}-gtk3")
 pkgver=${_wx_basever}.6
 pkgrel=2
 pkgdesc="A C++ library that lets developers create applications for Windows, Linux and UNIX (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://wxwidgets.org/"
 msys2_repository_url="https://github.com/wxWidgets/wxWidgets"
 msys2_references=(
@@ -31,10 +30,9 @@ makedepends=(
   "${MINGW_PACKAGE_PREFIX}-pkgconf"
   "${MINGW_PACKAGE_PREFIX}-python"
   "${MINGW_PACKAGE_PREFIX}-curl"
-  $([[ ${CARCH} == i686 ]] || echo \
-    "${MINGW_PACKAGE_PREFIX}-cairo" \
-    "${MINGW_PACKAGE_PREFIX}-gspell" \
-    "${MINGW_PACKAGE_PREFIX}-gtk3")
+  "${MINGW_PACKAGE_PREFIX}-cairo"
+  "${MINGW_PACKAGE_PREFIX}-gspell"
+  "${MINGW_PACKAGE_PREFIX}-gtk3"
   "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
   "${MINGW_PACKAGE_PREFIX}-libnotify"
   "${MINGW_PACKAGE_PREFIX}-libpng"
@@ -137,8 +135,6 @@ build() {
 
   #echo "_extra_config := ${_extra_config[@]}"
 
-  if [[ ${CARCH} != i686 ]]; then
-
   mkdir -p "${srcdir}"/build-gtk3-${MSYSTEM}-shared && cd "${srcdir}"/build-gtk3-${MSYSTEM}-shared
 
   ../${_realname}-${pkgver}${_wx_buildver}/configure \
@@ -169,7 +165,7 @@ build() {
 
   make #VERBOSE=1
 
-  mkdir -p "${srcdir}"/install-gtk3-${MSYSTEM}-shared 
+  mkdir -p "${srcdir}"/install-gtk3-${MSYSTEM}-shared
 
   make DESTDIR="${srcdir}/install-gtk3-${MSYSTEM}-shared" install
 
@@ -203,13 +199,10 @@ build() {
 
   make #VERBOSE=1 -j1
 
-  mkdir -p "${srcdir}"/install-gtk3-${MSYSTEM}-static 
+  mkdir -p "${srcdir}"/install-gtk3-${MSYSTEM}-static
 
   make DESTDIR="${srcdir}/install-gtk3-${MSYSTEM}-static" install
 
-  fi
-
-
   mkdir -p "${srcdir}"/build-msw-${MSYSTEM}-shared && cd "${srcdir}"/build-msw-${MSYSTEM}-shared
 
   ../${_realname}-${pkgver}${_wx_buildver}/configure \
@@ -438,11 +431,9 @@ package_wxwidgets3.2-common() {
   cp -a --recursive "${srcdir}/install-msw-${MSYSTEM}-shared${MINGW_PREFIX}/share/" \
       "${pkgdir}"${MINGW_PREFIX}/
 
-  if [[ ${CARCH} != i686 ]]; then
-    mkdir -p "${pkgdir}"${MINGW_PREFIX}/include
-    cp -a --recursive "${srcdir}/install-gtk3-${MSYSTEM}-shared${MINGW_PREFIX}/include/" \
-        "${pkgdir}"${MINGW_PREFIX}/
-  fi
+  mkdir -p "${pkgdir}"${MINGW_PREFIX}/include
+  cp -a --recursive "${srcdir}/install-gtk3-${MSYSTEM}-shared${MINGW_PREFIX}/include/" \
+      "${pkgdir}"${MINGW_PREFIX}/
 
   mkdir -p "${pkgdir}"${MINGW_PREFIX}/include
   cp -a --recursive "${srcdir}/install-msw-${MSYSTEM}-shared${MINGW_PREFIX}/include/" \
@@ -452,10 +443,8 @@ package_wxwidgets3.2-common() {
   cp -a "${srcdir}"/install-msw-${MSYSTEM}-shared${MINGW_PREFIX}/bin/wxrc*.* "${pkgdir}"${MINGW_PREFIX}/bin/
 
   mkdir -p "${pkgdir}"${MINGW_PREFIX}/lib
-  if [[ ${CARCH} != i686 ]]; then
-    cp -a "${srcdir}"/install-gtk3-${MSYSTEM}-static${MINGW_PREFIX}/lib/*.a "${pkgdir}"${MINGW_PREFIX}/lib/
-    cp -a "${srcdir}"/install-gtk3-${MSYSTEM}-shared${MINGW_PREFIX}/lib/*.a "${pkgdir}"${MINGW_PREFIX}/lib/
-  fi
+  cp -a "${srcdir}"/install-gtk3-${MSYSTEM}-static${MINGW_PREFIX}/lib/*.a "${pkgdir}"${MINGW_PREFIX}/lib/
+  cp -a "${srcdir}"/install-gtk3-${MSYSTEM}-shared${MINGW_PREFIX}/lib/*.a "${pkgdir}"${MINGW_PREFIX}/lib/
   cp -a "${srcdir}"/install-msw-${MSYSTEM}-static${MINGW_PREFIX}/lib/*.a  "${pkgdir}"${MINGW_PREFIX}/lib/
   cp -a "${srcdir}"/install-msw-${MSYSTEM}-shared${MINGW_PREFIX}/lib/*.a  "${pkgdir}"${MINGW_PREFIX}/lib/
 }