From 4983456bb20666f8a305b3ac858971d38107875e2a42d7ac684ff578d389d23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 26 Feb 2019 09:17:40 +0000 Subject: [PATCH] - 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 --- kde5-32bit-build-fix.patch | 13 +++++++++++++ libreoffice.changes | 6 ++++++ libreoffice.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 kde5-32bit-build-fix.patch diff --git a/kde5-32bit-build-fix.patch b/kde5-32bit-build-fix.patch new file mode 100644 index 0000000..d35ee47 --- /dev/null +++ b/kde5-32bit-build-fix.patch @@ -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(nCurrent); + } + break; + default: diff --git a/libreoffice.changes b/libreoffice.changes index b9da8a6..4905826 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 26 09:17:17 UTC 2019 - Tomáš Chvátal + +- Add patch to fix 32bit build: + * kde5-32bit-build-fix.patch + ------------------------------------------------------------------- Mon Feb 25 12:55:35 UTC 2019 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index f0c94dc..0585404 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -101,6 +101,7 @@ Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff Patch4: 0001-Speed-up-languagepack-installation.patch Patch5: old-boost.patch +Patch6: kde5-32bit-build-fix.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # 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 %patch3 %patch4 -p1 +%patch6 -p1 %patch990 -p1 %patch991 -p1