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

[Andreas Radke]

    Date: Saturday, August 18, 2018 @ 19:36:52
  Author: andyrtr
Revision: 332508

upgpkg: libreoffice-still 6.0.6-2

drop kde4 libs based vcl, add missing gpgme dep; add ttf-carlito makedep tu run some more tests

Modified:
  libreoffice-still/trunk/PKGBUILD
  libreoffice-still/trunk/libreoffice-still.csh
  libreoffice-still/trunk/libreoffice-still.sh

-----------------------+
 PKGBUILD              |   19 +++++++++----------
 libreoffice-still.csh |    1 -
 libreoffice-still.sh  |    1 -
 3 files changed, 9 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-18 17:35:40 UTC (rev 332507)
+++ PKGBUILD	2018-08-18 19:36:52 UTC (rev 332508)
@@ -13,7 +13,7 @@
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=6.0.6.2
 pkgver=6.0.6
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -24,12 +24,12 @@
 	'libmspub' 'harfbuzz-icu' 'glew' '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'
-	'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' 
+	'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' 'libxinerama' 'libpagemaker' # 'glm'
+	'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker'
 	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 
-	'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient'
+	'libexttextcat' 'libcmis' 'gobject-introspection'
 	'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode' 
 	'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice'
 )
@@ -97,8 +97,8 @@
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
             '8b4815788be087940750b775690b5890c4cf9e121f11006a72ccab834f212abb'
-            '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
-            'd24cfcb556ae1db02087c49012bbc4621f9ef7e3465ca832e1410326d260f283')
+            '52e90a5a3d8d5b626caa51675b601aba508463c2b9caa98d07cfa35220fc0b22'
+            '531de4133cb6ff5c841e4251fdafe69521ccd195f5933eb8c113291d3eff183a')
 
 prepare() {
 
@@ -166,7 +166,7 @@
 		--enable-dbus \
 		--enable-evolution2\
 		--enable-gio\
-		--enable-kde4\
+		--disable-kde4\
 		--enable-gtk3 \
 		--enable-introspection \
 		--disable-gstreamer-0-10 \
@@ -280,7 +280,7 @@
 		'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'
 		'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
 		'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
-		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec'
+		'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme'
 		'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy')
 	optdepends=('java-runtime:     adds java support'
 		'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
@@ -295,8 +295,7 @@
 		'postgresql-libs:  for postgresql-connector'
 		'coin-or-mp:	   required by the Calc solver'
 		'gtk2:             for GTK2 integration'
-		'gtk3:             for GTK3 integration'
-		'kdelibs:          for KDE desktop integration')
+		'gtk3:             for GTK3 integration')
 	backup=(etc/libreoffice/sofficerc
 		etc/libreoffice/bootstraprc
 		etc/libreoffice/psprint.conf

Modified: libreoffice-still.csh
===================================================================
--- libreoffice-still.csh	2018-08-18 17:35:40 UTC (rev 332507)
+++ libreoffice-still.csh	2018-08-18 19:36:52 UTC (rev 332508)
@@ -1,6 +1,5 @@
 # to force a certain look'n feel
 
 #setenv SAL_USE_VCLPLUGIN gen
-#setenv SAL_USE_VCLPLUGIN kde4
 #setenv SAL_USE_VCLPLUGIN gtk
 #setenv SAL_USE_VCLPLUGIN gtk3

Modified: libreoffice-still.sh
===================================================================
--- libreoffice-still.sh	2018-08-18 17:35:40 UTC (rev 332507)
+++ libreoffice-still.sh	2018-08-18 19:36:52 UTC (rev 332508)
@@ -1,6 +1,5 @@
 # to force a certain look'n feel
 
 #export SAL_USE_VCLPLUGIN=gen
-#export SAL_USE_VCLPLUGIN=kde4
 #export SAL_USE_VCLPLUGIN=gtk
 #export SAL_USE_VCLPLUGIN=gtk3