diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-11-06 12:34:40 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-11-06 12:34:40 +0100 |
| commit | 6b015d22b5b59eddb6e8c40989017d8492ac912c (patch) | |
| tree | 37fa633172a677124a614101d76a57d1be1c4539 | |
| parent | 624e141150ea71c22164ca4ac6602d6d5a191674 (diff) | |
Possibly fix another libreoffice problem. Still fails for other reasons.
| -rw-r--r-- | extra/libreoffice/PKGBUILD | 7 | ||||
| -rw-r--r-- | extra/libreoffice/fix-nobody-temp-dir.patch | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index a134d7d9e..e99ef7ae1 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -113,7 +113,8 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b - build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42) + build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42 + fix-nobody-temp-dir.patch) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 @@ -220,7 +221,8 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' '64497be966802e62ffe3282d3facf7b7' '89ff871e77e10357a976fe9d1ab3a65a' 'c4cb0d7f2602396a3f4cac55b8a4e308' - 'b8f1fb7f3902d22aeaa2575c6b08a62c') + 'b8f1fb7f3902d22aeaa2575c6b08a62c' + '3b7187740fb824c19be04f22531c52de') build() { @@ -261,6 +263,7 @@ build() { patch -Np1 -i ${srcdir}/pdfimport.diff patch -Np1 -i ${srcdir}/poppler-buildfix.diff patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff + patch -Np1 -i ${srcdir}/fix-nobody-temp-dir.patch # Checks if --hash-style is accepted, not if --hash-style=both is accepted. [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk diff --git a/extra/libreoffice/fix-nobody-temp-dir.patch b/extra/libreoffice/fix-nobody-temp-dir.patch new file mode 100644 index 000000000..a36465c05 --- /dev/null +++ b/extra/libreoffice/fix-nobody-temp-dir.patch @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/shared/vtablefactory.cxx.orig 2011-11-05 19:38:58.812005183 +0100 ++++ bridges/source/cpp_uno/shared/vtablefactory.cxx 2011-11-05 19:40:01.654548478 +0100 +@@ -263,7 +263,7 @@ + + for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i) + { +- if (!strDirectory.getLength()) ++ if (strDirectory.getLength() < 2) + strDirectory = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/tmp" )); + + strDirectory += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.execoooXXXXXX" )); |