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

[Andreas Radke]

    Date: Monday, August 20, 2018 @ 17:59:52
  Author: andyrtr
Revision: 332708

upgpkg: libreoffice-still 6.0.6-3

drop unneeded dependencies on glew and glu, build with system glm

Modified:
  libreoffice-still/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-20 17:20:39 UTC (rev 332707)
+++ PKGBUILD	2018-08-20 17:59:52 UTC (rev 332708)
@@ -13,7 +13,7 @@
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=6.0.6.2
 pkgver=6.0.6
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -21,13 +21,13 @@
 	'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
 	'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 
 	'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
-	'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'hicolor-icon-theme'
+	'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
 	'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
-	'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
+	'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
 	'gperf' 'gtk3' 'cppunit' 'beanshell' 'clucene' 
 	'junit' 'libmythes' 'libwpg'  'java-environment' 'postgresql-libs' 'libgl'
-	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew'
-	'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker'
+	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops' 'mdds'
+	'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
 	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
 	'libexttextcat' 'libcmis' 'gobject-introspection'
 	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
@@ -50,7 +50,6 @@
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2
 	${_additional_source_url}/pdfium-3235.tar.bz2
-        ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 	${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
 	${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar # for test suite
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -68,7 +67,6 @@
            ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
            Firebird-3.0.0.32483-0.tar.bz2
            pdfium-3235.tar.bz2
-           bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
            8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar  # for test suite
            odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar  # for test suite
            185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -91,7 +89,6 @@
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860'
             '7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f'
-            'd0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a'
             'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
             '702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
@@ -207,7 +204,7 @@
 		--with-system-beanshell \
 		--with-system-cppunit\
 		--with-system-graphite\
-		--without-system-glm \
+		--with-system-glm \
 		--with-system-libwpg \
 		--with-system-libwps \
 		--with-system-redland\
@@ -276,8 +273,8 @@
 		'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
 		'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu' 
 		'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
-		'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
-		'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
+		'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
+		'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
 		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
 		'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
 		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme'