diff --git a/atklistener-32bit-type-mismatch.patch b/atklistener-32bit-type-mismatch.patch deleted file mode 100644 index 08f4cb3..0000000 --- a/atklistener-32bit-type-mismatch.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 469fc646ec782f42e42947f480d5931b97e686ab Mon Sep 17 00:00:00 2001 -From: Michael Weghorn -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&, const com::sun::star::uno::Reference&, 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&, const com::sun::star::uno::Reference&, int)' - 54 | void handleChildAdded( - | ^~~~~~~~~~~~~~~~ - -Change-Id: I03caa5480ef133091ccd5c9ae682629cec3a789b -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154190 -Tested-by: René Engelhard -Reviewed-by: René Engelhard -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(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.spec b/libreoffice.spec index bcf18c6..f07e1ac 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -123,10 +123,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 # Fix build on sle12 -Patch993: python34-no-f-strings.patch +Patch992: python34-no-f-strings.patch BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf @@ -1033,9 +1031,8 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif %patch990 -p1 %patch991 -p1 -%patch992 -p1 %if 0%{?suse_version} < 1550 -%patch993 -p1 +%patch992 -p1 %endif # Disable some of the failing tests (some are random)