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

[Andreas Radke]

    Date: Sunday, July 20, 2014 @ 19:31:37
  Author: andyrtr
Revision: 217500

prepare next release 4.3.0rc3, use system glm

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-20 14:31:22 UTC (rev 217499)
+++ PKGBUILD	2014-07-20 17:31:37 UTC (rev 217500)
@@ -4,9 +4,9 @@
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=4.3.0.2
+_LOver=4.3.0.3 # RC3
 pkgver=4.3.0
-pkgrel=0.10
+pkgrel=0.11
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -20,7 +20,7 @@
 	'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
 	'junit' 'libmythes' 'libwpg'  'mesa' 'java-environment' 'postgresql-libs'
 	'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew'
-	'apr' 'serf' 'chrpath' 'ttf-liberation'
+	'apr' 'serf' 'chrpath' 'ttf-liberation' 'glm'
 	'valgrind')
 
 #_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
@@ -61,10 +61,8 @@
 	${_additional_source_url}/libe-book-0.1.1.tar.bz2
 	${_additional_source_url}/libabw-0.1.0.tar.bz2
 	${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2
-	${_additional_source_url}/9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2
+	${_additional_source_url}/libgltf/3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2
 	${_additional_source_url}/CoinMP-1.7.6.tgz
-	# do not use system glm, LibO patches it!
-	${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 	${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
 	${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
@@ -104,15 +102,14 @@
 	libabw-0.1.0.tar.bz2
 	language-subtag-registry-2014-04-10.tar.bz2
 	CoinMP-1.7.6.tgz
-	bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 	4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
 	OpenCOLLADA-master-6509aa13af.tar.bz2
-	9c8d3455e0d8ef51269784e9a473feeb-libgltf.tar.bz2)
-md5sums=('868f1ecb0b3326dc567466428f5b619b'
+	3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2)
+md5sums=('c63fe2858ee956ccaaa8bcade152ca1a'
          'SKIP'
-         'b031689c5d715aecb63a31ba3ddaae24'
+         '76bf4e114a946d493146f14745ad5fd5'
          'SKIP'
-         '96fef4a636161cfd8df181e2a9d2f130'
+         'e7c6cdddd70f23c45d6641a7c9d03899'
          'SKIP'
          'd6eef4b4cacb2183f2bf265a5a03a354'
          '1f24ab1d39f4a51faf22244c94a6203f'
@@ -147,9 +144,8 @@
          'c25a881d21abc5b4da19205db513cc22'
          '9317e967c8fa8ff50e049744c4b33c87'
          '49c94710f7858b1969d74ff72e6aac84'
-         '9c8d3455e0d8ef51269784e9a473feeb'
+         '3d9ea1f2828c46f8ba94b88a87b3326d'
          '1cce53bf4b40ae29790d2c5c9f8b1129'
-         'bae83fa5dc7f081768daace6e199adc3'
          '4b87018f7fff1d054939d19920b751a0'
          '4ca8a6ef0afeefc864e9ef21b9f14bd6'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
@@ -257,7 +253,7 @@
 		--with-system-cppunit\
 		--with-system-graphite\
 		--with-system-glew \
-		--without-system-glm \
+		--with-system-glm \
 		--with-system-libwpg \
 		--with-system-libwps \
 		--with-system-redland\