diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-28 09:59:52 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-28 09:59:52 +0000 |
| commit | 1d5a6fb9c476f62b41382a41755f932266feaf42 (patch) | |
| tree | bc47a72fc4321d04b88076b11416eec25a11bb36 /app-office | |
| parent | Install documentation separately. Clean redudant code from ebuild. (diff) | |
| download | gentoo-2-1d5a6fb9c476f62b41382a41755f932266feaf42.tar.gz gentoo-2-1d5a6fb9c476f62b41382a41755f932266feaf42.tar.bz2 gentoo-2-1d5a6fb9c476f62b41382a41755f932266feaf42.zip | |
Update sandbox violation patch to shut another one.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 06a0c0a9e5ea..97386d0b1031 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.68 2011/07/27 23:37:47 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.69 2011/07/28 09:59:52 scarabeus Exp $ + + 28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> + files/libreoffice-fix-sandbox-install.patch: + Update sandbox violation patch to shut another one. 27 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.2.3.ebuild: diff --git a/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch b/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch index aa5e102284dd..c96e42b4984a 100644 --- a/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch +++ b/app-office/libreoffice/files/libreoffice-fix-sandbox-install.patch @@ -6,7 +6,7 @@ diff -urN libreoffice-bootstrap-3.4.2.2.old/bin/distro-install-desktop-integrati # install desktop integration from plain packages -sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX` -+sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX` ++sysui_temp=`mktemp --tmpdir -d distro-pack-desktop-integration-XXXXXX` cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp" cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" builddir=`pwd` @@ -17,3 +17,16 @@ diff -urN libreoffice-bootstrap-3.4.2.2.old/bin/distro-install-desktop-integrati -exit 0 \ Chybí znak konce řádku na konci souboru +exit 0 + +--- libreoffice-bootstrap-3.4.2.2.old/sysui/desktop/share/create_tree.sh 2011-07-28 09:36:19.113673572 +0000 ++++ libreoffice-bootstrap-3.4.2.2/sysui/desktop/share/create_tree.sh 2011-07-28 09:36:08.795995995 +0000 +@@ -50,7 +50,7 @@ + ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX} + + cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin +-chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin ++chmod 0755 ${DESTDIR}/usr/bin/${PREFIX}-printeradmin + + if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then + # compat symlinks + |