diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-25 12:12:34 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-25 12:12:34 +0000 |
| commit | 4bfadb063b21064bbbf014f9ef7a8ec69d001d23 (patch) | |
| tree | 3fc82ddf2dca48e36aba58defd0ca1b5c29ce3b6 /app-office | |
| parent | Version bump, bug #375213 thank pavel sanda for report. Drop old. (diff) | |
| download | gentoo-2-4bfadb063b21064bbbf014f9ef7a8ec69d001d23.tar.gz gentoo-2-4bfadb063b21064bbbf014f9ef7a8ec69d001d23.tar.bz2 gentoo-2-4bfadb063b21064bbbf014f9ef7a8ec69d001d23.zip | |
Fix solenv patch. Accidentally added html page instead of the patch.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-solenv-build-crash.patch | 101 |
2 files changed, 14 insertions, 93 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 986476b5b002..3a9234d1652b 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.48 2011/07/25 11:19:44 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.49 2011/07/25 12:12:34 scarabeus Exp $ + + 25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> + files/libreoffice-solenv-build-crash.patch: + Fix solenv patch. Accidentally added html page instead of the patch. 25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.4.2.2.ebuild: diff --git a/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch b/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch index 60631296c05e..979587f792b4 100644 --- a/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch +++ b/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch @@ -1,100 +1,17 @@ -<!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 <caolanm@redhat.com> +From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara <caolanm@redhat.com> 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">@@ -1,3 +1,3 @@</span> -<span class="hl kwb">-ct2n ct2n : solenv NULL NULL</span> -<span class="hl kwa">+ct2n ct2n : solenv NULL</span> +--- a/ct2n/prj/build.lst ++++ b/ct2n/prj/build.lst +@@ -1,3 +1,3 @@ +-ct2n ct2n : solenv NULL NULL ++ct2n ct2n : solenv NULL 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 © 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© 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> |