community/libreoffice: upgrade to 5.3.0.3

2 files changed, 40 insertions, 57 deletions

diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index f4433f088c..609d18d845 100644
--- a/community/libreoffice/APKBUILD
+++ b/community/libreoffice/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer:
 pkgname=libreoffice
-pkgver=5.2.5.1
+pkgver=5.3.0.3
 pkgrel=0
 pkgdesc="LibreOffice - Meta package for the full office suite"
 url="http://www.libreoffice.org/"
@@ -15,7 +15,8 @@ depends_dev="cups-dev libjpeg-turbo-dev boost-dev clucene-dev libe-book-dev icu-
 	libxrender-dev libxrandr-dev neon-dev apr-dev redland-dev libexttextcat-dev
 	gconf-dev bluez-dev gstreamer1-dev gst-plugins-base1-dev gtk+2.0-dev
 	poppler-dev cairo-dev hyphen-dev mythes-dev python3-dev harfbuzz-dev
-	libfreehand-dev libodfgen-dev libcdr-dev"
+	libfreehand-dev libodfgen-dev libcdr-dev libzmf-dev libstaroffice-dev
+	liborcus-dev"
 makedepends="$depends_dev autoconf automake tar coreutils findutils ucpp gperf
 	bison flex zip perl perl-archive-zip sed libxml2-utils doxygen"
 # GNU sed is needed for in i18npool/CustomTarget_localedata.mk
@@ -26,19 +27,18 @@ subpackages="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw
 depends="$subpackages"
 _addsrcurl="http://dev-www.libreoffice.org/src"
 case $pkgver in
-	*.*.*.*) _v=${pkgver%.*};;
-	*.*.*) _v=$pkgver;;
+*.*.*.*) _v=${pkgver%.*};;
+*.*.*) _v=$pkgver;;
 esac
 
 # grep LIBXMLSEC_TARBALL download.lst
 source="http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-$pkgver.tar.xz
 	http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-dictionaries-$pkgver.tar.xz
 	http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-translations-$pkgver.tar.xz
-	$_addsrcurl/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
+	$_addsrcurl/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
 	linux-musl.patch
 	fix-execinfo.patch
 	fix-includes.patch
-	0010-icu-58.patch
 	"
 
 languages=""
@@ -164,7 +164,7 @@ add_lang zu "Zulu"
 # help abuild find shared objects in rpath
 ldpath="/usr/lib/libreoffice/program:/usr/lib/libreoffice/ure/lib/"
 
-_builddir="$srcdir"/libreoffice-$pkgver
+builddir="$srcdir"/libreoffice-$pkgver
 unpack() {
 	if [ -z "$force" ]; then
 		verify || return 1
@@ -185,24 +185,13 @@ unpack() {
 }
 
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-
-	# https://bugs.documentfoundation.org/show_bug.cgi?id=78174
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812
-	# gcc 4.9.x -fvisibility-inlines-hidden is broken, force disable it for now
-	sed -e 's/@HAVE_GCC_VISIBILITY_BROKEN@/TRUE/g' -i config_host.mk.in
-
+	cd "$builddir"
+	default_prepare || return 1
 	NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	# boost-1.59
 	export CPPFLAGS="$CPPFLAGS -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"
 	./configure \
@@ -217,10 +206,8 @@ build() {
 		--disable-online-update \
 		--disable-fetch-external \
 		--disable-dependency-tracking \
-		--disable-crashdump \
 		--enable-release-build \
 		--enable-split-app-modules \
-		--enable-verbose \
 		--enable-python=system \
 		--with-alloc=system \
 		--with-tls=openssl \
@@ -236,7 +223,6 @@ build() {
 		--without-system-sane \
 		--without-myspell-dicts \
 		--disable-firebird-sdbc \
-		--disable-orcus \
 		--disable-graphite \
 		--disable-coinmp \
 		--disable-lpsolve \
@@ -253,13 +239,13 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir"/../all distro-pack-install || return 1
 }
 
 _split() {
 	local i
-	for i in $(grep -v ^%dir $_builddir/file-lists/${1}_list.txt | sort -u); do
+	for i in $(grep -v ^%dir $builddir/file-lists/${1}_list.txt | sort -u); do
 		dirname="$(dirname $i)"
 		[ -d "$subpkgdir/$dirname" ] || install -dm755 "$subpkgdir/$dirname"
 		mv "$pkgdir"/../all/"$i" "$subpkgdir"/"$i"
@@ -304,7 +290,7 @@ impress() {
 
 libreofficekit() {
 	mkdir -p "$subpkgdir"/usr/include
-	mv "$_builddir"/include/LibreOfficeKit "$subpkgdir"/usr/include || return 1
+	mv "$builddir"/include/LibreOfficeKit "$subpkgdir"/usr/include || return 1
 }
 
 math() {
@@ -325,27 +311,24 @@ writer() {
 	_split writer
 }
 
-md5sums="1e93a3992c2358f4e6e3b1cdd373eda2  libreoffice-5.2.5.1.tar.xz
-d737d01c446a7f7edb0ea68cd6690594  libreoffice-dictionaries-5.2.5.1.tar.xz
-0ab59244bd923141e69b10b363dd332a  libreoffice-translations-5.2.5.1.tar.xz
-ce12af00283eb90d9281956524250d6e  ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
-bfde50b1b04c715cd172be03a204521f  linux-musl.patch
+md5sums="204c492a0b5e58dd0be9788c74a364ab  libreoffice-5.3.0.3.tar.xz
+f9e3e741b929c5af19b1321569537b68  libreoffice-dictionaries-5.3.0.3.tar.xz
+6ad27f9d0348010afca53167c9e350cb  libreoffice-translations-5.3.0.3.tar.xz
+86b1daaa438f5a7bea9a52d7b9799ac0  86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+04064db9416656b525c4f59f04dfa7e9  linux-musl.patch
 1cff63a520d1b037edddf1b4de4799dc  fix-execinfo.patch
-c6fc4d38ef1bab69f3570a0d087b4c52  fix-includes.patch
-ef0fced535314a39b836b641e593dc6c  0010-icu-58.patch"
-sha256sums="9756a322a497aa83d096fa0ac5541622d9a8f5038ce9c0ded48199566ab0d300  libreoffice-5.2.5.1.tar.xz
-a892f933b7da5dda3e4c5d399096cde77d75c4beb8bdf6ea64442ab6890dc357  libreoffice-dictionaries-5.2.5.1.tar.xz
-abf6e962aa2042bab4f2e6c3ba9eddbda64a56aa3251bde3b227cfffed926353  libreoffice-translations-5.2.5.1.tar.xz
-3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305  ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
-fd0778cfd18b034a415a8966f7a3d8437c3f2ba1c6cfde8220ba663261b9c67f  linux-musl.patch
+c6fc4d38ef1bab69f3570a0d087b4c52  fix-includes.patch"
+sha256sums="04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e  libreoffice-5.3.0.3.tar.xz
+c5c9463548286d8dbb33af722e13d01a2b753ea6103b51c9f2929d8d2079ddf5  libreoffice-dictionaries-5.3.0.3.tar.xz
+4321a57fba1012b30eae6e629f18d4139395fd5751af381dc87e31e084fca1d1  libreoffice-translations-5.3.0.3.tar.xz
+41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f  86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+7ad68a55826ca7b985cce28743c3f6196d469ab8e4aa4ac3d6072005053e16a5  linux-musl.patch
 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3  fix-execinfo.patch
-51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89  fix-includes.patch
-c3ff14bd23804b4fc3817fb6371eb7c56dcb9dcaddd2cb43ecbb7ccf6a801597  0010-icu-58.patch"
-sha512sums="72b88fc44bc440def7be8971a6976b87de41562eaa968eeb40bc5b9bd2d3ce4fb8581fc070ade804a8f7257e350df2cc8f2ac42c9d3241bd65d2a89c35602c00  libreoffice-5.2.5.1.tar.xz
-761bd6a87df18b3c49f50972a5d73ea4cf003a7cd16a353685df0f8caaf26d63a7974ca708dc742d5ff9b9a1761038babc1c2d56fd472b3278916dc1f0bfa358  libreoffice-dictionaries-5.2.5.1.tar.xz
-af31a4964485d2f28fa1d11d67a390fe6662846fdb26a1d00b66cd80bfbec01316274545fbbaf57a79185f1976c595f65ec46bba54008bf5287063858231e613  libreoffice-translations-5.2.5.1.tar.xz
-2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5  ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
-6abfd9c6cf1917e9ee89695086013c94f5ec68f9732ad60faeeaabe6f3765f5ff19df575a3ef0098d6dd6ba3c76369cec871770396f5cd84829031c3e38485a8  linux-musl.patch
+51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89  fix-includes.patch"
+sha512sums="06cf8a59c2b08f6aaf5012347aeae482ecccc4587c67fc6d3f267572f236999ec6fe1f1290926830ebe5631c705cf4e938b65a5765e99556c8d19178e0fece45  libreoffice-5.3.0.3.tar.xz
+a007a43850bd4e0a40462b32980215c51c17d1b27f071a0d30c89fe70d4047be8f1be7a283b0a4019b91bd0c1e2eb62bbc317b7039889114002e48b43650074f  libreoffice-dictionaries-5.3.0.3.tar.xz
+569e5450802201a34011e9e98d2de32676b5aac98abffa2241ab1aa23ade60baf222687a60e931fa28a55421f49b4c97f26169348172f272b3bf88aff9ed9457  libreoffice-translations-5.3.0.3.tar.xz
+20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5  86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a  linux-musl.patch
 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860  fix-execinfo.patch
-c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a  fix-includes.patch
-787eacb819935018d5230f3bceb7697bdb937ac776c88e4b5fece26dcb1069f338e2e1f1d4468df41facc3a2ec62e464f1ba14429aa2b5b509debf9146099ad2  0010-icu-58.patch"
+c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a  fix-includes.patch"
diff --git a/community/libreoffice/linux-musl.patch b/community/libreoffice/linux-musl.patch
index f9b6bd7646..5fbf6b31cd 100644
--- a/community/libreoffice/linux-musl.patch
+++ b/community/libreoffice/linux-musl.patch
@@ -1,6 +1,6 @@
---- libreoffice-4.4.0.3/configure.ac.orig	2015-01-22 22:05:28.000000000 -0200
-+++ libreoffice-4.4.0.3/configure.ac	2015-02-02 20:11:20.639411153 -0200
-@@ -569,7 +569,7 @@
+--- libreoffice-5.3.0.3/configure.ac.orig	2017-01-26 22:22:46.000000000 +0000
++++ libreoffice-5.3.0.3/configure.ac	2017-02-08 13:14:16.777547599 +0000
+@@ -652,7 +652,7 @@
      fi
      ;;
  
@@ -9,16 +9,16 @@
      test_gtk=yes
      build_gstreamer_1_0=yes
      build_gstreamer_0_10=yes
-@@ -4058,7 +4058,7 @@
+@@ -4170,7 +4170,7 @@
      esac
      ;;
  
 -linux-gnu*)
 +linux-gnu*|linux-musl*)
      COM=GCC
-     GUIBASE=unx
+     USING_X11=TRUE
      OS=LINUX
-@@ -6967,7 +6967,7 @@
+@@ -7197,7 +7197,7 @@
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
          ;;
  
@@ -27,7 +27,7 @@
          JAVAINC="-I$JAVA_HOME/include"
          JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
          test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -9429,21 +9429,6 @@
+@@ -9748,21 +9748,6 @@
  fi
  AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
  
@@ -49,12 +49,12 @@
  dnl =========================================
  dnl Check for the Windows  SDK.
  dnl =========================================
-@@ -12741,7 +12726,7 @@
+@@ -12775,7 +12760,7 @@
  
      case "$host_os" in
  
 -    aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
 +    aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
-         if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then
+         if test "$ENABLE_JAVA" != ""; then
              pathmunge "$JAVA_HOME/bin" "after"
          fi