From: Andreas Proschofsky Date: Tue, 18 Oct 2005 13:29:41 +0000 (+0000) Subject: Add missing patch X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=80bc0fcbc678bc4ecd1d0ac0bb5e94fa625a09d7;p=gentoo.git Add missing patch Package-Manager: portage-2.0.53_rc5 --- diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 8a6c0947b47e..c90df9f276ed 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.134 2005/10/18 06:45:16 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.135 2005/10/18 13:29:41 suka Exp $ + + 18 Oct 2005; Andreas Proschofsky + +files/2.0.0/stlport-vector-ppc-buildfix.diff: + Add missing patch, ooops. 18 Oct 2005; Andreas Proschofsky files/2.0.0/gentoo-2.0.0_rc3.diff, openoffice-2.0.0_rc3.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index fa86d40d2eb4..413d136e9824 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,4 @@ -MD5 23f09c15e39f99f4c514eaedae970677 ChangeLog 29465 +MD5 735ba5f66c420afa208092924910e766 ChangeLog 29596 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 @@ -35,6 +35,7 @@ MD5 4821a498748cc2b42dd3d32b27c95da9 files/2.0.0/config_office-openldap-fix.diff MD5 9fcafd818f3e84a8adda72501784243e files/2.0.0/gentoo-2.0.0_rc2.diff 1105 MD5 39239f7e09e3fdd536498728404bfbef files/2.0.0/gentoo-2.0.0_rc3.diff 957 MD5 078172057d5be938e24273c359b42435 files/2.0.0/no-ldap-mozilla.diff 1292 +MD5 705ccd454942401009fad47768eb3595 files/2.0.0/stlport-vector-ppc-buildfix.diff 1675 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322 MD5 cd8007c1f613acc2ee85255b0d20b711 files/digest-openoffice-2.0.0_rc2 416 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 new file mode 100644 index 000000000000..b25603f15ef4 --- /dev/null +++ b/app-office/openoffice/files/2.0.0/stlport-vector-ppc-buildfix.diff @@ -0,0 +1,35 @@ +--- 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 @@ + + CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g + CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC ++--- misc/build/STLport-4.5/src/gcc-linux.mak.old 2005-01-06 12:22:54.127217800 +1100 +++++ misc/build/STLport-4.5/src/gcc-linux.mak 2005-01-06 12:24:28.192917640 +1100 ++@@ -46,8 +46,8 @@ ++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g ++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC ++ ++-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG ++-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC +++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) +++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC ++ ++ include common_percent_rules.mak ++ include common_rules.mak ++--- misc/build/STLport-4.5/src/gcc.mak.old 2005-01-06 15:20:18.840975336 +1100 +++++ misc/build/STLport-4.5/src/gcc.mak 2005-01-06 15:21:00.373661408 +1100 ++@@ -44,8 +44,8 @@ ++ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g ++ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -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 + ***************