summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2005-01-14 15:28:10 +0000
committerAndreas Proschofsky <suka@gentoo.org>2005-01-14 15:28:10 +0000
commitaed4c5ef0f9189badb9096b04efc95625dadf70d (patch)
tree5d626461b7ac12ba294f2daeb833a9f1e0091346 /app-office/openoffice-ximian
parentWhitespace cleanup and touch libsandbox.so in the multilib loop to make the M... (diff)
downloadgentoo-2-aed4c5ef0f9189badb9096b04efc95625dadf70d.tar.gz
gentoo-2-aed4c5ef0f9189badb9096b04efc95625dadf70d.tar.bz2
gentoo-2-aed4c5ef0f9189badb9096b04efc95625dadf70d.zip
Fix for -gnome -kde
(Portage version: 2.0.51-r12)
Diffstat (limited to 'app-office/openoffice-ximian')
-rw-r--r--app-office/openoffice-ximian/ChangeLog6
-rw-r--r--app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch14
2 files changed, 19 insertions, 1 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 74ab26739729..1ce0e97730f9 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.88 2005/01/12 23:05:13 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.89 2005/01/14 15:28:10 suka Exp $
+
+ 14 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+ files/1.1.3/gentoo-1.3.7.patch:
+ Fix for building with -gnome and -kde
*openoffice-ximian-1.3.7 (13 Jan 2005)
diff --git a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch b/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch
index 5aae80515b08..d86f1ad62d1e 100644
--- a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch
+++ b/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch
@@ -1,5 +1,19 @@
--- patches/OOO_1_1_3/apply.orig 2004-12-02 00:07:00.659646960 +0100
+++ patches/OOO_1_1_3/apply 2004-12-02 00:07:18.119992584 +0100
+@@ -27,9 +27,10 @@
+ PLD : PLDOnly, LinuxCommon, KDECommon, GlobalDesktopFiles, NonArkCommon
+ KDE : LinuxCommon, KDEOnly
+ Ark : ArkOnly, LinuxCommon, GlobalDesktopFiles
+-Gentoo : LinuxCommon, GlobalDesktopFiles, NonArkCommon, GentooOnly
+-GentooGNOME : Gentoo, GnomeVFS, NovellOnly
+-GentooKDE : Gentoo, KDECommon
++GentooBase : LinuxCommon, GlobalDesktopFiles, NonArkCommon
++Gentoo: GentooBase
++GentooGNOME : GentooBase, GnomeVFS, NovellOnly
++GentooKDE : GentooBase, KDECommon
+
+ # somewhat odder:
+ Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only
@@ -1121,14 +1121,6 @@
########################################################