diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-12-23 17:44:49 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-12-23 17:44:49 +0000 |
| commit | c5f5759d19427e616a9fe565afacaf67c9233ed9 (patch) | |
| tree | 7180e81c999535d2b5a5f9a9c50c6d7bfa823183 /app-office | |
| parent | version bump (diff) | |
| download | gentoo-2-c5f5759d19427e616a9fe565afacaf67c9233ed9.tar.gz gentoo-2-c5f5759d19427e616a9fe565afacaf67c9233ed9.tar.bz2 gentoo-2-c5f5759d19427e616a9fe565afacaf67c9233ed9.zip | |
remove quickstarter for now
(Portage version: 2.1_pre1)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.0.1/noquickstarter.diff | 11 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.0.1.ebuild | 6 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 18c11ade8519..94992abe2dd2 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.162 2005/12/23 07:13:01 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.163 2005/12/23 17:44:49 suka Exp $ + + 23 Dec 2005; Andreas Proschofsky <suka@gentoo.org> + +files/2.0.1/noquickstarter.diff, openoffice-2.0.1.ebuild: + The new quickstarter seems to break the build for some people, backing out + the code after we find a better solution 23 Dec 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-2.0.1.ebuild: diff --git a/app-office/openoffice/files/2.0.1/noquickstarter.diff b/app-office/openoffice/files/2.0.1/noquickstarter.diff new file mode 100644 index 000000000000..60ac1eca9cfd --- /dev/null +++ b/app-office/openoffice/files/2.0.1/noquickstarter.diff @@ -0,0 +1,11 @@ +--- patches/src680/apply ++++ patches/src680/apply +@@ -14,7 +14,7 @@ + Safe64bit : 64bitForUpstream, NumberFormat, Trivial + LinuxCommon : Common, LinuxOnly, SystemBits, CWSBackports, GCJ, \ + QPro, Lwp, cairocanvas, VBAObjects, msaccess, \ +- FPickers, Mono, AddressBooks, QuickStarter ++ FPickers, Mono, AddressBooks + Win32Common : Common, NotDebian + 64bit : Safe64bit, 64bitPatches, 64bitUnsorted + # Binfilter patches: a special distro; applied only when building with binfilter diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild index 51e91ad68891..7b1aaffe6bcd 100644 --- a/app-office/openoffice/openoffice-2.0.1.ebuild +++ b/app-office/openoffice/openoffice-2.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.2 2005/12/23 07:13:01 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.3 2005/12/23 17:44:49 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs @@ -117,6 +117,10 @@ src_unpack() { unpack ooo-build-${PV}.tar.gz + #Some fixes for our patchset + cd ${S} + epatch ${FILESDIR}/2.0.1/noquickstarter.diff + #Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo" |