diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2004-01-23 15:54:51 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2004-01-23 15:54:51 +0000 |
| commit | 5fbdf79897b9170994a939f4adbf395aae59faec (patch) | |
| tree | 9311cd9554a20532fb7d7ee1b0bc672ec8aea988 /app-office | |
| parent | stable on alpha and ia64 (diff) | |
| download | historical-5fbdf79897b9170994a939f4adbf395aae59faec.tar.gz historical-5fbdf79897b9170994a939f4adbf395aae59faec.tar.bz2 historical-5fbdf79897b9170994a939f4adbf395aae59faec.zip | |
fix for exit crash, bug #39050
Diffstat (limited to 'app-office')
5 files changed, 30 insertions, 6 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 62ba5d8fd217..4ac02594930e 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.16 2004/01/21 18:03:34 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.17 2004/01/23 15:54:51 suka Exp $ + + 23 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.49.2-r1.ebuild, + openoffice-ximian-1.1.49.2.ebuild, files/1.1.0/norecent.patch: + Removing borked recent-files-patch, this should close bug #39050 *openoffice-ximian-1.1.49.2-r1 (21 Jan 2004) diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index a5de6eff947e..ffe477d0d70f 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,7 +1,7 @@ MD5 b00f9f81f4d97b4a2a6c8a82a9cc9ced openoffice-ximian-1.1.46.ebuild 18158 -MD5 0d04be11f24681a9ff382065ffe722cb openoffice-ximian-1.1.49.2-r1.ebuild 16080 -MD5 2af843e2465e6fa1a15284d44526b3e9 ChangeLog 4529 -MD5 5858132a0d515fabd91ce904844efdc5 openoffice-ximian-1.1.49.2.ebuild 15612 +MD5 deb42504819ebd3c1df792f616a4d542 openoffice-ximian-1.1.49.2-r1.ebuild 16210 +MD5 1ac0e611d23e2062019393a843ad477e ChangeLog 4738 +MD5 a44dc46e12ce8bf96d3f37960d763030 openoffice-ximian-1.1.49.2.ebuild 15743 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 c3eaa9b208dfc60ced92fd39d3ea6ae3 openoffice-ximian-1.1.47.3.ebuild 18222 MD5 f0de3fac5fcb75c45346444d17cca718 files/drawing.desktop 1653 @@ -15,6 +15,7 @@ MD5 ccf9300fea0851b4f6332a0451efdd87 files/digest-openoffice-ximian-1.1.49.2-r1 MD5 fb9a27908f3982a59eb2b1c4d29ea6f0 files/1.1.0/xoo-textdoc.desktop 2117 MD5 9caea43966f68ba0f3d7c364c9a01b89 files/1.1.0/ooffice-wrapper-1.3 8964 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.0/ximian-openoffice.applications 980 +MD5 d09a22a31a3dbfee9ac0e0902d200f75 files/1.1.0/norecent.patch 316 MD5 6667ab40f65e61a03abde8bf78a350a3 files/1.1.0/xoo-presentation.desktop 2046 MD5 0855b12848982a02ab95d6a981926a43 files/1.1.0/xoo-spreadsheet.desktop 1863 MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400 diff --git a/app-office/openoffice-ximian/files/1.1.0/norecent.patch b/app-office/openoffice-ximian/files/1.1.0/norecent.patch new file mode 100644 index 000000000000..a652e1464204 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.0/norecent.patch @@ -0,0 +1,11 @@ +--- apply 2004-01-08 12:54:42.880898904 +0100 ++++ apply 2004-01-08 12:54:42.881898752 +0100 +@@ -278,9 +278,6 @@ + user-desktop-install.diff + + [ Misc ] +-# Add support for the freedesktop.org ~/.recently-used spec. #24253 +-recent-files.diff +- + # stop the user having to fight ooimpress constantly + capitalization.diff diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2-r1.ebuild index c78ce003bc3e..c34bb6d831a0 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2-r1.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2-r1.ebuild,v 1.3 2004/01/22 13:39:16 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2-r1.ebuild,v 1.4 2004/01/23 15:54:51 suka Exp $ # IMPORTANT: This is extremely alpha!!! @@ -249,6 +249,10 @@ src_unpack() { epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch fi + #recent-files causes problems again, so removing + cd ${PATCHDIR}/patches/${PATCHLEVEL} + epatch ${FILESDIR}/${OO_VER}/norecent.patch + einfo "Applying Ximian OO.org Patches" ${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed" diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2.ebuild index b9606923125b..a32f2a93376f 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2.ebuild,v 1.4 2004/01/19 15:29:07 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.49.2.ebuild,v 1.5 2004/01/23 15:54:51 suka Exp $ # IMPORTANT: This is extremely alpha!!! @@ -251,6 +251,10 @@ src_unpack() { epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch fi + #recent-files causes problems again, so removing + cd ${PATCHDIR}/patches/${PATCHLEVEL} + epatch ${FILESDIR}/${OO_VER}/norecent.patch + einfo "Applying Ximian OO.org Patches" ${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed" |