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

Merge pull request #1111 from namso-01/master

Browse Source 
libreoffice: version bump 5.1.0.2
This commit is contained in:
Ertuğrul Erata
2016-01-25 22:34:29 +02:00
parent cd5a63071f e8ce396d67
commit b7c49dfc5d
10 changed files with 70 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/gtk/gtk3/pspec.xml
+9 -2
View File
@@ -11,7 +11,7 @@
<License>LGPLv2.1</License>
<Summary>The GIMP Toolkit version 3</Summary>
<Description>GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites.</Description>
<Archive sha1sum="a8516710bd1f5551244a66f7f7348a0605a6326b" type="tarxz">mirrors://gnome/gtk+/3.16/gtk+-3.16.4.tar.xz</Archive>
<Archive sha1sum="e7dd8a397031316c57b845bc76744ed5886385b1" type="tarxz">mirrors://gnome/gtk+/3.18/gtk+-3.18.6.tar.xz</Archive>
<BuildDependencies>
<Dependency>atk-devel</Dependency>
<Dependency>cups-devel</Dependency>
@@ -203,7 +203,14 @@
</Files>
</Package-->
<History>
<History>
<Update release="12">
<Date>2016-01-25</Date>
<Version>3.18.6</Version>
<Comment>Version bump.</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="11">
<Date>2015-07-07</Date>
<Version>3.16.4</Version>
desktop/toolkit/gtk/pango/actions.py
+2 -3
View File
@@ -19,7 +19,6 @@ def setup():
autotools.configure("--disable-static \
--sysconfdir=/etc \
--disable-gtk-doc \
--with-included-modules=basic-fc \
--%sable-introspection" % ("dis" if get.buildTYPE()=="emul32" else "en"))
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
@@ -31,8 +30,8 @@ def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
if get.buildTYPE()=="emul32":
shelltools.move("pango/.libs/pango-querymodules", "pango/.libs/pango-querymodules-32")
pisitools.dobin("pango/.libs/pango-querymodules-32")
#shelltools.move("pango/.libs/pango-querymodules", "pango/.libs/pango-querymodules-32")
#pisitools.dobin("pango/.libs/pango-querymodules-32")
return
pisitools.dodir("/etc/pango")
desktop/toolkit/gtk/pango/pspec.xml
+11 -7
View File
@@ -13,10 +13,8 @@
<IsA>library</IsA>
<Summary>Text rendering and layout library</Summary>
<Description>Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x.</Description>
<Archive sha1sum="c6ba02ee8f9d8b22b7cfd74c4b6ae170bebc8d2b" type="tarxz">mirrors://gnome/pango/1.36/pango-1.36.8.tar.xz</Archive>
<Archive sha1sum="13fc65cdd50d0a79d35f9d33a8d36144d091a533" type="tarxz">mirrors://gnome/pango/1.38/pango-1.38.1.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="1.20">gtk-doc</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>freetype-devel</Dependency>
<Dependency>cairo-devel</Dependency>
@@ -24,11 +22,10 @@
<Dependency>harfbuzz-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency>libXrender-devel</Dependency>
<Dependency versionFrom="1.20">gtk-doc</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency versionFrom="2.46.2">glib2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">pango-1.32.1-lib64.patch</Patch>
</Patches>
</Source>
<Package>
@@ -123,7 +120,14 @@
</Files>
</Package>
<History>
<History>
<Update release="12">
<Date>2016-01-25</Date>
<Version>1.38.1</Version>
<Comment>Version bump.</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="11">
<Date>2015-03-18</Date>
<Version>1.36.8</Version>
office/libreoffice/libreoffice/actions.py
+4 -3
View File
@@ -33,9 +33,8 @@ def setup():
--with-help \
--with-myspell-dicts \
--with-alloc=system \
--without-java \
--with-java \
--without-system-dicts \
--disable-gconf \
--disable-postgresql-sdbc \
--enable-release-build=yes \
--enable-python=system \
@@ -49,14 +48,16 @@ def setup():
--with-system-lcms2 \
--with-system-libpng \
--with-system-libxml \
--with-system-mesa-headers \
--with-system-nss \
--with-system-openssl \
--with-system-poppler \
--with-system-zlib \
--enable-scripting-beanshell \
--enable-scripting-javascript \
--disable-odk \
--enable-ext-wiki-publisher \
--enable-ext-nlpsolver \
--with-jdk-home=/usr/lib/jvm/java-7-openjdk \
--with-parallelism=%s' % (get.makeJOBS().replace("-j","")))
def build():
office/libreoffice/libreoffice/pspec.xml
+16 -5
View File
@@ -14,14 +14,14 @@
<IsA>app:gui</IsA>
<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>
<Archive sha1sum="01bb7e97526d097af88ea8a439f99a9e975102f8" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.0.1/libreoffice-5.0.1.2.tar.xz</Archive>
<Archive sha1sum="23072ea7ce052091b8ad4bd339c06be1d102e621" type="binary" target="libreoffice-5.0.1.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.0.1/libreoffice-help-5.0.1.2.tar.xz</Archive>
<Archive sha1sum="d7c0a1a080db50d2d6db11db6a558c620068eaee" type="binary" target="libreoffice-5.0.1.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.0.1/libreoffice-dictionaries-5.0.1.2.tar.xz</Archive>
<Archive sha1sum="78a206e38a81bbb9b30ec80704b20aafac29557a" type="binary" target="libreoffice-5.0.1.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.0.1/libreoffice-translations-5.0.1.2.tar.xz</Archive>
<Archive sha1sum="461cb874e5a71a0182973c95c5d8d218069b0dc8" type="tarxz">http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-5.1.0.2.tar.xz</Archive>
<Archive sha1sum="56aec345d2ee7ce6cba35a5689ee4259d855f0d6" type="binary" target="libreoffice-5.1.0.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-help-5.1.0.2.tar.xz</Archive>
<Archive sha1sum="5137f9af5df520d142382f7b9eacd7ff0c10c008" type="binary" target="libreoffice-5.1.0.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-dictionaries-5.1.0.2.tar.xz</Archive>
<Archive sha1sum="9195868fc7f53a7eb0093dfc5621f863d1656287" type="binary" target="libreoffice-5.1.0.2/external/tarballs/">http://download.documentfoundation.org/libreoffice/src/5.1.0/libreoffice-translations-5.1.0.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>ant</Dependency>
<Dependency>gperf</Dependency>
<Dependency>nss-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>cups-devel</Dependency>
<Dependency>curl-devel</Dependency>
<Dependency>glew-devel</Dependency>
@@ -29,6 +29,7 @@
<Dependency>lcms2-devel</Dependency>
<Dependency>boost-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<Dependency>jdk7-openjdk</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libICE-devel</Dependency>
<Dependency>libxslt-devel</Dependency>
@@ -47,6 +48,7 @@
<Dependency>libXcomposite-devel</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>gst-plugins-base-next-devel</Dependency>
<Dependency versionFrom="3.18.6">gtk3-devel</Dependency>
</BuildDependencies>
</Source>
@@ -113,6 +115,8 @@
<Path fileType="data">/usr/share/applications/</Path>
<Path fileType="data">/usr/share/application-registry</Path>
<Path fileType="library">/usr/lib/libreoffice/program/</Path>
<Path fileType="data">/usr/share/gir-1.0/LOKDocView-0.1.gir</Path>
<Path fileType="data">/usr/lib/girepository-1.0/LOKDocView-0.1.typelib</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/lib/libreoffice/program/intro.png">libreoffice-splash.png</AdditionalFile>
@@ -3279,6 +3283,13 @@
</Package>
<History>
<Update release="26">
<Date>2016-01-31</Date>
<Version>5.1.0.2</Version>
<Comment>Version bump.</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="25">
<Date>2015-009-01</Date>
<Version>5.0.1.2</Version>
programming/build/ant/actions.py
+14 -36
View File
@@ -8,9 +8,6 @@ from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
import os
import glob
shelltools.export("JAVA_HOME","/usr/lib/jvm/java-7-openjdk")
WorkDir = "apache-ant-%s" % get.srcVERSION()
@@ -19,39 +16,20 @@ javadir = "/usr/share/java"
def build():
shelltools.export("ANT_OPTS", "-Duser.home=%s" % WorkDir)
shelltools.system("./bootstrap.sh")
shelltools.system("./build.sh dist")
def install():
for d in (anthome, os.path.join(anthome, "lib"), os.path.join(anthome, "etc"), os.path.join(anthome, "bin"), javadir, os.path.join(javadir, "ant")):
pisitools.dodir(d)
pisitools.insinto("/etc/ant/", "%s/etc/*" % WorkDir)
pisitools.remove("/etc/ant/ant-bootstrap.jar")
pisitools.insinto("/usr/share/java/ant/", "%s/lib/*" % WorkDir)
pisitools.insinto("/usr/share/java/", "lib/optional/junit-4.11.jar", "junit.jar")
pisitools.insinto("/usr/share/java/", "lib/optional/hamcrest-core-1.3.jar", "hamcrest.jar")
pisitools.insinto("/usr/share/ant/lib/", "%s/lib/*" % WorkDir)
pisitools.insinto("/usr/share/ant/bin/", "apache-ant-1.9.6/bin/*")
shelltools.cd("build/lib")
for f in ("ant.jar", "ant-launcher.jar", "ant-bootstrap.jar"):
pisitools.insinto(javadir, f, f.replace(".jar", "-%s.jar" % get.srcVERSION()))
pisitools.dosym(os.path.join(javadir, f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(anthome, "lib", f))
pisitools.dosym(os.path.join(javadir, f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(javadir, f))
#Install optional JAR files to /usr/share/java/ant
for f in ("ant-jmf.jar", "ant-junit.jar", "ant-swing.jar"):
pisitools.insinto(os.path.join(javadir, "ant"), f, f.replace(".jar", "-%s.jar" % get.srcVERSION()))
pisitools.dosym(os.path.join(javadir, "ant", f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(anthome, "lib", f))
pisitools.dosym(os.path.join(javadir, "ant", f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(javadir, "ant", f))
shelltools.cd("../../src/script")
for f in glob.glob("*.bat"):
shelltools.unlink(f)
for f in glob.glob("*.cmd"):
shelltools.unlink(f)
pisitools.dobin("*")
pisitools.domove("/usr/bin/antRun*", os.path.join(anthome, "bin"))
shelltools.cd("../../")
#Install XSLs
pisitools.insinto(os.path.join(anthome, "etc"), "src/etc/*.xsl")
pisitools.dodoc("KEYS", "NOTICE", "README", "WHATSNEW", "LICENSE")
#pisitools.dohtml("docs/*")
for binsym in ["ant", "antRun", "antRun.pl", "complete-ant-cmd.pl", "runant.pl", "runant.py"]:
pisitools.dosym("/usr/share/ant/bin/%s" % binsym , "/usr/bin/%s" % binsym)
pisitools.insinto("/usr/share/doc/ant/", "%s/manual/*" % WorkDir) #for and-docs
pisitools.dodoc("KEYS", "NOTICE", "README", "WHATSNEW", "LICENSE")
programming/build/ant/files/20ant
-1
View File
@@ -1 +0,0 @@
ANT_HOME="/usr/share/ant"
programming/build/ant/files/apache-ant-no-test-jar.patch
-11
View File
@@ -1,11 +0,0 @@
--- apache-ant-1.8.0.orig/build.xml 2010-04-13 14:09:27.501531982 +0200
+++ apache-ant-1.8.0/build.xml 2010-04-13 14:57:08.321408006 +0200
@@ -832,7 +832,7 @@
===================================================================
-->
<target name="dist-lite"
- depends="jars,test-jar"
+ depends="jars"
description="--> creates a minimum distribution to run Apache Ant">
<mkdir dir="${dist.dir}"/>
programming/build/ant/files/bin_ant
+2 -2
View File
@@ -1,6 +1,6 @@
#!/bin/sh
. /etc/apache-ant/ant.conf
. /etc/ant/ant.conf
export LOCALCLASSPATH=${OPT_JAR_LIST}
/usr/share/apache-ant/bin/ant "$@"
/usr/share/ant/bin/ant "$@"
programming/build/ant/pspec.xml
+12 -10
View File
@@ -16,24 +16,19 @@
<BuildDependencies>
<Dependency>jdk7-openjdk</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">apache-ant-no-test-jar.patch</Patch>
</Patches>
</Source>
<Package>
<Name>ant</Name>
<RuntimeDependencies>
<!--<Dependency>jdk7-openjdk</Dependency>-->
</RuntimeDependencies>
<Files>
<Path fileType="config">/etc</Path>
<Path fileType="data">/usr/share/</Path>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/share/</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/etc/env.d/20ant">20ant</AdditionalFile>
<AdditionalFile target="/etc/ant.conf" permission="0644" owner="root">ant.conf</AdditionalFile>
<AdditionalFile target="/etc/ant/ant.conf" permission="0644" owner="root">ant.conf</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/profile.d/ant.sh">ant.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/profile.d/ant.csh">ant.csh</AdditionalFile>
</AdditionalFiles>
</Package>
@@ -46,6 +41,13 @@
</Package>
<History>
<Update release="7">
<Date>2016-01-25</Date>
<Version>1.9.6</Version>
<Comment>Fixed.</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2015-08-22</Date>
<Version>1.9.6</Version>
@@ -82,4 +84,4 @@
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>