From 73dffede824d29abc1ff5d5d10c755344a836212 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Wed, 19 Oct 2005 06:37:38 +0000 Subject: [PATCH] Updated the patch for PPC Package-Manager: portage-2.0.53_rc5 --- app-office/openoffice/ChangeLog | 6 +++++- app-office/openoffice/Manifest | 4 ++-- .../files/2.0.0/stlport-vector-ppc-buildfix.diff | 15 ++++++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index c90df9f276ed..cb553603312a 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.135 2005/10/18 13:29:41 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.136 2005/10/19 06:37:38 suka Exp $ + + 19 Oct 2005; Andreas Proschofsky + files/2.0.0/stlport-vector-ppc-buildfix.diff: + remove -D_STLP_DEBUG also from gcc-3.0.mak for PPC 18 Oct 2005; Andreas Proschofsky +files/2.0.0/stlport-vector-ppc-buildfix.diff: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 72027c539266..b586549f3008 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,4 @@ -MD5 735ba5f66c420afa208092924910e766 ChangeLog 29596 +MD5 d7eac5d8d0034e2b4285f5e883c9ab17 ChangeLog 29751 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766 @@ -32,7 +32,7 @@ MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475 MD5 39239f7e09e3fdd536498728404bfbef files/2.0.0/gentoo-2.0.0_rc3.diff 957 -MD5 705ccd454942401009fad47768eb3595 files/2.0.0/stlport-vector-ppc-buildfix.diff 1675 +MD5 10f9f087e0e267786691ea0909909504 files/2.0.0/stlport-vector-ppc-buildfix.diff 2213 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322 MD5 c27522fd99b4d48dc035d2defbe57015 files/digest-openoffice-2.0.0_rc3 478 diff --git a/app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff b/app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff index b25603f15ef4..8c6922b8b384 100644 --- a/app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff +++ b/app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff @@ -1,6 +1,6 @@ --- stlport/STLport-4.5.patch 2005-01-06 12:26:48.770546592 +1100 +++ stlport/STLport-4.5.patch 2005-01-06 12:26:01.125789696 +1100 -@@ -269,6 +269,32 @@ +@@ -269,6 +269,45 @@ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC @@ -29,6 +29,19 @@ ++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) + + include common_percent_rules.mak ++ include common_rules.mak ++--- misc/build/STLport-4.5/src/gcc-3.0.mak.orig +++++ misc/build/STLport-4.5/src/gcc-3.0.mak ++@@ -43,8 +43,8 @@ ++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC ++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC ++ ++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG ++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG +++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) +++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) ++ ++ include common_percent_rules.mak + include common_rules.mak *** misc/STLport-4.5/stlport/config/stl_gcc.h 2001-09-04 19:10:16.000000000 +0200 --- misc/build/STLport-4.5/stlport/config/stl_gcc.h 2005-04-26 15:06:27.000000000 +0200 -- 2.26.2