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

Andreas Radke andyrtr at archlinux.org
Thu Aug 15 16:25:20 UTC 2019


    Date: Thursday, August 15, 2019 @ 16:25:20
  Author: andyrtr
Revision: 359846

upgpkg: libreoffice-fresh 6.3.0-1

upstream update 6.3.0

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

--------------------+
 PKGBUILD           |   33 +++++++++++++++++++--------------
 build_failure.diff |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-15 11:30:45 UTC (rev 359845)
+++ PKGBUILD	2019-08-15 16:25:20 UTC (rev 359846)
@@ -10,8 +10,8 @@
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=6.2.5.2
-pkgver=6.2.5
+_LOver=6.3.0.4
+pkgver=6.3.0
 pkgrel=1
 arch=('x86_64')
 license=('LGPL3')
@@ -42,58 +42,60 @@
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
 	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	${_additional_source_url}/language-subtag-registry-2018-04-23.tar.bz2
+	${_additional_source_url}/language-subtag-registry-2019-04-03.tar.bz2
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/pdfium-3550.tar.bz2
+	${_additional_source_url}/pdfium-3794.tar.bz2
 	${_additional_source_url}/lxml-4.1.1.tgz
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
 	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
 	${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
-	${_additional_source_url2}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
+	${_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
            a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
            0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-           language-subtag-registry-2018-04-23.tar.bz2
+           language-subtag-registry-2019-04-03.tar.bz2
            17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
            d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
            ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-           pdfium-3550.tar.bz2
+           pdfium-3794.tar.bz2
            lxml-4.1.1.tgz
            Firebird-3.0.0.32483-0.tar.bz2
            8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
            odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar  # for test suite
-           49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
+           884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
            185d60944ea767075d27247c3162b3bc-unowinreg.dll
 )
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('0e9c00e9b17ee2d35415c6baafe13d16a891253477b8cecf1942f0035aac358e'
+sha256sums=('87830107b17fbf6c3831c8e6bf738e7d21fa7826debb88e4948d80caf2a7aed7'
             'SKIP'
-            '327f74590f60e9b0a58f5ab54304cdace248c9f1b45fd486a687481b715043d6'
+            '9f5c5dac7e6d4fafe8b7e14d8b67454e4773cd0696be967cef7b97f33fc72bf1'
             'SKIP'
-            'c39781ef5dc6602393c8cb2f7442c154385e9b89f13fce0e1f4ba600321e9d0a'
+            '090098f72f2c153ee361e9a01f7b2593b0447e93bf4d694a130b803c0577601c'
             'SKIP'
             '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
             '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
             '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
             '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
-            '14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878'
+            'a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d'
             'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
             '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
-            '572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679'
+            'e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4'
             '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
-            '49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63'
+            '884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+            '89ebb617c731a0ae4f47a5b3cb7cb7b451486a1036eb5ce49d5a9f50d51b79f2'
             'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
             '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6')
 
@@ -116,6 +118,9 @@
 	# 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

Added: build_failure.diff
===================================================================
--- build_failure.diff	                        (rev 0)
+++ build_failure.diff	2019-08-15 16:25:20 UTC (rev 359846)
@@ -0,0 +1,36 @@
+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