Âlibreoffice: first attempt to update to 4.4.4

libreoffice/Chakra.conf

@@ -1,41 +0,0 @@
---with-vendor=\"the Chakra GNU/Linux team\"
---disable-binfilter
---disable-fontooo
---disable-gnome-vfs
---enable-gio
---disable-gtk
---enable-cups
---enable-dbus
---enable-vba
---with-system-db
---with-system-curl
---with-system-expat
---with-system-freetype
---with-system-hunspell
---with-system-icu
---with-system-libwpd
---with-system-libxml
---with-system-libxslt
---with-system-mozilla=libxul
---with-system-neon
---with-system-python
---with-system-redland
---with-system-sane-header
---with-system-sndfile
---with-system-stdlibs
---with-system-xrender-headers
---with-system-zlib
---with-system-openssl
---with-system-odbc-headers
---with-jdk-home=${JAVA_HOME}
---with-system-xerces
---with-xerces-jar=/usr/share/java/xercesImpl.jar
---with-system-xalan
---with-xalan-jar=/usr/share/java/xalan.jar
---with-system-xml-apis
---with-xml-apis-jar=/usr/share/java/xml-apis.jar
---with-system-hsqldb
---with-hsqldb-jar=/usr/share/java/hsqldb.jar
---with-serializer-jar=/usr/share/java/serializer.jar
---with-use-shell=bash
---disable-dependency-tracking

libreoffice/Chakra.conf.in

@@ -1,41 +0,0 @@
---with-vendor=\"the Chakra GNU/Linux team\"
---disable-binfilter
---disable-fontooo
---disable-gnome-vfs
---enable-gio
---disable-gtk
---enable-cups
---enable-dbus
---enable-vba
---with-system-db
---with-system-curl
---with-system-expat
---with-system-freetype
---with-system-hunspell
---with-system-icu
---with-system-libwpd
---with-system-libxml
---with-system-libxslt
---with-system-mozilla=libxul
---with-system-neon
---with-system-python
---with-system-redland
---with-system-sane-header
---with-system-sndfile
---with-system-stdlibs
---with-system-xrender-headers
---with-system-zlib
---with-system-openssl
---with-system-odbc-headers
---with-jdk-home=${JAVA_HOME}
---with-system-xerces
---with-xerces-jar=/usr/share/java/xercesImpl.jar
---with-system-xalan
---with-xalan-jar=/usr/share/java/xalan.jar
---with-system-xml-apis
---with-xml-apis-jar=/usr/share/java/xml-apis.jar
---with-system-hsqldb
---with-hsqldb-jar=/usr/share/java/hsqldb.jar
---with-serializer-jar=/usr/share/java/serializer.jar
---with-use-shell=bash
---disable-dependency-tracking

libreoffice/Chakra.patch

@@ -1,11 +0,0 @@
---- patches/dev300/apply	2009-05-07 19:44:13.000000000 +0000
-+++ patches/dev300/apply.new	2009-05-11 18:46:58.108316633 +0000
-@@ -108,7 +108,7 @@
- rpl2: rPathCommon
- rpl2-64: rPathCommon
- # ArchLinux
--ArchLinux: LinuxCommon
-+Chakra: LinuxCommon, NotDebian, CairoFonts, Shrink
- # Win32
- Win32 : Win32Common
- # translate.org.za

libreoffice/buildfix_64bit_system_libjpeg.diff

@@ -1,11 +0,0 @@
---- solenv/inc/libs.mk	2009-07-02 09:44:33.084467312 +0000
-+++ solenv/inc/libs.mk.new	2009-07-02 10:44:03.420819776 +0000
-@@ -211,7 +211,7 @@
- .IF "$(OS)" == "FREEBSD"
- JPEG3RDLIB=/usr/local/lib/libjpeg.so
- .ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
--JPEG3RDLIB=/usr/lib64/libjpeg.so
-+JPEG3RDLIB=/usr/lib/libjpeg.so
- .ELSE
- JPEG3RDLIB=/usr/lib/libjpeg.so
- .ENDIF

libreoffice/libreoffice.install

@@ -1,24 +1,21 @@
 post_install() {
 
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-update-desktop-database -q
 update-mime-database usr/share/mime > /dev/null 2>&1
+kbuildsycoca4 --noincremental &> /dev/null
 
-echo " * You may want to use pacman -Ss libreoffice-extensions"
+echo " * You may want to pacman -Ss libreoffice-extensions"
 echo "   to see what extensions are prepared to install"
 echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
+echo " * make sure you have installed some ttf fonts (ttf-dejavu recommended)"
 }
 
 post_upgrade() {
 #  post_install $1
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-update-desktop-database -q
 update-mime-database usr/share/mime > /dev/null 2>&1
+kbuildsycoca4 --noincremental &> /dev/null
 }
 
 post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
 update-mime-database usr/share/mime > /dev/null 2>&1
+kbuildsycoca4 --noincremental &> /dev/null
 }

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 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
++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/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
+index 610ac5f..df243d0 100755
+--- a/pyuno/source/officehelper.py
++++ b/pyuno/source/officehelper.py
+@@ -44,7 +44,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"