Date: Mon, 5 Sep 2011 18:44:02 +0200 From: Baptiste Daroussin <bapt@freebsd.org> To: Christoph Moench-Tegeder <cmt@burggraben.net> Cc: office@freebsd.org, freebsd-ports@freebsd.org, Chris Rees <utisoft@gmail.com>, Leslie Jensen <leslie@eskk.nu> Subject: Re: libreoffice-3.4.3 fails to upgrade Message-ID: <20110905164402.GB70234@azathoth.lan> In-Reply-To: <20110905161132.GA84391@elch.exwg.net> References: <4E64CDA3.2010907@eskk.nu> <CADLo839imyvNQE9-KcAjZKSdRr3X1hAYV_szoaJu5qBTh4NgHQ@mail.gmail.com> <4E64D9AB.2040702@eskk.nu> <CADLo83_Xyr71f6jCc40xV-sL_aiAXsnZOemg619yAwxHcAsQww@mail.gmail.com> <20110905153115.GA69747@azathoth.lan> <20110905161132.GA84391@elch.exwg.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--61jdw2sOBCFtR2d/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Sep 05, 2011 at 06:11:33PM +0200, Christoph Moench-Tegeder wrote: > ## Baptiste Daroussin (bapt@freebsd.org): >=20 > > > Looks like it may be related to this commit: > > >=20 > > > http://www.freebsd.org/cgi/cvsweb.cgi/ports/editors/libreoffice/files= /patch-bin__distro-install-desktop-integration > > >=20 > > > Bapt, please would you investigate? > > >=20 > > > Chris > > >=20 > >=20 > > I just fixed it. > >=20 > > sorrt about that >=20 > Just to be clear what we're talking about... Version 1.2 (latest in the > cvsweb I'm seeing on www.freebsd.org) won't cut it, as the mktemp in > line 81 of distro-install-desktop-integration needs to be fixed, too > (remove the -t). >=20 > See here (this is only the first - and fixed - hunk of that patch): >=20 > --- distro-install-desktop-integration.orig 2011-09-05 17:59:59.000000000= +0200 > +++ distro-install-desktop-integration 2011-09-05 18:01:11.000000000 +0200 > @@ -74,12 +74,12 @@ > test -n "$oowrapper_name" && create_man_link "$oowrapper_name" "$use= d_man_page" "$file_list" > =20 > # add desktop file to the right file list > - test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "/usr/sh= are/applications/$desktop_file" >>"$DESTDIR/$file_list" > + test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "$PREFIX= DIR/share/applications/$desktop_file" >>"$DESTDIR/$file_list" > } > =20 > # install desktop integration from plain packages > -sysui_temp=3D`mktemp -t -d distro-pack-desktop-integration-XXXXXX` > -cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp" > +sysui_temp=3D`mktemp -d distro-pack-desktop-integration-XXXXXX` > +cp -a sysui/unx*/misc/libreoffice/* "$sysui_temp" > cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" > builddir=3D`pwd` > cd $sysui_temp >=20 >=20 > Regards, > Christoph >=20 You are right, once again sorry for the mess. /me promise to not touch libreoffice for a while :) Bapt --61jdw2sOBCFtR2d/ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk5k/FIACgkQ8kTtMUmk6Ezv9wCgvifF+g0qgyvDAOu5VW0qO1HM FysAoLtQPI1xAvgzRz/etQg4fbMlKnuv =fGuD -----END PGP SIGNATURE----- --61jdw2sOBCFtR2d/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110905164402.GB70234>