$ git diff --patch-with-stat --summary 7c7d27eb34698013990d1ccaa10a2d1a87c9cce8..748036230a1287b67f28e4054585e88f3a15bb95

 .abf.yml                                    |   2 +-
 pango-1.44.7-compile-with-our-cairo32.patch |  17 +++
 pango-1.44.7-fallthrough.patch              |  13 ++
 pango.spec                                  | 176 +++++++++++++++++++++++++++-
 4 files changed, 204 insertions(+), 4 deletions(-)
 create mode 100644 pango-1.44.7-compile-with-our-cairo32.patch
 create mode 100644 pango-1.44.7-fallthrough.patch

diff --git a/.abf.yml b/.abf.yml
index 8fa89bb..4f58821 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  pango-1.44.7.tar.xz: 2ca86089b657a2ccfede7d1b7598fdaa34c24859
+  pango-1.46.1.tar.xz: e6706b1499e8dd7df58a1f767aaa9c5c072a5dd9
diff --git a/pango-1.44.7-compile-with-our-cairo32.patch b/pango-1.44.7-compile-with-our-cairo32.patch
new file mode 100644
index 0000000..ffb32bc
--- /dev/null
+++ b/pango-1.44.7-compile-with-our-cairo32.patch
@@ -0,0 +1,17 @@
+diff -up pango-1.44.7/utils/viewer-cairo.c.omv~ pango-1.44.7/utils/viewer-cairo.c
+--- pango-1.44.7/utils/viewer-cairo.c.omv~	2020-06-13 20:17:15.926694735 +0200
++++ pango-1.44.7/utils/viewer-cairo.c	2020-06-13 20:18:39.568617278 +0200
+@@ -230,11 +230,11 @@ cairo_vector_view_create (const PangoVie
+     else if (0 == g_ascii_strcasecmp (extension, "svg"))
+       constructor = cairo_svg_surface_create;
+   #endif
+-  #ifdef CAIRO_HAS_PDF_SURFACE
++  #if defined(CAIRO_HAS_PDF_SURFACE) && !defined(__i386__)
+     else if (0 == g_ascii_strcasecmp (extension, "pdf"))
+       constructor = cairo_pdf_surface_create;
+   #endif
+-  #ifdef CAIRO_HAS_PS_SURFACE
++  #if defined(CAIRO_HAS_PS_SURFACE) && !defined(__i386__)
+     else if (0 == g_ascii_strcasecmp (extension, "ps"))
+       constructor = cairo_ps_surface_create;
+    #ifdef HAS_EPS
diff --git a/pango-1.44.7-fallthrough.patch b/pango-1.44.7-fallthrough.patch
new file mode 100644
index 0000000..517a7df
--- /dev/null
+++ b/pango-1.44.7-fallthrough.patch
@@ -0,0 +1,13 @@
+diff -up pango-1.46.1/pango/break.c.1~ pango-1.46.1/pango/break.c
+--- pango-1.46.1/pango/break.c.1~	2020-08-20 14:14:29.235972200 +0200
++++ pango-1.46.1/pango/break.c	2020-08-21 01:03:23.674873463 +0200
+@@ -451,6 +451,7 @@ pango_default_break (const gchar   *text
+ 	    break;
+ 
+ 	  case G_UNICODE_ENCLOSING_MARK:
++	    __attribute__((fallthrough));
+ 	  case G_UNICODE_NON_SPACING_MARK:
+ 	    GB_type = GB_Extend; /* Grapheme_Extend */
+ 	    break;
+diff -up pango-1.46.1/pango/pango-renderer.c.1~ pango-1.46.1/pango/pango-renderer.c
+diff -up pango-1.46.1/tests/testboundaries_ucd.c.1~ pango-1.46.1/tests/testboundaries_ucd.c
diff --git a/pango.spec b/pango.spec
index b4181df..14f5aa6 100644
--- a/pango.spec
+++ b/pango.spec
@@ -1,3 +1,7 @@
+# pango is used by gst-plugins-base, which is used by wine
+%ifarch %{x86_64}
+%bcond_without compat32
+%endif
 %define url_ver %(echo %{version}|cut -d. -f1,2)
 %define enable_gtkdoc 1
 
@@ -9,6 +13,11 @@
 %define libft2 %mklibname %{name}ft2_ %{api} %{major}
 %define libxft %mklibname %{name}xft %{api} %{major}
 
+%define lib32name %mklib32name %{name} %{api} %{major}
+%define lib32cairo %mklib32name %{name}cairo %{api} %{major}
+%define lib32ft2 %mklib32name %{name}ft2_ %{api} %{major}
+%define lib32xft %mklib32name %{name}xft %{api} %{major}
+
 %define girname %mklibname %{name}-gir %{api}
 %define gircairo %mklibname %{name}cairo-gir %{api}
 %define girft2 %mklibname %{name}ft2-gir %{api}
@@ -21,21 +30,35 @@
 %define devft2 %mklibname -d %{name}ft2_ %{api}
 %define devx %mklibname -d %{name}x %{api}
 %define devxft %mklibname -d %{name}xft %{api}
+
+%define dev32name %mklib32name -d %{name} %{api}
+%define dev32cairo %mklib32name -d %{name}cairo %{api}
+%define dev32ft2 %mklib32name -d %{name}ft2_ %{api}
+%define dev32x %mklib32name -d %{name}x %{api}
+%define dev32xft %mklib32name -d %{name}xft %{api}
+
 %bcond_with	bootstrap
 
 Summary:	System for layout and rendering of internationalized text
 Name:		pango
-Version:	1.44.7
-Release:	1
+Version:	1.46.1
+Release:	2
 License:	LGPLv2+
 Group:		System/Internationalization
 Url:		http://www.pango.org/
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/pango/%{url_ver}/%{name}-%{version}.tar.xz
+# Added as Source: rather than Patch: so autosetup doesn't pick it up.
+# This is an arch specific hack.
+Source1:	pango-1.44.7-compile-with-our-cairo32.patch
+Patch0:		pango-1.44.7-fallthrough.patch
 BuildRequires:	meson
+BuildRequires:	cmake
+BuildRequires:	git-core
 BuildRequires:	pkgconfig(cairo) >= 1.7.6
 BuildRequires:	pkgconfig(fontconfig) >= 2.5.0
 BuildRequires:	pkgconfig(freetype2) >= 2.1.3
 BuildRequires:	pkgconfig(glib-2.0) >= 2.24
+BuildRequires:	pkgconfig(gio-2.0) >= 2.24
 BuildRequires:	pkgconfig(gobject-introspection-1.0)
 BuildRequires:	pkgconfig(libthai) >= 0.1.9
 BuildRequires:	pkgconfig(harfbuzz) >= 0.9.3-3
@@ -55,6 +78,32 @@ Provides:	pango-modules = %{EVRD}
 Provides:	lib%{name}%{api} = %{EVRD}
 Provides:	lib%{name} = %{EVRD}
 %rename		%{_lib}pango1.0_0-modules
+%if %{with compat32}
+BuildRequires:	devel(libcairo)
+BuildRequires:	devel(libfontconfig)
+BuildRequires:	devel(libexpat)
+BuildRequires:	devel(libuuid)
+BuildRequires:	devel(libfreetype)
+BuildRequires:	devel(libXft)
+BuildRequires:	devel(libglib-2.0)
+BuildRequires:	devel(libgio-2.0)
+BuildRequires:	devel(libharfbuzz)
+BuildRequires:	devel(libatomic)
+BuildRequires:	devel(libfribidi)
+BuildRequires:	devel(libz)
+BuildRequires:	devel(libbz2)
+BuildRequires:	devel(libpng16)
+BuildRequires:	devel(libXrender)
+BuildRequires:	devel(libgobject-2.0)
+BuildRequires:	devel(libpixman-1)
+BuildRequires:	devel(libX11)
+BuildRequires:	devel(libXext)
+BuildRequires:	devel(libxcb)
+BuildRequires:	devel(libXau)
+BuildRequires:	devel(libXdmcp)
+BuildRequires:	devel(libmount)
+BuildRequires:	devel(libblkid)
+%endif
 
 %description
 A library to handle unicode strings as well as complex bidirectional
@@ -187,10 +236,90 @@ Requires:	%{girxft} = %{version}-%{release}
 This package includes the development library and header files
 for the %{name}xft package.
 
+%if %{with compat32}
+%package -n %{lib32name}
+Summary:	Internationalized text layout and rendering system (32-bit)
+Group:		%{group}
+
+%description -n %{lib32name}
+A library to handle unicode strings as well as complex bidirectional
+or context dependent shaped strings.
+It is the next step on Gtk+ internationalization.
+
+%package -n %{lib32cairo}
+Summary:	Internationalized text layout and rendering system - cairo (32-bit)
+Group:		%{group}
+
+%description -n %{lib32cairo}
+Library for %{name} - cairo.
+
+%package -n %{lib32ft2}
+Summary:	Internationalized text layout and rendering system - ft2 (32-bit)
+Group:		%{group}
+
+%description -n %{lib32ft2}
+Library for %{name} - ft2.
+
+%package -n %{lib32xft}
+Summary:	Internationalized text layout and rendering system - xft (32-bit)
+Group:		%{group}
+
+%description -n %{lib32xft}
+Library for %{name} - xft.
+
+%package -n %{dev32name}
+Summary:	Internationalized text layout and rendering system (32-bit)
+Group:		Development/GNOME and GTK+
+Requires:	%{devname} = %{EVRD}
+Requires:	%{lib32name} = %{EVRD}
+
+%description -n %{dev32name}
+This package includes the development library and header files
+for the %{name} package.
+
+%package -n %{dev32cairo}
+Summary:	Internationalized text layout and rendering system - cairo (32-bit)
+Group:		Development/GNOME and GTK+
+Requires:	%{devcairo} = %{version}-%{release}
+Requires:	%{lib32cairo} = %{version}-%{release}
+
+%description -n %{dev32cairo}
+This package includes the development library and header files
+for the %{name}cairo package.
+
+%package -n %{dev32ft2}
+Summary:	Internationalized text layout and rendering system - ft2 (32-bit)
+Group:		Development/GNOME and GTK+
+Requires:	%{devft2} = %{version}-%{release}
+Requires:	%{lib32ft2} = %{version}-%{release}
+
+%description -n %{dev32ft2}
+This package includes the development library and header files
+for the %{name}ft2 package.
+
+%package -n %{dev32xft}
+Summary:	Internationalized text layout and rendering system - xft (32-bit)
+Group:		Development/GNOME and GTK+
+Requires:	%{devxft} = %{version}-%{release}
+Requires:	%{lib32xft} = %{version}-%{release}
+
+%description -n %{dev32xft}
+This package includes the development library and header files
+for the %{name}xft package.
+%endif
+
 %prep
 %autosetup -p1
+%if %{with compat32}
+patch -p1 -b -z .1~ <%{S:1}
+%meson32 \
+	-Db_ndebug=true \
+	-Dc_std=c11 \
+	-Dgir=false \
+	-Denable_docs=false \
+	-Dintrospection=false
+%endif
 
-%build
 %meson \
 	-Db_ndebug=true \
 	-Dc_std=c11 \
@@ -205,9 +334,16 @@ for the %{name}xft package.
 	-Denable_docs=false \
 %endif
 
+%build
+%if %{with compat32}
+%ninja_build -C build32
+%endif
 %ninja_build -C build
 
 %install
+%if %{with compat32}
+%ninja_install -C build32
+%endif
 %ninja_install -C build
 
 # No need to package the tests, they aren't relevant
@@ -258,6 +394,8 @@ rm -rf %{buildroot}%{_libexecdir}/installed-tests \
 #doc %{_datadir}/gtk-doc/html/pango
 %{_libdir}/libpango-*.so
 %{_libdir}/pkgconfig/pango.pc
+%{_libdir}/pkgconfig/pangofc.pc
+%{_libdir}/pkgconfig/pangoot.pc
 %if !%{with bootstrap}
 %{_datadir}/gir-1.0/Pango-%{api}.gir
 %{_datadir}/gir-1.0/PangoFc-%{api}.gir
@@ -293,3 +431,35 @@ rm -rf %{buildroot}%{_libexecdir}/installed-tests \
 %endif
 %{_includedir}/pango-1.0/pango/pangoxft.h
 %{_includedir}/pango-1.0/pango/pangoxft-render.h
+
+%if %{with compat32}
+%files -n %{lib32name}
+%{_prefix}/lib/libpango-%{api}.so.%{major}*
+
+%files -n %{lib32cairo}
+%{_prefix}/lib/libpangocairo-%{api}.so.%{major}*
+
+%files -n %{lib32ft2}
+%{_prefix}/lib/libpangoft2-%{api}.so.%{major}*
+
+%files -n %{lib32xft}
+%{_prefix}/lib/libpangoxft-%{api}.so.%{major}*
+
+%files -n %{dev32name}
+%{_prefix}/lib/libpango-*.so
+%{_prefix}/lib/pkgconfig/pango.pc
+%{_prefix}/lib/pkgconfig/pangofc.pc
+%{_prefix}/lib/pkgconfig/pangoot.pc
+
+%files -n %{dev32cairo}
+%{_prefix}/lib/libpangocairo*.so
+%{_prefix}/lib/pkgconfig/pangocairo.pc
+
+%files -n %{dev32ft2}
+%{_prefix}/lib/libpangoft2-*.so
+%{_prefix}/lib/pkgconfig/pangoft2.pc
+
+%files -n %{dev32xft}
+%{_prefix}/lib/libpangoxft-*.so
+%{_prefix}/lib/pkgconfig/pangoxft.pc
+%endif