diff --git a/mingw-w64-gdk-pixbuf2/PKGBUILD b/mingw-w64-gdk-pixbuf2/PKGBUILD
index 28b6b8bd54..54300a4109 100644
--- a/mingw-w64-gdk-pixbuf2/PKGBUILD
+++ b/mingw-w64-gdk-pixbuf2/PKGBUILD
@@ -6,7 +6,7 @@ _realname=gdk-pixbuf2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.42.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An image loading library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -59,6 +59,7 @@ build() {
   meson \
     --prefix=${MINGW_PREFIX} \
     --wrap-mode=nodownload \
+    --default-library=both \
     --auto-features=enabled \
     --buildtype=plain \
     -Dinstalled_tests=false \
diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD
index f16848f156..97c54572a5 100644
--- a/mingw-w64-gtk3/PKGBUILD
+++ b/mingw-w64-gtk3/PKGBUILD
@@ -4,7 +4,7 @@ _realname=gtk3
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache")
 pkgver=3.24.30
-pkgrel=3
+pkgrel=4
 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -78,10 +78,13 @@ build() {
   fi
 
   CFLAGS+=" -DG_ENABLE_DEBUG"  # so the GTK_DEBUG env var works
+  CFLAGS+=" -Wno-deprecated-declarations"
+
   MSYS2_ARG_CONV_EXCL="--prefix=" \
   meson \
     --prefix="${MINGW_PREFIX}" \
     --wrap-mode=nodownload \
+    --default-library=both \
     --auto-features=enabled \
     "${extra_config[@]}" \
     -Dbroadway_backend=true \
@@ -143,6 +146,13 @@ package_gtk-update-icon-cache() {
   mv ${pkgdir}${MINGW_PREFIX}/share/man/man1/gtk-update-icon-cache{,-3.0}.1
 }
 
+# template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
+# vim: set ft=bash :
+
+# generate wrappers
 for _name in "${pkgname[@]}"; do
-  eval "package_${_name}() { package_${_name#${MINGW_PACKAGE_PREFIX}-}; }";
+  _short="package_${_name#${MINGW_PACKAGE_PREFIX}-}"
+  _func="$(declare -f "${_short}")"
+  eval "${_func/#${_short}/package_${_name}}"
 done
+# template end;