pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1147

Browse Source
This commit is contained in:
Fridrich Strba 2024-03-12 06:21:11 +00:00 committed by Git OBS Bridge
parent da543a716d
commit 0b064a213e
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fix-32-bit-build.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 0ca8822016e1..3f37ce03c73c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -790,7 +790,7 @@ static void osl_file_adjustLockFlags(const OString& path, int *flags, sal_uInt32
// write lock and not a read lock).
// Fixes the following bug:
// https://bugs.documentfoundation.org/show_bug.cgi?id=55004
- switch (aFileStatFs.f_type) {
+ switch (static_cast<size_t>(aFileStatFs.f_type)) {
case SMB_SUPER_MAGIC:
case CIFS_SUPER_MAGIC:
case SMB2_SUPER_MAGIC:

8
libreoffice.spec
View File

@ -17,11 +17,8 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8} %{!?aarch64:%global aarch64 aarch64 arm64 armv8}
# extensions
%define numbertext_version 0.9.5
# Urls # Urls
%define external_url https://dev-www.libreoffice.org/src/ %define external_url https://dev-www.libreoffice.org/src/
#%%define tarball_url https://download.documentfoundation.org/libreoffice/src/6.4.0
%define tarball_url https://dev-builds.libreoffice.org/pre-releases/src/ %define tarball_url https://dev-builds.libreoffice.org/pre-releases/src/
# LTO needs newer toolchain stack only # LTO needs newer toolchain stack only
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
@ -74,7 +71,7 @@ Source98: %{name}.keyring
Source99: %{name}-rpmlintrc Source99: %{name}-rpmlintrc
Source100: %{name}.changes Source100: %{name}.changes
# prebuilt extensions # prebuilt extensions
Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_%{numbertext_version}.oxt Source402: %{external_url}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
# used extensions sources # used extensions sources
Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Source450: %{external_url}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 Source452: %{external_url}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
@ -117,6 +114,8 @@ Patch11: fix_webp_on_sle12_sp5.patch
Patch14: use-fixmath-shared-library.patch Patch14: use-fixmath-shared-library.patch
# PATCH-FIX-SUSE Fix make distro-pack-install # PATCH-FIX-SUSE Fix make distro-pack-install
Patch15: fix-sdk-idl.patch Patch15: fix-sdk-idl.patch
#
Patch16: fix-32-bit-build.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep # save time by relying on rpm check rather than doing stupid find+grep
@ -1037,6 +1036,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif %endif
%patch -P 14 -p1 %patch -P 14 -p1
%patch -P 15 -p1 %patch -P 15 -p1
%patch -P 16 -p1
%patch -P 990 -p1 %patch -P 990 -p1
%patch -P 991 -p1 %patch -P 991 -p1
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550