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

[Andreas Radke]

    Date: Thursday, January 26, 2017 @ 22:41:14
  Author: andyrtr
Revision: 287562

upgpkg: libreoffice-fresh 5.2.5-1

upstream update 5.2.5

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

---------------+
 PKGBUILD      |   24 ++++++++++--------------
 buildfix.diff |   30 ------------------------------
 2 files changed, 10 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-26 22:10:30 UTC (rev 287561)
+++ PKGBUILD	2017-01-26 22:41:14 UTC (rev 287562)
@@ -11,9 +11,9 @@
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=5.2.4.2
-pkgver=5.2.4
-pkgrel=2
+_LOver=5.2.5.1
+pkgver=5.2.5
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -65,8 +65,7 @@
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-fresh.sh libreoffice-fresh.csh
 	update_liborcus_to_0.11.0.diff
-	remove_unnecessary_orcus_external_usage_from_makefiles.diff
-	buildfix.diff)
+	remove_unnecessary_orcus_external_usage_from_makefiles.diff)
 noextract=(boost_1_60_0.tar.bz2
 	ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
 	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -94,11 +93,11 @@
 	976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll)
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('8b73d1afa6a1ff6bc153ab1f31afc86c42cc8d0e5831bf82e66a8df0fcf6eb10'
+sha256sums=('9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300'
             'SKIP'
-            'fef3a7699d20e198ac66267f50ffce5bcbef48617434af477de8887340ebe182'
+            '11199cca59748dc9cade4f5cbb0478f600d3c54114b09819eac54338dbbd49b4'
             'SKIP'
-            '620cab5f916663275895a9b50b8e00f7e96dbd8dc8129e79bc266274af3cae1c'
+            'abf6e962aa2042bab4f2e6c3ba9eddbda64a56aa3251bde3b227cfffed926353'
             'SKIP'
             '686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b'
             '3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305'
@@ -130,8 +129,7 @@
             '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
             'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283'
             '4fc7b046fe96464a576d897330d1caa14998ab767002f84edf11a63b9ec35a7f'
-            'f6df5179582803bd71211a392218e9f7c062dc183832d6823cc7a13021e3e543'
-            '898785fc665f4c661666e4f78e0307a77640c37ce005354db75782cffa61286c')
+            'f6df5179582803bd71211a392218e9f7c062dc183832d6823cc7a13021e3e543')
 
 prepare() {
 
@@ -162,9 +160,6 @@
 		esac
 		ARCH_FLAGS="$ARCH_FLAGS $i"
 	done
-	
-	# upstream fix for broken test
-	patch -Np1 -i ../buildfix.diff
 }
 
 build() {
@@ -303,7 +298,7 @@
 		'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
 		'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
 		'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
-		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' 'gtk2'
+		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
 		'liborcus' 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis')
 	optdepends=('java-runtime:     adds java support'
 		'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
@@ -318,6 +313,7 @@
 		'libpaper:         takes care of papersize'
 		'postgresql-libs:  for postgresql-connector'
 		'coin-or-mp:	   required by the Calc solver'
+		'gtk2:             for GTK2 integration'
 		'gtk3:             for GTK3 integration'
 		'kdelibs:          for KDE desktop integration')
 	backup=(etc/libreoffice/sofficerc

Deleted: buildfix.diff
===================================================================
--- buildfix.diff	2017-01-26 22:10:30 UTC (rev 287561)
+++ buildfix.diff	2017-01-26 22:41:14 UTC (rev 287562)
@@ -1,30 +0,0 @@
-From 014394f10a11a1b36f8a2e8a0722ec2fddf74b40 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
-Date: Fri, 9 Dec 2016 15:26:59 +0000
-Subject: oss-fuzz we don't want this stream to automatically resize on seeks
- past end
-
-Change-Id: Ie42b2e173cd3ed9faaf17c3c978227613129fa84
-(cherry picked from commit f212bd45a7c7d97fb16380cd9fa7c6abbfb71e05)
-(cherry picked from commit b832d7019f7e7499f5fb3da5d5f49ddbf0f35585)
-Reviewed-on: https://gerrit.libreoffice.org/31803
-Tested-by: Jenkins <ci at libreoffice.org>
-Reviewed-by: Michael Stahl <mstahl at redhat.com>
-
-diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
-index 88ab38f..c4f7e78 100644
---- a/vcl/source/filter/wmf/winwmf.cxx
-+++ b/vcl/source/filter/wmf/winwmf.cxx
-@@ -1093,7 +1093,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
-                             {   // first EMF comment
-                                 nEMFRecCount    = nComRecCount;
-                                 nEMFSize        = nEMFTotalSize;
--                                pEMFStream = o3tl::make_unique<SvMemoryStream>( nEMFSize );
-+                                pEMFStream = o3tl::make_unique<SvMemoryStream>(nEMFSize, 0);
-                             }
-                             else if( ( nEMFRecCount != nComRecCount ) || ( nEMFSize != nEMFTotalSize ) ) // add additional checks here
-                             {
--- 
-cgit v0.10.2
-
-