[arch-commits] Commit in libreoffice-still/trunk (2 files)
Andreas Radke
andyrtr at archlinux.org
Thu Aug 6 18:01:23 UTC 2015
Date: Thursday, August 6, 2015 @ 20:01:22
Author: andyrtr
Revision: 243094
upgpkg: libreoffice-still 4.4.5-2
upstream update 4.4.5
Modified:
libreoffice-still/trunk/PKGBUILD
libreoffice-still/trunk/make-pyuno-work-with-system-wide-module-install.diff
------------------------------------------------------+
PKGBUILD | 168 ++++++-----------
make-pyuno-work-with-system-wide-module-install.diff | 6
2 files changed, 67 insertions(+), 107 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-08-06 17:37:09 UTC (rev 243093)
+++ PKGBUILD 2015-08-06 18:01:22 UTC (rev 243094)
@@ -4,23 +4,24 @@
pkgbase=libreoffice-still
pkgname=('libreoffice-still-sdk' 'libreoffice-still')
-_LOver=4.3.7.2
-pkgver=4.3.7
-pkgrel=4
+_LOver=4.4.5.2
+pkgver=4.4.5
+pkgrel=2
arch=('i686' 'x86_64')
license=('LGPL3')
url="http://www.libreoffice.org/"
-makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2'
+makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' # 'libwps'
'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'
- 'junit' 'java-hamcrest' 'libmythes' 'libwpg' 'mesa' 'java-environment' 'postgresql-libs'
+ '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')
+ 'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
+ 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp')
_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
@@ -32,7 +33,7 @@
${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- ${_additional_source_url}/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
+ ${_additional_source_url}/commons-logging-1.2-src.tar.gz
${_additional_source_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
${_additional_source_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
@@ -42,41 +43,33 @@
${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
${_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}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
- ${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
+ ${_additional_source_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
- ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- ${_additional_source_url}/libmwaw-0.3.1.tar.bz2
- ${_additional_source_url}/libwps-0.3.0.tar.bz2
- ${_additional_source_url}/libfreehand-0.1.0.tar.bz2
- ${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
- ${_additional_source_url}/libe-book-0.1.1.tar.bz2
- ${_additional_source_url}/libabw-0.1.0.tar.bz2
${_additional_source_url}/language-subtag-registry-2014-12-03.tar.bz2
- ${_additional_source_url}/CoinMP-1.7.6.tgz
${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
+ ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ ${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
${_additional_source_url}/libgltf/libgltf-0.0.2.tar.bz2
+ ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${_additional_source_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
+ ${_additional_source_url}/libfreehand-0.1.0.tar.bz2
+ ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
+ ${_additional_source_url}/libwps-0.3.1.tar.bz2
+ ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
make-pyuno-work-with-system-wide-module-install.diff
libreoffice-still.sh libreoffice-still.csh)
noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
- 9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
- 185d60944ea767075d27247c3162b3bc-unowinreg.dll
- 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
- ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
- 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
+ commons-logging-1.2-src.tar.gz
8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
@@ -86,31 +79,30 @@
97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
- 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- libmwaw-0.3.1.tar.bz2
- libwps-0.3.0.tar.bz2
- libfreehand-0.1.0.tar.bz2
- Firebird-2.5.2.26540-0.tar.bz2
- libe-book-0.1.1.tar.bz2
- libabw-0.1.0.tar.bz2
language-subtag-registry-2014-12-03.tar.bz2
- CoinMP-1.7.6.tgz
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
OpenCOLLADA-master-6509aa13af.tar.bz2
- libgltf-0.0.2.tar.bz2)
-md5sums=('f7f93afa99f1032a754e6d2edf0ca07c'
+ 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ Firebird-2.5.2.26540-0.tar.bz2
+ libgltf-0.0.2.tar.bz2
+ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ 5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
+ libfreehand-0.1.0.tar.bz2
+ 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
+ libwps-0.3.1.tar.bz2
+ 185d60944ea767075d27247c3162b3bc-unowinreg.dll)
+md5sums=('9bcb92fc06b3e2676a841420079598bd'
'SKIP'
- '470fd48120d48f19f5aa977cc7cd7af2'
+ 'fefc1e3b500a4064f19245e4702bbb46'
'SKIP'
- '450dec6fa55dd9218d66db5b3783c9b0'
+ '4c82bc306d11d2bedf27780656300af3'
'SKIP'
'd6eef4b4cacb2183f2bf265a5a03a354'
'1f24ab1d39f4a51faf22244c94a6203f'
@@ -117,7 +109,7 @@
'35c94d2df8893241173de1d16b6034c0'
'798b2ffdc8bcfe7bca2cf92b62caf685'
'a7983f859eafb2677d7ff386a023bc40'
- 'e8e197d628436490886d17cffa108fe3'
+ 'ce977548f1cbf46918e93cd38ac35163'
'8ab049135b2d15313da5d9f0656894a1'
'2c9b0f83ed5890af02c0df1c1776f39b'
'048751f3271906db5126ab76870444c4'
@@ -127,30 +119,26 @@
'97b2d4dba862397f446b217e2b623e71'
'f94d9870737518e3b597f9265f4e9803'
'8ce2fcd72becf06c41f7201d15373ed9'
- 'd8bd5eed178db6e2b18eeed243f85aa8'
'3bdf40c0d199af31923e900d082ca2dd'
'ace6ab49184e329db254e454a010f56d'
'db60e4fde8dd6d6807523deb71ee34dc'
- 'ba2930200c9f019c2d93a8c88c651a0f'
- 'ae330b9493bd4503ac390106ff6060d7'
- '22f8a85daf4a012180322e1f52a7563b'
+ '10d61fbaa6a06348823651b1bd7940fe'
'7681383be6ce489d84c1c74f4e7f9643'
- '36271d3fa0d9dec1632029b6d7aac925'
'0168229624cfac409e766913506961a8'
- '17410483b5b5f267aa18b7e00b65e6e0'
- '185d60944ea767075d27247c3162b3bc'
- '6f1ac4a0e24131c422e1e91f07718fb6'
- 'd4d77d08b9048bae3b8ec8df11f80efd'
- '5f029fef73e42a2c2ae4524a7513f97d'
- '21154d2004e025c8a3666625b0357bb5'
- 'c25a881d21abc5b4da19205db513cc22'
- '9317e967c8fa8ff50e049744c4b33c87'
'0f2677ec23bb43ddc7355d1b4cc8ed45'
- '1cce53bf4b40ae29790d2c5c9f8b1129'
'4b87018f7fff1d054939d19920b751a0'
'4ca8a6ef0afeefc864e9ef21b9f14bd6'
+ '17410483b5b5f267aa18b7e00b65e6e0'
+ '21154d2004e025c8a3666625b0357bb5'
'd63a9f47ab048f5009d90693d6aa6424'
- '07d2bf5ad839a394cca008b3ec6e7bb1'
+ 'd8bd5eed178db6e2b18eeed243f85aa8'
+ 'ba2930200c9f019c2d93a8c88c651a0f'
+ '5821b806a98e6c38370970e682ce76e8'
+ '5f029fef73e42a2c2ae4524a7513f97d'
+ '36271d3fa0d9dec1632029b6d7aac925'
+ 'a111d9ef5a0dab564e9aec0f2cf8d218'
+ '185d60944ea767075d27247c3162b3bc'
+ 'dcb5ad3e5f7139227677ea064b075422'
'4195735a80876ae812fca5736b50192a'
'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
@@ -188,20 +176,9 @@
build() {
cd libreoffice-$_LOver
- # i686 build broken in make CppunitTest_sw_ooxmlsdrexport
- [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ooxmlsdrexport/d' sw/Module_sw.mk
- [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_rtfimport/d' sw/Module_sw.mk
- [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_rtfexport/d' sw/Module_sw.mk
- [ "$CARCH" = "i686" ] && sed -i '/CppunitTest_sw_ww8import/d' sw/Module_sw.mk
-
- # next broken test
- [ "$CARCH" = "x86_64" ] && sed -i '/CppunitTest_macros_test/d' sw/Module_sw.mk
-
-
# strip -s from Makeflags in case you use it to shorten build logs
_MAKEFLAGS=${MAKEFLAGS/-s/}
-
./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
--enable-split-app-modules \
--with-parallelism=${_MAKEFLAGS/-j/} \
@@ -221,11 +198,9 @@
--disable-kde\
--enable-kde4\
--enable-gtk3 \
- --enable-gstreamer \
--disable-gstreamer-0-10 \
- --enable-lockdown\
- --enable-opencl \
- --enable-opengl \
+ --disable-gconf \
+ --disable-lockdown \
--enable-openssl \
--enable-odk\
--enable-orcus \
@@ -249,13 +224,15 @@
--without-system-jfreereport \
--without-system-apache-commons \
--with-system-libodfgen \
- --without-system-libmwaw \
+ --with-system-libmwaw \
--with-system-libetonyek \
--without-system-libfreehand \
--without-system-firebird \
--with-system-libatomic-ops \
- --without-system-libebook \
- --without-system-libabw \
+ --with-system-libebook \
+ --with-system-libabw \
+ --with-system-coinmp \
+ --without-system-libgltf \
--with-system-dicts \
--with-external-dict-dir=/usr/share/hunspell \
--with-external-hyph-dir=/usr/share/hyphen \
@@ -272,7 +249,6 @@
--without-system-npapi-headers \
--with-jdk-home="/usr/lib/jvm/default" \
--with-ant-home="/usr/share/apache-ant"\
- --with-hamcrest="/usr/share/java/hamcrest-core.jar" \
--without-system-boost\
--with-system-icu \
--with-system-cairo \
@@ -284,7 +260,7 @@
--with-system-clucene \
--disable-dependency-tracking \
--enable-hardlink-deliver
-
+
touch src.downloaded
make build
# use this if i686 fails
@@ -302,8 +278,8 @@
package_libreoffice-still-sdk() {
pkgdesc="Software Development Kit for LibreOffice maintenance branch"
depends=('libreoffice-still' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- provides=('libreoffice-still-sdk-doc' 'libreoffice-sdk' 'libreoffice-sdk-doc')
- conflicts=('libreoffice-still-sdk-doc' 'libreoffice-fresh-sdk')
+ 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/}
@@ -325,12 +301,13 @@
package_libreoffice-still() {
pkgdesc="LibreOffice maintenance branch"
- depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2'
+ depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' # 'libwps'
'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'
- 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'glu' 'libxinerama' 'libcups')
+ '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' 'libcups')
optdepends=('java-runtime: adds java support'
'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
'pstoedit: translates PostScript and PDF graphics into other vector formats'
@@ -344,6 +321,7 @@
'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
'libpaper: takes care of papersize'
'postgresql-libs: for postgresql-connector'
+ 'coin-or-mp: required by the Calc solver'
'gtk2: for GTK2 integration'
'gtk3: for GTK3 integration'
'kdelibs: for KDE desktop integration')
@@ -354,16 +332,7 @@
etc/profile.d/libreoffice-still.csh)
install=$pkgbase.install
provides=('libreoffice' 'libreoffice-en-US')
- conflicts=('libreoffice-fresh' '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-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')
+ conflicts=('libreoffice-fresh')
mv fakeinstall/* ${pkgdir}/
@@ -403,13 +372,4 @@
# add application descriptions
install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
${pkgdir}/usr/share/appdata
-
- # fix insecure rpath
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbc.so.3
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libOsi.so.1
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCoinMP.so.1
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbcSolver.so.3
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libOsiClp.so.1
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCgl.so.1
- chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libClp.so.1
}
Modified: make-pyuno-work-with-system-wide-module-install.diff
===================================================================
--- make-pyuno-work-with-system-wide-module-install.diff 2015-08-06 17:37:09 UTC (rev 243093)
+++ make-pyuno-work-with-system-wide-module-install.diff 2015-08-06 18:01:22 UTC (rev 243094)
@@ -29,10 +29,10 @@
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"]
More information about the arch-commits
mailing list