[arch-commits] Commit in libreoffice-fresh/trunk (8 files)
Andreas Radke
andyrtr at nymeria.archlinux.org
Thu May 22 20:52:19 UTC 2014
Date: Thursday, May 22, 2014 @ 22:52:19
Author: andyrtr
Revision: 213397
prepare next major update - 4.3.0.0.beta1
Added:
libreoffice-fresh/trunk/libreoffice-base.install
libreoffice-fresh/trunk/libreoffice-calc.install
libreoffice-fresh/trunk/libreoffice-common.install
libreoffice-fresh/trunk/libreoffice-draw.install
libreoffice-fresh/trunk/libreoffice-impress.install
libreoffice-fresh/trunk/libreoffice-writer.install
libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff
Modified:
libreoffice-fresh/trunk/PKGBUILD
------------------------------------------------------+
PKGBUILD | 78 +++++++++++++----
libreoffice-base.install | 11 ++
libreoffice-calc.install | 11 ++
libreoffice-common.install | 47 ++++++++++
libreoffice-draw.install | 11 ++
libreoffice-impress.install | 11 ++
libreoffice-writer.install | 11 ++
make-pyuno-work-with-system-wide-module-install.diff | 44 +++++++++
8 files changed, 208 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-22 20:00:32 UTC (rev 213396)
+++ PKGBUILD 2014-05-22 20:52:19 UTC (rev 213397)
@@ -29,11 +29,11 @@
'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
'clucene' 'junit' 'libmythes' 'libwpg' 'mesa' 'clucene'
'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
- 'gdb' 'doxygen' 'libatomic_ops' 'glew' 'apr' 'serf'
+ 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' 'apr' 'serf'
# the runtime dependencies
"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>=52.1"
+ 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' 'icu'
'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
'libcdr' 'libmspub'
@@ -55,7 +55,6 @@
_additional_source_url2="http://dev-www.libreoffice.org/extern"
source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
${_additional_source_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
- ${_additional_source_url}/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -75,7 +74,6 @@
${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${_additional_source_url}/47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
@@ -92,13 +90,14 @@
${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
${_additional_source_url}/CoinMP-1.7.6.tgz
${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip # don't use system glm! LibO patches it!
+ ${_additional_source_url}/collada2gltf-master-6258611a6a.tar.bz2
+ ${_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
- prevent_KDE_Qt_from_interfering_with_the_session_manager.diff)
+ libreoffice-common.sh libreoffice-common.csh)
noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
185d60944ea767075d27247c3162b3bc-unowinreg.dll
- 47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
@@ -132,7 +131,58 @@
language-subtag-registry-2014-03-27.tar.bz2
8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
CoinMP-1.7.6.tgz
- bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip)
+ bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+ collada2gltf-master-6258611a6a.tar.bz2
+ OpenCOLLADA-master-6509aa13af.tar.bz2
+ 510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2)
+md5sums=('c98ff0989252558dc21b71ec5e32049f'
+ 'SKIP'
+ '5b3b55d75a9659dace93900c3e88d6a9'
+ 'SKIP'
+ '507657907ee417631287c79deb44cfc8'
+ 'SKIP'
+ 'd6eef4b4cacb2183f2bf265a5a03a354'
+ '1f24ab1d39f4a51faf22244c94a6203f'
+ '35c94d2df8893241173de1d16b6034c0'
+ '798b2ffdc8bcfe7bca2cf92b62caf685'
+ 'a7983f859eafb2677d7ff386a023bc40'
+ 'e8e197d628436490886d17cffa108fe3'
+ '8ab049135b2d15313da5d9f0656894a1'
+ '2c9b0f83ed5890af02c0df1c1776f39b'
+ '048751f3271906db5126ab76870444c4'
+ 'eeb2c7ddf0d302fba4bfc6e97eac9624'
+ '39bb3fcea1514f1369fcfc87542390fd'
+ '3404ab6b1792ae5f16bbd603bd1e1d03'
+ '97b2d4dba862397f446b217e2b623e71'
+ 'f94d9870737518e3b597f9265f4e9803'
+ '8ce2fcd72becf06c41f7201d15373ed9'
+ 'd8bd5eed178db6e2b18eeed243f85aa8'
+ '3bdf40c0d199af31923e900d082ca2dd'
+ 'ace6ab49184e329db254e454a010f56d'
+ 'db60e4fde8dd6d6807523deb71ee34dc'
+ 'ba2930200c9f019c2d93a8c88c651a0f'
+ 'ae330b9493bd4503ac390106ff6060d7'
+ '22f8a85daf4a012180322e1f52a7563b'
+ '7681383be6ce489d84c1c74f4e7f9643'
+ '36271d3fa0d9dec1632029b6d7aac925'
+ '0168229624cfac409e766913506961a8'
+ '17410483b5b5f267aa18b7e00b65e6e0'
+ '185d60944ea767075d27247c3162b3bc'
+ 'd794625f156a9fb1c53b3f8a8aa13b5e'
+ '496dd00028afcc19f896b01394769043'
+ '21154d2004e025c8a3666625b0357bb5'
+ '2f1ceaf2ac8752ed278e175447d9b978'
+ '40fa48e03b1e28ae0325cc34b35bc46d'
+ '504af523f5d1a5590bbeb6a4b55e8a97'
+ '8ac8ae9829c4fefd1ae9f715f95d4e0b'
+ '1cce53bf4b40ae29790d2c5c9f8b1129'
+ 'bae83fa5dc7f081768daace6e199adc3'
+ 'c8a8be5829ceffacfe1d68d078f5c442'
+ '4ca8a6ef0afeefc864e9ef21b9f14bd6'
+ '510c3f8504bfb8cc8c8fc5d0fac74055'
+ '07d2bf5ad839a394cca008b3ec6e7bb1'
+ '4195735a80876ae812fca5736b50192a'
+ 'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
prepare() {
@@ -153,11 +203,7 @@
# fix not upstreamable pyuno paths - patch taken from Debian
patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-
- # fix some startup issues with kde4 integration
- # https://bugs.archlinux.org/task/39819 - https://bugs.freedesktop.org/show_bug.cgi?id=77128
-# patch -Np1 -i ${srcdir}/prevent_KDE_Qt_from_interfering_with_the_session_manager.diff
-
+
#use the CFLAGS but remove the LibO overridden ones
for i in $CFLAGS; do
case "$i" in
@@ -216,7 +262,7 @@
--without-fonts\
--with-system-apr \
--with-system-libcdr \
- --without-system-mdds\
+ --with-system-mdds\
--without-myspell-dicts \
--with-system-libvisio \
--without-system-libcmis \
@@ -250,7 +296,7 @@
--without-system-npapi-headers \
--with-ant-home="/usr/share/apache-ant"\
--without-system-boost\
- --without-system-icu \
+ --with-system-icu \
--with-system-cairo\
--with-system-libs\
--with-system-mythes\
@@ -284,7 +330,7 @@
install=libreoffice-common.install
depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen'
- 'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" #"icu>=52.1"
+ 'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" 'icu'
#'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
'libodfgen' 'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
'libmspub' 'libcdr' 'glew' # 'apr' 'serf' ?
Added: libreoffice-base.install
===================================================================
--- libreoffice-base.install (rev 0)
+++ libreoffice-base.install 2014-05-22 20:52:19 UTC (rev 213397)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Added: libreoffice-calc.install
===================================================================
--- libreoffice-calc.install (rev 0)
+++ libreoffice-calc.install 2014-05-22 20:52:19 UTC (rev 213397)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Added: libreoffice-common.install
===================================================================
--- libreoffice-common.install (rev 0)
+++ libreoffice-common.install 2014-05-22 20:52:19 UTC (rev 213397)
@@ -0,0 +1,47 @@
+post_install() {
+
+xdg-icon-resource forceupdate --theme hicolor
+update-desktop-database -q
+update-mime-database usr/share/mime > /dev/null 2>&1
+
+echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
+echo "-------------------------------------------------------------------"
+echo "LibreOffice has been split into several packages:"
+echo "- libreoffice-common"
+echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
+echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
+echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+echo " the LibreOffice APIs and for creating"
+echo " extensions (UNO components)."
+echo "-------------------------------------------------------------------"
+echo " * you need to install at least one libreoffice-langpack"
+echo " * you may want to pacman -Ss libreoffice-extensions"
+echo " to see what additional 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)"
+}
+
+post_upgrade() {
+# post_install $1
+xdg-icon-resource forceupdate --theme hicolor
+update-desktop-database -q
+update-mime-database usr/share/mime > /dev/null 2>&1
+ if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
+ # important upgrade notice
+ echo "LibreOffice has been split into several packages:"
+ echo "- libreoffice-common"
+ echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
+ echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
+ echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+ echo " the LibreOffice APIs and for creating"
+ echo " extensions (UNO components)."
+ echo "Now you need to install at least one libreoffice-langpack!"
+ fi
+}
+
+post_remove() {
+update-desktop-database -q
+xdg-icon-resource forceupdate --theme hicolor
+update-mime-database usr/share/mime > /dev/null 2>&1
+}
Added: libreoffice-draw.install
===================================================================
--- libreoffice-draw.install (rev 0)
+++ libreoffice-draw.install 2014-05-22 20:52:19 UTC (rev 213397)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Added: libreoffice-impress.install
===================================================================
--- libreoffice-impress.install (rev 0)
+++ libreoffice-impress.install 2014-05-22 20:52:19 UTC (rev 213397)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Added: libreoffice-writer.install
===================================================================
--- libreoffice-writer.install (rev 0)
+++ libreoffice-writer.install 2014-05-22 20:52:19 UTC (rev 213397)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Added: make-pyuno-work-with-system-wide-module-install.diff
===================================================================
--- make-pyuno-work-with-system-wide-module-install.diff (rev 0)
+++ make-pyuno-work-with-system-wide-module-install.diff 2014-05-22 20:52:19 UTC (rev 213397)
@@ -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/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
+@@ -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"
More information about the arch-commits
mailing list