[arch-commits] Commit in libreoffice-fresh/trunk (PKGBUILD build_failure.diff)

Andreas Radke andyrtr at archlinux.org
Wed Sep 4 19:47:14 UTC 2019


    Date: Wednesday, September 4, 2019 @ 19:47:13
  Author: andyrtr
Revision: 361620

upgpkg: libreoffice-fresh 6.3.1-1

upstream update 6.3.1

Modified:
  libreoffice-fresh/trunk/PKGBUILD
Deleted:
  libreoffice-fresh/trunk/build_failure.diff

--------------------+
 PKGBUILD           |   17 ++++++-----------
 build_failure.diff |   36 ------------------------------------
 2 files changed, 6 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-04 18:12:58 UTC (rev 361619)
+++ PKGBUILD	2019-09-04 19:47:13 UTC (rev 361620)
@@ -10,9 +10,9 @@
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=6.3.0.4
-pkgver=6.3.0
-pkgrel=2
+_LOver=6.3.1.2
+pkgver=6.3.1
+pkgrel=1
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -54,7 +54,6 @@
 	${_additional_source_url2}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
-        build_failure.diff
 	libreoffice-fresh.sh libreoffice-fresh.csh)
 noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -73,11 +72,11 @@
            185d60944ea767075d27247c3162b3bc-unowinreg.dll
 )
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('87830107b17fbf6c3831c8e6bf738e7d21fa7826debb88e4948d80caf2a7aed7'
+sha256sums=('78c7c9a4d2203daeb1d3a6e7e8a522492b5d89fd374903558876dc3300bcc251'
             'SKIP'
-            '9f5c5dac7e6d4fafe8b7e14d8b67454e4773cd0696be967cef7b97f33fc72bf1'
+            'c61cfe66488e768a40565139ada3cdbd2d91d9b5931fcf09738823ca05ac7980'
             'SKIP'
-            '090098f72f2c153ee361e9a01f7b2593b0447e93bf4d694a130b803c0577601c'
+            '090ccea6d46695e5a2435196835103173eb75a6a57539b686d5aac092f6c088c'
             'SKIP'
             '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
             '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -95,7 +94,6 @@
             '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
-            '89ebb617c731a0ae4f47a5b3cb7cb7b451486a1036eb5ce49d5a9f50d51b79f2'
             'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
             '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6')
 
@@ -118,9 +116,6 @@
 	# fix not upstreamable pyuno paths - FS#54250
 	patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
 
-        # build fix
-        patch -Np1 -i ${srcdir}/build_failure.diff
-
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in

Deleted: build_failure.diff
===================================================================
--- build_failure.diff	2019-09-04 18:12:58 UTC (rev 361619)
+++ build_failure.diff	2019-09-04 19:47:13 UTC (rev 361620)
@@ -1,36 +0,0 @@
-From 913120fe50ee770e60bd82e2e60047242872111a Mon Sep 17 00:00:00 2001
-From: Lionel Elie Mamane <lionel at 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 at suse.cz>
-Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
-Tested-by: Jenkins
----
- i18npool/source/calendar/calendarImpl.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'i18npool/source/calendar/calendarImpl.cxx')
-
-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
-
-


More information about the arch-commits mailing list