diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-26 04:08:50 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-26 04:08:50 +0000 |
commit | cda3f380f74d60573c1202f7f34a79c8182e341a (patch) | |
tree | 267f0bea80b969004688d5352a9472b4816a8742 /extra | |
parent | 5f3874cb8718456941af21c866515ddddd82edbc (diff) |
Mon May 26 04:03:20 UTC 2014
Diffstat (limited to 'extra')
-rw-r--r-- | extra/libreoffice-fresh/PKGBUILD | 378 | ||||
-rw-r--r-- | extra/libreoffice-fresh/libreoffice-fresh.csh | 6 | ||||
-rw-r--r-- | extra/libreoffice-fresh/libreoffice-fresh.install | 13 | ||||
-rw-r--r-- | extra/libreoffice-fresh/libreoffice-fresh.sh | 6 | ||||
-rw-r--r-- | extra/libreoffice-fresh/make-pyuno-work-with-system-wide-module-install.diff | 44 | ||||
-rw-r--r-- | extra/wayland/PKGBUILD | 6 |
6 files changed, 450 insertions, 3 deletions
diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD new file mode 100644 index 000000000..43fbac8a5 --- /dev/null +++ b/extra/libreoffice-fresh/PKGBUILD @@ -0,0 +1,378 @@ +# $Id: PKGBUILD 213572 2014-05-25 11:27:38Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> + +pkgname="libreoffice-fresh" +_LOver=4.3.0.0.beta1 +pkgver=4.3.0 +pkgrel=0.2 +pkgdesc="LibreOffice branch which contains new features and program enhancements" +arch=('i686' 'x86_64') +license=('LGPL3') +url="http://www.libreoffice.org/" +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' #'libxaw' + 'libgl' 'dbus-glib' 'libxslt' 'redland' 'icu' #'librsvg' + 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' # 'libtextcat' + 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' + 'libcdr' 'libmspub' 'harfbuzz-icu' 'gconf' 'glew' 'nss' 'clucene' + # 'lpsolve' ? calc + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' + 'gtk2' 'xdg-utils' #'telepathy-glib' 'orbit2' 'translate-toolkit' + 'gst-plugins-base-libs' 'glu') +makedepends=('sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant' + 'gperf' 'kdelibs' 'gconf' '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' + 'ttf-liberation' # to satisfy regression tests + 'chrpath') +optdepends=('libreoffice-fresh-langpack: additional language support' + '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' + 'libmythes: for use in thesaurus' + 'beanshell2: interactive java -- good for prototyping/macros' + 'vigra: C++ computer vision library, usable in Basebmp' + 'libmspack: library for Microsoft compression formats for use in FontOOo' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' + 'sane: for scanner access' + 'unixodbc: adds ODBC database support' + 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' + #'gtk2: for browser plugin and old gtk2 desktop integration' + 'libpaper: takes care of papersize' + 'postgresql-libs: for postgresql-connector' + 'gtk3: for gtk3 Gnome integration' + 'kdelibs: for kde desktop integration' + 'make: for use in SDK' + 'gcc: for use in SDK' + 'zip: for use in SDK') +backup=(etc/libreoffice/sofficerc + etc/libreoffice/bootstraprc + etc/libreoffice/psprint.conf + etc/profile.d/libreoffice-fresh.sh + etc/profile.d/libreoffice-fresh.csh) +install=$pkgname.install +provides=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome' + 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk' 'libreoffice-sdk-doc' + 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' + 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') +conflicts=('libreoffice-stable' 'libreoffice-common' 'libreoffice-base' 'libreoffice-calc' 'libreoffice-draw' 'libreoffice-gnome' + 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' 'libreoffice-sdk' 'libreoffice-sdk-doc' + 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' + 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') + +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +_additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" +source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} + ${_additional_source_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 + ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz + ${_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}/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 + ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + ${_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}/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.2.0.tar.bz2 + ${_additional_source_url}/libfreehand-0.0.0.tar.bz2 + ${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2 + ${_additional_source_url}/libe-book-0.0.3.tar.bz2 + ${_additional_source_url}/libabw-0.0.2.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2 + ${_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-fresh.sh libreoffice-fresh.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 + a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip + e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-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 + eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip + 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip + 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip + 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 + 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.2.0.tar.bz2 + libfreehand-0.0.0.tar.bz2 + Firebird-2.5.2.26540-0.tar.bz2 + libe-book-0.0.3.tar.bz2 + libabw-0.0.2.tar.bz2 + 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 + 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() { + + cd libreoffice-$_LOver + + # move external sources into place + mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources + for source in "${noextract[@]}"; do + ln -s ${srcdir}/$source . + done + popd + + # unowinreg.dll must be a file not a symlink or the result will become a broken symlink + # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll + rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll + 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.diff + + #use the CFLAGS but remove the LibO overridden ones + for i in $CFLAGS; do + case "$i" in + -O?|-pipe|-Wall|-g|-fexceptions) continue;; + esac + ARCH_FLAGS="$ARCH_FLAGS $i" + done + + + # qt4 fix + sed -i "s:qmake:qmake-qt4:g" configure.ac +} + +build() { + cd libreoffice-$_LOver + + #autoconf -f + + # non-SMP test build + #export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + + ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ + --enable-split-app-modules \ + --with-parallelism=${MAKEFLAGS/-j/} \ + --with-external-tar="${srcdir}/ext_sources" \ + --disable-fetch-external \ + --disable-verbose \ + --enable-release-build \ + --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib --mandir=/usr/share/man \ + --with-lang="" \ + --enable-crashdump \ + --enable-avahi \ + --enable-dbus \ + --enable-evolution2\ + --enable-gio\ + --disable-gnome-vfs\ + --disable-kde\ + --enable-kde4\ + --enable-gtk3 \ + --enable-gstreamer \ + --disable-gstreamer-0-10 \ + --enable-lockdown\ + --enable-opencl \ + --enable-opengl \ + --enable-openssl \ + --enable-odk\ + --enable-orcus \ + --enable-python=system \ + --enable-scripting-beanshell \ + --enable-scripting-javascript \ + --disable-telepathy \ + --enable-ext-wiki-publisher \ + --enable-ext-nlpsolver \ + --without-fonts\ + --with-system-apr \ + --with-system-libcdr \ + --with-system-mdds\ + --without-myspell-dicts \ + --with-system-libvisio \ + --without-system-libcmis \ + --with-system-libmspub \ + --without-system-libexttextcat \ + --without-system-orcus \ + --without-system-liblangtag \ + --without-system-jfreereport \ + --without-system-apache-commons \ + --with-system-libodfgen \ + --without-system-libmwaw \ + --with-system-libetonyek \ + --without-system-libfreehand \ + --without-system-firebird \ + --with-system-libatomic-ops \ + --without-system-libebook \ + --without-system-libabw \ + --with-system-dicts \ + --with-external-dict-dir=/usr/share/hunspell \ + --with-external-hyph-dir=/usr/share/hyphen \ + --with-external-thes-dir=/usr/share/mythes \ + --with-system-beanshell \ + --with-system-cppunit\ + --with-system-graphite\ + --with-system-glew \ + --without-system-glm \ + --with-system-libwpg \ + --with-system-libwps \ + --with-system-redland\ + --with-system-serf \ + --without-system-npapi-headers \ + --with-ant-home="/usr/share/apache-ant"\ + --without-system-boost\ + --with-system-icu \ + --with-system-cairo\ + --with-system-libs\ + --with-system-mythes\ + --with-system-headers\ + --without-system-hsqldb \ + --with-alloc=system\ + --with-system-clucene \ + --disable-dependency-tracking \ + --enable-hardlink-deliver #--help + + touch src.downloaded + make +} + +#check() { +# cd ${srcdir}/build +# make check +#} + +package() { + + cd libreoffice-$_LOver + make DESTDIR="$pkgdir/" distro-pack-install + + # put configuration files into place + install -dm755 ${pkgdir}/etc/libreoffice + install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ + install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ + + # install dummy links to make them found by LibO + cd ${pkgdir}/usr/lib/libreoffice/program/ + ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . + cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ + ln -vsf /etc/libreoffice/psprint.conf . + + # allow to preset desired VLC + install -dm755 ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/libreoffice-fresh.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh # fails + rm -rf ${pkgdir}/etc/bash_completion.d + + # make pyuno find its modules + install -dm755 ${pkgdir}/usr/lib/python3.4/site-packages + ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.4/site-packages/uno.py + ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py + + # fix environment path to keep compatibility with other java-environments + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh + + # fix permissions + find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; + + # cleanup + rm -rf ${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 +} diff --git a/extra/libreoffice-fresh/libreoffice-fresh.csh b/extra/libreoffice-fresh/libreoffice-fresh.csh new file mode 100644 index 000000000..502512189 --- /dev/null +++ b/extra/libreoffice-fresh/libreoffice-fresh.csh @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk +#setenv SAL_USE_VCLPLUGIN gtk3 diff --git a/extra/libreoffice-fresh/libreoffice-fresh.install b/extra/libreoffice-fresh/libreoffice-fresh.install new file mode 100644 index 000000000..fb59da3b1 --- /dev/null +++ b/extra/libreoffice-fresh/libreoffice-fresh.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/libreoffice-fresh/libreoffice-fresh.sh b/extra/libreoffice-fresh/libreoffice-fresh.sh new file mode 100644 index 000000000..7bfdcf7f6 --- /dev/null +++ b/extra/libreoffice-fresh/libreoffice-fresh.sh @@ -0,0 +1,6 @@ +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 diff --git a/extra/libreoffice-fresh/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice-fresh/make-pyuno-work-with-system-wide-module-install.diff new file mode 100644 index 000000000..3317b3ca5 --- /dev/null +++ b/extra/libreoffice-fresh/make-pyuno-work-with-system-wide-module-install.diff @@ -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" diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 5defd4e30..e8e61ce22 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 204641 2014-01-24 14:01:34Z tomegun $ +# $Id: PKGBUILD 213577 2014-05-25 19:33:41Z seblu $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('MIT') depends=('libffi' 'expat') makedepends=('doxygen') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('bc91befb8386ec5c1ff4f24ad8464c24a7496ae2') +sha1sums=('bace08b4a531ea4b80b4cf4e953320bc48ed7efe') build() { cd $pkgname-$pkgver |