Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2007 from ayhanyalcinsoy/master

Browse Source 
libreoffice:version bump to 5.2.0.1
This commit is contained in:
yusuf
2016-06-26 17:19:34 +03:00
committed by GitHub
parent 1234b0aaaa 3cc0da29dc
commit 364832c5ab
3 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/libreoffice/libreoffice/actions.py
+8 -8
View File
@@ -19,7 +19,7 @@ def setup():
shelltools.system('sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac') shelltools.system('sed -i "s:mdds >= 0.12.0:mdds-1.0 >= 0.12.0:g" configure.ac')
shelltools.chmod("%s/bin/unpack-sources" % OurWorkDir) shelltools.chmod("%s/bin/unpack-sources" % OurWorkDir)
shelltools.export("LO_PREFIX", "/usr") shelltools.export("LO_PREFIX", "/usr")
shelltools.export("PYTHON", "python2.7") shelltools.export("PYTHON", "python3.4")
shelltools.cd(OurWorkDir) shelltools.cd(OurWorkDir)
shelltools.touch("autogen.lastrun") shelltools.touch("autogen.lastrun")
@@ -28,14 +28,14 @@ def setup():
-i svl/source/misc/gridprinter.cxx') -i svl/source/misc/gridprinter.cxx')
shelltools.system('./autogen.sh \ shelltools.system('./autogen.sh \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--with-vendor=PisiLinux \ --with-vendor=PisiLinux \
--with-lang="ALL" \ --with-lang="ALL" \
--disable-gtk3 \ --enable-gtk3 \
--with-help \ --with-help \
--with-myspell-dicts \ --with-myspell-dicts \
--with-alloc=system \ --with-alloc=system \
--with-java \ --with-java \
--without-system-dicts \ --without-system-dicts \
--disable-postgresql-sdbc \ --disable-postgresql-sdbc \
--enable-release-build=yes \ --enable-release-build=yes \
office/libreoffice/libreoffice/files/make-pyuno-work-with-system-wide-module-install.diff
+44
View File
@@ -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"
office/libreoffice/libreoffice/pspec.xml
+14 -6
View File
@@ -13,12 +13,13 @@
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<Summary>LibreOffice office suite</Summary> <Summary>LibreOffice office suite</Summary>
<Description>LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office.</Description> <Description>LibreOffice is an open source, multi-platform office productivity suite. It includes key desktop applications such as a word processor, a spreadsheet application, a presentation creator-viewer, a formula editor and a drawing program, with a user interface and feature set similar to other office suites. Sophisticated and flexible, LibreOffice also works transparently with a variety of file formats, including those of Microsoft Office.</Description>
<Archive sha1sum="7f8ebce9509ff9a6c9c47159c09983daffbb738f" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-5.1.2.2.tar.xz</Archive> <Archive sha1sum="771c4c748a738cdd4107a2a1b9f008700ffcbf28" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.2.0/libreoffice-5.2.0.1.tar.xz</Archive>
<Archive sha1sum="1e7f0de6f58d61b4e12ab48b3f8bd9cecc357cb6" type="binary" target="libreoffice-5.1.2.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-help-5.1.2.2.tar.xz</Archive> <Archive sha1sum="8cdc115478e3ddaec5842ff3f411b3c2eb557504" type="binary" target="libreoffice-5.2.0.1/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.2.0/libreoffice-help-5.2.0.1.tar.xz</Archive>
<Archive sha1sum="4b5f24eeed0e5f9ade9e46cf2b25ab7552e18162" type="binary" target="libreoffice-5.1.2.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-dictionaries-5.1.2.2.tar.xz</Archive> <Archive sha1sum="db1ce96dadd1e2df00f497efdc2c7c7773c0b6a0" type="binary" target="libreoffice-5.2.0.1/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.2.0/libreoffice-dictionaries-5.2.0.1.tar.xz</Archive>
<Archive sha1sum="3c094c272f12b5cd54861f294886a97ad0b62b70" type="binary" target="libreoffice-5.1.2.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.1.2/libreoffice-translations-5.1.2.2.tar.xz</Archive> <Archive sha1sum="9507598f599bb23229aa5beb3488d45bddc446e8" type="binary" target="libreoffice-5.2.0.1/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.2.0/libreoffice-translations-5.2.0.1.tar.xz</Archive>
<Patches> <Patches>
<Patch level="1">remove_unnecessary_orcus_external_usage_from_makefiles.diff</Patch> <Patch>make-pyuno-work-with-system-wide-module-install.diff</Patch>
<Patch>remove_unnecessary_orcus_external_usage_from_makefiles.diff</Patch>
</Patches> </Patches>
<BuildDependencies> <BuildDependencies>
<Dependency>ant</Dependency> <Dependency>ant</Dependency>
@@ -50,7 +51,7 @@
<Dependency>libXcomposite-devel</Dependency> <Dependency>libXcomposite-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency> <Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>gst-plugins-base-next-devel</Dependency> <Dependency>gst-plugins-base-next-devel</Dependency>
<!-- <Dependency versionFrom="3.18.6">gtk3-devel</Dependency> --><!--gtk3 desteği tamamlandığında açılacak--> <Dependency versionFrom="3.18.6">gtk3-devel</Dependency>
<Dependency versionFrom="2.24.28">gtk2-devel</Dependency> <Dependency versionFrom="2.24.28">gtk2-devel</Dependency>
<Dependency>libatomic_ops-devel</Dependency> <Dependency>libatomic_ops-devel</Dependency>
<Dependency>librsvg-devel</Dependency> <Dependency>librsvg-devel</Dependency>
@@ -3107,6 +3108,13 @@
</Package> </Package>
<History> <History>
<Update release="3">
<Date>2016-06-26</Date>
<Version>5.2.0.1</Version>
<Comment>Release Bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="2"> <Update release="2">
<Date>2016-06-09</Date> <Date>2016-06-09</Date>
<Version>5.1.2.2</Version> <Version>5.1.2.2</Version>