[arch-commits] Commit in libreoffice/trunk (PKGBUILD.next_stable)

[andyrtr at archlinux.org]

    Date: Friday, December 23, 2011 @ 06:17:35
  Author: andyrtr
Revision: 145603

prepare LibO 3.5 branch release  - add upstream patch to fix menu icons

Modified:
  libreoffice/trunk/PKGBUILD.next_stable

----------------------+
 PKGBUILD.next_stable |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD.next_stable
===================================================================
--- PKGBUILD.next_stable	2011-12-23 11:12:58 UTC (rev 145602)
+++ PKGBUILD.next_stable	2011-12-23 11:17:35 UTC (rev 145603)
@@ -20,7 +20,7 @@
 	'libreoffice-extension-report-builder')
 _LOver=3.4.99.2
 pkgver=3.5.0beta2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -72,7 +72,8 @@
 	${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
 	#${_additional_source_url}/cc8eb870d6a324d36575420efd856319-libcdr-0.0.0.tar.bz2
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e)
+	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
+	fix_menuicons.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=c3569696294bb264a0c645db12f027d44b4e033f)
 noextract=(a8b25a0bf696fd126a08319d88998492-libvisio-0.0.11.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
@@ -132,7 +133,8 @@
          'e1c178b18f130b40494561f02bc1a948'
          '7c2549f6b0a8bb604e6c4c729ffdcfe6'
          '185d60944ea767075d27247c3162b3bc'
-         '60ce5dc9bd098f95c2e621a930c98dd9')
+         '60ce5dc9bd098f95c2e621a930c98dd9'
+         'f9bd737527dafd3eeb451cf0dd95d7d6')
 
 build() {
 
@@ -155,6 +157,7 @@
 	# buildfixes & bugfixes
 	# one late fix to solve make distro-pack-install issue
 	patch -Np1 -i ${srcdir}/gmake_install.diff
+	patch -Np1 -i ${srcdir}/fix_menuicons.diff
 
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205