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

[Andreas Radke]

    Date: Friday, June 21, 2013 @ 15:01:23
  Author: andyrtr
Revision: 188806

prepare 4.1.x release; use system harfbuzz

Modified:
  libreoffice/trunk/PKGBUILD.41

-------------+
 PKGBUILD.41 |   28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

Modified: PKGBUILD.41
===================================================================
--- PKGBUILD.41	2013-06-21 12:59:27 UTC (rev 188805)
+++ PKGBUILD.41	2013-06-21 13:01:23 UTC (rev 188806)
@@ -18,9 +18,9 @@
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.1.0.0.beta2
+_LOver=4.1.0.1
 pkgver=4.1.0
-pkgrel=0.2 #beta2
+pkgrel=0.3 #rc1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -29,7 +29,7 @@
              'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
-             'clucene' 'bluez-libs' # 'harfbuzz'
+             'clucene' 'bluez-libs' 'harfbuzz-icu'
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" 
@@ -75,14 +75,12 @@
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
-	${_additional_source_url}/c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2
 	${_additional_source_url}/libcdr-0.0.14.tar.bz2
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
 	${_additional_source_url}/libmwaw-0.1.9.tar.bz2
 	${_additional_source_url}/libvisio-0.0.28.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh
-	fix_install.diff)
+	libreoffice-common.sh libreoffice-common.csh)
 noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
@@ -113,14 +111,13 @@
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
-	c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2
 	libcdr-0.0.14.tar.bz2
 	libmspub-0.0.6.tar.bz2
 	libmwaw-0.1.9.tar.bz2
 	libvisio-0.0.28.tar.bz2	)
-md5sums=('a785e1ed4809246edc39d0b55a807cdd'
-         '96ea39853d9058cb9e98749539827187'
-         '6ecbe09a87d5c2c1a186671d24643111'
+md5sums=('7d05e9454306e8f14a5c2388b64e28f4'
+         '932d9f89fc5f1766c15fcbb9d852c329'
+         '269eee2e7aa1643f0ea5063042643d33'
          'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -151,15 +148,13 @@
          '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
          '8473296c671b6e3dd8197f4145e0854b'
-         'c48827713e93539dc7285f9e86ffbdc5'
          'd88f9b94df880d2c05be943b000ca112'
          '1120705cd0f0d9bd5506360bf57b6c2e'
          '2090daf6e8a27b52e8c5f26c915bd7c5'
          '05574c2ec54dd0c29d75cacdf9419f44'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
-         'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
-         'd1fa6b1b1820cc5a7154720a1dcb0a4a')
+         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 
 prepare() {
 
@@ -179,10 +174,6 @@
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
     
-    # fix file-lists
-    # http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-1&id=8ce82f83fb8146b684bec5d903d76f034ba37d4a
-    patch -Np1 -i ${srcdir}/fix_install.diff
-    
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in
@@ -246,7 +237,6 @@
 		--without-system-apache-commons \
 		--without-system-libodfgen \
 		--without-system-libmwaw \
-		--without-system-harfbuzz \
 		--with-system-dicts \
 		--with-external-dict-dir=/usr/share/hunspell \
 		--with-external-hyph-dir=/usr/share/hyphen \
@@ -294,7 +284,7 @@
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg'
           'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4"
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
+          'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'libcups:          adds printing support'