From: Tomas Chvatal Date: Mon, 25 Jul 2011 12:12:34 +0000 (+0000) Subject: Fix solenv patch. Accidentally added html page instead of the patch. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cba7d018d7aebbeda5e9563324c7acc59f31ff23;p=gentoo.git Fix solenv patch. Accidentally added html page instead of the patch. Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64 --- 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 + files/libreoffice-solenv-build-crash.patch: + Fix solenv patch. Accidentally added html page instead of the patch. 25 Jul 2011; Tomáš Chvátal libreoffice-3.4.2.2.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index c1bcac67c43e..bddff582b7b5 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -13,7 +13,7 @@ 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-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6 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 @@ -209,12 +209,12 @@ EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d60 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 18777 RMD160 b86b290230b499ebb29e47d6f87d2277e696ac70 SHA1 e24a72b06fce79284f0563fcf657741ed5a5b18c SHA256 8e210006ebcb7d621f4b662c8064661457164d060208eb5a1a51d5aea3895f05 -MISC ChangeLog 9925 RMD160 be95e2e8bb736ba349684f573e83ac6538d76072 SHA1 4c10add2745412ecef58fc4f38e9aa79e8bf0120 SHA256 897538d9a3e08eaebb58e278caecc44fe80ac863f2286c9c54ac690ba06cbba7 +MISC ChangeLog 10098 RMD160 8371fb23629d47f84e7c7a5396870fcc730545d9 SHA1 8156943aef36c3628350200b7936502ac94d64c4 SHA256 3f789a99101b7183c101170575a12cb2f287b29bef020739c69933ca0c3c6a24 MISC metadata.xml 882 RMD160 fec57be29e81f82a00fe1a3792d06bf55094312f SHA1 2256f830fe8568d99a9104a8446dde40259546d0 SHA256 4b55d790375e3eb2cd00a94f2327efccc0a505cb8e3358eb9a15e44f917f5333 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4tUVYACgkQHB6c3gNBRYeh4wCfc1XBd4rjnH23hJ8rxN6HsXES -/NAAoJlUMi3PtP4B+rn+Ij37YzgmMiEU -=4tdT +iEYEARECAAYFAk4tXYkACgkQHB6c3gNBRYd5OwCgk6Exkgo9SnsuA/2QtZ2Ee6cj +rUkAn3J1Ip9Vf80a8Axs6tz2O+k2aQ2Q +=xGG2 -----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 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 @@ - - - -svntogit/packages.git - Git clone of the 'packages' subversion repository - - - - - - - - - -
- -
- -
-
-
- - - -
-summaryrefslogtreecommitdiffstats
- - - -
-
-
path: root/libreoffice/trunk/buildfix_ct2n.diff
blob: 979587f792b497a33ebe8d6a8fe7ffa4e620cc88 (plain) - - -
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-
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 
 Date: Tue, 12 Apr 2011 19:35:51 +0000
 Subject: duplicate NULLs
 
----
+---
 diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
 index 91f44b7..714d926 100644
---- a/ct2n/prj/build.lst
-+++ b/ct2n/prj/build.lst
-@@ -1,3 +1,3 @@
--ct2n	ct2n	:	solenv NULL NULL
-+ct2n	ct2n	:	solenv NULL
+--- 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
---
+--
 cgit v0.8.3-6-g21f6
-
-
-
-
-

Copyright © 2002-2011 Judd Vinet and Aaron Griffin. 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.

-
- - -