Add a patch to fix text visibility problems when built with gcc 4.2, see bug #184054

Package-Manager: portage-2.1.3_rc6

5 files changed, 47 insertions, 14 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 3a762d16ac86..cafde7f6e074 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.332 2007/06/22 11:22:42 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.333 2007/07/07 07:59:58 suka Exp $
+
+  07 Jul 2007; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.2.1/swregion-gcc42.diff, files/2.2.1/gentoo-2.2.1.diff,
+  openoffice-2.2.1.ebuild:
+  Add a patch to fix text visibility problems when built with gcc 4.2, see bug
+  #184054
 
   22 Jun 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.2.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 44ca891ea250..984d899a9655 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -6,10 +6,10 @@ AUX 2.2.1/disable-regcomp-python.diff 934 RMD160 8582217885e66be466b17d27a135fff
 MD5 1d4f1d467652abdd8481cfffc4ee64de files/2.2.1/disable-regcomp-python.diff 934
 RMD160 8582217885e66be466b17d27a135fffdbeb1e3b0 files/2.2.1/disable-regcomp-python.diff 934
 SHA256 0526fda86c774428af207870e5ed186c296c4c671325b2eb75623eae6a3f93d1 files/2.2.1/disable-regcomp-python.diff 934
-AUX 2.2.1/gentoo-2.2.1.diff 182 RMD160 2cf5750a040b0711f4cef05882a1d403d41927af SHA1 92b1de167a32a5b9f71f124eec75917c46c0ebb9 SHA256 c441bb2a3e291ca19bd839b6f544151195779f38df4a3cf3a8f92f337057f7ee
-MD5 0f5ab709306b362f1787d578510b0838 files/2.2.1/gentoo-2.2.1.diff 182
-RMD160 2cf5750a040b0711f4cef05882a1d403d41927af files/2.2.1/gentoo-2.2.1.diff 182
-SHA256 c441bb2a3e291ca19bd839b6f544151195779f38df4a3cf3a8f92f337057f7ee files/2.2.1/gentoo-2.2.1.diff 182
+AUX 2.2.1/gentoo-2.2.1.diff 487 RMD160 00c90c8a42fb065a0bb7a56bcf19dc006d6f513e SHA1 7bc0ce08045a08f4a5ef7e7023818dbb0e9ddebf SHA256 317ee2b7d41e880d14db287dffc79d586b0f6566d438932aec67d079db932b29
+MD5 3b4f8eb92fb110265e487b9b8b5d5c59 files/2.2.1/gentoo-2.2.1.diff 487
+RMD160 00c90c8a42fb065a0bb7a56bcf19dc006d6f513e files/2.2.1/gentoo-2.2.1.diff 487
+SHA256 317ee2b7d41e880d14db287dffc79d586b0f6566d438932aec67d079db932b29 files/2.2.1/gentoo-2.2.1.diff 487
 AUX 2.2.1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 MD5 1f836c5ae6bd978035358290c001c579 files/2.2.1/ooo-env_log.diff 617
 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e files/2.2.1/ooo-env_log.diff 617
@@ -18,6 +18,10 @@ AUX 2.2.1/regcompapply.diff 306 RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d
 MD5 df1c2b425e5eb0c3f710997078dbab71 files/2.2.1/regcompapply.diff 306
 RMD160 1ea8ae87049aaba655b95e0700c53d6cf17df87d files/2.2.1/regcompapply.diff 306
 SHA256 f3a600f6178ab276bf58d69d97acf02200d99be07df00fcdd61442625f3a37ae files/2.2.1/regcompapply.diff 306
+AUX 2.2.1/swregion-gcc42.diff 249 RMD160 223949d7378a47ea087407dc5c7242885e996d4e SHA1 ece731057c93a1489c6dab232cec08355484f514 SHA256 ab8aa2f8e9cff370e8e264f2e67a7c4d69896620a23102fe0b3acb0201754c08
+MD5 8e94566a37c5205330ead8092b78638e files/2.2.1/swregion-gcc42.diff 249
+RMD160 223949d7378a47ea087407dc5c7242885e996d4e files/2.2.1/swregion-gcc42.diff 249
+SHA256 ab8aa2f8e9cff370e8e264f2e67a7c4d69896620a23102fe0b3acb0201754c08 files/2.2.1/swregion-gcc42.diff 249
 DIST OOo_2.2.1_src_binfilter.tar.bz2 7756778 RMD160 a6194849bb8e2130709a7ff769a8e751a43f86c6 SHA1 aa2c316e0fab13a25c07c2cfd0eafb7a50c96678 SHA256 13f2f6dad82a085a60724fa6dbc58c564a8c496cc27189af3cd7286a6e6adeb8
 DIST OOo_2.2.1_src_core.tar.bz2 123479583 RMD160 fa6775f397bf093ad5be19c28c18d179bb1057b8 SHA1 dad86ea3e8ed2805986c82333cf7a12040696269 SHA256 adc54c88892f5ced9887945709856efeb628fe5f7b5b2f2aa7797c5391b9c7d6
 DIST OOo_2.2.1_src_l10n.tar.bz2 76560727 RMD160 58f56faab079f179348f4c64cdbe176e296345f7 SHA1 f7c1592210c60313464b7f2cec88cb850578aec1 SHA256 d23cc1d5dc97533b03b04336e2a136ee4a359b2bd8239a008bd3e4508eae2b25
@@ -31,14 +35,14 @@ DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412
 DIST ooo-build-2.2.1.tar.gz 4845814 RMD160 73863358dc7866f2ef9b3454591ad39f6612a271 SHA1 1051eb892960fe86ae7ce2b973ee21d1123ed5f7 SHA256 e642aa70c6b5fdfcb5614f9be787538a9e0f7f4f1c67b74f8c43e4bd5f4dcc3d
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
-EBUILD openoffice-2.2.1.ebuild 11875 RMD160 67655b81bcc4b93ca571aeb2c3faa6f7f73abdb5 SHA1 b4b63fdfc32c1792d6dccc2d673bbc8ff28a7d18 SHA256 caa98ee3ffdfcf1b7c816537d9a883b3db3ca304a8e67534bbb18ccecc37457f
-MD5 1a92eb86c4aa5f3442f94bc1f879864a openoffice-2.2.1.ebuild 11875
-RMD160 67655b81bcc4b93ca571aeb2c3faa6f7f73abdb5 openoffice-2.2.1.ebuild 11875
-SHA256 caa98ee3ffdfcf1b7c816537d9a883b3db3ca304a8e67534bbb18ccecc37457f openoffice-2.2.1.ebuild 11875
-MISC ChangeLog 69121 RMD160 20f27845d5bccf2a0e379c2b6aa344297143a1ba SHA1 3c2d82b7449efb6256c75ae4dd2047eee579a760 SHA256 2f28e08e5c51a90a974c37fd3bb0a7e0e231e927fb8576f9b3fa9fb2f626b978
-MD5 39433d4b9b4f037df6f030879a52d60e ChangeLog 69121
-RMD160 20f27845d5bccf2a0e379c2b6aa344297143a1ba ChangeLog 69121
-SHA256 2f28e08e5c51a90a974c37fd3bb0a7e0e231e927fb8576f9b3fa9fb2f626b978 ChangeLog 69121
+EBUILD openoffice-2.2.1.ebuild 11947 RMD160 8d8abf95cd2a730d745d9f167b60f55b58326bf4 SHA1 685b7afe7b81f15147b21ed246fec2370550f9cc SHA256 713349e9a3f0d05ae268aeba76619063fb07ef67b9718c8b569f6c786de590fb
+MD5 9bded5222697b418b954e8f74fdfbedf openoffice-2.2.1.ebuild 11947
+RMD160 8d8abf95cd2a730d745d9f167b60f55b58326bf4 openoffice-2.2.1.ebuild 11947
+SHA256 713349e9a3f0d05ae268aeba76619063fb07ef67b9718c8b569f6c786de590fb openoffice-2.2.1.ebuild 11947
+MISC ChangeLog 69358 RMD160 38749bcb3c30281166f527dca6c56d39dd214ee4 SHA1 112e65d9dcf44062fd3cde680691135ad9fcf974 SHA256 7250a026257bb4fbfeb0b63f387e19f5b0d159574fb5d0a689cedc247b9b371e
+MD5 d20f316c03381bf6d9351833018e95f8 ChangeLog 69358
+RMD160 38749bcb3c30281166f527dca6c56d39dd214ee4 ChangeLog 69358
+SHA256 7250a026257bb4fbfeb0b63f387e19f5b0d159574fb5d0a689cedc247b9b371e ChangeLog 69358
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff b/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff
index 85f600e31780..bb9e6cdf0bd2 100644
--- a/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff
+++ b/app-office/openoffice/files/2.2.1/gentoo-2.2.1.diff
@@ -8,4 +8,15 @@
  EOT
      chmod 755 $1
  }
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -1185,6 +1185,8 @@
+ system-db-check.diff, i#65979, hmth
+ # User ~/.ooo-2.0 as user dir
+ scp2-user-config-ooo-2.0.diff, pmladek
++# Fix visbility issue with gcc-4.2
++swregion-gcc42.diff, i#78417, aprosky
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
 
diff --git a/app-office/openoffice/files/2.2.1/swregion-gcc42.diff b/app-office/openoffice/files/2.2.1/swregion-gcc42.diff
new file mode 100644
index 000000000000..55b289ed0354
--- /dev/null
+++ b/app-office/openoffice/files/2.2.1/swregion-gcc42.diff
@@ -0,0 +1,11 @@
+--- sw/source/core/bastyp/swregion.cxx	16 Sep 2006 20:43:34 -0000	1.4
++++ sw/source/core/bastyp/swregion.cxx	3 Jul 2007 02:13:13 -0000
+@@ -79,6 +79,7 @@
+ {
+ 	if( rDel )
+ 	{
++		pData = (SwRect*) pData;
+ 		*(pData+nPos) = rRect;
+ 		rDel = FALSE;
+ 	}
+
diff --git a/app-office/openoffice/openoffice-2.2.1.ebuild b/app-office/openoffice/openoffice-2.2.1.ebuild
index 5ef560598883..0b742cb234c6 100644
--- a/app-office/openoffice/openoffice-2.2.1.ebuild
+++ b/app-office/openoffice/openoffice-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1.ebuild,v 1.7 2007/06/22 11:22:42 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1.ebuild,v 1.8 2007/07/07 07:59:58 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -201,6 +201,7 @@ src_unpack() {
 
 	#Some fixes for our patchset
 	cd ${S}
+	cp -f ${FILESDIR}/${PV}/swregion-gcc42.diff ${S}/patches/src680 || die
 	epatch ${FILESDIR}/${PV}/gentoo-${PV}.diff
 	epatch ${FILESDIR}/${PV}/ooo-env_log.diff