Bump the cppunit patch to actualy work. Smaller and smarter :)

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

3 files changed, 28 insertions, 40 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 208205c95579..b79dcfe3c4a3 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.103 2011/08/11 14:16:30 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.104 2011/08/11 18:08:49 scarabeus Exp $
+
+  11 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/libreoffice-kill-cppunit.patch:
+  Bump the cppunit patch to actualy work. Smaller and smarter :)
 
   11 Aug 2011; Mark Loeser <halcy0n@gentoo.org> libreoffice-3.3.3.ebuild:
   Stable for ppc
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 69a89d9a9473..3fb646220f7b 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
@@ -17,7 +20,7 @@ AUX libreoffice-check-for-avx.patch 1973 RMD160 49ec33a7a230886e59658000ff0469bd
 AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50
 AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a
 AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2ad0667b20d4dba72cf4ee2 SHA1 87345e895473a8bb209b0ad542670c5eb7717ab0 SHA256 a664796c27c69fe5119af5d82313dc65371eb873c1d15691d97745d9a1ee3e81
-AUX libreoffice-kill-cppunit.patch 2349 RMD160 3d44d65dba2789196af1354690d73419bf56c3cf SHA1 5446e57e017bac10aa19b58c8a5a2509c8268835 SHA256 d8180a6a3ab007ac504557ff857a73a3acdd50ece1cda0e46b16c5269e24c727
+AUX libreoffice-kill-cppunit.patch 555 RMD160 97655715899b1518b3c7935e6db504196f561d00 SHA1 05d28cbc51ca13b8f77c95e78a1810318a423afc SHA256 5d792f868f0dec1ee3147a1054e127ecbf07aa33a69132a5f60e3b692896543e
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
@@ -171,5 +174,12 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 bd31b78ac9b3d4a0917f4d4ce824a7f82c8
 EBUILD libreoffice-3.4.2.3.ebuild 19524 RMD160 3f20ecce6bd76e1935ceb70e9679802a3f1332ac SHA1 e0f50f98936fb77c2c59b34bf8be59c9b9871cdd SHA256 8b640ef102a661f15d192472529752277c8a6e1e9e25682ca1b9199955d4ca58
 EBUILD libreoffice-3.4.9999.ebuild 19445 RMD160 414a14d324576f880fa503110fb9e9f1905e4a1d SHA1 b72c72cada623c72b73c25d02b60c7909e460845 SHA256 27f7d615b993c2cbc911320782c64fa1628ca9f15763cefee1fc990d6a10de52
 EBUILD libreoffice-9999.ebuild 18872 RMD160 366094ce7d6d513d476a6d69ef878c3873ed7d1c SHA1 8c0b6cf4f8e95c7b506d8dcab2f740a239df29de SHA256 e520329be224cb2cd4c9cf6b3389782913440f5e325b9de12114aae576f003d7
-MISC ChangeLog 20188 RMD160 377ead43025eb64db545093f1cbb08370f352c12 SHA1 a5aa9f6ccfcf39e9eab934d3a2ee9dc00c92d94f SHA256 e39d760f261e47a363db6bf938d766ccd1ab5d05905da9906c75a95a6749bec7
+MISC ChangeLog 20351 RMD160 2c5e939998979a523d0819ee1d9f042eaa8bc8a7 SHA1 b515e0274ef0d2d21de3f45edaef9fea25f557e6 SHA256 700d6993572e79f34e84209bb242a65f17f146eeacf3d19c042c35adf3a24389
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5EGrcACgkQHB6c3gNBRYfV7ACfc8kkpVtl6WN4A8Hhh7qLUW4t
+sxEAnjZFGgonJW9UaMaT48+uX1tGNKyI
+=zcyK
+-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-kill-cppunit.patch b/app-office/libreoffice/files/libreoffice-kill-cppunit.patch
index fc1f6c34b380..8cb1f9f8e230 100644
--- a/app-office/libreoffice/files/libreoffice-kill-cppunit.patch
+++ b/app-office/libreoffice/files/libreoffice-kill-cppunit.patch
@@ -1,38 +1,12 @@
-diff -urN libreoffice-libs-extern-3.4.2.3.old/cppunit/kill_switch.patch libreoffice-libs-extern-3.4.2.3/cppunit/kill_switch.patch
---- libreoffice-libs-extern-3.4.2.3.old/cppunit/kill_switch.patch	1970-01-01 01:00:00.000000000 +0100
-+++ libreoffice-libs-extern-3.4.2.3/cppunit/kill_switch.patch	2011-08-11 12:11:50.319812105 +0200
-@@ -0,0 +1,22 @@
-+diff -urN cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.cpp cppunit-1.12.1.new/src/DllPlugInTester/DllPlugInTester.cpp
-+--- cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.cpp	2004-06-25 13:11:45.000000000 +0200
-++++ cppunit-1.12.1.new/src/DllPlugInTester/DllPlugInTester.cpp	2011-08-11 12:08:33.597271474 +0200
-+@@ -207,6 +207,7 @@
-+ main( int argc, 
-+       const char *argv[] )
-+ {
-++	return 0;
-+   const int successReturnCode = 0;
-+   const int failureReturnCode = 1;
-+   const int badCommadLineReturnCode = 2;
-+diff -urN cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.cpp cppunit-1.12.1.new/src/DllPlugInTester/DllPlugInTesterTest.cpp
-+--- cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.cpp	2004-06-25 12:41:27.000000000 +0200
-++++ cppunit-1.12.1.new/src/DllPlugInTester/DllPlugInTesterTest.cpp	2011-08-11 12:08:50.338062186 +0200
-+@@ -5,6 +5,7 @@
-+ 
-+ int main(int argc, char* argv[])
-+ {
-++  return 0;
-+   CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest();
-+   CPPUNIT_NS::TextUi::TestRunner runner;
-+   runner.addTest( suite );
-diff -urN libreoffice-libs-extern-3.4.2.3.old/cppunit/makefile.mk libreoffice-libs-extern-3.4.2.3/cppunit/makefile.mk
---- libreoffice-libs-extern-3.4.2.3.old/cppunit/makefile.mk	2011-08-11 12:11:13.141276903 +0200
-+++ libreoffice-libs-extern-3.4.2.3/cppunit/makefile.mk	2011-08-11 12:12:10.071565172 +0200
-@@ -34,7 +34,7 @@
-     # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
-     #  cppunit-1.12.1.tar.gz/download>
+diff -urN libreoffice-ure-3.4.2.3.old/sal/cppunittester/cppunittester.cxx libreoffice-ure-3.4.2.3/sal/cppunittester/cppunittester.cxx
+--- libreoffice-ure-3.4.2.3.old/sal/cppunittester/cppunittester.cxx	2011-08-11 20:03:27.877207705 +0200
++++ libreoffice-ure-3.4.2.3/sal/cppunittester/cppunittester.cxx	2011-08-11 20:03:55.351864224 +0200
+@@ -94,6 +94,8 @@
+     SetErrorMode(SEM_NOGPFAULTERRORBOX|dwMode);
+ #endif
  
--PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch
-+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch kill_switch.patch
-     # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
-     #  aid=2912590&group_id=11795&atid=311795>
-     # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
++    return 0;
++
+     CppUnit::TestResult result;
+     sal_uInt32 index = 0;
+     for (; index < rtl_getAppCommandArgCount(); index += 3) {