summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2005-01-28 15:53:52 +0000
committerAndreas Proschofsky <suka@gentoo.org>2005-01-28 15:53:52 +0000
commit85855f43bba6e64a84471cd533bcf7a81a916d0f (patch)
treea16b25df3d391671f0b433510f5c355b843d493a /app-office
parentadded missing libmpeg2 dependency. fixes #69229 (diff)
downloadgentoo-2-85855f43bba6e64a84471cd533bcf7a81a916d0f.tar.gz
gentoo-2-85855f43bba6e64a84471cd533bcf7a81a916d0f.tar.bz2
gentoo-2-85855f43bba6e64a84471cd533bcf7a81a916d0f.zip
fix -gnome -kde bug #
(Portage version: 2.0.51-r15)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice-ximian/ChangeLog6
-rw-r--r--app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch13
2 files changed, 14 insertions, 5 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 5b770a6e5a0b..32d8718775ae 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.104 2005/01/28 07:29:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.105 2005/01/28 15:53:52 suka Exp $
+
+ 28 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+ files/1.1.4/gentoo-1.3.8.patch:
+ Fix the -gnome -kde bug, again. Closes bug #79831
*openoffice-ximian-1.3.8 (28 Jan 2005)
diff --git a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
index 4deda5db44cc..fcc14e353b12 100644
--- a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
+++ b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.8.patch
@@ -1,14 +1,19 @@
--- patches/OOO_1_1_4/apply.orig 2004-12-02 00:07:00.659646960 +0100
+++ patches/OOO_1_1_4/apply 2004-12-02 00:07:18.119992584 +0100
-@@ -33,7 +33,7 @@
+@@ -33,9 +33,10 @@
PLD : PLDOnly, LinuxCommon, FilePickers, KDECommon, GlobalDesktopFiles, NonArkCommon, NoRpath
KDE : LinuxCommon, FilePickers, KDEOnly, NoRpath
Ark : ArkOnly, LinuxCommon, FilePickers, GlobalDesktopFiles, Gcc34, NoRpath, IndicFixes, MSCodec
-Gentoo : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, GentooOnly, NoRpath
-+Gentoo : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, NoRpath
- GentooGNOME : Gentoo, GnomeVFS, NovellOnly
- GentooKDE : Gentoo, KDECommon
+-GentooGNOME : Gentoo, GnomeVFS, NovellOnly
+-GentooKDE : Gentoo, KDECommon
++GentooBase : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, NoRpath
++Gentoo : GentooBase
++GentooGNOME : GentooBase, GnomeVFS, NovellOnly
++GentooKDE : GentooBase, KDECommon
+ # somewhat odder:
+ Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only, NoRpath
@@ -1225,20 +1225,6 @@
########################################################