rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

Accepting request 618562 from home:adamm:branches:LibreOffice:Factory

Browse Source 
- Enable display of commands in build logs
- Diable header-only Boost:System usage on older Leap
- old-boost.patch: Fix building with older Boost version
- Bumb disk space constraints. We need more than 32GB.

OBS-URL: https://build.opensuse.org/request/show/618562
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=690
This commit is contained in:
Tomáš Chvátal 2018-06-23 06:29:17 +00:00 committed by Git OBS Bridge
parent f6116df69a
commit 75c76fd1ea
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_constraints
View File

@ -4,7 +4,7 @@
<size unit="M">4000</size>
</physicalmemory>
<disk>
<size unit="G">30</size>
<size unit="G">50</size>
</disk>
</hardware>
</constraints>

8
libreoffice.changes
View File

@ -3,6 +3,14 @@ Fri Jun 22 08:54:24 UTC 2018 - tchvatal@suse.com
- Expand disk constraints to not fail on arm64
-------------------------------------------------------------------
Thu Jun 21 12:37:33 UTC 2018 - adam.majer@suse.de
- Enable display of commands in build logs
- Diable header-only Boost:System usage on older Leap
- old-boost.patch: Fix building with older Boost version
- Bumb disk space constraints. We need more than 32GB.
-------------------------------------------------------------------
Sun Jun 17 07:56:09 UTC 2018 - tchvatal@suse.com

12
libreoffice.spec
View File

@ -102,6 +102,7 @@ Patch3: mediawiki-no-broken-help.diff
# Fix java detection on pcs with 99+ cpus, it prints too many warnings and then
# math does not work
Patch4: libreoffice-java-sched.patch
Patch5: old-boost.patch
# try to save space by using hardlinks
Patch990: install-with-hardlinks.diff
BuildRequires: %{name}-share-linker
@ -941,6 +942,8 @@ Provides additional %{langname} translations and resources for %{project}. \
%if 0%{?suse_version} < 1330
# The rename of the configdir is needed only on older than factory for compat
%patch1
# patch to build with old boost
%patch5 -p1
%endif # Leap 42/SLE-12
%patch2
%patch3
@ -961,6 +964,11 @@ sed -i -e /CppunitTest_sw_uiwriter/d sw/Module_sw.mk
# The gpg files are not loaded properly
sed -i -e /CPPUNIT_TEST\(testODFEncryptedGPG\)/d xmlsecurity/qa/unit/signing/signing.cxx
%if 0%{?suse_version} < 1500
# Header-only libboost_system is not available
find -name \*.mk -exec sed -i s,-DBOOST_ERROR_CODE_HEADER_ONLY,, {} \;
%endif
# Do not generate doxygen timestamp
echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile
echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile
@ -1083,7 +1091,7 @@ export NOCONFIGURE=yes
# no coinormp packages for coinmp
# just call make here as we added the jobs in configure
make build-nocheck
make verbose=t build-nocheck
%check
# Run tests only on 64b intel as they are resource hogs
@ -1096,7 +1104,7 @@ cp savejar/*.jar %{buildroot}%{_libdir}/%{name}/program/classes/
%endif
%install
make DESTDIR=%{buildroot} distro-pack-install
make verbose=t DESTDIR=%{buildroot} distro-pack-install
# Do not pollute build log
set +x

13
old-boost.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libreoffice-6.1.0.0.beta2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
===================================================================
--- libreoffice-6.1.0.0.beta2.orig/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ libreoffice-6.1.0.0.beta2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -58,7 +58,7 @@ OUString applicationDirPath()
const auto utf8Path = applicationSystemPath.toUtf8();
auto ret = boost::filesystem::path(utf8Path.getStr(), utf8Path.getStr() + utf8Path.getLength());
ret.remove_filename();
- return OUString::fromUtf8(OString(ret.c_str(), ret.size()));
+ return OUString::fromUtf8(OString(ret.c_str(), strlen(ret.c_str())));
}
OUString findPickerExecutable()