- Add patch to fix building on older openSUSE releases:

* gcc.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=803
This commit is contained in:
Tomáš Chvátal 2019-07-31 11:32:21 +00:00 committed by Git OBS Bridge
parent 2d00e9b3a2
commit 117a15109c
3 changed files with 41 additions and 0 deletions

33
gcc.patch Normal file
View File

@ -0,0 +1,33 @@
From 913120fe50ee770e60bd82e2e60047242872111a Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Wed, 10 Jul 2019 10:27:19 +0200
Subject: build failure - disambiguate Calendar return class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I892281f85f6cc9c2de2c341ae63240ae85d302c4
Reviewed-on: https://gerrit.libreoffice.org/76595
Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Jenkins
---
i18npool/source/calendar/calendarImpl.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index c9e22f7..228bed3 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -128,7 +128,7 @@ CalendarImpl::getLoadedCalendar2()
return xCalendar->getLoadedCalendar2();
}
-Calendar SAL_CALL
+::css::i18n::Calendar SAL_CALL
CalendarImpl::getLoadedCalendar()
{
if (!xCalendar.is())
--
cgit v1.1

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 31 11:31:01 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Add patch to fix building on older openSUSE releases:
* gcc.patch
-------------------------------------------------------------------
Fri Jul 19 08:19:37 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -100,6 +100,7 @@ Patch1: scp2-user-config-suse.diff
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-no-broken-help.diff
Patch4: gcc.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
@ -969,6 +970,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo
%endif # Leap 42/SLE-12
%patch2
%patch3
%patch4 -p1
%patch990 -p1
%patch991 -p1