summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2007-10-11 07:21:53 +0000
committerAndreas Proschofsky <suka@gentoo.org>2007-10-11 07:21:53 +0000
commit857181925d3b9615d78c73a1bc8469b5848806c3 (patch)
tree3cb3ce06913d362c72baec20806b0382915816de
parentamd64 stable, bug 193960 (diff)
downloadgentoo-2-857181925d3b9615d78c73a1bc8469b5848806c3.tar.gz
gentoo-2-857181925d3b9615d78c73a1bc8469b5848806c3.tar.bz2
gentoo-2-857181925d3b9615d78c73a1bc8469b5848806c3.zip
Redo the regcompapply patch as it obviously has been applied wrong recently
(Portage version: 2.1.3.12)
-rw-r--r--app-office/openoffice/ChangeLog7
-rw-r--r--app-office/openoffice/files/2.3.0/regcompapply.diff14
2 files changed, 13 insertions, 8 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 17b7c6c7bb83..a6777f899db1 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.348 2007/10/10 07:54:36 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.349 2007/10/11 07:21:52 suka Exp $
+
+ 11 Oct 2007; Andreas Proschofsky <suka@gentoo.org>
+ files/2.3.0/regcompapply.diff:
+ Redo the regcompapply patch as it obviously has been applied wrong recently,
+ resulting in the return of the build problems on ppc
10 Oct 2007; Andreas Proschofsky <suka@gentoo.org>
openoffice-2.3.0.ebuild:
diff --git a/app-office/openoffice/files/2.3.0/regcompapply.diff b/app-office/openoffice/files/2.3.0/regcompapply.diff
index 007a74949a6b..e3554ea16aa8 100644
--- a/app-office/openoffice/files/2.3.0/regcompapply.diff
+++ b/app-office/openoffice/files/2.3.0/regcompapply.diff
@@ -1,13 +1,13 @@
--- patches/src680/apply
+++ patches/src680/apply
-@@ -1089,6 +1089,9 @@
- system-db-check.diff, i#65979, hmth
- # User ~/.ooo-2.0 as user dir
- scp2-user-config-ooo-2.0.diff, pmladek
+@@ -1087,6 +1087,9 @@
+ [ GentooOnly ]
+ SectionOwner => aprosky
+
+#fix build on ppc
+disable-regcomp-java.diff
+disable-regcomp-python.diff
-
- [ DebianBaseOnly ]
- SectionOwner => rengelha
+ # Allow build to proceed with PaX enabled
+ gentoo-pax-fix.diff, aprosky
+ # support server-only versions of 64bit JDKs