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

[andyrtr at archlinux.org]

    Date: Monday, February 20, 2012 @ 16:00:26
  Author: andyrtr
Revision: 150703

upgpkg: libreoffice 3.5.0-2

add postgresql-connector package, FS#28457; use system boost again

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-20 20:55:17 UTC (rev 150702)
+++ PKGBUILD	2012-02-20 21:00:26 UTC (rev 150703)
@@ -14,18 +14,19 @@
 	'libreoffice-sdk-doc'
 	'libreoffice-writer'
 	'libreoffice-en-US'
+	'libreoffice-postgresql-connector'
 	'libreoffice-extension-pdfimport'
 	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder')
 _LOver=3.5.0.3
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs'
@@ -45,7 +46,6 @@
 _additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	${_additional_source_url}/776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -77,7 +77,6 @@
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810)
 noextract=(776ad69a63ac1e99abed176e54ce25d9-libvisio-0.0.14.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -108,7 +107,6 @@
          '9df4051a689526888da0467c29186e8c'
          '8f7d2774f635f83cebc74e1d4f609d0f'
          '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
          '776ad69a63ac1e99abed176e54ce25d9'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -234,7 +232,7 @@
 		--without-system-mozilla \
 		--without-system-mozilla-headers \
 		--with-ant-home="/usr/share/java/apache-ant"\
-		--without-system-boost\
+		--with-system-boost\
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mythes\
@@ -340,7 +338,7 @@
 package_libreoffice-base() {
  pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
  depends=('libreoffice-common')
- optdepends=()
+ optdepends=('libreoffice-postgresql-connector')
  backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
@@ -359,6 +357,35 @@
  done
 }
 
+package_libreoffice-postgresql-connector() {
+ pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
+ depends=('libreoffice-base' 'postgresql-libs')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # no file-list so far
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
+ install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
+ 
+# # create directories from *list.txt file
+# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   install -dm755 ${pkgdir}/${directory/\%dir/}
+# done
+# # install files into the pkg from fakeinstall dir
+# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+#   dirname=`dirname $file`
+#   # check if directory has been already been created - some are missing like manpages
+#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+#   # mv file from fakeinstall to pkgdir
+#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+# done
+}
+
 package_libreoffice-calc() {
  pkgdesc="Spreadsheet application for LibreOffice."
  depends=('libreoffice-common' 'lpsolve' )