SHA256
1
0
forked from pool/libreoffice

- Add patch to fix 32bit build:

* kde5-32bit-build-fix.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=757
This commit is contained in:
Tomáš Chvátal 2019-02-26 09:17:40 +00:00 committed by Git OBS Bridge
parent 86080bf006
commit 4983456bb2
3 changed files with 21 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 5d40a7de39ab..d8d35b2f90b5 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -661,7 +661,7 @@ uno::Any KDE5FilePicker::handleGetListValue(QComboBox* pQComboBox, sal_Int16 nAc
case ControlActions::GET_SELECTED_ITEM_INDEX:
{
int nCurrent = pQComboBox->currentIndex();
- aAny <<= nCurrent;
+ aAny <<= static_cast<sal_Int32>(nCurrent);
}
break;
default:

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 26 09:17:17 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to fix 32bit build:
* kde5-32bit-build-fix.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 25 12:55:35 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> Mon Feb 25 12:55:35 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -101,6 +101,7 @@ Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff
Patch4: 0001-Speed-up-languagepack-installation.patch Patch4: 0001-Speed-up-languagepack-installation.patch
Patch5: old-boost.patch Patch5: old-boost.patch
Patch6: kde5-32bit-build-fix.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
@ -964,6 +965,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%patch2 %patch2
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch6 -p1
%patch990 -p1 %patch990 -p1
%patch991 -p1 %patch991 -p1