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

[Andreas Radke]

    Date: Tuesday, July 26, 2016 @ 21:34:17
  Author: andyrtr
Revision: 272497

prepare next major release

Added:
  libreoffice-fresh/trunk/buildfix.diff
Modified:
  libreoffice-fresh/trunk/PKGBUILD.52

---------------+
 PKGBUILD.52   |   32 +++++++++++---------------------
 buildfix.diff |   27 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 21 deletions(-)

Modified: PKGBUILD.52
===================================================================
--- PKGBUILD.52	2016-07-26 20:57:08 UTC (rev 272496)
+++ PKGBUILD.52	2016-07-26 21:34:17 UTC (rev 272497)
@@ -11,9 +11,9 @@
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=5.2.0.0.beta2
-pkgver=5.2.0.
-pkgrel=0.1
+_LOver=5.2.0.3 # =RC3
+pkgver=5.2.0
+pkgrel=0.3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -68,7 +68,7 @@
 	libreoffice-fresh.sh libreoffice-fresh.csh
 	update_liborcus_to_0.11.0.diff
 	remove_unnecessary_orcus_external_usage_from_makefiles.diff
-	gcc6_buildfix.diff)
+	buildfix.diff)
 noextract=(boost_1_60_0.tar.bz2
 	ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
 	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -98,11 +98,11 @@
 	libfreehand-0.1.1.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll)
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-md5sums=('484d287d943f3ff4d69239a47e5b06e1'
+md5sums=('281164e403d93fdbfbacd7c3d5afd310'
          'SKIP'
-         'c0cb82517f584e94217b796db887e4fc'
+         'bd178f898741e0b159d01e53535a75d9'
          'SKIP'
-         '946a70d47c609e15ba95b8640de77a5c'
+         '3c706c76e39e4990834560f60df043e2'
          'SKIP'
          '65a840e1a0b13a558ff19eeb2c4f0cbe'
          'ce12af00283eb90d9281956524250d6e'
@@ -137,7 +137,7 @@
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
          '3f526b966a672d1237cfcbadae0e3f95'
          'ac71e21ecc0976b2ea6e233854963d4b'
-         '6752d22fc5bcbdbef0640c6aca163e50')
+         'd386f3a0b484cd3929329a294159f5bc')
 
 prepare() {
 
@@ -149,6 +149,9 @@
 		ln -s ${srcdir}/$source .
 	done
 	popd
+	
+	# https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-2&id=e13db0f16c4ac5a243587e881d7b18979d07f478
+	patch -Np1 -i ../buildfix.diff
 
 	# unowinreg.dll must be a file not a symlink or the result will become a broken symlink
 	# /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -172,19 +175,6 @@
 #	[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlexport7/d' sw/Module_sw.mk
 #	[ "$CARCH" = "i686" ] && sed -i '/CppunitTest_basic_scanner/d' basic/Module_basic.mk
 
-	# qt4 fix
-#	sed -i "s:qmake:qmake-qt4:g" configure.ac
-
-	# https://cgit.freedesktop.org/libreoffice/core/commit/?id=b325b4c286b56a63316063a3ac4648bf7b7efcbe
-#	patch -Np1 -i ${srcdir}/update_liborcus_to_0.11.0.diff
-	# https://cgit.freedesktop.org/libreoffice/core/commit/?id=07d4c443e21cd22545d4516515c50b1c8dd39a9b
-#	patch -Np1 -i ${srcdir}/remove_unnecessary_orcus_external_usage_from_makefiles.diff
-
-#	sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac
-	
-	# fix checking whether KDE is >= 4.2... configure: error: KDE version too old
-	# http://bugs.debian.org/823145
-#	patch -Np1 -i ${srcdir}/gcc6_buildfix.diff
 }
 
 build() {

Added: buildfix.diff
===================================================================
--- buildfix.diff	                        (rev 0)
+++ buildfix.diff	2016-07-26 21:34:17 UTC (rev 272497)
@@ -0,0 +1,27 @@
+From e13db0f16c4ac5a243587e881d7b18979d07f478 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 25 Jul 2016 12:08:35 +0100
+Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
+
+Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
+(cherry picked from commit 0b8e589875ffd84150470832de18ebd79989efc0)
+Reviewed-on: https://gerrit.libreoffice.org/27513
+Reviewed-by: David Tardon <dtardon at redhat.com>
+Tested-by: Jenkins <ci at libreoffice.org>
+
+diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
+index 25bc26d..5d1cfb5 100644
+--- a/ucb/source/ucp/ftp/ftploaderthread.cxx
++++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
+@@ -77,7 +77,7 @@ FTPLoaderThread::~FTPLoaderThread() {
+ 
+ 
+ CURL* FTPLoaderThread::handle() {
+-    CURL* ret = osl_getThreadKeyData(m_threadKey);
++    CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
+     if(!ret) {
+         ret = curl_easy_init();
+         if (ret != nullptr) {
+-- 
+cgit v0.10.2
+