From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QKqss-0000op-3F for garchives@archives.gentoo.org; Fri, 13 May 2011 11:50:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5F2B1C02A; Fri, 13 May 2011 11:50:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 13F131C02A for ; Fri, 13 May 2011 11:50:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EAF81B407B for ; Fri, 13 May 2011 11:50:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DE56180504 for ; Fri, 13 May 2011 11:50:08 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <926828c5ab13612ac08ffe8f57aa523804b1a54f.anarchy@gentoo> Subject: [gentoo-commits] dev/anarchy:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: dev/anarchy X-VCS-Files: app-office/libreoffice/Manifest app-office/libreoffice/files/enable-startup-notification.diff app-office/libreoffice/files/env_log.diff app-office/libreoffice/files/fix-ooo-collision.diff app-office/libreoffice/files/gentoo-3.3.2.diff app-office/libreoffice/files/gentoo-pythonpath.diff app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff app-office/libreoffice/files/scrap-pixmap-links.diff app-office/libreoffice/files/sdext-presenter.diff app-office/libreoffice/libreoffice-3.3.2.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 926828c5ab13612ac08ffe8f57aa523804b1a54f Date: Fri, 13 May 2011 11:50:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: db05a231d33ce7cd8ce3783faa8f71a5 commit: 926828c5ab13612ac08ffe8f57aa523804b1a54f Author: Jory A. Pratt gentoo org> AuthorDate: Fri May 13 11:48:16 2011 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri May 13 11:48:16 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/anarchy.git;a=3D= commit;h=3D926828c5 add support for gcc-4.6 to libreoffice with system libs --- app-office/libreoffice/Manifest | 91 ++++ .../files/enable-startup-notification.diff | 108 +++++ app-office/libreoffice/files/env_log.diff | 25 ++ .../libreoffice/files/fix-ooo-collision.diff | 29 ++ app-office/libreoffice/files/gentoo-3.3.2.diff | 49 +++ .../libreoffice/files/gentoo-pythonpath.diff | 11 + .../files/libreoffice-3.3-libpng-1.5.diff | 13 + .../libreoffice-3.3.0_libxmlsec_fix_extern_c.diff | 38 ++ ...libreoffice-3.3.1-neon_remove_SSPI_support.diff | 27 ++ .../libreoffice/files/libreoffice-3.3.2-gcc46.diff | 295 +++++++++++++ .../files/libreoffice-libdb5-fix-check.diff | 25 ++ .../libreoffice/files/scrap-pixmap-links.diff | 37 ++ app-office/libreoffice/files/sdext-presenter.diff | 11 + app-office/libreoffice/libreoffice-3.3.2.ebuild | 451 ++++++++++++++= ++++++ 14 files changed, 1210 insertions(+), 0 deletions(-) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Man= ifest new file mode 100644 index 0000000..133f93b --- /dev/null +++ b/app-office/libreoffice/Manifest @@ -0,0 +1,91 @@ +AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e= 0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da= 334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a +AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA= 1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4= c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 +AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e0479= 26f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f8= 12699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4 +AUX gentoo-3.3.2.diff 1710 RMD160 406448b0b05ff95cf23d5e13a3a9e102955f29= 6b SHA1 0149b456d80da07fea047c2443becf316f2711a2 SHA256 e31ebd94a154338e5= 27976d24354917e01e9ca4ff54917e2a697d2cc2bca672e +AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3= 643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f= 197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a +AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71= d78deb75d42e184 SHA1 caf49686b19f11b56ea929494d16a56cc4e05326 SHA256 13c5= d10642c2f044293186eb46de0611dd36ee3f0f3134ea2b3ea2c6ed6984f8 +AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a702= 5e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3= c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf46907= 9c +AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b= 136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97= d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc= 5e7e +AUX libreoffice-3.3.2-gcc46.diff 13710 RMD160 30039ccaa4cc068532546625df= b4ed36b338503d SHA1 cfb3008a61168e94a928a213c7a8da459676cbae SHA256 fb357= 13bf8e85239dc6b1f5c7529eff720417254a004f53c2fea86945941c453 +AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9= f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f= 8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a +AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73= ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38= c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9 +AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc= 45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5fae= e5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f +DIST 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz 4893724 RMD160= aefa80476ef8340be84440b61f738f432da51c92 SHA1 025d5d0d566a23ddb353495c11= 6116c1088ba2e9 SHA256 9d29cba4312812a26b14effda2cf56284e70226cdccc90a8384= 4297e3b7498ee +DIST 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 376068 RMD160 b= 6c1b121ea1b3b1386a188e9f425a7288b1de865 SHA1 c67f67b4b8ae46ef94bc8c09dc29= ff66d5796d37 SHA256 585c15b3b9ae0f3562d0aa35e15406adfd75357087d93009d4fa4= ae034c6e983 +DIST 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz 540999 RMD16= 0 2058bab6642460fdaee13993dd05da29aa516efa SHA1 e98d7149d6a20fdbb58cc0b79= cb5e3f95ae304e4 SHA256 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec830= 6000b256829655 +DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 RMD160 8b= 25da02fbc2702a43cc88b0af8eaeb41c0f75a0 SHA1 7168b0f40aa5c72267899601c116d= 2348d2f56ec SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da= 4bf3802370 +DIST 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz 31512= 2 RMD160 e99bb5017c29657c3303d8810e21bf02d737c345 SHA1 28d4ec24dfda4eb41b= 6ceaa0cfcfca41b578f3b3 SHA256 6e6c53064ef6f40891ad72c06fab9f3c8fdcda80e03= c9d0b21244cb1d4bf030b +DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 RMD160 40a15ad= 43e92335558c868d66bca521e57d8c583 SHA1 0619ed3a89644bef318df67db12045b2b5= 90585b SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e= 6cec6 +DIST 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 728789 RMD160 c= 5590829fedb1934a4854fb5d9a85d443cd0f406 SHA1 1dcd28d3fc7af42ceb63006cdc56= aa55ac66d355 SHA256 5ff7825fd09d0774b4f863ac77ed0d0349e4910de6c596e92c0af= 2ed9ecc0306 +DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 RMD1= 60 6056046e4043e3e6a613029fe94f5f1728bebcd5 SHA1 8f949ae74a6d66278a595bd0= 63f13e0ad196d14a SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be8= 9bf7cf39eefdd4a +DIST 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html 203= 35 RMD160 b74ae68c08ef3bc579407337e2f4f527c4754d9c SHA1 f07e5f2744ebf5a5d= 1018f77b312a50bfd06a006 SHA256 71730ed23e9f00e7b93bc78538bbf7750be501f149= bf04d1289c83cb222a2708 +DIST 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz 769268 RMD160 = 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb= 5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884= b350574e6695 +DIST 284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz 1657246 RMD16= 0 00d43701b92a6b7befacf082bbf01a4ecfe71275 SHA1 d55390a4242ad61f034291f1c= 854ab037e508272 SHA256 edfdb0734fb7120bf1cbb60e45a07864db2daaadf5c3591ccf= 7357f244d82a40 +DIST 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz 3= 568559 RMD160 5b7c679ca59540a19cfabb22b923f11d77da84c0 SHA1 32d2298c78132= a629ed2ac6c9830b4d52770ce02 SHA256 556921bf0de5c508985c95eef77b73a4388a7d= a1b7e703060c79c58385483bf4 +DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 RMD160 687165f= a06edad490e6173f3b868e1e1afdfc2c9 SHA1 1acea86fd399ed7817879d36370d3d1f8b= 109050 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c20819133= 3c6e1 +DIST 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip 867405= RMD160 83ada665ea92bd70cd8e9c73f0921e5790d6d9f1 SHA1 b67507ea7a48f7b6807= 5cdfb2384784e516cb8ca SHA256 f1691e48d02effdee0701622297394451759f13e0e0b= 36e788847f4b3e2ba11b +DIST 37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip 4706244 = RMD160 be12115ab2d4fbb13851a54b2538d615a4055aab SHA1 b4a2aba7b27e5a10f40b= 980a50aedadeb63228b4 SHA256 d78e33142ae37a1e085c6d1b0f0171abcd8fa626acc6d= 6da24212d8193df5685 +DIST 377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt 638 R= MD160 0bc261dd64cb9abbaf2c89dbb0fea66da310ab46 SHA1 4bc1606963326e4f1236a= 1a0ddafb7808e5a8b79 SHA256 4e62b6cb81cbab67e666e69ab8d069e66629d38e37f220= 7c0bce1f53e2868fd3 +DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 RMD160 0e6a= 6f183b1aafa43635ed9dfb74fc76761e65b4 SHA1 b92930010622906778f713fb8f0153f= a0683d018 SHA256 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7= e85a9045 +DIST 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz 463264 RMD160 d43dd= 826d64cc5a100618a9c7153b525510830f1 SHA1 180143410351cc87078c56e676491312= 19484f16 SHA256 b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e77= 13ddb91 +DIST 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 149529= 99 RMD160 e807b51c007a80de843566c47f16149afeb03a5e SHA1 19bdd1cabba599e5b= 0ed6fb0efc446e860e021b0 SHA256 8da587c6870bb35719c64c5973cafe1ce3f834fb33= f343d2293a56a58bf1ef1b +DIST 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 441 R= MD160 db97e6581e875ede8cf895a63d2c689f1eae667f SHA1 60bca1db80e8cb5bd1621= f79350b26a3a10360b2 SHA256 4745d5b571c79e1323044893f408d675527b4f641def3f= 2c2b204b5997604484 +DIST 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz 22508 RMD1= 60 08682935b555027eb032a212accb2284ce93d645 SHA1 b8ecfaee8aef693817f0ebc1= 2a2e932ac9467776 SHA256 799682f52182fa8295227731b4efad639413f82c1950a6459= 047477000f2a619 +DIST 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz 674912 RMD160 e90= 0cb8670b8c430beaa45895fb474411cb1958d SHA1 f9940698840c8a8045677e8be68ab8= 580903e20a SHA256 b33a7d56f454c331ae50996f989e86c9166e57af97b74de28cddf3d= 51ac11f00 +DIST 5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip 44748 RMD160 de0= edf9be3e466c0291c75cff49f44851bdd69f4 SHA1 82663948e32fe269c3ac9c6704855e= 1dbf63d6de SHA256 b1c123f73fe5c48092576b1f15eee6e374697b2b361ee8b0f7762e4= 036ab1911 +DIST 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz 2424604 RM= D160 a46ebbc4915dd871891c8461a331dd0804b61101 SHA1 bb845c3de2bb7ad93dddb2= c752247ec91475a947 SHA256 d1708a3a9a0d08b1cde1e9d95de950c2f18fffc3ca41413= c06b3ed3cae34a5f5 +DIST 79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip 1449297 RMD160 70849= a36291392e7f0f17f32884514eb4264371b SHA1 f4685ca1a539f9eb8cda92acd485b143= 0290712f SHA256 a7907d558d77b6c980542b31546b199adf2fc8fc7ee2bb0ba3cfaf94f= ba57902 +DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 RMD160 68e2= 48ec03675458f0536282ef250efa42c4c154 SHA1 8a90669029e107b61953b90ba11545f= ef586c2ca SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df= 34e21753 +DIST 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar 56041 R= MD160 fbf2fc7ec950ac7282b50ee5fbe0d9c9426c1894 SHA1 72a838242dfe8089fbe08= e143bbe28a19a0fa396 SHA256 deb9897f2c48a8c921bec4d72a98b506d86f3a69e35d94= 39e0896ca8ee1a8563 +DIST 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip 4001063= RMD160 530969ea625e7c7c2b8f8336a6d69a960ba3b31f SHA1 704c90532c96c460c9f= b0ca0a4b41561dd958dcb SHA256 4a9c251e8ee02295fdba9d988863f19ee13ee56b9bc2= aa4c16411f414ad09ab5 +DIST 8ea307d71d11140574bfb9fcc2487e33-libbase.zip 161294 RMD160 9baf290f= eb0ce0da668842c0c300ab20cc5009d9 SHA1 29ef207664bb89283ad176c5afab26a95b5= 0e9b9 SHA256 9d6a8da4a4f6e201d3d7eb6293a5c01b5686d67c6df8f3cf9458df449c75= 846c +DIST 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 64057 RMD160= f2ca02c3bbd8e6787284420f8cb9364c6d5746cf SHA1 02e9cca05a9a3b6da59236c680= 1c186c07c311f3 SHA256 f0ff752a2c82548b02d8edeeaffbe9f276f4b8c509fdb909d3b= 7e2a71beb8cc3 +DIST 9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 306902 RMD160= 08a73131db2f3c2949959296ff270015833b3e71 SHA1 afc64ef4c4e8404f045efaa52c= 16c975c5cb1c84 SHA256 d69f6ccf8c4902b643302373bb6b3f95248f223fc0f75d47ade= 53e8949064c79 +DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d= 097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b= 63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a +DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c= 42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256= ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195 +DIST Sun_ODF_Template_Pack_es.oxt 4972619 RMD160 3b8bf592b34256969421472= b6ca492479d10d145 SHA1 2b33b91d536c39dba2ec5504f68d72c001712782 SHA256 0a= 00c795f4af10919d981e7409895198c9f09d2ab05f9e578a1e8428071f5bc3 +DIST Sun_ODF_Template_Pack_fr.oxt 4970438 RMD160 44de71cb028dde89836bfd1= 167b084dea54922e5 SHA1 3908eee06c17154c2cff6c9f175a7a8dad258e47 SHA256 4c= 8b739255122c989f00b3b706d99b93fa1c4cf428d61fd550994093aaca8fb5 +DIST Sun_ODF_Template_Pack_hu.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766= c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b= 069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8 +DIST Sun_ODF_Template_Pack_it.oxt 4960369 RMD160 9d8881f645f409599b7a5e1= 4cb4b6842e5883383 SHA1 85c7670e182d5ed5aeb2d9bfe20d161c4ac824c8 SHA256 6e= 87462d76954698ffcbcf4145fd13ab9c41520026160363fd6e97f7cad3ae05 +DIST a06a496d7a43cbdc35e69dbe678efadb-libloader.zip 166507 RMD160 21cf9e= c399c036494c7020d2ad02d9231e210fe1 SHA1 ce173113d325aa82c54c91322c2de25a1= c5a2157 SHA256 54092554adf14b90d32ea0fdf2ea3de50e22644cfc1f930a3abd8b7df9= 633c8e +DIST a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.htm= l 44798 RMD160 4242fd0c126dc5d2d7edc1f66a0565bf42812a7e SHA1 e5fb08ef4f0f= 19018ba4b397569edb5fa1c916c7 SHA256 05e6fddefb41a3a675a719c597bf0c44d2a41= 16d5978d02db8a32cca5f405672 +DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 RMD160 9238= 70cf88023713a492e0a5c5d5707ec21d8739 SHA1 2d49e11b0b711970f494294dc3698f0= 5eb294853 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a4107= 3724c870 +DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD1= 60 28bdf89bab559d82d82c75f6a339b5351ee06f48 SHA1 528dc8fa11343fa2a5d584dd= 2f8d5e2238ed78ba SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a= 1646b1f2232b825 +DIST bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 13176 RMD160 = df5850e54a1049328050d6a0c46a2d109a9827d0 SHA1 cef151475872853a9f0b8e3ce6c= 65d829403008f SHA256 9bb0f3d57c170a6833c3aec020ec52b6c7280d26bf42c9134773= c54cd238ac75 +DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6= SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c2= 8f4727e89b632875a128c9fccc17102f18773f0ea620b +DIST c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz 686207 RMD160 1= d5d88a8521eab43a57f270550bb654c8c980b32 SHA1 7c36232506c5cfc911b2e2edc44a= 1841a74630f5 SHA256 3be3b80c0151fbc69bc93767e952cf4bfbe61874328b1c979126b= bbcf1e75da5 +DIST ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.201007= 21.tar.gz 1324547 RMD160 4ff48c470d788e0fccdd9b8c3acdb66b73fcf546 SHA1 e3= 6555ed4e13a8109bfdb5a8c621de6d581f5ab7 SHA256 9cdea85d1ee40160cf48fc482fb= d9038b07b47d909f2091039338d39b0bb7d2f +DIST cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2 43041 RMD160 76= d894e8f083d03ef1795e9c4c764c4b20c90a3a SHA1 3a1d839b9a36287074c3724fa16ac= 1e04d343fbe SHA256 4d28548468bb63edf630ebfc8c14f80531f12265f8fa5694c01b40= 1594d01dff +DIST d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz 638806 RMD160 d2= 6e2f1f10c434599e5fee50b25f8e158ce4b083 SHA1 4aaf6fdca76acec0b2dd6f50e23c1= 80c5fa1bef5 SHA256 03b9d0af693190d95bbf159df69cd34ec93ac4373cc922d902fc6b= 579c8617d1 +DIST d1a3205871c3c52e8a50c9f18510ae12-libformula.zip 516667 RMD160 9f573= e6e1863e33e56c0f55e1263cc73796be85c SHA1 557462b46e68d2b067aa7b0a0521943c= 703209ff SHA256 41099b1a7f53c9af816a1eba8a3ad9a05a3345935ae4c5697013d8464= 77f3910 +DIST d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip 764464 RMD160 5f7f24ab86a= 2b1d051dfd775b66c7681c212be6a SHA1 626731cb89e69d864d0f52a571f71f44d90db3= 94 SHA256 c8e14bb686e113b126dc802d922fbafcf8fca592ea230ffc07c4672a3ab0a97= 9 +DIST dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip 89510 RMD160 a7d= fb272393ba1698146cc7b170c256be11b6f25 SHA1 36ef214f64bab59ce7300f9af8ecff= 88a218874c SHA256 0f4cc8f5a1fb233f8101c86d5b118ef1c910c623e759da108cb7297= 43deb1ff8 +DIST e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt 175= RMD160 a2dee9cfec3a784c38cfb343abd739cee8d5008f SHA1 23e23f0d6f6b7e4c9b7= e2f0ef25f5057e61f0e4c SHA256 62f48b6922e661141ddbc8b78518409d063f2f7d41d8= c46e02fadd5a01e6272f +DIST extras-3.1.tar.bz2 130647 RMD160 dc9022051a589dbd810afa9b871472d27c= 9e80aa SHA1 c4e9c3ed2502c584f1b6e4b7d650afc8c33fccb6 SHA256 6691d40911bf1= b1ef7832a5b320e2ab383a79e463ef0dad9b13eb7a5e74c8b1d +DIST f3e2febd267c8e4b13df00dac211dd6d-flute.zip 83503 RMD160 c73b7919ee7= 3d248d11d433f036b3232e1d151f8 SHA1 76830de4f64998e68c0d03a4c02177c6dfebbf= b1 SHA256 13968a9ade310ee464be04380fecbeb2f591a3a462e4048ad1ebc4dae65538f= 5 +DIST f7925ba8491fe570e5164d2c72791358-libfonts.zip 1336993 RMD160 a4ba6e= 7e2e19a085dc054d3793f7c31d5c32894c SHA1 171fc524f7f42e99b23754c8aca060037= 8057d40 SHA256 40549fb2995749f1c57455d1226b1e1fa1cfca635ce9d79d8de9ec625e= 4a82b9 +DIST fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt = 559 RMD160 46ffb5caf57188aef737668221cf0013621a2a80 SHA1 21ed62fb15fc59a9= 42ec0ced95e885653290f0f9 SHA256 aab31340dfc8a6ba5c9689349ff892336044cb663= 7a426404cf197ac21ed2244 +DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD1= 60 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca8= 2f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3= c8dabf20fea8256 +DIST libreoffice-artwork-3.3.2.2.tar.bz2 21989346 RMD160 1ccf6ed246bca09= 2e3b0fc4e56dbd257e7a54073 SHA1 58111f00cb80b0003a5acb33174318c8d9975685 S= HA256 81b087bf616b521ece2be1922c532917be0cb564ffec1a8043219d2cf9b5aa6d +DIST libreoffice-base-3.3.2.2.tar.bz2 2082264 RMD160 0f20c212d3336ce7029= 8b0825539d45acef101ab SHA1 b04e5dfa550db2726338d9be61b908e47a9e3e50 SHA25= 6 32a03ea3897f978bc98d67a03cae60f2c9b6e395e1aa8c8cca06f62979efcf15 +DIST libreoffice-bootstrap-3.3.2.2.tar.bz2 2751299 RMD160 b8279525a1c7ef= 789a5c03853e69d775d9218521 SHA1 68829ca1d83407ad295c7c2495d7e0b9969ef45b = SHA256 8799545dd696be0288e690ae066b4a91bdd4979b4947a9faf36f21c1500ae044 +DIST libreoffice-build-3.3.2.2.tar.gz 14466234 RMD160 c41a7af4da7d1cb680= a7eb0197846ae2ccfe15d1 SHA1 aaa0d1cc4bb79cc70a6c7fb083706411bf510e78 SHA2= 56 be754033eacb59dd79234ac60b3c3a0a9c08eac510daa0fb16ed16abe2cf5e3e +DIST libreoffice-calc-3.3.2.2.tar.bz2 9407394 RMD160 6495cdf36687d88a8d2= 650c9ee8054f70b2523ba SHA1 d6b165fd27065854b61f312c689c049ad12c251d SHA25= 6 cba5e46ad4899e68dceefd655f3607e752186f699cff50af9fddc7220082f996 +DIST libreoffice-components-3.3.2.2.tar.bz2 5123213 RMD160 825f1463c7cab= ef10fb32961e927d5a85460cf05 SHA1 4f2d2aaef0efbc0aea695efb536367cf01fbc60e= SHA256 8c554f9266eb92b1bdd09379bde83ece2180bdf132f6f45f59c2d509884c5e71 +DIST libreoffice-extensions-3.3.2.2.tar.bz2 4198856 RMD160 17e2fc608bcfc= 729da938b8f18598decb3b591e9 SHA1 c0733e402696e6e99b6a4658471a990de1a349b9= SHA256 f5ad77b09cf174bd73b107805e09c6bd6ddadd5348908861f4e730dee62347ff +DIST libreoffice-extras-3.3.2.2.tar.bz2 38706912 RMD160 063ff609bd3a8841= 4e4dedd4c103cfbdcaae7cb7 SHA1 f07ec52a6367e110d4e969eb21b4678ee07f61a4 SH= A256 74bb20a2ce2c3139ca7b35c4d82390b26c745e09e7b7596521e7a80d73459b4d +DIST libreoffice-filters-3.3.2.2.tar.bz2 11950736 RMD160 6c1d5bb2d8958bf= 3ee4a5ced4b678fa1dddec401 SHA1 6b15187c796a31ede38ad1108addce94d94d40f5 S= HA256 7ab895b5873b2a9f1d6d631d6af1fbbbf8c8d520564d46c30440658e2833e58a +DIST libreoffice-help-3.3.2.2.tar.bz2 1914229 RMD160 b00668915f716b57c79= 491896b97431db0dd7513 SHA1 08213ff55841426c1c20ff2f5269a7a941deb38f SHA25= 6 f3d105f2e4eae770ba87b8ecb7b425a2479aa3bcfca4b95bb0de4cd50f5b2da8 +DIST libreoffice-impress-3.3.2.2.tar.bz2 2607403 RMD160 372200c44b544273= b13eb2187b492148472f5ce4 SHA1 19bfe0c22e7b7623766ef2fc237aea11b7a0049b SH= A256 93a879bb15bb1995d3f0c33a623639c4f0917fa3909fe998865001546d6575cf +DIST libreoffice-l10n-3.3.2.2.tar.bz2 80784635 RMD160 d0674b3ae355eb19d9= e85f7898ce811595a00632 SHA1 18d661cf597c8ecf350a808462b332ca3c5d5611 SHA2= 56 a0f705de7cdabcde047545b9240a295eb2002e7fcfec81f2a12262b6937c578d +DIST libreoffice-libs-core-3.3.2.2.tar.bz2 16698853 RMD160 12ac46ee9e8f5= 1e997d6193042629c46c9abf2ee SHA1 236d605f6b5faa01de6000c0440ef24286e6f167= SHA256 66b1924fac13fc0a293b59abf55cc1d28dd0e8af085b758d166e7f1d3997323a +DIST libreoffice-libs-extern-3.3.2.2.tar.bz2 628888 RMD160 d94568c00e515= de6aa6e6764c06db297d5e84f83 SHA1 4ccb124b2c96238e6509f4ffb316380663d1425f= SHA256 6f55e4c1cfe6ce179448342f117030f8e0016b154d0a68ead52d5a48f5af8222 +DIST libreoffice-libs-extern-sys-3.3.2.2.tar.bz2 38822520 RMD160 9346442= 9e38e6d6827efea3146e4334b81aeef7c SHA1 93ec79c399dae49485e93dafe2f8d5df3e= fcd344 SHA256 b63de5e7bb8274fa3e82a0a028dff56c985b6c3d44517b7840973be980d= 8a8b5 +DIST libreoffice-libs-gui-3.3.2.2.tar.bz2 10833350 RMD160 f5ce3aef3d44fd= ad6194ea71a8b3dafb8ef18c5a SHA1 dfe92cf62f553103804c2ff971428fd95d36edb1 = SHA256 c9264c0f7b292bf131f74c8b54f380350f29f9e4d3e4da203483c6d2c20cf15f +DIST libreoffice-postprocess-3.3.2.2.tar.bz2 43106 RMD160 609ed05dec5000= 8a26e8fbb07e78d0e4898d5b52 SHA1 8b60346b59375a52dec80c4f81d13175e21f5829 = SHA256 2e7ab60dac2c520c9d709b34f631bb2ce30cbc9ae04f58dbb32314a683c65762 +DIST libreoffice-sdk-3.3.2.2.tar.bz2 1710897 RMD160 a179fdc2248e5b968fca= 56577ae0dfe3fd6d4dc0 SHA1 e92375a45afdf2612946ab45ac423878ba188d6f SHA256= 95699df280e7ec022ec4659448359040fb00d47f680ee808b4a9554153490b29 +DIST libreoffice-testing-3.3.2.2.tar.bz2 50946350 RMD160 eeee1b4f985ee68= 97def774b5e9f0cd38014883c SHA1 e67f369188858b5b7451762049953daf1167e925 S= HA256 0b67a06192fe157e9fe0c0f70acc96897db53add936baf4d3b5f1a7552e81ed3 +DIST libreoffice-ure-3.3.2.2.tar.bz2 6165456 RMD160 016a6e690e02e41519e2= d64d174f542b5a4e50f2 SHA1 40261e8a9605e504661111c41229ce0ee2986844 SHA256= 37b340c3b476e1c7a95c4406228848d8afe0b5f8188af7a4f01f7fa5772232ea +DIST libreoffice-writer-3.3.2.2.tar.bz2 6778875 RMD160 db0b4ae2c1c93c6e3= 5e93e48ee4ce5bdc1e963dc SHA1 d0d329bd1659c3d943c746c4f8cc76379094d7cc SHA= 256 3b7fe1fa2a889b5358a958c8e669505fa81251164c773d3dad650ce53009a973 +DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 = SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340= b0306711c2d8767cc3481dd9e7d9b0d059906d12653c +EBUILD libreoffice-3.3.2.ebuild 17977 RMD160 a5698175eff89ca8dc7c1a4d156= 9802424ecd353 SHA1 5e9e6edaba54c79d35c0c5fa3ea5e758173bd9bc SHA256 1749ff= eae18f2df741ef0ee7a8eb9bb1105f9c5a2dadd0248dedb1fadbbd01d1 diff --git a/app-office/libreoffice/files/enable-startup-notification.dif= f b/app-office/libreoffice/files/enable-startup-notification.diff new file mode 100644 index 0000000..39e1172 --- /dev/null +++ b/app-office/libreoffice/files/enable-startup-notification.diff @@ -0,0 +1,108 @@ +--- desktop/base.desktop.in.in 2010-01-12 12:35:25.000000000 +0200 ++++ desktop/base.desktop.in.in 2010-03-25 14:23:29.000000000 +0200 +@@ -6,7 +6,7 @@ + Icon=3Dooo-base@OOO_BINSUFFIX@ + Type=3DApplication + Categories=3DOffice;Database; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + MimeType=3Dapplication/vnd.oasis.opendocument.database;application/vnd.= sun.xml.base; + _Name=3DOpenOffice.org Base + _GenericName=3DDatabase +--- desktop/calc.desktop.in.in 2010-01-12 12:35:25.000000000 +0200 ++++ desktop/calc.desktop.in.in 2010-03-25 14:23:36.000000000 +0200 +@@ -7,7 +7,7 @@ + Type=3DApplication + InitialPreference=3D6 + Categories=3DOffice;Spreadsheet; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + MimeType=3Dapplication/msexcel;application/vnd.lotus-1-2-3;application/= vnd.ms-excel;application/vnd.oasis.opendocument.chart;application/vnd.oas= is.opendocument.chart-template;application/vnd.oasis.opendocument.spreads= heet;application/vnd.oasis.opendocument.spreadsheet-template;application/= vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.= sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-dbase;ap= plication/x-dbf;application/x-quattropro;text/csv;text/spreadsheet;text/x= -csv;application/vnd.ms-excel.sheet.binary.macroEnabled.12;application/vn= d.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedoc= ument.spreadsheetml.sheet;application/vnd.ms-excel.template.macroEnabled.= 12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;a= pplication/csv;application/excel;application/tab-separated-values;applica= tion/x-123;application/x-dos_ms_excel;application/x-excel;application/x-m= s-excel;application/x-msexcel;text/comma-se parated-values;text/tab-separated-values;text/x-comma-separated-values; + _Name=3DOpenOffice.org Calc + _GenericName=3DSpreadsheet +--- desktop/draw.desktop.in.in 2010-01-12 12:35:25.000000000 +0200 ++++ desktop/draw.desktop.in.in 2010-03-25 14:23:44.000000000 +0200 +@@ -6,7 +6,7 @@ + Icon=3Dooo-draw@OOO_BINSUFFIX@ + Type=3DApplication + Categories=3DGraphics;VectorGraphics; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + InitialPreference=3D6 + MimeType=3Dapplication/vnd.oasis.opendocument.graphics;application/vnd.= oasis.opendocument.graphics-template;application/vnd.stardivision.draw;ap= plication/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template; + _Name=3DOpenOffice.org Draw +--- desktop/impress.desktop.in.in 2010-01-12 12:35:25.000000000 +0200 ++++ desktop/impress.desktop.in.in 2010-03-25 14:23:52.000000000 +0200 +@@ -6,7 +6,7 @@ + Icon=3Dooo-impress@OOO_BINSUFFIX@ + Type=3DApplication + Categories=3DOffice;Presentation; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + MimeType=3Dapplication/mspowerpoint;application/vnd.ms-powerpoint;appli= cation/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocu= ment.presentation-template;application/vnd.stardivision.impress;applicati= on/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;applicati= on/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlfor= mats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoin= t.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocum= ent.presentationml.presentation;application/vnd.ms-powerpoint.template.ma= croEnabled.12;application/vnd.openxmlformats-officedocument.presentationm= l.template; + InitialPreference=3D5 + _Name=3DOpenOffice.org Impress +--- desktop/math.desktop.in.in 2010-01-12 12:35:25.000000000 +0200 ++++ desktop/math.desktop.in.in 2010-03-25 14:24:02.000000000 +0200 +@@ -7,7 +7,7 @@ + Icon=3Dooo-math@OOO_BINSUFFIX@ + Type=3DApplication + Categories=3DOffice;Math; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + MimeType=3Dapplication/vnd.oasis.opendocument.formula;application/vnd.o= asis.opendocument.formula-template;application/vnd.stardivision.math;appl= ication/vnd.sun.xml.math;text/mathml; + _Name=3DOpenOffice.org Math + _GenericName=3DFormula +--- desktop/ooo-extension-manager.desktop.in.in 2010-01-12 12:35:25.0000= 00000 +0200 ++++ desktop/ooo-extension-manager.desktop.in.in 2010-03-25 14:24:10.0000= 00000 +0200 +@@ -5,7 +5,7 @@ + Exec=3Dunopkg@OOO_BINSUFFIX@ gui %U + NoDisplay=3Dtrue + Type=3DApplication +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + Categories=3DX-SuSE-Core-Office;Office; + MimeType=3Dapplication/vnd.openofficeorg.extension; + Name=3DOpenOffice.org Extension Manager +--- desktop/startcenter.desktop.in.in 2010-01-12 12:35:25.000000000 +020= 0 ++++ desktop/startcenter.desktop.in.in 2010-03-25 14:24:20.000000000 +020= 0 +@@ -6,7 +6,7 @@ + Icon=3Dooo-gulls@OOO_BINSUFFIX@ + Type=3DApplication + Categories=3DOffice;X-SuSE-Core-Office; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + InitialPreference=3D5 + _Name=3DOpenOffice.org + _GenericName=3DOffice +--- desktop/template.desktop.in.in 2010-01-12 12:35:25.000000000 +0200 ++++ desktop/template.desktop.in.in 2010-03-25 14:24:27.000000000 +0200 + Icon=3Dooo-gulls@OOO_BINSUFFIX@ + Type=3DApplication + Categories=3DX-SuSE-Core-Office;Office; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + _Name=3DLibreOffice + _GenericName=3DOffice Suite +--- desktop/web.desktop.in.in 2010-01-12 12:35:25.000000000 +0200 ++++ desktop/web.desktop.in.in 2010-03-25 14:24:33.000000000 +0200 +@@ -6,7 +6,7 @@ + Icon=3Dooo-web@OOO_BINSUFFIX@ + Type=3DApplication + Categories=3DNetwork;WebDevelopment; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + MimeType=3Dapplication/vnd.oasis.opendocument.text-web; + _Name=3DOpenOffice.org Writer/Web + _GenericName=3DWeb Page Creation +--- desktop/writer.desktop.in.in 2010-01-12 12:35:25.000000000 +0200 ++++ desktop/writer.desktop.in.in 2010-03-25 14:24:39.000000000 +0200 +@@ -6,7 +6,7 @@ + Icon=3Dooo-writer@OOO_BINSUFFIX@ + Type=3DApplication + Categories=3DOffice;WordProcessor; +-StartupNotify=3Dfalse ++StartupNotify=3Dtrue + MimeType=3Dapplication/msword;application/rtf;application/vnd.ms-works;= application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocumen= t.text-master;application/vnd.oasis.opendocument.text-template;applicatio= n/vnd.stardivision.writer;application/vnd.stardivision.writer-global;appl= ication/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;applicat= ion/vnd.sun.xml.writer.template;application/vnd.wordperfect;application/w= ordperfect;application/x-extension-txt;application/x-t602;text/plain;text= /rtf;application/vnd.ms-word.document.macroEnabled.12;application/vnd.ope= nxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-w= ord.template.macroEnabled.12;application/vnd.openxmlformats-officedocumen= t.wordprocessingml.template; + InitialPreference=3D5 + _Name=3DOpenOffice.org Writer diff --git a/app-office/libreoffice/files/env_log.diff b/app-office/libre= office/files/env_log.diff new file mode 100644 index 0000000..908169a --- /dev/null +++ b/app-office/libreoffice/files/env_log.diff @@ -0,0 +1,25 @@ +--- bin/build-ooo.orig 2007-04-18 18:32:06.000000000 +0200 ++++ bin/build-ooo 2007-04-18 18:32:45.000000000 +0200 +@@ -21,9 +21,8 @@ + echo "configuring ..."; + autoconf || exit 1; +=20 +-echo "Env for configure:" +-set +-echo "Env for configure ends" ++echo "Log Env for configure to `pwd`/env.log" ++set > env.log +=20 + eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1; +=20 +@@ -88,8 +88,8 @@ + # similar that gives child nmake's pain. + unset MAKEFLAGS +=20 +-echo "Env:" +-set ++echo "Log Env to `pwd`/env.log" ++set > env.log +=20 + # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are no= t + # already merged? diff --git a/app-office/libreoffice/files/fix-ooo-collision.diff b/app-of= fice/libreoffice/files/fix-ooo-collision.diff new file mode 100644 index 0000000..5bdc5c2 --- /dev/null +++ b/app-office/libreoffice/files/fix-ooo-collision.diff @@ -0,0 +1,29 @@ +--- bin/package-ooo.orig 2010-11-29 20:16:08.700004578 +0100 ++++ bin/package-ooo 2010-11-29 20:20:47.972004579 +0100 +@@ -104,12 +104,12 @@ + ln -sf $OOINSTBASE/program/soffice$BINSUFFIX $PREFIX/bin/soffice$BINSUF= FIX +=20 + # no man-page so ... +-if test "z$VENDORNAME" !=3D "zDebian" -a "z$VENDORNAME" !=3D "zMandriva= "; then ++if test "z$VENDORNAME" !=3D "zDebian" -a "z$VENDORNAME" !=3D "zMandriva= " -a "z$VENDORNAME" !=3D "zGentoo"; then + install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig + install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINS= UFFIX + fi +=20 +-if test "z$VENDORNAME" =3D "zMandriva"; then ++if test "z$VENDORNAME" =3D "zMandriva" -o "z$VENDORNAME" =3D "zGentoo";= then + install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFI= X + install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINS= UFFIX + fi +@@ -210,9 +210,9 @@ + done + =09 + # shared MIME info +- mkdir -p $PREFIX/share/mime/packages ++ mkdir -p $DATADIR/mime/packages + cd $TOOLSDIR/desktop +- cp openoffice.xml $PREFIX/share/mime/packages ++ cp openoffice.xml $DATADIR/mime/packages/libreoffice.xml + if test "z$RUN_POST_INSTALL_SCRIPTS" =3D "zyes" &&=20 + which update-mime-database >/dev/null 2>&1 ; then + update-mime-database /usr/share/mime || : diff --git a/app-office/libreoffice/files/gentoo-3.3.2.diff b/app-office/= libreoffice/files/gentoo-3.3.2.diff new file mode 100644 index 0000000..2a4b293 --- /dev/null +++ b/app-office/libreoffice/files/gentoo-3.3.2.diff @@ -0,0 +1,49 @@ +--- distro-configs/Gentoo.conf.in ++++ distro-configs/Gentoo.conf.in +@@ -1,5 +1,3 @@ +---disable-fontooo +---disable-qadevooo + --enable-neon + --enable-xrender-link + --with-external-dict-dir=3D/usr/share/myspell +--- configure.in=20 ++++ configure.in=20 +@@ -1326,12 +1326,18 @@ + done + fi + SUNTEMPLATES_LANG=3D +- # check whether the langs are requested at all +- for lang in $wanted_sun_templates ; do +- if test -n "`echo $with_lang | grep "$lang"`" ; then +- SUNTEMPLATES_LANG=3D"$SUNTEMPLATES_LANG $lang" +- fi +- done ++ ++ # --with-lang=3D"" now used for en-US ++ if test "z$with_lang" =3D "z" ; then ++ SUNTEMPLATES_LANG=3D"en-US" ++ else ++ # check whether the langs are requested at all ++ for lang in $wanted_sun_templates ; do ++ if test -n "`echo $with_lang | grep "$lang"`" ; then ++ SUNTEMPLATES_LANG=3D"$SUNTEMPLATES_LANG $lang" ++ fi ++ done ++ fi + AC_MSG_RESULT([$SUNTEMPLATES_LANG]) + fi + AC_SUBST(SUNTEMPLATES_LANG) +--- bin/package-ooo ++++ bin/package-ooo +@@ -126,8 +126,8 @@ + fi +=20 + # create bash completion +-mkdir -p $OODESTDIR/etc/bash_completion.d +-$TOOLSDIR/bin/generate-bash-completion --binsuffix=3D"$BINSUFFIX" $TOOL= SDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice$= {BINSUFFIX}.sh ++mkdir -p $SYSCONFDIR/bash_completion.d ++$TOOLSDIR/bin/generate-bash-completion --binsuffix=3D"$BINSUFFIX" $TOOL= SDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BI= NSUFFIX}.sh + if test "$COMPAT_OOWRAPPERS" =3D "YES" ; then + $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuf= fix=3D"$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_= completion.d/ooffice${BINSUFFIX}.sh + fi + diff --git a/app-office/libreoffice/files/gentoo-pythonpath.diff b/app-of= fice/libreoffice/files/gentoo-pythonpath.diff new file mode 100644 index 0000000..4714b0a --- /dev/null +++ b/app-office/libreoffice/files/gentoo-pythonpath.diff @@ -0,0 +1,11 @@ +--- bin/package-ooo=20 ++++ bin/package-ooo=20 +@@ -33,6 +33,7 @@ + { + cat <$1 + #!/bin/sh ++unset PYTHONPATH + $OOINSTBASE/program/soffice $2 "\$@" + EOT + chmod 755 $1 + diff --git a/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff= b/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff new file mode 100644 index 0000000..d0ca2ed --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.3-libpng-1.5.diff @@ -0,0 +1,13 @@ +--- desktop/unx/source/splashx.c.ark 2011-01-16 20:25:10.846685172 +0100 ++++ desktop/unx/source/splashx.c 2011-01-16 20:27:12.673351839 +0100 +@@ -137,8 +137,8 @@ int splash_load_bmp( const char *filenam + PNG_TRANSFORM_GRAY_TO_RGB | PNG_TRANSFORM_BGR, NULL); +=20 + bitmap_rows =3D png_get_rows( png_ptr, info_ptr ); +- width =3D info_ptr->width; +- height =3D info_ptr->height; ++ width =3D png_get_image_width( png_ptr, info_ptr ); ++ height =3D png_get_image_height( png_ptr, info_ptr ); +=20 + #if 0 + { diff --git a/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix= _extern_c.diff b/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec= _fix_extern_c.diff new file mode 100644 index 0000000..168d272 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.3.0_libxmlsec_fix_extern= _c.diff @@ -0,0 +1,38 @@ +--- libxmlsec/makefile.mk.ORIGINAL 2010-11-11 09:35:21.000000000 -0600 ++++ libxmlsec/makefile.mk 2011-02-13 03:13:41.496866392 -0600 +@@ -67,7 +67,8 @@ + xmlsec1-noverify.patch \ + xmlsec1-mingw32.patch \ + xmlsec1-mingw-keymgr-mscrypto.patch \ +- xmlsec1-vc10.patch ++ xmlsec1-vc10.patch \ ++ xmlsec1-1.2.14_fix_extern_c.patch +=20 + ADDITIONAL_FILES=3D \ + include$/xmlsec$/mscrypto$/akmngr.h \ +--- libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.ORIGINAL 1969-12-31 18:0= 0:00.000000000 -0600 ++++ libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch 2011-02-13 03:11:34.7405= 94681 -0600 +@@ -0,0 +1,23 @@ ++--- misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h.ORIGINAL 2009-12-= 05 15:19:18.000000000 -0600 +++++ misc/build/xmlsec1-1.2.14/include/xmlsec/xmlsec.h 2011-02-13 03:09:= 42.917240245 -0600 ++@@ -11,16 +11,16 @@ ++ #ifndef __XMLSEC_H__ ++ #define __XMLSEC_H__ =20 ++=20 ++-#ifdef __cplusplus ++-extern "C" { ++-#endif /* __cplusplus */=20 ++- ++ #include ++=20 ++ #include ++ #include ++ #include ++=20 +++#ifdef __cplusplus +++extern "C" { +++#endif /* __cplusplus */=20 +++ ++ /*********************************************************************= ** ++ * ++ * Basic types to make ports to exotic platforms easier diff --git a/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_S= SPI_support.diff b/app-office/libreoffice/files/libreoffice-3.3.1-neon_re= move_SSPI_support.diff new file mode 100644 index 0000000..4230374 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_sup= port.diff @@ -0,0 +1,27 @@ +--- ucb/source/ucp/webdav/NeonSession.cxx ++++ ucb/source/ucp/webdav/NeonSession.cxx +@@ -253,9 +253,6 @@ +=20 + // ------------------------------------------------------------------- + extern "C" int NeonSession_NeonAuth( void * inUserData, +-#ifdef NE_FEATURE_SSPI +- const char * inAuthProtocol, +-#endif + const char * inRealm, + int attempt, + char * inoutUserName, +@@ -322,14 +319,6 @@ +=20 + bool bCanUseSystemCreds =3D false; +=20 +-#ifdef NE_FEATURE_SSPI +- bCanUseSystemCreds +- =3D (attempt =3D=3D 0) && // avoid endless loops +- ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature. +- ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) =3D=3D 0 ) || +- ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) =3D=3D 0 ) )= ; +-#endif +- + int theRetVal =3D pListener->authenticate( + rtl::OUString::createFromAscii( inRealm ), + theSession->getHostName(), diff --git a/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff b/= app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff new file mode 100644 index 0000000..164a177 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.3.2-gcc46.diff @@ -0,0 +1,295 @@ +diff --git basegfx/source/polygon/b2dpolygon.cxx basegfx/source/polygon/= b2dpolygon.cxx +index f88069b..4e578a9 100644 +--- basegfx/source/polygon/b2dpolygon.cxx ++++ basegfx/source/polygon/b2dpolygon.cxx +@@ -257,6 +257,8 @@ class ControlVectorPair2D + basegfx::B2DVector maNextVector; +=20 + public: ++ ControlVectorPair2D() {} ++ + const basegfx::B2DVector& getPrevVector() const=20 + {=20 + return maPrevVector;=20 +diff --git basegfx/source/polygon/b2dsvgpolypolygon.cxx basegfx/source/p= olygon/b2dsvgpolypolygon.cxx +index 7f5ed07..51b8740 100644 +--- basegfx/source/polygon/b2dsvgpolypolygon.cxx ++++ basegfx/source/polygon/b2dsvgpolypolygon.cxx +@@ -787,9 +787,9 @@ namespace basegfx + // (since + // createPolygonFromEllipseSegment() + // normalizes to e.g. cw arc) +- const bool bFlipSegment( (bLargeArcFlag= !=3D0) =3D=3D=20 +- (fmod(fTheta2+2*M_PI-fTheta1, +- 2*M_PI) self; + typedef std::vector< DYN XX* > impl_type; + typedef typename impl_type::size_type size_type; +- typedef ptrdiff_t difference_type; ++ typedef std::ptrdiff_t difference_type; +=20 + class const_iterator; + class iterator; +diff --git autodoc/source/display/idl/hi_linkhelper.hxx autodoc/source/d= isplay/idl/hi_linkhelper.hxx +index c08be55..1cdfaa7 100644 +--- autodoc/source/display/idl/hi_linkhelper.hxx ++++ autodoc/source/display/idl/hi_linkhelper.hxx +@@ -85,9 +85,7 @@ class LinkHelper + const String & XrefsSuffix() const; = =20 + =20 + private: =20 +- // DATA +- mutable HtmlEnvironment_Idl & +- rEnv; ++ HtmlEnvironment_Idl & rEnv; + }; =20 +=20 + inline const ary::idl::CodeEntity * =20 +diff --git autodoc/inc/ary/idl/i_ce2s.hxx autodoc/inc/ary/idl/i_ce2s.hxx +index c490980..efb2711 100644 +--- autodoc/inc/ary/idl/i_ce2s.hxx ++++ autodoc/inc/ary/idl/i_ce2s.hxx +@@ -51,6 +51,7 @@ class Ce_2s + { + public: + // LIFECYCLE ++ Ce_2s() {} + virtual ~Ce_2s(); +=20 + static DYN Ce_2s * Create_( +diff --git unotools/inc/unotools/streamwrap.hxx unotools/inc/unotools/st= reamwrap.hxx +index 80cde76..4b53500 100644 +--- unotools/inc/unotools/streamwrap.hxx ++++ unotools/inc/unotools/streamwrap.hxx +@@ -51,7 +51,7 @@ namespace utl + //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + typedef ::cppu::WeakImplHelper1 < stario::XInputStream + > InputStreamWrapper_Base; +- // needed for some compilers ++// needed for some compilers + /// helper class for wrapping an SvStream into an XInputStream + class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrappe= r_Base + { +@@ -69,9 +69,6 @@ public: + OInputStreamWrapper(SvStream* pStream, sal_Bool bOwner=3Dsal_False)= ; + virtual ~OInputStreamWrapper(); +=20 +-// UNO Anbindung +- DECLARE_UNO3_AGG_DEFAULTS(OInputStreamWrapper, InputStreamWrapper_B= ase); +- + // stario::XInputStream + virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >&= aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, star= io::BufferSizeExceededException, staruno::RuntimeException); + virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int= 8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedExceptio= n, stario::BufferSizeExceededException, staruno::RuntimeException); +@@ -122,9 +119,6 @@ protected: + public: + OOutputStreamWrapper(SvStream& _rStream) :rStream(_rStream) { } +=20 +-// UNO Anbindung +- DECLARE_UNO3_AGG_DEFAULTS(OOutputStreamWrapper, OutputStreamWrapper= _Base); +- + // stario::XOutputStream + virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 = >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceeded= Exception, staruno::RuntimeException); + virtual void SAL_CALL flush() throw(stario::NotConnectedException, = stario::BufferSizeExceededException, staruno::RuntimeException); +diff --git lotuswordpro/source/filter/xfilter/xfparastyle.hxx lotuswordp= ro/source/filter/xfilter/xfparastyle.hxx +index fde03ae..ead40ff 100644 +--- lotuswordpro/source/filter/xfilter/xfparastyle.hxx ++++ lotuswordpro/source/filter/xfilter/xfparastyle.hxx +@@ -235,10 +235,7 @@ public: +=20 + sal_uInt32 GetFlag(){ return m_nFlag; } +=20 +- /** +- * @descr return margins. +- */ +- XFMargins GetMargins(){return m_aMargin;} ++ XFMargins& GetMargins(){return m_aMargin;} +=20 + virtual enumXFStyle GetStyleFamily(); +=20 +diff --git chart2/source/controller/main/ChartController.hxx chart2/sour= ce/controller/main/ChartController.hxx +index 3927da9..93b1706 100644 +--- chart2/source/controller/main/ChartController.hxx ++++ chart2/source/controller/main/ChartController.hxx +@@ -545,7 +545,7 @@ private: + TheModel* operator->() const { return m_pTheModel; } + private: + TheModel* m_pTheModel; +- mutable ::osl::Mutex& m_rModelMutex; ++ ::osl::Mutex& m_rModelMutex; + }; +=20 + private: +diff --git writerperfect/source/filter/Style.hxx writerperfect/source/fi= lter/Style.hxx +index 2820415..d54f0c8 100644 +--- writerperfect/source/filter/Style.hxx ++++ writerperfect/source/filter/Style.hxx +@@ -34,7 +34,7 @@ + class TopLevelElementStyle + { + public: +- TopLevelElementStyle() : mpsMasterPageName(NULL) { } ++ TopLevelElementStyle() : mpsMasterPageName(0) { } + virtual ~TopLevelElementStyle() { if (mpsMasterPageName) delete mps= MasterPageName; } + void setMasterPageName(WPXString &sMasterPageName) { mpsMasterPageN= ame =3D new WPXString(sMasterPageName); } + const WPXString * getMasterPageName() const { return mpsMasterPageN= ame; } +diff --git filter/source/xmlfilteradaptor/streamwrap.hxx filter/source/x= mlfilteradaptor/streamwrap.hxx +index 369a7bb..2a1a2ce 100644 +--- filter/source/xmlfilteradaptor/streamwrap.hxx ++++ filter/source/xmlfilteradaptor/streamwrap.hxx +@@ -34,13 +34,6 @@ + #include + #include +=20 +-#define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \ +-virtual void SAL_CALL acquire() throw() { baseclass::acquire= (); } \ +-virtual void SAL_CALL release() throw() { baseclass::release= (); } \ +-virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com= ::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeExce= ption) \ +-{ return baseclass::queryInterface(_rType); } \ +-void SAL_CALL PUT_SEMICOLON_AT_THE_END() +- + namespace osl + { + class File; +@@ -63,9 +56,6 @@ class OOutputStreamWrapper : public OutputStreamWrappe= r_Base + public: + OOutputStreamWrapper(::osl::File& _rStream) :rStream(_rStream) { } +=20 +-// UNO Anbindung +- DECLARE_UNO3_AGG_DEFAULTS(OOutputStreamWrapper, OutputStreamWrapper= _Base); +- + // stario::XOutputStream + virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 = >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceeded= Exception, staruno::RuntimeException); + virtual void SAL_CALL flush() throw(stario::NotConnectedException, = stario::BufferSizeExceededException, staruno::RuntimeException); +diff --git comphelper/inc/comphelper/oslfile2streamwrap.hxx comphelper/i= nc/comphelper/oslfile2streamwrap.hxx +index d636666..4d6c454 100644 +--- comphelper/inc/comphelper/oslfile2streamwrap.hxx ++++ comphelper/inc/comphelper/oslfile2streamwrap.hxx +@@ -44,10 +44,7 @@ namespace comphelper + // FmUnoIOStream, + // stream zum schreiben un lesen von Daten, basieren auf File + //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +-struct InputStreamWrapper_Base : public ::cppu::WeakImplHelper1=20 +-{}; +- +-class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public InputStreamWr= apper_Base ++class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public ::cppu::WeakI= mplHelper1 + { + ::osl::Mutex m_aMutex; + ::osl::File* m_pFile; +@@ -58,14 +55,6 @@ public: + OSLInputStreamWrapper(::osl::File* pStream, sal_Bool bOwner=3Dsal_F= alse); + virtual ~OSLInputStreamWrapper(); +=20 +-// UNO Anbindung +- virtual void SAL_CALL acquire() throw() +- { InputStreamWrapper_Base::acquire(); } +- virtual void SAL_CALL release() throw() +- { InputStreamWrapper_Base::release(); } +- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::= com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeE= xception) +- { return InputStreamWrapper_Base::queryInterface(_rType); } +- + // stario::XInputStream + virtual sal_Int32 SAL_CALL readBytes(staruno::Sequence< sal_Int8 >&= aData, sal_Int32 nBytesToRead) throw(stario::NotConnectedException, star= io::BufferSizeExceededException, staruno::RuntimeException); + virtual sal_Int32 SAL_CALL readSomeBytes(staruno::Sequence< sal_Int= 8 >& aData, sal_Int32 nMaxBytesToRead) throw(stario::NotConnectedExceptio= n, stario::BufferSizeExceededException, staruno::RuntimeException); +@@ -78,24 +67,13 @@ public: + // FmUnoOutStream, + // Datensenke fuer Files + //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +-struct OutputStreamWrapper_Base : public ::cppu::WeakImplHelper1=20 +-{}; +- +-class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public OutputStream= Wrapper_Base ++class COMPHELPER_DLLPUBLIC OSLOutputStreamWrapper : public ::cppu::Weak= ImplHelper1 + { + ::osl::File& rFile; +=20 + public: + OSLOutputStreamWrapper(::osl::File& _rFile) :rFile(_rFile) { } +=20 +-// UNO Anbindung +- virtual void SAL_CALL acquire() throw() +- { OutputStreamWrapper_Base::acquire(); } +- virtual void SAL_CALL release() throw() +- { OutputStreamWrapper_Base::release(); } +- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::= com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeE= xception) +- { return OutputStreamWrapper_Base::queryInterface(_rType); } +- + // stario::XOutputStream + virtual void SAL_CALL writeBytes(const staruno::Sequence< sal_Int8 = >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceeded= Exception, staruno::RuntimeException); + virtual void SAL_CALL flush() throw(stario::NotConnectedException, = stario::BufferSizeExceededException, staruno::RuntimeException); +diff --git sc/source/filter/inc/xeroot.hxx sc/source/filter/inc/xeroot.h= xx +index cac22f4..dc8652e 100644 +--- sc/source/filter/inc/xeroot.hxx ++++ sc/source/filter/inc/xeroot.hxx +@@ -168,7 +168,7 @@ private: + XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const; +=20 + private: +- mutable XclExpRootData& mrExpData; /// Reference to the global= export data struct. ++ XclExpRootData& mrExpData; /// Reference to the global export = data struct. + }; +=20 + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D +diff --git sc/source/filter/inc/xiroot.hxx sc/source/filter/inc/xiroot.h= xx +index 1b4153e..83953e3 100644 +--- sc/source/filter/inc/xiroot.hxx ++++ sc/source/filter/inc/xiroot.hxx +@@ -218,7 +218,7 @@ public: + void ReadCodeName( XclImpStream& rStrm, bool bGlobal= s ); +=20 + private: +- mutable XclImpRootData& mrImpData; /// Reference to the global= import data struct. ++ XclImpRootData& mrImpData; /// Reference to the global import = data struct. + }; +=20 + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D +diff --git sc/source/filter/inc/xlroot.hxx sc/source/filter/inc/xlroot.h= xx +index 5e132fa..3f9f6fa 100644 +--- sc/source/filter/inc/xlroot.hxx ++++ sc/source/filter/inc/xlroot.hxx +@@ -285,7 +285,7 @@ public: + inline void IncCurrScTab() { ++mrData.mnScTab; } +=20 + private: +- mutable XclRootData& mrData; /// Reference to the global dat= a struct. ++ XclRootData& mrData; /// Reference to the global data struct= . + }; +=20 + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D +diff --git dbaccess/source/core/dataaccess/documentdefinition.hxx dbacce= ss/source/core/dataaccess/documentdefinition.hxx +index f74b6ac..e51b959 100644 +--- dbaccess/source/core/dataaccess/documentdefinition.hxx ++++ dbaccess/source/core/dataaccess/documentdefinition.hxx +@@ -374,7 +374,7 @@ private: + ODocumentDefinition& m_rDocumentDefinition; + const ::com::sun::star::uno::Any m_aOldValue; + const ::com::sun::star::uno::Any m_aNewValue; +- mutable ::osl::ResettableMutexGuard& m_rClearForNotify; ++ ::osl::ResettableMutexGuard& m_rClearForNotify; +=20 + void impl_fireEvent_throw( const sal_Bool i_bVetoable ); + }; +diff --git hwpfilter/source/list.hxx hwpfilter/source/list.hxx +index 043a214..02f6e00 100644 +--- hwpfilter/source/list.hxx ++++ hwpfilter/source/list.hxx +@@ -41,6 +41,7 @@ + * re-implements the same functionality, based on the STL. + */ +=20 ++#include + #include +=20 + template + diff --git a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.di= ff b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff new file mode 100644 index 0000000..0c59f02 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff @@ -0,0 +1,25 @@ +--- configure.in.orig 2011-01-13 21:12:40.420005851 +0100 ++++ configure.in 2011-01-13 21:15:23.680008513 +0100 +@@ -4456,16 +4456,17 @@ + else return 1; + } + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db = 4.1])]) +- DB_LIB=3D +- for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do +- AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB=3D"db$dbver"; DB_CPPLIB= =3D"db_cxx$dbver"; break; ] , +- AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB=3D"db$dbver";= DB_CPPLIB=3D"db_cxx$dbver"; break; ] ++ save_LIBS=3D"$LIBS" ++ for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do ++ AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB=3D"db$dbver"; DB_CPP= LIB=3D"db_cxx$dbver"; LIBS=3D"-ldb$dbver $LIBS"; break; ] , ++ AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB=3D"db$dbver";= DB_CPPLIB=3D"db_cxx$dbver"; LIBS=3D"-ldb$dbver $LIBS"; break; ] + ) + ) + done + if test -z "$DB_LIB" ; then=20 +- AC_MSG_ERROR([db not installed or functional]) ++ AC_CHECK_FUNC(dbopen, [], [ AC_MSG_ERROR([db not installed or f= unctional]) ]) + fi ++ LIBS=3D"$save_LIBS" + SCPDEFS=3D"$SCPDEFS -DSYSTEM_DB" + else + AC_MSG_RESULT([internal]) diff --git a/app-office/libreoffice/files/scrap-pixmap-links.diff b/app-o= ffice/libreoffice/files/scrap-pixmap-links.diff new file mode 100644 index 0000000..69cfbbe --- /dev/null +++ b/app-office/libreoffice/files/scrap-pixmap-links.diff @@ -0,0 +1,37 @@ +--- bin/package-ooo=20 ++++ bin/package-ooo=20 +@@ -212,14 +212,6 @@ + done + done +=20 +- # create symlinks below share/pixmaps to keep the backward compatibili= ty +- pixmapsdir=3D$PREFIX/share/pixmaps +- mkdir -p $pixmapsdir +- cd $OODESTDIR$icondir/48x48/apps +- for icon in ooo-*.png ; do +- ln -sf $icondir/48x48/apps/$icon $pixmapsdir +- done +-=09 + # shared MIME info + mkdir -p $DATADIR/mime/packages + cd $TOOLSDIR/desktop +--- bin/piece/desktop-support-app=20 ++++ bin/piese/desktop-support-app=20 +@@ -75,17 +75,6 @@ + test -n "$list_icon_dirs" && echo "%dir $icon_dir/$size/$category" >>f= iles-$piece.txt + done +=20 +- # create symlink below share/pixmaps to keep the backward compatibi= lity +- if test "$category" =3D "apps" ; then +- file=3D$DESTDIR/$icon_dir/48x48/apps/$icon_name.png +- if test -f $file ; then +- filename=3D`basename $file` +- pixmaps_dir=3D/usr/share/pixmaps +- mkdir -p $DESTDIR$pixmaps_dir +- ln -sf $icon_dir/48x48/apps/$filename $DESTDIR$pixmaps_dir +- test -n "$DESTDIR" && echo "$pixmaps_dir/$filename" >>files-$piece= .txt +- fi +- fi + } +=20 + case "$app" in diff --git a/app-office/libreoffice/files/sdext-presenter.diff b/app-offi= ce/libreoffice/files/sdext-presenter.diff new file mode 100644 index 0000000..b1eac7d --- /dev/null +++ b/app-office/libreoffice/files/sdext-presenter.diff @@ -0,0 +1,11 @@ +--- sdext/source/presenter/makefile.mk 2011-01-24 20:03:50.376007211 +01= 00 ++++ sdext/source/presenter/makefile.mk 2011-01-24 20:04:45.184007227 +01= 00 +@@ -295,7 +295,7 @@ + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ +=20 +-$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp := $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp ++$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.x= hp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp + @echo creating $@ + @-$(MKDIRHIER) $(@:d) + $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTERE= XTENSIONPRODUCTNAME@/Presenter Console/g' > $@ diff --git a/app-office/libreoffice/libreoffice-3.3.2.ebuild b/app-office= /libreoffice/libreoffice-3.3.2.ebuild new file mode 100644 index 0000000..357efbc --- /dev/null +++ b/app-office/libreoffice/libreoffice-3.3.2.ebuild @@ -0,0 +1,451 @@ +# 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.= 3.2.ebuild,v 1.2 2011/04/07 21:03:27 josejx Exp $ + +EAPI=3D"3" + +WANT_AUTOMAKE=3D"1.9" + +KDE_REQUIRED=3D"optional" +CMAKE_REQUIRED=3D"never" + +PYTHON_DEPEND=3D"2" +PYTHON_USE_WITH=3D"threads" + +inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag= -o-matic gnome2-utils java-pkg-opt-2 kde4-base multilib pax-utils python = toolchain-funcs + +IUSE=3D"binfilter cups -custom-cflags dbus debug eds gnome gstreamer gtk= kde ldap nsplugin odk opengl templates" + +MY_PV=3D3.3.2.2 +MY_P=3D"${PN}-build-${MY_PV}" +PATCHLEVEL=3DOOO320 +SRC=3DOOo_${PV}_src +S=3D"${WORKDIR}/${MY_P}" +DEVPATH=3D"http://download.documentfoundation.org/libreoffice/src" +CONFFILE=3D${S}/distro-configs/Gentoo.conf.in +BASIS=3Dbasis3.3 + +DESCRIPTION=3D"LibreOffice, a full office productivity suite." +HOMEPAGE=3D"http://www.libreoffice.org" +SRC_URI=3D"${DEVPATH}/${PN}-build-${MY_PV}.tar.gz + templates? ( + http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template= _Pack_en-US.oxt + http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template= _Pack_de.oxt + http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template= _Pack_it.oxt + http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template= _Pack_fr.oxt + http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template= _Pack_es.oxt + ftp://ftp.devall.hu/kami/go-oo//Sun_ODF_Template_Pack_hu.oxt + ) + odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowi= nreg.dll ) ) + http://download.go-oo.org/SRC680/extras-3.1.tar.bz2 + http://download.go-oo.org/SRC680/biblio.tar.bz2" + +# Shiny split sources with so many packages... +MODULES=3D"artwork base bootstrap calc components extensions extras filt= ers help +impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk t= esting +ure writer l10n" + +for mod in ${MODULES}; do + SRC_URI+=3D" ${DEVPATH}/${PN}-${mod}-${MY_PV}.tar.bz2" +done + +# addons +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/128cfc86ed595= 3e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/17410483b5b5f= 267aa18b7e00b65e6e0-hsqldb_1_8_0.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/1756c4fa6c616= ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/18f577b374d60= b3c760a3a3350407632-STLport-4.5.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/1f24ab1d39f4a= 51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/24be19595acad= 0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/26b3e95ddf3d9= c077c480ea45874b3b8-lp_solve_5.5.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/284e768eeda0e= 2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/2a177023f9ea8= ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/ca4870d899fd7= e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/35c94d2df8893= 241173de1d16b6034c0-swingExSrc.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/35efabc239af8= 96dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/377a60170e518= 5eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/39bb3fcea1514= f1369fcfc87542390fd-sacjava-1.3.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/3ade8cfe7e59c= a8e65052644fed9fca4-epm-3.7.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/48470d662650c= 3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/4a660ce8466c9= df01f19036435425c3a-glibc-2.1.3-stub.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/599dc4cc65a07= ee868cf92a667a913d2-xpdf-3.02.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/5aba06ede2daa= 9f2c11892fbd7bc3057-libserializer.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/7376930b0d3f3= d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/79600e696a98f= f95c2eba976f7a8dfbb-liblayout.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/798b2ffdc8bcf= e7bca2cf92b62caf685-rhino1_5R5.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/8294d6c42e355= 3229af9934c5c0ed997-stax-api-1.0-2-sources.jar" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/8ea307d71d111= 40574bfb9fcc2487e33-libbase.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/a06a496d7a43c= bdc35e69dbe678efadb-libloader.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/a4d9b30810a43= 4a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/a7983f859eafb= 2677d7ff386a023bc40-xsltml_2.1.2.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/ada24d37d8d63= 8b3d8a9985e80bc2978-source-9.0.0.7-bj.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/bc702168a2af1= 6869201dbe91e46ae48-LICENSE_Python-2.6.1" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/c441926f3a552= ed3e5b274b62e86af16-STLport-4.0.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/d0b5af6e408b8= d2958f3d83b5244f5e8-hyphen-2.4.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/d1a3205871c3c= 52e8a50c9f18510ae12-libformula.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/d4c4d91ab3a8e= 52a2e69d48d34ef4df4-core.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/dbb3757275dc5= cc80820c0b4dd24ed95-librepository.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/e0707ff896045= 731ff99e99799606441-README_db-4.7.25.NC-custom.txt" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/f3e2febd267c8= e4b13df00dac211dd6d-flute.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/f7925ba8491fe= 570e5164d2c72791358-libfonts.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/fb7ba5c2182be= 4e73748859967455455-README_stax-api-1.0-2-sources.txt" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2= e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/37282537d0ed1= a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/067201ea8b126= 597670b5eff72e1f66c-mythes-1.2.0.tar.gz" +ADDONS_SRC+=3D" http://hg.services.openoffice.org/binaries/cf8a6967f7de5= 35ae257fa411c98eb88-mdds_0.3.0.tar.bz2" +ADDONS_SRC+=3D" http://download.go-oo.org/src/47e1edaa44269bc537ae8cabeb= b0f638-JLanguageTool-1.0.0.tar.bz2" +ADDONS_SRC+=3D" http://download.go-oo.org/src/90401bca927835b6fbae4a707e= d187c8-nlpsolver-0.9.tar.bz2" +ADDONS_SRC+=3D" http://download.go-oo.org/src/0f63ee487fda8f21fafa767b3c= 447ac9-ixion-0.2.0.tar.gz" +ADDONS_SRC+=3D" http://download.go-oo.org/extern/185d60944ea767075d27247= c3162b3bc-unowinreg.dll" +ADDONS_SRC+=3D" http://download.go-oo.org/src/9e436bff44c60dc8b97cba0c7f= c11a5c-libwps-0.2.0.tar.bz2" +ADDONS_SRC+=3D" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00= bbbc004d-LinLibertineG-20110101.zip" +SRC_URI+=3D" ${ADDONS_SRC}" + +LANGS1=3D"af ar as ast be_BY bg bn bo br brx bs ca ca_XV cs cy da de dgo= dz el en en_GB en_ZA eo es et eu fa fi fr ga gd gl gu he hi hr hu id is = it ja ka kk km kn ko kok ks ku ky lo lt lv mai mk ml mn mni mr ms my nb n= e nl nn nr ns oc om or pa_IN pap pl ps pt pt_BR ro ru rw sa_IN sat sd sh = si sk sl sq sr ss st sv sw_TZ ta te tg th ti tn tr ts ug uk uz ve vi xh z= h_CN zh_TW zu" +LANGS=3D"${LANGS1} en en_US" + +for X in ${LANGS} ; do + IUSE+=3D" linguas_${X}" +done + +# intersection of available linguas and app-dicts/myspell-* dictionaries +SPELL_DIRS=3D"af bg ca cs cy da de el en eo es et fr ga gl he hr hu it k= u lt mk nb nl nn pl pt ru sk sl sv tn zu" +SPELL_DIRS_DEPEND=3D"" +for X in ${SPELL_DIRS} ; do + SPELL_DIRS_DEPEND+=3D" linguas_${X}? ( app-dicts/myspell-${X} )" +done + +LICENSE=3D"LGPL-3" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND=3D"!app-office/libreoffice-bin + !app-office/openoffice-bin + !app-office/openoffice + cups? ( net-print/cups ) + dbus? ( >=3Ddev-libs/dbus-glib-0.71 ) + eds? ( >=3Dgnome-extra/evolution-data-server-1.2 ) + gnome? ( >=3Dx11-libs/gtk+-2.10:2 + gnome-base/gconf:2 ) + gtk? ( >=3Dx11-libs/gtk+-2.10:2 ) + gstreamer? ( >=3Dmedia-libs/gstreamer-0.10 + >=3Dmedia-libs/gst-plugins-base-0.10 ) + java? ( >=3Ddev-java/bsh-2.0_beta4 + dev-java/lucene:2.3 + dev-java/lucene-analyzers:2.3 ) + ldap? ( net-nds/openldap ) + nsplugin? ( net-libs/xulrunner:1.9 + >=3Ddev-libs/nspr-4.6.6 + >=3Ddev-libs/nss-3.11-r1 ) + opengl? ( virtual/opengl ) + app-arch/zip + app-arch/unzip + >=3Dapp-text/hunspell-1.1.4-r1 + >=3Dapp-text/poppler-0.12.3-r3[xpdf-headers] + dev-libs/expat + >=3Ddev-libs/glib-2.18 + >=3Ddev-libs/icu-4.0 + >=3Ddev-lang/perl-5.0 + >=3Dnet-libs/neon-0.24.7 + >=3Ddev-libs/openssl-0.9.8g + dev-libs/redland[ssl] + >=3Dmedia-libs/freetype-2.1.10-r2 + >=3Dmedia-libs/fontconfig-2.3.0 + >=3Dmedia-libs/vigra-1.4 + media-libs/libpng + >=3Dsys-libs/db-4.3 + >=3Dmedia-libs/libwpg-0.2.0 + >=3Dapp-text/libwpd-0.9.1 + virtual/jpeg + >=3Dx11-libs/cairo-1.0.2 + x11-libs/libXaw + x11-libs/libXinerama + x11-libs/libXrandr" + +RDEPEND=3D"java? ( >=3Dvirtual/jre-1.5 ) + ${SPELL_DIRS_DEPEND} + ${COMMON_DEPEND}" + +DEPEND=3D"${COMMON_DEPEND} + java? ( || ( =3Dvirtual/jdk-1.6* =3Dvirtual/jdk-1.5* ) + >=3Ddev-java/ant-core-1.7 ) + >=3Ddev-libs/boost-1.36 + >=3Ddev-libs/libxml2-2.0 + dev-perl/Archive-Zip + dev-libs/libxslt + dev-util/cppunit + >=3Ddev-util/gperf-3 + dev-util/intltool + dev-util/pkgconfig + >=3Dnet-misc/curl-7.12 + >=3Dsys-apps/findutils-4.1.20-r1 + sys-devel/bison + sys-apps/coreutils + sys-devel/flex + sys-libs/zlib + x11-libs/libXrender + x11-libs/libXtst + x11-proto/printproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto" + +pkg_setup() { + + java-pkg-opt-2_pkg_setup + + # sys-libs/db version used + local db_ver=3D$(db_findver '>=3Dsys-libs/db-4.3') + + kde4-base_pkg_setup + + python_set_active_version 2 + python_pkg_setup + +} + +src_unpack() { + + unpack ${MY_P}.tar.gz + +} + +src_prepare() { + + if use custom-cflags; then + ewarn " You are using custom CFLAGS, which is NOT supported and can ca= use " + ewarn " all sorts of build and runtime errors. " + ewarn + ewarn " Before reporting a bug, please make sure you rebuild and try w= ith " + ewarn " basic CFLAGS, otherwise the bug will not be accepted. " + ewarn + fi + + ewarn + ewarn " If you experience a build break, please make sure to retry " + ewarn " with MAKEOPTS=3D"-j1" before filing a bug. " + ewarn + + # Check if we have enough RAM and free diskspace to build this beast + CHECKREQS_MEMORY=3D"512" + use debug && CHECKREQS_DISK_BUILD=3D"12288" || CHECKREQS_DISK_BUILD=3D"= 7144" + check_reqs + + strip-linguas ${LANGS} + + # en_US is built by default, upstream needs us to use --with-lang=3D"" = in this case though, so strip it out + export LINGUAS_TEMP=3D$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//= g;s/_GB/en_GB/g;s/_ZA/en_ZA/g') + + if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} =3D=3D " " ]]; then + export LINGUAS_OOO=3D"" + else + # always build en-US as a fallback (needed for broken code / translati= ons) + export LINGUAS_OOO=3D"en-US ${LINGUAS_TEMP//_/-}" + fi + + if use !java; then + ewarn " You are building with java-support disabled, this results in s= ome " + ewarn " of the LibreOffice functionality being disabled. " + ewarn " If something you need does not work for you, rebuild with " + ewarn " java in your USE-flags. " + ewarn + fi + + if use !gtk && use !gnome; then + ewarn " If you want the LibreOffice systray quickstarter to work " + ewarn " activate either the 'gtk' or 'gnome' use flags. " + ewarn + fi + + # Some fixes for our patchset + epatch "${FILESDIR}/gentoo-${PV}.diff" + epatch "${FILESDIR}/gentoo-pythonpath.diff" + epatch "${FILESDIR}/env_log.diff" + epatch "${FILESDIR}/fix-ooo-collision.diff" + epatch "${FILESDIR}/scrap-pixmap-links.diff" + epatch "${FILESDIR}/enable-startup-notification.diff" + use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotf= ixes" + cp -f "${FILESDIR}/${PN}-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patch= es/hotfixes" + cp -f "${FILESDIR}/${PN}-3.3-libpng-1.5.diff" "${S}/patches/hotfixes" + cp -f "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" "${S}/pat= ches/hotfixes" + cp -f "${FILESDIR}/${PN}-libdb5-fix-check.diff" "${S}/patches/hotfixes" + cp -f "${FILESDIR}/${PN}-3.3.2-gcc46.diff" "${S}/patches/hotfixes" + + #Use flag checks + if use java ; then + echo "--with-ant-home=3D${ANT_HOME}" >> ${CONFFILE} + echo "--with-jdk-home=3D$(java-config --jdk-home 2>/dev/null)" >> ${CO= NFFILE} + echo "--with-java-target-version=3D$(java-pkg_get-target)" >> ${CONFFI= LE} + echo "--with-jvm-path=3D/usr/$(get_libdir)/" >> ${CONFFILE} + echo "--with-system-beanshell" >> ${CONFFILE} + echo "--with-system-lucene" >> ${CONFFILE} + echo "--with-beanshell-jar=3D$(java-pkg_getjar bsh bsh.jar)" >> ${CONF= FILE} + echo "--with-lucene-core-jar=3D$(java-pkg_getjar lucene-2.3 lucene-cor= e.jar)" >> ${CONFFILE} + echo "--with-lucene-analyzers-jar=3D$(java-pkg_getjar lucene-analyzers= -2.3 lucene-analyzers.jar)" >> ${CONFFILE} + fi + + echo $(use_enable nsplugin mozilla) >> ${CONFFILE} + echo $(use_with nsplugin system-mozilla libxul) >> ${CONFFILE} + + echo $(use_enable binfilter) >> ${CONFFILE} + echo $(use_enable cups) >> ${CONFFILE} + echo $(use_enable dbus) >> ${CONFFILE} + echo $(use_enable eds evolution2) >> ${CONFFILE} + echo $(use_enable gnome gconf) >> ${CONFFILE} + echo $(use_enable gnome gio) >> ${CONFFILE} + echo "--disable-gnome-vfs" >> ${CONFFILE} + echo $(use_enable gnome lockdown) >> ${CONFFILE} + echo $(use_enable gstreamer) >> ${CONFFILE} + echo $(use_enable gtk systray) >> ${CONFFILE} + echo $(use_enable ldap) >> ${CONFFILE} + echo $(use_enable opengl) >> ${CONFFILE} + echo $(use_with ldap openldap) >> ${CONFFILE} + echo $(use_enable debug crashdump) >> ${CONFFILE} + echo $(use_enable debug strip-solver) >> ${CONFFILE} + + # Extension stuff, disabled when building without java for bug #352812 + if use java; then + echo "--with-extension-integration" >> ${CONFFILE} + echo "--enable-pdfimport" >> ${CONFFILE} + echo "--enable-minimizer" >> ${CONFFILE} + echo "--enable-presenter-console" >> ${CONFFILE} + echo "--enable-presenter-extra-ui" >> ${CONFFILE} + #still necessary + echo "--enable-presenter-screen" >> ${CONFFILE} + fi + + # Misc stuff + echo "--disable-graphite" >> ${CONFFILE} + echo "--with-system-cppunit" >> ${CONFFILE} + echo "--with-system-openssl" >> ${CONFFILE} + echo "--with-system-redland" >> ${CONFFILE} + echo "--without-junit" >> ${CONFFILE} + + #fix desktop files bug #352955 + sed -i 's/Exec=3Doo/Exec=3Dlo/g' "${S}"/desktop/*.desktop.in.in || die = "Could not fix desktop files" + + # needed for sun-templates patch + eautoreconf + +} + +src_configure() { + + use kde && export KDE4DIR=3D"${KDEDIR}" + use kde && export QT4LIB=3D"/usr/$(get_libdir)/qt4" + + # Use multiprocessing by default now, it gets tested by upstream + export JOBS=3D$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/") + + # compiler flags + use custom-cflags || strip-flags + use debug || filter-flags "-g*" + # silent miscompiles; LO/OOo adds -O2/1/0 where appropriate + filter-flags "-O*" + + if [[ $(gcc-major-version) -lt 4 ]]; then + filter-flags "-fstack-protector" + filter-flags "-fstack-protector-all" + replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer" + fi + + # Now for our optimization flags ... + export ARCH_FLAGS=3D"${CXXFLAGS}" + use debug || export LINKFLAGSOPTIMIZE=3D"${LDFLAGS}" + + # Make sure gnome-users get gtk-support + local GTKFLAG=3D"--disable-gtk" + { use gtk || use gnome; } && GTKFLAG=3D"--enable-gtk" + + cd "${S}" + ./configure --with-distro=3D"Gentoo" \ + --prefix=3D"${EPREFIX}"/usr \ + --sysconfdir=3D"${EPREFIX}"/etc \ + --with-arch=3D"${ARCH}" \ + --with-srcdir=3D"${DISTDIR}" \ + --with-lang=3D"${LINGUAS_OOO}" \ + --with-num-cpus=3D"${JOBS}" \ + --without-binsuffix \ + --with-installed-ooo-dirname=3D"libreoffice" \ + --with-drink=3D"True Blood" \ + --without-git \ + --with-split \ + ${GTKFLAG} \ + --enable-cairo \ + --with-system-cairo \ + --disable-mono \ + --disable-kde \ + $(use_enable kde kde4) \ + $(use_enable !debug strip) \ + $(use_enable odk) \ + $(use_with java) \ + $(use_with templates sun-templates) \ + --disable-access \ + --disable-post-install-scripts \ + $(use_enable java extensions) \ + --with-system-libwpd \ + --with-system-libwpg \ + --mandir=3D"${EPREFIX}"/usr/share/man \ + --libdir=3D"${EPREFIX}"/usr/$(get_libdir) \ + || die "Configuration failed!" + +} + +src_compile() { + + make || die "Build failed" + +} + +src_install() { + + export PYTHONPATH=3D"" + + einfo "Preparing Installation" + make DESTDIR=3D"${D}" install || die "Installation failed!" + + # Fix the permissions for security reasons + chown -RP root:0 "${ED}" + + # record java libraries + if use java; then + java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/${BASIS}/program/clas= ses/*.jar + java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/ure/share/java/*.jar + fi + + # Upstream places the bash-completion module in /etc. Gentoo places the= m in + # /usr/share/bash-completion. bug 226061 + dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh libreoffi= ce + rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed" + +} + +pkg_preinst() { + + { use gtk || use gnome; } && gnome2_icon_savelist + +} + +pkg_postinst() { + + # Cache updates + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + { use gtk || use gnome; } && gnome2_icon_cache_update + + BASHCOMPLETION_NAME=3Dlibreoffice && bash-completion_pkg_postinst + + pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.= bin + + # Add available & useful jars to LibreOffice classpath + use java && "${EPREFIX}"/usr/$(get_libdir)/${PN}/${BASIS}/program/java-= set-classpath $(java-config --classpath=3Djdbc-mysql 2>/dev/null) >/dev/n= ull + + kde4-base_pkg_postinst + +} + +pkg_postrm() { + + fdo-mime_desktop_database_update + { use gtk || use gnome; } && gnome2_icon_cache_update + +}