From 0990ca2677ca370b6c8133b322bcb10736b2119d517261846a702f00bce3d910 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 7 Aug 2023 18:16:50 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1087

---
 atklistener-32bit-type-mismatch.patch | 71 +++++++++++++++++++++++++++
 libreoffice.changes                   |  7 +++
 libreoffice.spec                      |  3 ++
 3 files changed, 81 insertions(+)
 create mode 100644 atklistener-32bit-type-mismatch.patch

diff --git a/atklistener-32bit-type-mismatch.patch b/atklistener-32bit-type-mismatch.patch
new file mode 100644
index 0000000..08f4cb3
--- /dev/null
+++ b/atklistener-32bit-type-mismatch.patch
@@ -0,0 +1,71 @@
+From 469fc646ec782f42e42947f480d5931b97e686ab Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Fri, 7 Jul 2023 17:57:03 +0200
+Subject: gtk3 a11y: Use sal_Int32 consistently to fix i386 build
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+... after
+
+    commit 3b7db802731826b6cc3b55100470b0c61c1f2dfa
+    Date:   Thu May 4 10:06:14 2023 +0200
+
+        tdf#105404 [API CHANGE] add index to accessiblity change event
+
+Reported to fail like this:
+
+    /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.cxx:164:6: error: no declaration matches 'void AtkListener::handleChildAdded(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext>&, const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>&, sal_Int32)'
+      164 | void AtkListener::handleChildAdded(
+          |      ^~~~~~~~~~~
+    In file included from /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.cxx:29:
+    /home/rene/LibreOffice/git/libreoffice-7-6/vcl/unx/gtk3/a11y/atklistener.hxx:54:10: note: candidate is: 'void AtkListener::handleChildAdded(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext>&, const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>&, int)'
+       54 |     void handleChildAdded(
+          |          ^~~~~~~~~~~~~~~~
+
+Change-Id: I03caa5480ef133091ccd5c9ae682629cec3a789b
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154190
+Tested-by: René Engelhard <rene@debian.org>
+Reviewed-by: René Engelhard <rene@debian.org>
+Tested-by: Jenkins
+---
+ vcl/unx/gtk3/a11y/atklistener.cxx | 2 +-
+ vcl/unx/gtk3/a11y/atklistener.hxx | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/vcl/unx/gtk3/a11y/atklistener.cxx b/vcl/unx/gtk3/a11y/atklistener.cxx
+index 854e43133112..b9a053d83a7b 100644
+--- a/vcl/unx/gtk3/a11y/atklistener.cxx
++++ b/vcl/unx/gtk3/a11y/atklistener.cxx
+@@ -207,7 +207,7 @@ void AtkListener::handleChildAdded(
+ void AtkListener::handleChildRemoved(
+     const uno::Reference< accessibility::XAccessibleContext >& rxParent,
+     const uno::Reference< accessibility::XAccessible>& rxChild,
+-    int nChildIndexHint)
++    sal_Int32 nChildIndexHint)
+ {
+     sal_Int32 nIndex = nChildIndexHint;
+     if (nIndex != -1 && (nIndex < 0 || nIndex >= static_cast<sal_Int32>(m_aChildList.size())))
+diff --git a/vcl/unx/gtk3/a11y/atklistener.hxx b/vcl/unx/gtk3/a11y/atklistener.hxx
+index 546c5e9456fb..e286f40e5a19 100644
+--- a/vcl/unx/gtk3/a11y/atklistener.hxx
++++ b/vcl/unx/gtk3/a11y/atklistener.hxx
+@@ -54,13 +54,13 @@ private:
+     void handleChildAdded(
+         const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent,
+         const css::uno::Reference< css::accessibility::XAccessible>& rxChild,
+-        int nIndexHint);
++        sal_Int32 nIndexHint);
+ 
+     // Process CHILD_EVENT notifications with a child removed
+     void handleChildRemoved(
+         const css::uno::Reference< css::accessibility::XAccessibleContext >& rxParent,
+         const css::uno::Reference< css::accessibility::XAccessible>& rxChild,
+-        int nIndexHint);
++        sal_Int32 nIndexHint);
+ 
+     // Process INVALIDATE_ALL_CHILDREN notification
+     void handleInvalidateChildren(
+-- 
+cgit v1.2.1
+
diff --git a/libreoffice.changes b/libreoffice.changes
index f80b9fa..49898e0 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug  7 18:15:51 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * atklistener-32bit-type-mismatch.patch
+    + fix type mismatch on i586
+
 -------------------------------------------------------------------
 Mon Jul 24 11:04:08 UTC 2023 - Andreas Schwab <schwab@suse.de>
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 9853a47..5e175af 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -121,6 +121,8 @@ Patch101:       0001-Revert-java-9-changes.patch
 Patch990:       install-with-hardlinks.diff
 # save time by relying on rpm check rather than doing stupid find+grep
 Patch991:       libreoffice-no-destdircheck.patch
+# Fix build on i586
+Patch992:       atklistener-32bit-type-mismatch.patch
 BuildRequires:  %{name}-share-linker
 BuildRequires:  ant
 BuildRequires:  autoconf
@@ -1043,6 +1045,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
 %endif
 %patch990 -p1
 %patch991 -p1
+%patch992 -p1
 
 # Disable some of the failing tests (some are random)
 %if 0%{?suse_version} < 1330