mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
extra/libreoffice-fresh to 4.4.0-2
This commit is contained in:
parent
e5f23039be
commit
bb5731312c
3 changed files with 15 additions and 72 deletions
|
@ -11,7 +11,7 @@ pkgbase=libreoffice-fresh
|
|||
pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
|
||||
_LOver=4.4.0.3
|
||||
pkgver=4.4.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('i686' 'x86_64')
|
||||
license=('LGPL3')
|
||||
url="http://www.libreoffice.org/"
|
||||
|
@ -19,10 +19,10 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'lib
|
|||
'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
|
||||
'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
|
||||
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
|
||||
'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
|
||||
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
|
||||
'desktop-file-utils' 'shared-mime-info' 'gtk2' 'xdg-utils' 'gst-plugins-base-libs'
|
||||
'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
|
||||
'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
|
||||
'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
|
||||
'junit' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
|
||||
'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew'
|
||||
'apr' 'serf' 'chrpath' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
|
||||
|
@ -67,7 +67,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
|
|||
${_additional_source_url}/libfreehand-0.1.0.tar.bz2
|
||||
${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
|
||||
${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
make-pyuno-work-with-system-wide-module-install_LibO44.diff
|
||||
make-pyuno-work-with-system-wide-module-install.diff
|
||||
libreoffice-fresh.sh libreoffice-fresh.csh)
|
||||
noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
|
||||
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||
|
@ -164,7 +164,7 @@ prepare() {
|
|||
cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
|
||||
|
||||
# fix not upstreamable pyuno paths - patch taken from Debian
|
||||
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install_LibO44.diff
|
||||
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
|
||||
|
@ -211,7 +211,8 @@ build() {
|
|||
--enable-kde4\
|
||||
--enable-gtk3 \
|
||||
--disable-gstreamer-0-10 \
|
||||
--enable-lockdown\
|
||||
--disable-gconf \
|
||||
--disable-lockdown \
|
||||
--enable-openssl \
|
||||
--enable-odk\
|
||||
--enable-orcus \
|
||||
|
@ -289,8 +290,8 @@ build() {
|
|||
package_libreoffice-fresh-sdk() {
|
||||
pkgdesc="Software Development Kit for LibreOffice Fresh"
|
||||
depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
|
||||
provides=('libreoffice-sdk' 'libreoffice-sdk-doc' 'libreoffice-still-sdk' 'libreoffice-still-sdk-doc')
|
||||
conflicts=('libreoffice-sdk' 'libreoffice-sdk-doc' 'libreoffice-still-sdk' 'libreoffice-still-sdk-doc')
|
||||
provides=('libreoffice-sdk')
|
||||
conflicts=('libreoffice-still-sdk')
|
||||
|
||||
for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
|
||||
install -dm755 ${pkgdir}/${dir/\%dir/}
|
||||
|
@ -316,7 +317,7 @@ package_libreoffice-fresh() {
|
|||
'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
|
||||
'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
|
||||
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
|
||||
'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
|
||||
'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
|
||||
'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'libpagemaker'
|
||||
'gst-plugins-base-libs' 'libxinerama' 'libabw' 'libmwaw' 'libe-book')
|
||||
optdepends=('java-runtime: adds java support'
|
||||
|
@ -341,22 +342,8 @@ package_libreoffice-fresh() {
|
|||
etc/profile.d/libreoffice-fresh.sh
|
||||
etc/profile.d/libreoffice-fresh.csh)
|
||||
install=$pkgbase.install
|
||||
provides=('libreoffice' 'libreoffice-common' 'libreoffice-base' 'libreoffice-calc'
|
||||
'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress'
|
||||
'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer'
|
||||
'libreoffice-postgresql-connector' 'libreoffice-extension-wiki-publisher'
|
||||
'libreoffice-extension-nlpsolver' 'libreoffice-en-US')
|
||||
conflicts=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc'
|
||||
'libreoffice-draw' 'libreoffice-gnome' 'libreoffice-impress'
|
||||
'libreoffice-kde4' 'libreoffice-math' 'libreoffice-writer'
|
||||
'libreoffice-extension-wiki-publisher' 'libreoffice-postgresql-connector'
|
||||
'libreoffice-extension-nlpsolver' 'libreoffice-en-US'
|
||||
'libreoffice-still-common' 'libreoffice-still-base' 'libreoffice-still-calc'
|
||||
'libreoffice-still-draw' 'libreoffice-still-gnome' 'libreoffice-still-impress'
|
||||
'libreoffice-still-kde4' 'libreoffice-still-math' 'libreoffice-still-writer'
|
||||
'libreoffice-still-extension-wiki-publisher' 'libreoffice-still-postgresql-connector'
|
||||
'libreoffice-still-extension-nlpsolver' 'libreoffice-still-en-US')
|
||||
replaces=('libreoffice-fresh-en-US')
|
||||
provides=('libreoffice' 'libreoffice-en-US')
|
||||
conflicts=('libreoffice-still')
|
||||
|
||||
mv fakeinstall/* ${pkgdir}/
|
||||
|
||||
|
|
|
@ -29,10 +29,10 @@ index f93ac5e..92a2891 100644
|
|||
import pyuno
|
||||
|
||||
try:
|
||||
diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
|
||||
diff --git a/pyuno/source/officehelper.py b/pyuno/source/officehelper.py
|
||||
index 610ac5f..df243d0 100755
|
||||
--- a/scripting/source/pyprov/officehelper.py
|
||||
+++ b/scripting/source/pyprov/officehelper.py
|
||||
--- 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"]
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
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"
|
Loading…
Reference in a new issue