Add build fixes for crash in solenv and vbahelper fix for gcc-4.6.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

5 files changed, 149 insertions, 7 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 57d3f75e0149..78657932a338 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.46 2011/07/25 07:26:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.47 2011/07/25 10:42:13 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild, +files/libreoffice-solenv-build-crash.patch,
+  +files/libreoffice-vbaobj-visibility-fix.patch:
+  Add build fixes for crash in solenv and vbahelper fix for gcc-4.6.
 
   25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 4907e8cb1643..16aa10a81636 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,8 +13,10 @@ AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a6
 AUX libreoffice-3.3.2-bison25.diff 911 RMD160 b3335fe3728e97b69bde744dcd34dc27d4f3212c SHA1 857406c4735f9bcb0d1a7bd0b1dec3b444142ac6 SHA256 d16a9c2a41d2a5669208eac33212920e2d356da60d30e9dc5126ccd13319464b
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
+AUX libreoffice-solenv-build-crash.patch 6207 RMD160 fc900f7b23fb47a2434f0c6c36b793a5d7ecf7f4 SHA1 9a3fa011be07bba1a1890bf520498349c68adac9 SHA256 5a4c58da0b18cfcf5cb736cea79630a21bb94cf1967ee472f99d9e39cb1d4bf8
 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
 AUX libreoffice-unfigured-options.txt 1886 RMD160 b3ad4169dc6634b5e9e34e41af5a90a5de980577 SHA1 2f2ea97227408c8d55c8697d4180cb7284157cce SHA256 9e9188be96eeaacb4d6f5755370e90a0ee791ee95e20098315c758d659f15320
+AUX libreoffice-vbaobj-visibility-fix.patch 1343 RMD160 a4325ffffbd33ba49f77dc1e4fb83304e45912f1 SHA1 1a018dcecf0eb47223a47c419d3cb01471524d3a SHA256 9a0cd10f837a60b723abbf1e0b972fbe607c7308c5f9a2760a350c731f8a5764
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
 AUX wrapper.in 102 RMD160 e11e046dc57bed812ba28e549145fdc3605ede8d SHA1 2e8cf54755431070b2352621eb4a91179a7cc543 SHA256 0cd747062eb7d6d4ecabbf8943575c688c273c7f258b5793a5cff42254ecb432
@@ -206,13 +208,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-EBUILD libreoffice-3.4.2.2.ebuild 18649 RMD160 52d6b0a10c8fbf717476c7ffa196b345697ddb34 SHA1 0a729386cacc71dde1fedcfc231f3a1e7d153319 SHA256 11c14f75a4db2db813ed12ab5f9b4ed04f4fc0868fc18993a71c8b792c389fc6
-MISC ChangeLog 9519 RMD160 f396bd96c5fa39bf0d30598ade78e3dcce94f18c SHA1 2c8cd13460822032801057c7e4c7feb2c34f3b2e SHA256 9584cdf78cdd658fdd4e8963d60a34a0f6ff184fed6bda8c7a10147ffb2a138b
+EBUILD libreoffice-3.4.2.2.ebuild 18744 RMD160 b879c97dcf9e40808709ed92f6c795a186f33660 SHA1 22e66de3f9fea1accdf47141585a5c57767d99f2 SHA256 2c910eef98d0b8defb6c34d03c0addf1d34276d18582a3b4d87ad61cf9bfea95
+MISC ChangeLog 9769 RMD160 21a6f0fa2a8a5d05c0cdc0f8035e89f570281bb8 SHA1 44f06a77bc4c96cba6a8b50fba75f39458b7431f SHA256 5bfe07f07685cfe96e887b40081a8ac17af3f431358aa63c085c376f4d756e4f
 MISC metadata.xml 882 RMD160 fec57be29e81f82a00fe1a3792d06bf55094312f SHA1 2256f830fe8568d99a9104a8446dde40259546d0 SHA256 4b55d790375e3eb2cd00a94f2327efccc0a505cb8e3358eb9a15e44f917f5333
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4tGr4ACgkQHB6c3gNBRYdygACaAivwed60wC9uPhT4F5WZOyEX
-/foAoKvdjMSobLwMG2hVURGkxYRYvo32
-=5bO8
+iEYEARECAAYFAk4tSPMACgkQHB6c3gNBRYe02gCgiOXwr5sZYD/sCxZJcBqwQo1G
+LFIAoJgf6lUwN+bNs6lJbjZorBDIUfWQ
+=tcne
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch b/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch
new file mode 100644
index 000000000000..60631296c05e
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch
@@ -0,0 +1,100 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>svntogit/packages.git - Git clone of the 'packages' subversion repository</title>
+<meta name='generator' content='cgit v0.9-26-gb13d'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit.css'/>
+<link rel='alternate' title='Atom feed' href='http://projects.archlinux.org/svntogit/packages.git/atom/libreoffice/trunk/buildfix_ct2n.diff?h=master' type='application/atom+xml'/>
+<link rel="stylesheet" href="/archnavbar.css" />
+<link rel="icon" href="/favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+</head>
+<body>
+	<div id="archnavbar"><!-- Arch Linux global navigation bar -->
+		<div id="archnavbarlogo">
+			<p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>
+		</div>
+		<div id="archnavbarmenu">
+			<ul id="archnavbarlist">
+				<li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>
+				<li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
+				<li id="anb-forums"><a href="http://bbs.archlinux.org/" title="Community forums">Forums</a></li>
+				<li id="anb-wiki"><a href="http://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
+				<li id="anb-bugs"><a href="http://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>
+				<li id="anb-aur"><a href="http://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
+				<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
+			</ul>
+		</div>
+	</div><!-- #archnavbar -->
+<div id='cgit'><table id='header'>
+<tr>
+<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td><td class='form'><form method='get' action=''>
+<select name='h' onchange='this.form.submit();'>
+<option value='master' selected='selected'>master</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>Git clone of the 'packages' subversion repository</td><td class='sub right'>Arch Linux Developers</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/svntogit/packages.git/'>summary</a><a href='/svntogit/packages.git/refs/'>refs</a><a href='/svntogit/packages.git/log/libreoffice/trunk/buildfix_ct2n.diff'>log</a><a class='active' href='/svntogit/packages.git/tree/libreoffice/trunk/buildfix_ct2n.diff'>tree</a><a href='/svntogit/packages.git/commit/libreoffice/trunk/buildfix_ct2n.diff'>commit</a><a href='/svntogit/packages.git/diff/libreoffice/trunk/buildfix_ct2n.diff'>diff</a><a href='/svntogit/packages.git/stats/libreoffice/trunk/buildfix_ct2n.diff'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/libreoffice/trunk/buildfix_ct2n.diff'>
+<select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/svntogit/packages.git/tree/'>root</a>/<a href='/svntogit/packages.git/tree/libreoffice'>libreoffice</a>/<a href='/svntogit/packages.git/tree/libreoffice/trunk'>trunk</a>/<a href='/svntogit/packages.git/tree/libreoffice/trunk/buildfix_ct2n.diff'>buildfix_ct2n.diff</a></div><div class='content'>blob: 979587f792b497a33ebe8d6a8fe7ffa4e620cc88 (<a href='/svntogit/packages.git/plain/libreoffice/trunk/buildfix_ct2n.diff'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a>
+<a class='no' id='n2' name='n2' href='#n2'>2</a>
+<a class='no' id='n3' name='n3' href='#n3'>3</a>
+<a class='no' id='n4' name='n4' href='#n4'>4</a>
+<a class='no' id='n5' name='n5' href='#n5'>5</a>
+<a class='no' id='n6' name='n6' href='#n6'>6</a>
+<a class='no' id='n7' name='n7' href='#n7'>7</a>
+<a class='no' id='n8' name='n8' href='#n8'>8</a>
+<a class='no' id='n9' name='n9' href='#n9'>9</a>
+<a class='no' id='n10' name='n10' href='#n10'>10</a>
+<a class='no' id='n11' name='n11' href='#n11'>11</a>
+<a class='no' id='n12' name='n12' href='#n12'>12</a>
+<a class='no' id='n13' name='n13' href='#n13'>13</a>
+<a class='no' id='n14' name='n14' href='#n14'>14</a>
+<a class='no' id='n15' name='n15' href='#n15'>15</a>
+<a class='no' id='n16' name='n16' href='#n16'>16</a>
+<a class='no' id='n17' name='n17' href='#n17'>17</a>
+</pre></td>
+<td class='lines'><pre><code>From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
+From: Caolán McNamara &lt;caolanm&#64;redhat.com&gt;
+Date: Tue, 12 Apr 2011 19:35:51 +0000
+Subject: duplicate NULLs
+
+<span class="hl kwb">---</span>
+diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
+index 91f44b7..714d926 100644
+<span class="hl kwb">--- a/ct2n/prj/build.lst</span>
+<span class="hl kwa">+++ b/ct2n/prj/build.lst</span>
+<span class="hl kwd">&#64;&#64; -1,3 +1,3 &#64;&#64;</span>
+<span class="hl kwb">-ct2n	ct2n	:	solenv NULL NULL</span>
+<span class="hl kwa">+ct2n	ct2n	:	solenv NULL</span>
+ ct2n	ct2n		usr1	-	all	ct2n_mkout NULL
+ ct2n	ct2n      nmake	-	all	ct2n_ct2n NULL
+<span class="hl kwb">--</span>
+cgit v0.8.3-6-g21f6
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+</div>
+<div class="foot" style="padding-left:1em;padding-right:1em;">
+<p>Copyright &copy; 2002-2011 <a href="mailto:jvinet@zeroflux.org"
+title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
+title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo
+are recognized trademarks. Some rights reserved. The registered trademark
+Linux&copy; is used pursuant to a sublicense from LMI, the exclusive licensee
+of Linus Torvalds, owner of the mark on a world-wide basis.</p>
+</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/app-office/libreoffice/files/libreoffice-vbaobj-visibility-fix.patch b/app-office/libreoffice/files/libreoffice-vbaobj-visibility-fix.patch
new file mode 100644
index 000000000000..5739100d0d43
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-vbaobj-visibility-fix.patch
@@ -0,0 +1,33 @@
+--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
++++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
+@@ -238,7 +238,7 @@
+ 
+ // including a HelperInterface implementation
+ template< typename Ifc1 >
+-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
++class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
+ {
+ typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
+ protected:
+--- sc/Library_vbaobj.mk
++++ sc/Library_vbaobj.mk
+@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
+         sc/source/ui/vba/vbaquerytable \
+         sc/source/ui/vba/vbarange \
+         sc/source/ui/vba/vbasheetobject \
+-        sc/source/ui/vba/vbasheetobjects \
+         sc/source/ui/vba/vbastyle \
+         sc/source/ui/vba/vbastyles \
+         sc/source/ui/vba/vbatextboxshape \
+@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
+         sc/source/ui/vba/vbawsfunction \
+ ))
+ 
++$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
++        sc/source/ui/vba/vbasheetobjects \
++        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
++))
++
+ ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
+ $(eval $(call gb_Library_set_ldflags,vbaobj,\
+ 	$$(LDFLAGS) \
diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 0e552eb0366c..46b2e7e270ff 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.6 2011/07/25 07:26:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.7 2011/07/25 10:42:13 scarabeus Exp $
 
 EAPI=3
 
@@ -215,6 +215,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.4.1-salfix.diff"
 	"${FILESDIR}/sdext-presenter.diff"
 	"${FILESDIR}/${PN}-svx.patch"
+	"${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
+	"${FILESDIR}/${PN}-solenv-build-crash.patch"
 )
 
 # Uncoment me when updating to eapi4