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

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

Browse Source 
- boost_1_69.patch: Fix compilation with Boost 1.69

OBS-URL: https://build.opensuse.org/request/show/653528
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=731
This commit is contained in:
Tomáš Chvátal 2018-12-04 09:38:10 +00:00 committed by Git OBS Bridge
parent 91326e7f01
commit fb120df753
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
boost_1_69.patch Normal file
View File

@ -0,0 +1,13 @@
Index: libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx
===================================================================
--- libreoffice-6.1.3.2.orig/sfx2/source/appl/shutdownicon.cxx
+++ libreoffice-6.1.3.2/sfx2/source/appl/shutdownicon.cxx
@@ -141,7 +141,7 @@ bool LoadModule()
#endif // ENABLE_QUICKSTART_APPLET
}
assert(!boost::logic::indeterminate(loaded));
- return loaded;
+ return (bool)loaded;
}
}

5
libreoffice.changes
View File

@ -5,6 +5,11 @@ Thu Nov 29 10:41:59 UTC 2018 - jdelvare@suse.com
overwrite an existing document overwrite an existing document
* bsc1117300.patch * bsc1117300.patch
-------------------------------------------------------------------
Thu Nov 29 10:10:00 UTC 2018 - adam.majer@suse.de
- boost_1_69.patch: Fix compilation with Boost 1.69
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com> Wed Nov 28 12:51:12 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>

4
libreoffice.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
@ -112,6 +112,7 @@ Patch8: bsc1112112.patch
Patch9: bsc882383.patch Patch9: bsc882383.patch
# Bug 1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document # Bug 1117300 - [DATA LOSS] Saving a new document can silently overwrite an existing document
Patch10: bsc1117300.patch Patch10: bsc1117300.patch
Patch11: boost_1_69.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
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
@ -962,6 +963,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%patch990 -p1 %patch990 -p1
# Disable some of the failing tests (some are random) # Disable some of the failing tests (some are random)