Source: libreoffice
Version: 1:6.1.4-1
Severity: normal
Tags: patch upstream
User: debian-68k@lists.debian.org
Usertags: m68k
Hello!
The attached patch should fix libreoffice on m68k, please apply :-).
Forwarded upstream as [1].
Thanks,
Adrian
> [1] https://gerrit.libreoffice.org/#/c/65684/
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaub...@debian.org
`. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Description: Fix incorrect parameter type to std::min() on m68k
Author: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de>
Last-Update: 2018-12-28
--- libreoffice-6.1.4.orig/cppu/source/typelib/typelib.cxx
+++ libreoffice-6.1.4/cppu/source/typelib/typelib.cxx
@@ -1660,7 +1660,7 @@ extern "C" sal_Int32 typelib_typedescrip
#ifdef __m68k__
// Anything that is at least 16 bits wide is aligned on a
16-bit
// boundary on the m68k default abi
- sal_Int32 nMaxAlign = std::min(rMaxIntegralTypeSize, 2);
+ sal_Int32 nMaxAlign = std::min(rMaxIntegralTypeSize,
sal_Int32( 2 ));
nStructSize = (nStructSize + nMaxAlign -1) / nMaxAlign *
nMaxAlign;
#else
// Example: A { double; int; } structure has a size of 16
instead of 10. The
