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

[Andreas Radke]

    Date: Saturday, May 24, 2014 @ 22:45:56
  Author: andyrtr
Revision: 213561

fix deps, fix insecure rpath

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-24 19:12:43 UTC (rev 213560)
+++ PKGBUILD	2014-05-24 20:45:56 UTC (rev 213561)
@@ -11,21 +11,23 @@
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 depends=("curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
-		 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
-		 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' 'icu'
-		 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite'
+		 'libwps' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' #'libxaw' 
+		 'libgl' 'dbus-glib' 'libxslt' 'redland' 'icu' #'librsvg' 
+		 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' # 'libtextcat' 
 		 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
-		 'libcdr' 'libmspub'
+		 'libcdr' 'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene'
+		 # 'lpsolve' ? calc
 		 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
-		 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib'
-		 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests
-	     'git')
+		 'gtk2' 'xdg-utils' #'telepathy-glib' 'orbit2' 'translate-toolkit' 
+		 'gst-plugins-base-libs' 'glu')
 makedepends=('sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
 			 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
-			 'clucene' 'junit' 'libmythes' 'libwpg'  'mesa' 'clucene'
+			 'clucene' 'junit' 'libmythes' 'libwpg'  'mesa'
 			 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
-			 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew' 'apr' 'serf')
-optdepends=('libreoffice-langpack: additional language support'
+			 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew' 'apr' 'serf'
+			 'ttf-liberation' # to satisfy regression tests
+			 'chrpath')
+optdepends=('libreoffice-fresh-langpack: additional language support'
             'java-runtime:     adds java support'
             'java-environment:	required by extension-wiki-publisher and extension-nlpsolver'
             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
@@ -37,13 +39,19 @@
             'sane:             for scanner access'
             'unixodbc:         adds ODBC database support'
             'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-            'gtk2:             for browser plugin'
-            'libpaper:         takes care of papersize')
+            #'gtk2:             for browser plugin and old gtk2 desktop integration'
+            'libpaper:         takes care of papersize'
+            'postgresql-libs:  for postgresql-connector'
+            'gtk3:             for gtk3 Gnome integration'
+            'kdelibs:          for kde desktop integration'
+            'make:             for use in SDK'
+            'gcc:              for use in SDK'
+            'zip:              for use in SDK')
 backup=(etc/libreoffice/sofficerc
         etc/libreoffice/bootstraprc
         etc/libreoffice/psprint.conf
-        etc/profile.d/libreoffice-common.sh
-        etc/profile.d/libreoffice-common.csh)
+        etc/profile.d/libreoffice-fresh.sh
+        etc/profile.d/libreoffice-fresh.csh)
 install=$pkgname.install
 provides=('libreoffice-common' 	'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome'
           'libreoffice-impress'	'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk'	'libreoffice-sdk-doc'
@@ -99,7 +107,7 @@
 	${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
 	${_additional_source_url}/510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh)
+	libreoffice-fresh.sh libreoffice-fresh.csh)
 noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 	9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -323,7 +331,7 @@
 package() {
 	
 	cd libreoffice-$_LOver
-	make DESTDIR="$pkgdir/" install
+	make DESTDIR="$pkgdir/" distro-pack-install
 	
 	# put configuration files into place
 	install -dm755 ${pkgdir}/etc/libreoffice
@@ -338,7 +346,7 @@
 
 	# allow to preset desired VLC
 	install -dm755 ${pkgdir}/etc/profile.d
-	install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
+	install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/
 
 	# move bash-completion files to its new place
 	install -dm755 ${pkgdir}/usr/share/bash-completion/completions
@@ -356,8 +364,15 @@
 	# fix permissions
 	find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
 	
-	# add extensions
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+	# cleanup
+	rm -rf ${pkgdir}/usr/share/appdata
+	
+	# fix insecure rpath
+    chrpath -d $pkgdir/usr/lib/libreoffice/program/libCbc.so.3
+    chrpath -d $pkgdir/usr/lib/libreoffice/program/libOsi.so.1
+    chrpath -d $pkgdir/usr/lib/libreoffice/program/libCoinMP.so.1
+    chrpath -d $pkgdir/usr/lib/libreoffice/program/libCbcSolver.so.3
+    chrpath -d $pkgdir/usr/lib/libreoffice/program/libOsiClp.so.1
+    chrpath -d $pkgdir/usr/lib/libreoffice/program/libCgl.so.1
+    chrpath -d $pkgdir/usr/lib/libreoffice/program/libClp.so.1
 }