Fri Oct 5 01:33:01 PDT 2012

2 files changed, 70 insertions, 32 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index e53c4c31d..2e6c051f7 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166171 2012-09-05 06:03:48Z andyrtr $
+# $Id: PKGBUILD 167978 2012-10-04 14:32:20Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -23,10 +23,10 @@ pkgname=('libreoffice-common'
 	'libreoffice-scripting-javascript'
 	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
-_LOver=3.6.1.2
-pkgver=3.6.1
-pkgrel=4
+	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
+_LOver=3.6.2.2
+pkgver=3.6.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -35,7 +35,6 @@ makedepends=( # makedepends
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-              #'saxon' - currently broken 
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
@@ -81,8 +80,8 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
 	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	make-pyuno-work-with-system-wide-module-install.diff
 	buildfix.diff
-	git_fixes.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
@@ -114,9 +113,9 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('3ddcf145b74daa4361e48dafe97e7d21'
-         '7966e66099729d23d9ee594f526a50ed'
-         '2555590c1b4395857fc5c469f7f1bd0c'
+md5sums=('ae171ba4633cc72dba4451b1bdd3385e'
+         'cdad0734d247d91a79cb282fd851d2a7'
+         'e9a7e3d35432b72a4603ce094deb6a67'
          '18f577b374d60b3c760a3a3350407632'
          'f02578f5218f217a9f20e9c30e119c6a'
          '94e7f271e38c976462558b4278590178'
@@ -147,8 +146,8 @@ md5sums=('3ddcf145b74daa4361e48dafe97e7d21'
          '0d2dcdfbf28d6208751b33057f5361f0'
          'ce5a1def34578b75959ac31210f031f6'
          '185d60944ea767075d27247c3162b3bc'
+         '97bf43dda273d79ff90c848ab53b0e3c'
          '234e91ac65945ce1ab1e3839780e90f7'
-         '2445aca137bdbf0cf7526e91f768a1d0'
          'abcb1b0a7deaffe13ab3d7ca70becb49'
          '72790a4103da259a55cadd66db931d00')
 
@@ -171,8 +170,10 @@ build() {
 	ln -s ../libreoffice-translations-$_LOver/translations .
 
 	# buildfixes & bugfixes
-    patch -Np1 -i ${srcdir}/buildfix.diff
-    patch -Np1 -i ${srcdir}/git_fixes.diff
+    patch -Np1 -i ${srcdir}/buildfix.diff	# leaves out a broken pdfimport test
+    
+    # fix not upstreamable pyuno paths - patch taken from Debian
+    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
     
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
@@ -266,7 +267,7 @@ build() {
 	make
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
+	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
 }
 
 #check() {
@@ -281,7 +282,6 @@ package_libreoffice-common() {
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
           'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'libcups:          adds printing support'
@@ -373,27 +373,22 @@ package_libreoffice-postgresql-connector() {
  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
+ # workaround double entries in the file list
+ mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig
+ sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt
  
  # 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
+ 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`
+ 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
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
    # mv file from fakeinstall to pkgdir
-#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
-# done
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
 }
 
 package_libreoffice-calc() {
@@ -550,7 +545,6 @@ package_libreoffice-sdk() {
  done
  
   # fix environment path to keep compatibility with openjdk6 and openjdk7
-  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
   sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
 }
 
diff --git a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
new file mode 100644
index 000000000..e86548136
--- /dev/null
+++ b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index defd7b2..ea2a809 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
+     exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|FreeBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
+index f93ac5e..92a2891 100644
+--- a/pyuno/source/module/uno.py
++++ b/pyuno/source/module/uno.py
+@@ -26,8 +26,12 @@
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
++import os
+ import sys
+ 
++sys.path.append('/usr/lib/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc"
+ import pyuno
+ 
+ try:
+diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
+index 610ac5f..df243d0 100755
+--- a/scripting/source/pyprov/officehelper.py
++++ b/scripting/source/pyprov/officehelper.py
+@@ -53,7 +53,7 @@ def bootstrap():
+         if "UNO_PATH" in os.environ:
+             sOffice = os.environ["UNO_PATH"]
+         else:
+-            sOffice = "" # lets hope for the best
++            sOffice = "/usr/lib/libreoffice/program"
+         sOffice = os.path.join(sOffice, "soffice")
+         if platform.startswith("win"): 
+             sOffice += ".exe"