# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Jun 2009; Yar Odin (yarodin) <yarodin@gmail.com> -files/2.4.2,
+ -files/2.4.2/build-gcc43-missingincludes.diff,
+ -files/2.4.2/gentoo-completion_matches.diff,
+ -files/2.4.2/gentoo-configure.diff, -files/3.0.1,
+ -files/3.0.1/gentoo-ReturnInteger.hdl, -openoffice-infra-2.4.2.ebuild,
+ -files/2.4.2/gentoo-configure-pg.diff,
+ -files/2.4.2/gentoo-fixsandbox.diff,
+ -files/3.0.1/gentoo-ReturnInteger.hpp,
+ -files/3.0.1/gentoo-XVBAToOOEventDescGen.hpp,
+ -files/3.0.1/gentoo-completion_matches.diff,
+ -files/3.0.1/gentoo-configure.diff, +files/3.1.0/gentoo-configure-pg.diff,
+ -files/3.0.1/gentoo-buildfix-mono-2-2.diff,
+ -openoffice-infra-3.0.1.ebuild, -files/2.4.2/gentoo-infragentoo.diff,
+ -files/3.0.1/gentoo-XVBAToOOEventDescGen.hdl,
+ -files/3.0.1/gentoo-configure-pg.diff, -files/3.0.1/gentoo-hunspell.diff,
+ -files/3.0.1/gentoo-infragentoo.diff, -files/3.0.1/gentoo-mkdepend.diff,
+ -files/3.0.1/gentoo-nojavanostax.diff, -files/3.0.1/gentoo-ru_dict.diff,
+ -files/3.0.1/gentoo-scripts.diff,
+ -files/3.0.1/gentoo-solenv_kde_mess.diff,
+ -files/3.0.1/gentoo-vba_incl.diff, +files/3.1.0,
+ +files/3.1.0/buildfix-gcc44.diff, +files/3.1.0/gentoo-configure.diff,
+ +files/3.1.0/gentoo-dont_strip_libs.diff,
+ +files/3.1.0/gentoo-infra-builder.diff,
+ +files/3.1.0/gentoo-vba-parallel-build.diff,
+ +files/3.1.0/solenv.workaround-for-the-kde-mess.diff,
+ +openoffice-infra-3.1.0.ebuild, -files/2.4.2/gentoo-macolor.diff,
+ -files/2.4.2/gentoo-mkdepend.diff, -files/2.4.2/gentoo-scripts.diff,
+ +files/3.1.0/gentoo-infra-gentoo.diff,
+ -files/2.4.2/gentoo-python-2.3.4.diff,
+ +files/3.1.0/gentoo-layout-simple-dialogs-svx.diff,
+ +files/3.1.0/gentoo-mkdepend.diff, +files/3.1.0/gentoo-ru_dict.diff:
+ Version bump to 3.1.0
+
17 Apr 2009; Yar Odin (yarodin) <yarodin@gmail.com>
openoffice-infra-3.0.1.ebuild:
Change app-text/poppler to virtual/poppler at deps.
-AUX 2.4.2/build-gcc43-missingincludes.diff 3310 RMD160 6ea986ae44b5e249035e7d04870e784718619c72 SHA1 bab742a313ed0614fe4fb59ad6391dcfaed01efe SHA256 41ad676a33dec5f3440190b5b4a7cfb355167e992149d64ad1b039a618cc0c2a
-AUX 2.4.2/gentoo-completion_matches.diff 698 RMD160 057d3d3b931c88889ef8fe6044bba89646119c76 SHA1 60b7be8278afd35587f465cf4f4a8371c47236ad SHA256 f8890eebea86cc1aa5302041b370bba7f5a31c5cb73430a51915c9d1eb2ae4f9
-AUX 2.4.2/gentoo-configure-pg.diff 462 RMD160 b06d8ff48558aa630c5416a476ba76bae2179021 SHA1 d81399ba991dd831eb0a2b8327e15fa55790b77f SHA256 848253d70dd02dfccd945a1d3975fbca687a088f077ca10105ffa239d2123066
-AUX 2.4.2/gentoo-configure.diff 1997 RMD160 48a291e843fe9c037e2809bd692606fb0cb70f8f SHA1 2e5bf003c03df2c3181f05206f83bc8d96e501fd SHA256 002ba3ce94f6b1b99460103e053a2e8cc08f02a93fe45ac04c013f3f5cdd2c09
-AUX 2.4.2/gentoo-fixsandbox.diff 486 RMD160 7695ae51e590030c67d746080acf32e4f6ecc07a SHA1 55fa01e5b9ced476744fe2e323bfe179649f47e8 SHA256 235bcf294618f70d52beeb0f276073cc09410a9b23e6b5a94aec60b51fe65e13
-AUX 2.4.2/gentoo-infragentoo.diff 3193 RMD160 7914cec43429ec00f1276ca125d29935950ecdb0 SHA1 fd1b18427ec81398a0e9ff3006b390c09b16c1db SHA256 c057c0d56d74ff625f1d75d26ae6fb6453e983f75322eaf55f8bae43ed743607
-AUX 2.4.2/gentoo-macolor.diff 619 RMD160 1c8511a7dd573274b47d5f4088f62bb1d5a9137d SHA1 ec0cf61a41e7f93be2ef429017d7ede612ab3e1b SHA256 10d272e96c5a61c86040ea66c577316c869012a9b67f88c8bd6fb5d6d1e3b3a8
-AUX 2.4.2/gentoo-mkdepend.diff 411 RMD160 bec06f29b47c604c559765684c39a168b8b561e0 SHA1 41c392a1d4f197cebee49d474b686f318218d6bc SHA256 92627d6662329fb49102f5a0c9a5c1347fe125fec6933f2615a43a39171ea2ae
-AUX 2.4.2/gentoo-python-2.3.4.diff 7511 RMD160 65aa0a28399b5741f821ee62f3faed039fe5f64c SHA1 1e3c252952d7dc24e8855102dd559fae64a0b222 SHA256 a15a79c7d8eea20a090c7e9ef376898fc94de48e0b8d39a8dc6759c7e4326289
-AUX 2.4.2/gentoo-scripts.diff 1181 RMD160 9e86bc9a137cad7d16c6a75c0479cc6fab3f0b63 SHA1 4dc205ad2841756742ac0c6defc2e1047f29cc18 SHA256 62e2c280b988e2cd9258eedaacbed9c8a9e96e7aea0bc8d8fd61c6e3edf0a049
-AUX 3.0.1/gentoo-ReturnInteger.hdl 754 RMD160 2e2ad754d338e458ae39ab953d0bf00895b00e40 SHA1 39c1e2648c90813e8d1cf80ae54d44f90cf3879f SHA256 8f6adc5108b52872a3dddc4b261be71e9ecebcf1290cc7c2c512b93ac26aa8d2
-AUX 3.0.1/gentoo-ReturnInteger.hpp 1402 RMD160 aafa5507e5b39f2a37d6b2c83d7863791f44bf62 SHA1 3078a431f3055786784528f5b0eb741c10bc488b SHA256 d26cc55eabe836bdd3e21fc46e3cd0883dfa51139c039bba540779f3442243a9
-AUX 3.0.1/gentoo-XVBAToOOEventDescGen.hdl 1722 RMD160 3988f9a0d8279b4290afbdec45282894a3ba5f2f SHA1 0ec7c9351f80746c51fcc8c1e3ba086639b5b7b5 SHA256 95abb7e536b09a91b06f4cd3ba94e0540a4cf990aff50e36363a7aa9edb8c883
-AUX 3.0.1/gentoo-XVBAToOOEventDescGen.hpp 1649 RMD160 2c16c1e76c8857cd8416008638ce3c004215f967 SHA1 72e4033a48f937cd826564e2439f6d1f1f35bd3d SHA256 34a87b207852869d4d4f5037cfb6e01e81257633047113db5dc6adc301877b02
-AUX 3.0.1/gentoo-buildfix-mono-2-2.diff 523 RMD160 993dee1c2ab796980e7f04f8b9c0aeefc19743c7 SHA1 b2aee23fa2a7d6fb0b1a1d1ca97609bfaaa7f696 SHA256 5f807dd7b892dfa30c177ed20e69c19f50541bfec2f94a2ff1caaa5aa656a324
-AUX 3.0.1/gentoo-completion_matches.diff 695 RMD160 c4dbf41740073786c31eb543d846282383e5fff6 SHA1 7898aafab4406382a44fb2bd7ce0face0bb11d63 SHA256 6af7c86d8fb6af166c388f202dbff64587cd546715b6d28f49c3188cf0de4594
-AUX 3.0.1/gentoo-configure-pg.diff 462 RMD160 4a16957ceebc9bde6fbfe60a2503b3439712059c SHA1 fae773f59ee378981ca17edb2b99f62aa251026d SHA256 ede7075103e3633bfb2e3faee1fc4560f835c6929e4c9a0fdb5b755333173bec
-AUX 3.0.1/gentoo-configure.diff 1998 RMD160 bd3afe18b3c354788d49b98905831c47dc7d479b SHA1 658a9456b32800443e7bc76f178d091cab134b65 SHA256 d6063b61830645f0a1297756b47cb299c8430f35f677c95d3458358a10839e72
-AUX 3.0.1/gentoo-hunspell.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
-AUX 3.0.1/gentoo-infragentoo.diff 2485 RMD160 9a8450b1f41cfcd50422fff650428f7bad639e73 SHA1 4883c20a81e4137378d4805551571329ff5c6bce SHA256 fda31403e5a109ee56625343b2ea7e4244b78feff891028e9b5df13725f091df
-AUX 3.0.1/gentoo-mkdepend.diff 345 RMD160 f76234b5fd970d71e6e06af3d50e21459c72a373 SHA1 b0d01f2c6062beec0c836b93ce8f774b928b04e5 SHA256 ef6732854c02b09887f74176b0ea4b330a11ebaf7ecd5f78c595a633af320ae2
-AUX 3.0.1/gentoo-nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
-AUX 3.0.1/gentoo-ru_dict.diff 3089 RMD160 c24efcedf5b38b0c12a22e301c62172768c44f85 SHA1 5e0ed235bbe3f7e93b9ffe22b062db7a8e6d1658 SHA256 abce1be9aadaaa6ece195edf832ebe68df4e63ac8b748d7ad96451d90350a661
-AUX 3.0.1/gentoo-scripts.diff 1086 RMD160 53dfcce0407d2fc7b00cf7c478a64de0f7201049 SHA1 d238824eccbd0741047807c2f47902dba973095a SHA256 774e3a26d31838796e0cfa822d51589c6a07b8ce2481233c1b1113a81bf0a612
-AUX 3.0.1/gentoo-solenv_kde_mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
-AUX 3.0.1/gentoo-vba_incl.diff 697 RMD160 63c4f319bf879e2287c45d9e685845b99473595c SHA1 d23061f3079ff121dec57a0b09313d2849dee513 SHA256 29f7a8297f9fcbe6cdd50fefbe2beedfbc3003c9333fc6bb4af692f1db853157
+AUX 3.1.0/buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
+AUX 3.1.0/gentoo-configure-pg.diff 462 RMD160 4a16957ceebc9bde6fbfe60a2503b3439712059c SHA1 fae773f59ee378981ca17edb2b99f62aa251026d SHA256 ede7075103e3633bfb2e3faee1fc4560f835c6929e4c9a0fdb5b755333173bec
+AUX 3.1.0/gentoo-configure.diff 1453 RMD160 cd74d0dfcd1c0ff9c560ad778c01da23984f928b SHA1 994e990bcce9e9418ed2e7be9558eeb95f1442fc SHA256 70c44f6f8cfaec3024fc46ff60a04a4766fd52be3bcfee6fe79c00bc74a5a10e
+AUX 3.1.0/gentoo-dont_strip_libs.diff 955 RMD160 3815892d75a70966533372ab72da73200037958b SHA1 e57b5b49e0d9f918e90b36570c0a8a0125d54709 SHA256 c7410c402ac8322e63686c2e6d725ed3c2242a6b4026705c8344684fa34b108e
+AUX 3.1.0/gentoo-infra-builder.diff 1118 RMD160 bd16e8064c89469cac0ea291b31c9f5caba8a028 SHA1 a731a03ef25f6a884e722bc2a4b4da80f5f46132 SHA256 1d6fcb2b31e605edad597ff8da44e2a8adfdb67eec65ca821c453a958718ca50
+AUX 3.1.0/gentoo-infra-gentoo.diff 2733 RMD160 83e0fe2c473b46b49fe2925d141ac812cdf96058 SHA1 1d9dc4b7502bdd9e5b2c9d8b14d43ad23e9431a0 SHA256 611eb79726c82bce001a1e4c7f9c0a5985900bccb40475162b0568d83e624fa9
+AUX 3.1.0/gentoo-layout-simple-dialogs-svx.diff 1207 RMD160 28c8f2394cebf860701b36d3b5c4f0d7583736bd SHA1 807ba97128197fa1d16be3fb7bb0948a444d06da SHA256 7135bb29a6b36e3deca6094119c34b17549d4959a12bac91ec30aa22bcc141f4
+AUX 3.1.0/gentoo-mkdepend.diff 1694 RMD160 e6970418012f5cdf569188907543c6e4a51b7851 SHA1 a6c941492d69840b2705fbe885ad655a9922cbc5 SHA256 9596bf24a44b8b55a46c5a039944c3b2dc40adafae125ed77c81704255ec901b
+AUX 3.1.0/gentoo-ru_dict.diff 3089 RMD160 c24efcedf5b38b0c12a22e301c62172768c44f85 SHA1 5e0ed235bbe3f7e93b9ffe22b062db7a8e6d1658 SHA256 abce1be9aadaaa6ece195edf832ebe68df4e63ac8b748d7ad96451d90350a661
+AUX 3.1.0/gentoo-vba-parallel-build.diff 2725 RMD160 b5952a1d86c0ac8a242d2c1bff63dd052e270f6a SHA1 ce5b638b54ddabc08c30511141ddfc3516427790 SHA256 0dc84f44e27af0191b4b2ef561b2e30ae85dcb9a4ae941658a49bf73a3debab4
+AUX 3.1.0/solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
AUX gentoo-epm-3.7.patch.diff 2627 RMD160 18d2ac9bea7e9ceb5adc40599cfb151ac3de1f84 SHA1 d2e6b612ce7df5606e7101fffe2cff2f0d16c0e3 SHA256 eb801d90856c48f04b4fee8d21b01d0dd2951288efd6aa4ed5cf6807074c2c12
AUX gentoo-system_pgsql.diff 646 RMD160 7354b333ca619617616e6b8dba2a259a68cb4aa3 SHA1 f3bb553f042bf62b527dee3067f02be245a431d6 SHA256 2c5cb32de91ca71402cc590cc539bd6f4f0dab921507edb7a41f1bf9717bedf5
AUX java-set-classpath.in 2608 RMD160 b47b6046bfeb1c01512534d4c19308cf5892c208 SHA1 45a3a40a6fcb707a4783e81c04a0c084cd9d68a1 SHA256 4c4e24eeb801d758b896f537de6d50263e1a23d285a24d67fe72e6a7ec50fd59
AUX wrapper.in 96 RMD160 34ca656bc8af3c5b44ed16cebedf5d3297b09a2d SHA1 5861b8434da84efff56e5ceaf53a7668a5f52cea SHA256 97b603968d423e5d8e52c1c14c118647df0a7a858d6a1cb10524af9ea90a9dbc
-DIST OOo_2.4.2_src_binfilter.tar.bz2 6674731 RMD160 09662444f359f86bb7eeec0c035ae29360e989e5 SHA1 1c7f652c71ad3364a98d79d4f6751db00c7daa99 SHA256 b6a504004b355b485d764ebbd2f67e7d60d73ad1bf48bd762704fa91d9cb5597
-DIST OOo_2.4.2_src_core.tar.bz2 153673147 RMD160 d29ed7d23a7616b05d855c172e6f148aeb0f4b69 SHA1 f84782887062011f34c5c8f0279c40d159051a34 SHA256 d096bfe3789e73d6cf080da7a1189e1f2fb9ccf26cc5c96d9f939bd1cff33df2
-DIST OOo_2.4.2_src_l10n.tar.bz2 81193726 RMD160 7a2bf7cbe404b7fe8cb61c670717f54046e1cab9 SHA1 c59fefaf9f7e3372fbeb2a1e468270613b7b1fa6 SHA256 0b1869f8c9fc56ee7c6830bd844f212f6e8587d9deb0c7c3105c1acf22da63e8
-DIST OOo_2.4.2_src_sdk.tar.bz2 38354 RMD160 6f1334b4609a372970c03b33d9d8b9fe1a582d69 SHA1 5129e3ebd4ca18b0772f9916a94c52933896c68f SHA256 46f3f832384dd17dd503bd6090277f8937483c74850dd6b2666feb82361bb653
-DIST OOo_2.4.2_src_system.tar.bz2 44071903 RMD160 172fcde006f5e81f3be526ab50dbb10a67d277b3 SHA1 67dd2af4c25a311c2e83a7dcd3a8229378ee1625 SHA256 28eb0c3f53be94d01e93821669c9652a135f61faebf77b8a131e9632d1e090e4
-DIST OOo_3.0.1_src_binfilter.tar.bz2 6595398 RMD160 c6859a376c55cd453be214dbfa2d56f1b845a32b SHA1 d84518159538ef736271177b7ebe4697fc4b811d SHA256 3c8920d97777d7e2c579c8ade5ef13c9184278aa6b6185b7f15e70a61ea0077b
-DIST OOo_3.0.1_src_core.tar.bz2 182573274 RMD160 9c4f18779a03cdabb0204d8eb1b661b4d9cc1369 SHA1 2da6b2cf0b75873477f22cc9d69a4f0c8b43b435 SHA256 00e3a4c634b3522b006b6ca5690a97c814be546be5a19b80edfa53638e3df339
-DIST OOo_3.0.1_src_extensions.tar.bz2 13941829 RMD160 e89c7594f642147a95e85612d5646bc3edc869db SHA1 c695982d166422a838560ef7b134a5665bc61198 SHA256 dfc70ba2ac28c0c5f6942499bfd9dfa2fb147695f96ee4ec12d44d4b5f45e5b6
-DIST OOo_3.0.1_src_l10n.tar.bz2 86008240 RMD160 a02e8c06c67ac7b2833afa4a54993d81674e8b9b SHA1 13f1bf0989a09c52c57dbc1d6cf1feaec369a085 SHA256 53f0e621d2b38b97742ab67ef18313a868dbde43924ef54f9133121f29d4d75b
-DIST OOo_3.0.1_src_system.tar.bz2 45625279 RMD160 35f1822f3e3aa2f6af0c268dd51534568473e636 SHA1 8c73821b542c9c96b071550fe0e3e813e21a1246 SHA256 bb3dadb23570f1d36f0b1bcbe5a39782921b955513db28d05e9ca75eeca2e8fe
-DIST infra-ooo-files_2.4.2.tar.gz 16480053 RMD160 8b14a6b019c10d1ddb073d85a596aeb2471e3a4d SHA1 0da8caabf9d778d232e118418337b56a5c1629af SHA256 57cb12e730a74e1518ab4444fbfb07c268bdb1485c2bc4512aba7a98f8ad40a1
-DIST infra-ooo-files_3.0.1.tar.gz 20712561 RMD160 76be30a30f6cd859a2342018550fc48637518d06 SHA1 28a79a28769548d0bf39fdb8c1bfa2f14e97576b SHA256 2b4daca6b551f71a31c0746d5be63ce7a126b5d281041222f8c637b3b522d411
+DIST OOo_3.1.0_src_binfilter.tar.bz2 6543459 RMD160 e7ff15bd78713dcdbfd0df0ca499727cd412b070 SHA1 7128a2f8af0b0f1163a2f03331057242ec254f34 SHA256 beef276633c12ed8ccd98b1682ec41cbcd7befaaf5899c6b848a58a378cc0ef6
+DIST OOo_3.1.0_src_core.tar.bz2 186059913 RMD160 3395799874fd376fa82827f4b1b2d7af193748f8 SHA1 7a2812823376c028d81c4d3aeaac56e00f89636c SHA256 5ae7ba714499822872aecbe419dbc5357f48c497ef98fc96c85298d5af9b474f
+DIST OOo_3.1.0_src_extensions.tar.bz2 14867603 RMD160 d66bc267f92291ec0cc1b1530d95c8d9cfac7f62 SHA1 fd6dff089f722c9d647f2ee5dd0e818b1a7e6576 SHA256 5429f6c2115213f1441cdc7e5e6e8e7727aa178750861b10e7077cd786e83ba7
+DIST OOo_3.1.0_src_l10n.tar.bz2 96360273 RMD160 35ea76f926342a8bfa8b6b30edd08f048bb06811 SHA1 3ba93e779492bc6cf4955394a211462529057f03 SHA256 40baaf144de1cf5ff90f985ac55466aeb145127ab9389f01dba023144ff618ad
+DIST OOo_3.1.0_src_system.tar.bz2 53314585 RMD160 9ffd6694d4cdd7d3f4f8fd6aaf1ffa6c64b39d27 SHA1 a73c6aa867b7686d33611694e33d6351110d2a0a SHA256 52d74c30fa333498e4236d876ad31d4dc5d08eb5b72a42e2c378cb8f59162694
+DIST infra-ooo-files_3.1.0.tar.gz 14893448 RMD160 137a78f9c77bff141e6f8138c53a11d2217719d8 SHA1 9f86b12773ab781b8ea4c18261eccce850807c11 SHA256 e70ca0680388e1355e4ab9136888972724698fec1c9e9079d89509e91f09e0e0
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-infra-2.4.2.ebuild 23901 RMD160 41fbfa75a8ad55bbb8c289960ed839c3b85c6556 SHA1 167c79bf59a3e353150b3ab135ef759fb6d4d796 SHA256 76f973c5bcadfe5c448fe96b0d6c9c0e6d1ff8a4c83dfe643f832b318c9be356
-EBUILD openoffice-infra-3.0.1.ebuild 23565 RMD160 a6e63e6565d66d58128532f6ab928e9cdd0a2eee SHA1 ba8a9c862419237529d1e5a68229bf25634129ea SHA256 0bf7739b558cc23a76fed8eea0aa7fd03219f2114d265b69a4a68cb376eb2c79
-MISC ChangeLog 4105 RMD160 d6b55d08ec0b28950eb190948dd109b91218d4f5 SHA1 70b6bf019deb9864d8b5bc8f0642a9c8f56313f5 SHA256 f6308737cc33fa9fd3159ede52465e239345a8c47dc70244ae8e1b079237fa77
+EBUILD openoffice-infra-3.1.0.ebuild 23183 RMD160 35c4215e65e3cf3dfec5be3ca442f198ebc534eb SHA1 0eaed4a0981fc53ae245304d3ee9814a3de31b7e SHA256 502854ce36338577bd920932132b113285c64632abc07568c1617b2325a7cd2b
+MISC ChangeLog 5842 RMD160 171bbcaeb625965bbaad75611087bf1755b909a8 SHA1 e12af5a407cd7a7339c975ab10be569bd5ac71f2 SHA256 d0c62f25e9f5c47911cafe072ae363828eb2713de0569924cc03bf588c1abfa3
MISC metadata.xml 786 RMD160 7ade4465c360cd6e056bb17ad84d734b0632bfa0 SHA1 02dc5171d3660ff4471d40eb9f344b1e7d195254 SHA256 cf87cefd0eca5cfdf69024e119d003b02d7cba4e18cf05a939dcc4766af4ed25
+++ /dev/null
---- ./writerfilter/source/dmapper/DomainMapper_Impl.hxx.gcc43~ 2007-10-29 20:26:21.000000000 +0500
-+++ ./writerfilter/source/dmapper/DomainMapper_Impl.hxx 2008-08-15 22:57:23.000000000 +0600
-@@ -46,6 +46,7 @@
- #endif
- #include <vector>
- #include <stack>
-+#include <cstring>
-
- #ifndef INCLUDED_RESOURCESIDS
- #include <doctok/resourceids.hxx>
---- ./writerfilter/source/dmapper/GraphicImport.cxx.gcc43~ 2008-08-15 23:00:24.000000000 +0600
-+++ ./writerfilter/source/dmapper/GraphicImport.cxx 2008-08-15 23:01:02.000000000 +0600
-@@ -98,7 +98,7 @@
- #endif
- #include <rtl/ustrbuf.hxx>
-
--
-+#include <cstring>
- #include <iostream>
-
- namespace dmapper
---- ./writerfilter/source/odiapi/qname/QName.cxx.gcc43~ 2008-08-15 23:02:44.000000000 +0600
-+++ ./writerfilter/source/odiapi/qname/QName.cxx 2008-08-15 23:03:07.000000000 +0600
-@@ -43,6 +43,7 @@
- #include <assert.h>
- #include <stdexcept>
- #include <string>
-+#include <cstring>
- #include <stdio.h>
-
- namespace writerfilter
---- ./writerfilter/unocomponent/debugservices/rtfsl/RTFSLParser.cxx.gcc43~ 2008-08-15 23:05:02.000000000 +0600
-+++ ./writerfilter/unocomponent/debugservices/rtfsl/RTFSLParser.cxx 2008-08-15 23:05:21.000000000 +0600
-@@ -66,6 +66,7 @@
- #include <odiapi/qname/QName.hxx>
- #include <odiapi/props/Properties.hxx>
- #include <stack>
-+#include <cstring>
-
- #include <ctype.h>
-
---- ./writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx.gcc43~ 2008-08-15 23:07:02.000000000 +0600
-+++ ./writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx 2008-08-15 23:07:51.000000000 +0600
-@@ -63,6 +63,7 @@
- #include <com/sun/star/beans/PropertyValue.hpp>
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <comphelper/seqstream.hxx>
-+#include <cstring>
-
- #include <ctype.h>
-
---- ./writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx.gcc43~ 2008-08-15 23:08:39.000000000 +0600
-+++ ./writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx 2008-08-15 23:08:57.000000000 +0600
-@@ -55,6 +55,7 @@
- #include <hash_set>
- #include <assert.h>
- #include <string>
-+#include <cstring>
- #include <cppuhelper/implbase2.hxx>
- #include <com/sun/star/embed/XTransactedObject.hpp>
- #include <com/sun/star/embed/XStorage.hpp>
---- ./writerfilter/source/ooxml/gperfattributes.hxx.gcc43~ 2008-08-16 10:37:04.000000000 +0600
-+++ ./writerfilter/source/ooxml/gperfattributes.hxx 2008-08-16 10:37:22.000000000 +0600
-@@ -31,6 +31,7 @@
-
-
- #include "OOXMLtokens.hxx"
-+#include <cstring>
-
- namespace ooxml { namespace tokenmap { namespace attributes {
- struct token { const char * name; TokenEnum_t nToken; };
---- ./writerfilter/source/ooxml/gperfelements.hxx.gcc43~ 2008-08-16 10:36:49.000000000 +0600
-+++ ./writerfilter/source/ooxml/gperfelements.hxx 2008-08-16 10:37:27.000000000 +0600
-@@ -31,6 +31,7 @@
-
-
- #include "OOXMLtokens.hxx"
-+#include <cstring>
-
- namespace ooxml { namespace tokenmap { namespace elements {
- struct token { const char * name; TokenEnum_t nToken; };
---- crashrep/source/unx/main.cxx.orig 2009-02-21 19:15:51.000000000 +0500
-+++ crashrep/source/unx/main.cxx 2009-02-21 19:16:13.000000000 +0500
-@@ -45,6 +45,7 @@
- #include <unistd.h>
- #include <pwd.h>
- #include <pthread.h>
-+#include <limits.h>
-
- #include <hash_map>
- #include <vector>
+++ /dev/null
---- python/Python-2.3.4.patch.orig 2007-10-26 17:27:52.000000000 +0600
-+++ python/Python-2.3.4.patch 2008-08-04 20:30:34.000000000 +0600
-@@ -16214,3 +16214,14 @@
-
- /* Define the macros needed if on a UnixWare 7.x system. */
- #if defined(__USLC__) && defined(__SCO_VERSION__)
-+--- misc/build/Python-2.3.4/Modules/readline.c.orig 2008-08-04 18:36:17.000000000 +0600
-++++ misc/build/Python-2.3.4/Modules/readline.c 2008-08-04 20:08:02.000000000 +0600
-+@@ -580,7 +580,7 @@
-+ Py_XDECREF(endidx);
-+ begidx = PyInt_FromLong((long) start);
-+ endidx = PyInt_FromLong((long) end);
-+- return completion_matches(text, *on_completion);
-++ return rl_completion_matches(text, *on_completion);
-+ }
-+
-+
+++ /dev/null
---- config_office/configure.in.orig 2008-10-26 12:57:20.000000000 +0500
-+++ config_office/configure.in 2008-10-26 12:57:57.000000000 +0500
-@@ -3791,7 +3800,7 @@
- fi
- save_CFLAGS=$CFLAGS
- save_LIBS=$LIBS
--CFLAGS="-I`pg_config --includedir`"
-+CFLAGS="-I`pg_config --includedir` -L`pg_config --libdir`"
- AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], [])
- AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR(libpq is needed)], [])
- CFLAGS=$save_CFLAGS
+++ /dev/null
---- config_office/configure.in.orig 2008-11-22 13:40:23.000000000 +0500
-+++ config_office/configure.in 2008-11-22 13:42:45.000000000 +0500
-@@ -103,6 +103,11 @@
- epm, however epm is useless for large scale
- package building.
- ],,enable_epm="yes")
-+AC_ARG_WITH(epm,
-+[[ --with-epm[=internal|external]
-+ use internal or system epm.
-+ [default=internal]
-+]],,with_epm=internal)
- AC_ARG_WITH(package-format,
- [ --with-package-format specify package format(s) for OOo installsets.
- Default is "normal" one of the OS/Distribution.
-@@ -737,6 +742,9 @@
- [ --with-alloc Define which allocator to build with
- (choices are oo, system, tcmalloc)
- ],,)
-+AC_ARG_ENABLE(gstreamer,
-+[ --enable-gstreamer Enables GStreamer avmedia backend
-+],,)
-
- BUILD_TYPE="OOo EXT"
-
-@@ -3204,12 +3212,12 @@
- for a in "$RPM" rpmbuild rpm; do
- $a --usage >/dev/null 2> /dev/null
- if test $? -eq 0; then
-- RPM=$a
-+# RPM=$a
- break
- else
- $a --version >/dev/null 2> /dev/null
- if test $? -eq 0; then
-- RPM=$a
-+# RPM=$a
- break
- fi
- fi
-@@ -3222,7 +3230,8 @@
- fi
- fi
- if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then
-- AC_PATH_PROG(DPKG, dpkg, no)
-+# AC_PATH_PROG(DPKG, dpkg, no)
-+ DPKG=no
- if test "$DPKG" = "no"; then
- AC_MSG_ERROR([dpkg needed for deb creation. Install dpkg.])
- fi
-@@ -4048,7 +4057,7 @@
- AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
- if test "$enable_mozilla" = "no"; then
- AC_MSG_RESULT([no])
--elif test "$with_system_mozilla" = "yes"; then
-+elif test "$with_system_mozilla" = "yes" -o "$enable_kdeab" = "yes"; then
- AC_MSG_RESULT([no, not possible with system-mozilla])
- else
- AC_MSG_RESULT([yes])
+++ /dev/null
---- officecfg/util/makefile.mk.orig 2009-01-11 01:08:01.000000000 +0500
-+++ officecfg/util/makefile.mk 2009-01-11 01:08:45.000000000 +0500
-@@ -41,7 +41,6 @@
-
- $(MISC)$/$(TARGET)_delzip :
- -$(RM) $(BIN)$/registry_{$(alllangiso)}.zip
-- -$(RM) $(COMMON_OUTPUT)$/bin$/registry_{$(alllangiso)}.zip
-
- $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
- cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
+++ /dev/null
---- patches/src680/apply.orig 2009-02-20 22:00:46.000000000 +0500
-+++ patches/src680/apply 2009-02-20 22:01:35.000000000 +0500
-@@ -89,7 +89,7 @@
- # openmamba
- openmamba: LinuxCommon, GlobalDesktopFiles
- #Gentoo
--GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, Gcc43
-+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, Gcc43
- GentooUnstable: GentooBase, GentooExperimental, TransparentPrinting, PptExport
- Gentoo : GentooBase
- Gentoo64: GentooBase
-@@ -131,7 +131,10 @@
-
- #InfraUnix: LinuxCommon, EMFPlus, CustomUserConfig, PostgreSQL, InfraPatches, InfraNotUbuntu, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding
- InfraUnix: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, InfraNotUbuntu, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding
--UbuntuInfra: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraUbuntu
-+UbuntuInfra: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraUbuntu
-+InfraGentooBase: Gentoo, EMFPlus, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Fpickers, QuickStarter, InfraNotUbuntu, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding
-+InfraGentoo: InfraGentooBase
-+InfraGentooPG: InfraGentooBase, InfraUnixPatchesPG, PostgreSQL
- InfraSolaris: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, InfraPatches, InfraNotUbuntu, Infra1252toLocale, InfraSolaris, NotDebian, CustomKeyBinding
- InfraWin32: Win32Common, EMFPlus, CJK, OOXML, CustomUserConfig, InfraPatches, InfraNotUbuntu, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding
- InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
-@@ -1207,7 +1210,7 @@
- # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
- libxmlsec-system-nss.diff, i#69368, pmladek
-
--# xulrunner-1.9.diff, i#86670
-+xulrunner-1.9.diff, i#86670
-
- # allow separate helpcontent build
-
-@@ -1849,7 +1852,7 @@
- sdbc-postgresql.diff
- sdbc-postgresql-build-lst.diff
- sdbc-postgresql-config_office.diff
--# connectivity-workben-postgresql.diff
-+connectivity-workben-postgresql.diff
- gcc-4.3-postgresql.diff
-
-
-@@ -2304,6 +2307,7 @@
- [ Gcc43 ]
- # Make it compile with gcc 4.3
- cws-gcc430two.diff, i#83276
-+build-gcc43-missingincludes.diff
-
- [ OxygenOfficePalettes ]
- palette-enhanced-arrow.diff
-@@ -2598,8 +2602,10 @@
- [InfraUbuntu]
- disable-scsolver-menu-entry.diff
-
--[InfraUnixPatches]
-+[InfraUnixPatchesPG]
- connectivity-freebsd-libs.diff
-+
-+[InfraUnixPatches]
- freebsd-store-alloca.diff
- freebsd-writerfilter.diff
-
+++ /dev/null
---- canvas/source/tools/image.cxx.orig 2007-09-20 20:50:23.000000000 +0600
-+++ canvas/source/tools/image.cxx 2008-07-27 14:33:26.000000000 +0600
-@@ -2302,8 +2302,8 @@
- // TODO(E1): Return value
- // TODO(F1): FillRule
- fillGradient( rValues,
-- rValues.maColor1,
-- rValues.maColor2,
-+ rValues.maColors [0],
-+ rValues.maColors [rValues.maColors.getLength () - 1],
- aPoly,
- aTextureTransform,
- textures[0] );
+++ /dev/null
---- soltools/mkdepend/makefile.mk.orig 2007-11-02 17:42:04.000000000 +0500
-+++ soltools/mkdepend/makefile.mk 2008-08-06 20:28:10.000000000 +0600
-@@ -56,7 +56,7 @@
- LIBSALCPPRT=$(0)
- UWINAPILIB=$(0)
-
--CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS -DINCLUDEDIR=$(EMQ)".$(EMQ)"
-+CDEFS+=-Wno-implicit-function-declaration -DNO_X11 -DXP_PC -DHW_THREADS -DINCLUDEDIR=$(EMQ)".$(EMQ)"
-
- OBJFILES= \
- $(OBJ)$/cppsetup.obj \
+++ /dev/null
---- python/Python-2.3.4.patch.orig 2009-02-15 10:33:05.000000000 +0500
-+++ python/Python-2.3.4.patch 2009-02-15 10:36:09.000000000 +0500
-@@ -155,6 +155,23 @@
- *** misc/Python-2.3.4/Makefile.pre.in Tue Nov 18 20:54:00 2003
- --- misc/build/Python-2.3.4/Makefile.pre.in Wed Oct 17 14:01:01 2007
- ***************
-+*** 56,62 ****
-+ OPT= @OPT@
-+ BASECFLAGS= @BASECFLAGS@
-+ CFLAGS= $(BASECFLAGS) $(OPT)
-+! CPPFLAGS= -I. -I$(srcdir)/Include
-+ LDFLAGS= @LDFLAGS@
-+ LDLAST= @LDLAST@
-+ SGI_ABI= @SGI_ABI@
-+--- 56,62 ----
-+ OPT= @OPT@
-+ BASECFLAGS= @BASECFLAGS@
-+ CFLAGS= $(BASECFLAGS) $(OPT)
-+! CPPFLAGS= -D_FORTIFY_SOURCE=0 -I. -I$(srcdir)/Include
-+ LDFLAGS= @LDFLAGS@
-+ LDLAST= @LDLAST@
-+ SGI_ABI= @SGI_ABI@
-+***************
- *** 114,123 ****
- RUNSHARED= @RUNSHARED@
-
-@@ -1540,7 +1557,7 @@
- *** 1 ****
- ! dummy
- --- 1,48 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _bsddb.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _bsddb.mak
- !
- ! ..\Modules\_bsddb.c : \
- ! "..\Include\abstract.h"\
-@@ -1838,7 +1855,7 @@
- *** 1 ****
- ! dummy
- --- 1,49 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _csv.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _csv.mak
- !
- ! ..\Modules\_csv.c : \
- ! "..\Include\abstract.h"\
-@@ -2136,7 +2153,7 @@
- *** 1 ****
- ! dummy
- --- 1,53 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _socket.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _socket.mak
- !
- ! ..\Modules\socketmodule.c : \
- ! "..\Include\abstract.h"\
-@@ -2438,7 +2455,7 @@
- *** 1 ****
- ! dummy
- --- 1,51 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _sre.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _sre.mak
- !
- ! ..\Modules\_sre.c : \
- ! "..\Include\abstract.h"\
-@@ -2738,7 +2755,7 @@
- *** 1 ****
- ! dummy
- --- 1,50 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _symtable.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _symtable.mak
- !
- ! ..\Modules\symtablemodule.c : \
- ! "..\Include\abstract.h"\
-@@ -3036,7 +3053,7 @@
- *** 1 ****
- ! dummy
- --- 1,50 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _testcapi.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _testcapi.mak
- !
- ! ..\Modules\_testcapimodule.c : \
- ! "..\Include\abstract.h"\
-@@ -3333,7 +3350,7 @@
- *** 1 ****
- ! dummy
- --- 1,49 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von _tkinter.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von _tkinter.mak
- !
- ! ..\Modules\_tkinter.c : \
- ! "..\Include\abstract.h"\
-@@ -3641,7 +3658,7 @@
- *** 1 ****
- ! dummy
- --- 1,50 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von bz2.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von bz2.mak
- !
- ! ..\Modules\bz2module.c : \
- ! "..\Include\abstract.h"\
-@@ -3890,7 +3907,7 @@
- *** 1 ****
- ! dummy
- --- 1,50 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von datetime.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von datetime.mak
- !
- ! ..\Modules\datetimemodule.c : \
- ! "..\Include\abstract.h"\
-@@ -4191,7 +4208,7 @@
- *** 1 ****
- ! dummy
- --- 1,5 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von make_versioninfo.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von make_versioninfo.mak
- !
- ! ..\PC\make_versioninfo.c : \
- ! "..\Include\patchlevel.h"\
-@@ -4428,7 +4445,7 @@
- *** 1 ****
- ! dummy
- --- 1,48 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von mmap.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von mmap.mak
- !
- ! ..\Modules\mmapmodule.c : \
- ! "..\Include\abstract.h"\
-@@ -4723,7 +4740,7 @@
- *** 1 ****
- ! dummy
- --- 1,53 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von parser.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von parser.mak
- !
- ! ..\Modules\parsermodule.c : \
- ! "..\Include\abstract.h"\
-@@ -5025,7 +5042,7 @@
- *** 1 ****
- ! dummy
- --- 1,85 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von pyexpat.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von pyexpat.mak
- !
- ! ..\Modules\pyexpat.c : \
- ! "..\Include\abstract.h"\
-@@ -5390,7 +5407,7 @@
- *** 1 ****
- ! dummy
- --- 1,52 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von python.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von python.mak
- !
- ! ..\Modules\python.c : \
- ! "..\Include\abstract.h"\
-@@ -5725,7 +5742,7 @@
- *** 1 ****
- ! dummy
- --- 1,5452 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von pythoncore.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von pythoncore.mak
- !
- ! ..\Modules\_codecsmodule.c : \
- ! "..\Include\abstract.h"\
-@@ -12624,7 +12641,7 @@
- *** 1 ****
- ! dummy
- --- 1,52 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von pythonw.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von pythonw.mak
- !
- ! ..\PC\python_exe.rc : \
- ! "..\PC\pycon.ico"\
-@@ -12943,7 +12960,7 @@
- *** 1 ****
- ! dummy
- --- 1,48 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von select.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von select.mak
- !
- ! ..\Modules\selectmodule.c : \
- ! "..\Include\abstract.h"\
-@@ -13241,7 +13258,7 @@
- *** 1 ****
- ! dummy
- --- 1,51 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von unicodedata.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von unicodedata.mak
- !
- ! ..\Modules\unicodedata.c : \
- ! "..\Include\abstract.h"\
-@@ -13539,7 +13556,7 @@
- *** 1 ****
- ! dummy
- --- 1,2 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von w9xpopen.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von w9xpopen.mak
- !
- *** misc/Python-2.3.4/PCbuild/w9xpopen.mak Wed Oct 17 13:58:38 2007
- --- misc/build/Python-2.3.4/PCbuild/w9xpopen.mak Wed Oct 17 14:01:02 2007
-@@ -13731,7 +13748,7 @@
- *** 1 ****
- ! dummy
- --- 1,49 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von winreg.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von winreg.mak
- !
- ! ..\PC\_winreg.c : \
- ! "..\Include\abstract.h"\
-@@ -14045,7 +14062,7 @@
- *** 1 ****
- ! dummy
- --- 1,48 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von winsound.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von winsound.mak
- !
- ! ..\PC\winsound.c : \
- ! "..\Include\abstract.h"\
-@@ -14340,7 +14357,7 @@
- *** 1 ****
- ! dummy
- --- 1,49 ----
--! # Microsoft Developer Studio erstellte Abhängigkeitsdatei, einbezogen von zlib.mak
-+! # Microsoft Developer Studio erstellte Abh�ngigkeitsdatei, einbezogen von zlib.mak
- !
- ! ..\Modules\zlibmodule.c : \
- ! "..\Include\abstract.h"\
+++ /dev/null
-diff -u bin/apply.pl bin/apply.pl
---- bin/apply.pl
-+++ bin/apply.pl
-@@ -753,7 +753,7 @@
- my $ver_line;
- my $is_old = 1;
-
-- open ($Patch, "/usr/local/bin/gpatch --version|") || die "Can't run patch: $!";
-+ open ($Patch, "/usr/bin/patch --version|") || die "Can't run patch: $!";
- $ver_line = <$Patch>;
- $ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n";
- if ($1 >= 2 && $2 >= 5 && $3 >= 9) {
-@@ -1040,7 +1040,7 @@
- $applied_patches = $dest_dir.'/applied_patches';
-
- $opts = join ' ', @arguments;
-- $base_cmd = "/usr/local/bin/gpatch -l -p0 $opts -d $dest_dir";
-+ $base_cmd = "/usr/bin/patch -l -p0 $opts -d $dest_dir";
- if (is_old_patch_version()) {
- $base_cmd = 'sed \'s/^\(@.*\)\r$/\1/\' | ' . $base_cmd;
- }
-diff -u bin/enable-dict bin/enable-dict
---- bin/enable-dict
-+++ bin/enable-dict
-@@ -6,7 +6,7 @@
-
- test -f $ARC || exit 1
- cd $WRKDIR/dictionaries || exit 2
--gtar xjf $ARC
-+tar xjf $ARC
- grep -q $LNG prj/build.lst && exit 0
- line="di dictionaries\\$LNG nmake - all di_$LNG di_diclst NULL"
- head -n `wc -l prj/build.lst |awk '{print $1 - 1}'` prj/build.lst > prj/build.lst.tmp
+++ /dev/null
-#ifndef INCLUDED_MSFORMS_RETURNINTEGER_HDL
-#define INCLUDED_MSFORMS_RETURNINTEGER_HDL
-
-#include "sal/config.h"
-
-#include "cppu/macros.hxx"
-#include "sal/types.h"
-
-namespace msforms {
-
-#ifdef SAL_W32
-# pragma pack(push, 8)
-#elif defined(SAL_OS2)
-# pragma pack(8)
-#endif
-
-struct ReturnInteger {
- inline ReturnInteger() SAL_THROW(());
-
- inline ReturnInteger(const ::sal_Int32& Value_) SAL_THROW(());
-
- ::sal_Int32 Value;
-};
-
-#ifdef SAL_W32
-# pragma pack(pop)
-#elif defined(SAL_OS2)
-# pragma pack()
-#endif
-
-}
-
-namespace com { namespace sun { namespace star { namespace uno {
-class Type;
-} } } }
-
-inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( const ::msforms::ReturnInteger* );
-
-#endif // INCLUDED_MSFORMS_RETURNINTEGER_HDL
+++ /dev/null
-#ifndef INCLUDED_MSFORMS_RETURNINTEGER_HPP
-#define INCLUDED_MSFORMS_RETURNINTEGER_HPP
-
-#include "sal/config.h"
-
-#include "ReturnInteger.hdl"
-
-#include "com/sun/star/uno/Type.hxx"
-#include "cppu/unotype.hxx"
-#include "sal/types.h"
-#include "typelib/typeclass.h"
-#include "typelib/typedescription.h"
-
-namespace msforms {
-
-inline ReturnInteger::ReturnInteger() SAL_THROW( () )
- : Value(0)
-{
-}
-
-inline ReturnInteger::ReturnInteger(const ::sal_Int32& Value_) SAL_THROW( () )
- : Value(Value_)
-{
-}
-
-}
-
-namespace msforms {
-
-inline ::com::sun::star::uno::Type const & cppu_detail_getUnoType(::msforms::ReturnInteger const *) {
- //TODO: On certain platforms with weak memory models, the following code can result in some threads observing that the_type points to garbage
- static ::typelib_TypeDescriptionReference * the_type = 0;
- if (the_type == 0) {
- ::typelib_TypeDescriptionReference * the_members[] = {
- ::cppu::UnoType< ::sal_Int32 >::get().getTypeLibType() };
- ::typelib_static_struct_type_init(&the_type, "msforms.ReturnInteger", 0, 1, the_members, 0);
- }
- return *reinterpret_cast< ::com::sun::star::uno::Type * >(&the_type);
-}
-
-}
-
-inline ::com::sun::star::uno::Type const & SAL_CALL getCppuType(::msforms::ReturnInteger const *) SAL_THROW(()) {
- return ::cppu::UnoType< ::msforms::ReturnInteger >::get();
-}
-
-#endif // INCLUDED_MSFORMS_RETURNINTEGER_HPP
+++ /dev/null
-#ifndef INCLUDED_ORG_OPENOFFICE_VBA_XVBATOOOEVENTDESCGEN_HDL
-#define INCLUDED_ORG_OPENOFFICE_VBA_XVBATOOOEVENTDESCGEN_HDL
-
-#include "sal/config.h"
-
-#include "com/sun/star/script/ScriptEventDescriptor.hdl"
-namespace com { namespace sun { namespace star { namespace script { class XScriptEventsSupplier; } } } }
-#include "com/sun/star/uno/RuntimeException.hdl"
-#include "com/sun/star/uno/XInterface.hdl"
-#include "com/sun/star/uno/Reference.h"
-#include "com/sun/star/uno/Sequence.h"
-#include "cppu/macros.hxx"
-#include "rtl/ustring.hxx"
-
-namespace com { namespace sun { namespace star { namespace uno {
-class Type;
-} } } }
-
-namespace org { namespace openoffice { namespace vba {
-
-class SAL_NO_VTABLE XVBAToOOEventDescGen : public ::com::sun::star::uno::XInterface
-{
-public:
-
- // Methods
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > SAL_CALL getEventDescriptions( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xControl, const ::rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException) = 0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::script::XScriptEventsSupplier > SAL_CALL getEventSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xControl, const ::rtl::OUString& sCodeName ) throw (::com::sun::star::uno::RuntimeException) = 0;
-
- static inline ::com::sun::star::uno::Type const & SAL_CALL static_type(void * = 0);
-};
-
-} } }
-
-inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( const ::com::sun::star::uno::Reference< ::org::openoffice::vba::XVBAToOOEventDescGen >* ) SAL_THROW( () );
-
-#endif // INCLUDED_ORG_OPENOFFICE_VBA_XVBATOOOEVENTDESCGEN_HDL
+++ /dev/null
-#ifndef INCLUDED_ORG_OPENOFFICE_VBA_XVBATOOOEVENTDESCGEN_HPP
-#define INCLUDED_ORG_OPENOFFICE_VBA_XVBATOOOEVENTDESCGEN_HPP
-
-#include "sal/config.h"
-
-#include "XVBAToOOEventDescGen.hdl"
-
-#include "com/sun/star/script/ScriptEventDescriptor.hpp"
-#include "com/sun/star/script/XScriptEventsSupplier.hpp"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/XInterface.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/Type.hxx"
-#include "cppu/unotype.hxx"
-#include "osl/mutex.hxx"
-#include "rtl/ustring.hxx"
-
-namespace org { namespace openoffice { namespace vba {
-
-inline ::com::sun::star::uno::Type const & cppu_detail_getUnoType(::org::openoffice::vba::XVBAToOOEventDescGen const *) {
- static typelib_TypeDescriptionReference * the_type = 0;
- if ( !the_type )
- {
- typelib_static_mi_interface_type_init( &the_type, "org.openoffice.vba.XVBAToOOEventDescGen", 0, 0 );
- }
- return * reinterpret_cast< ::com::sun::star::uno::Type * >( &the_type );
-}
-
-} } }
-
-inline ::com::sun::star::uno::Type const & SAL_CALL getCppuType(::com::sun::star::uno::Reference< ::org::openoffice::vba::XVBAToOOEventDescGen > const *) SAL_THROW(()) {
- return ::cppu::UnoType< ::com::sun::star::uno::Reference< ::org::openoffice::vba::XVBAToOOEventDescGen > >::get();
-}
-
-::com::sun::star::uno::Type const & ::org::openoffice::vba::XVBAToOOEventDescGen::static_type(void *) {
- return ::getCppuType(static_cast< ::com::sun::star::uno::Reference< ::org::openoffice::vba::XVBAToOOEventDescGen > * >(0));
-}
-
-#endif // INCLUDED_ORG_OPENOFFICE_VBA_XVBATOOOEVENTDESCGEN_HPP
+++ /dev/null
---- cli_ure/source/climaker/makefile.mk
-+++ cli_ure/source/climaker/makefile.mk
-@@ -62,7 +62,7 @@
-
- $(BIN)$/climaker : climaker_csharp.cs
- gmcs -debug -unsafe climaker_csharp.cs -reference:$(BIN)/cli_basetypes.dll -out:$(BIN)$/climaker.exe
-- mkbundle2 --static -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll
-+ mkbundle2 -L $(OUT)/lib --deps -o $(BIN)$/climaker $(BIN)$/climaker.exe $(BIN)/cli_basetypes.dll
-
- .INCLUDE : target.mk
- .ENDIF # "$(ENABLE_MONO_CLIMAKER)" != "YES"
-
+++ /dev/null
---- python/Python-2.3.4.patch.orig 2008-06-09 19:04:49.000000000 +0600
-+++ python/Python-2.3.4.patch 2008-10-26 00:31:23.000000000 +0600
-@@ -14661,3 +14661,14 @@
-
- /* Define the macros needed if on a UnixWare 7.x system. */
- #if defined(__USLC__) && defined(__SCO_VERSION__)
-+--- misc/build/Python-2.3.4/Modules/readline.c.orig 2008-08-04 18:36:17.000000000 +0600
-++++ misc/build/Python-2.3.4/Modules/readline.c 2008-08-04 20:08:02.000000000 +0600
-+@@ -580,7 +580,7 @@
-+ Py_XDECREF(endidx);
-+ begidx = PyInt_FromLong((long) start);
-+ endidx = PyInt_FromLong((long) end);
-+- return completion_matches(text, *on_completion);
-++ return rl_completion_matches(text, *on_completion);
-+ }
-+
-+
+++ /dev/null
-? unxlngx6.pro
-Index: source/lingutil/lingutil.cxx
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/lingutil.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 lingutil.cxx
---- lingucomponent/source/lingutil/lingutil.cxx 13 Jun 2008 14:02:52 -0000 1.4
-+++ lingucomponent/source/lingutil/lingutil.cxx 24 Oct 2008 15:01:43 -0000
-@@ -322,11 +322,15 @@
- {
- LanguageType nLang = MsLangId::convertIsoStringToLanguage( aIt2->aLocaleNames[0] );
-
-+ if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE)
-+ {
-+ DBG_ERROR( "old style dictionary with invalid language found!" );
-+ continue;
-+ }
-+
- // language not yet added?
- if (aNewStyleLanguages.count( nLang ) == 0)
-- {
- rNewStyleDics.push_back( *aIt2 );
-- }
- }
- else
- {
+++ /dev/null
---- patches/dev300/apply.orig 2009-02-18 21:55:55.000000000 +0500
-+++ patches/dev300/apply 2009-02-18 21:59:02.000000000 +0500
-@@ -150,6 +150,9 @@
-
- InfraUnix: LinuxCommon, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, IntegrateExtensions
- InfraLinux: LinuxCommon, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, UbuntuIntrepidOnly
-+InfraGentooBase: Gentoo, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly
-+InfraGentoo: InfraGentooBase
-+InfraGentooPG: InfraGentooBase, InfraUnixPatchesPG, PostgreSQL
- InfraSolaris: LinuxCommon, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
- InfraWin32: Win32Common, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
- InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
-@@ -1474,6 +1477,10 @@
- [ GentooOnly ]
- SectionOwner => aprosky
-
-+# No java build
-+nojavanostax.diff
-+# Fix freezes with dict|hyph-stuff in one dir
-+hunspell-one-dir-nocrash.diff
- # Allow build to proceed with PaX enabled
- gentoo-pax-fix.diff, aprosky
- # support server-only versions of 64bit JDKs
-@@ -1555,6 +1562,9 @@
- mono-climaker-config.diff
- mono-climaker-bridgetest.diff
-
-+# Buildfix with Mono 2.2, aprosky
-+buildfix-mono-2-2.diff
-+
- [ VBAObjects ]
- SectionOwner => noelpwer
-
-@@ -1882,7 +1892,7 @@
- sdbc-postgresql.diff
- sdbc-postgresql-build-lst.diff
- sdbc-postgresql-config_office.diff
--# connectivity-workben-postgresql.diff
-+connectivity-workben-postgresql.diff
- gcc-4.3-postgresql.diff
-
-
-@@ -2807,8 +2817,10 @@
- instset-prefer-langpacks.diff, thorsten
- sfx2-remove-check-update-on-fileload.diff, kohei
-
--[InfraUnixPatches]
-+[InfraUnixPatchesPG]
- connectivity-freebsd-libs.diff
-+
-+[InfraUnixPatches]
- freebsd-store-alloca.diff
- freebsd-gperf.diff, i#85469, rail
- freebsd-writerfilter.diff
+++ /dev/null
---- soltools/mkdepend/makefile.mk.orig 2008-04-11 00:06:06.000000000 +0600
-+++ soltools/mkdepend/makefile.mk 2008-10-25 22:25:48.000000000 +0600
-@@ -49,7 +49,7 @@
- LIBSALCPPRT=
- UWINAPILIB=
-
--CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS
-+CDEFS+=-Wno-implicit-function-declaration -DNO_X11 -DXP_PC -DHW_THREADS
-
- OBJFILES= \
- $(OBJ)$/cppsetup.obj \
+++ /dev/null
---- config_office/configure.in
-+++ config_office/configure.in
-@@ -3452,6 +3452,7 @@
- dnl ===================================================================
- dnl Check for building stax
- dnl ===================================================================
-+if test "$SOLAR_JAVA" != ""; then
- AC_MSG_CHECKING([whether to build the stax])
- if test -f "../external/StAX/jsr173_1.0_api.jar"; then
- BUILD_STAX=NO
-@@ -3459,6 +3460,7 @@
- else
- BUILD_STAX=YES
- AC_MSG_RESULT([yes])
-+fi
- fi
- AC_SUBST(BUILD_STAX)
-
---- stax/makefile.mk
-+++ stax/makefile.mk
-@@ -35,12 +35,13 @@
- TARGET=stax
- USE_JAVAVER=TRUE
-
-+.IF "$(SOLAR_JAVA)" != ""
-+
- # --- Settings -----------------------------------------------------
-
- .INCLUDE : settings.mk
- .INCLUDE : antsettings.mk
-
--.IF "$(SOLAR_JAVA)" != ""
- .IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj"
- all:
- @echo "Your java version already contains StAX"
-@@ -68,14 +69,20 @@
-
- OUT2CLASS=jsr173_1.0_api.jar
-
-+.ENDIF # "$(BUILD_STAX)" != "YES"
-+
-+.ELSE # $(SOLAR_JAVA)==""
-+all:
-+ @echo "Nothing to do: SOLAR_JAVA not set"
- .ENDIF # $(SOLAR_JAVA)!= ""
- # --- Targets ------------------------------------------------------
-
-+.IF "$(SOLAR_JAVA)" != ""
- .INCLUDE : set_ext.mk
-+.ENDIF
- .INCLUDE : target.mk
- .IF "$(SOLAR_JAVA)" != ""
- .INCLUDE : tg_ext.mk
--.ENDIF
-
- .ENDIF # "$(BUILD_STAX)" != "YES"
-
-
+++ /dev/null
---- scripting/source/vbaevents/eventhelper.cxx.orig 2008-11-19 18:33:27.000000000 +0500
-+++ scripting/source/vbaevents/eventhelper.cxx 2008-11-19 18:33:55.000000000 +0500
-@@ -3,7 +3,7 @@
- #include <comphelper/proparrhlp.hxx>
- #include <comphelper/propertycontainer.hxx>
-
--#include <org/openoffice/vba/XVBAToOOEventDescGen.hpp>
-+#include <XVBAToOOEventDescGen.hpp>
-
- #include <com/sun/star/beans/XPropertySet.hpp>
- #include <com/sun/star/beans/XIntrospection.hpp>
-@@ -27,7 +27,7 @@
- #include <com/sun/star/awt/KeyEvent.hpp>
- #include <com/sun/star/awt/MouseEvent.hpp>
-
--#include <msforms/ReturnInteger.hpp>
-+#include <ReturnInteger.hpp>
-
- #include <sfx2/objsh.hxx>
- #include <basic/sbstar.hxx>
--- /dev/null
+--- sw/source/core/doc/docbm.cxx 2009-05-17 16:41:34.765483089 -0500
++++ sw/source/core/doc/docbm.cxx 2009-05-17 16:41:39.141355157 -0500
+@@ -33,6 +33,7 @@
+ #include "precompiled_sw.hxx"
+
+
++#include <cstdio>
+ #include <tools/pstm.hxx>
+ #include <svx/linkmgr.hxx>
+ #include <fmtanchr.hxx>
+--- sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-17 17:06:33.556313757 -0500
++++ sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-17 17:06:46.964547351 -0500
+@@ -32,6 +32,7 @@
+ #include "precompiled_sw.hxx"
+
+ #include <iostream>
++#include <cstdio>
+ #include "WW8TableInfo.hxx"
+ #include "swtable.hxx"
+ #include "pam.hxx"
---- config_office/configure.in.orig 2008-10-26 12:57:20.000000000 +0500
-+++ config_office/configure.in 2008-10-26 12:57:57.000000000 +0500
-@@ -105,6 +105,11 @@
- epm, however epm is useless for large scale
- package building.
- ],,enable_epm="yes")
-+AC_ARG_WITH(epm,
-+[[ --with-epm[=internal|external]
-+ use internal or system epm.
-+ [default=internal]
-+]],,with_epm=internal)
- AC_ARG_WITH(package-format,
- [ --with-package-format specify package format(s) for OOo installsets.
- Default is "normal" one of the OS/Distribution.
+--- configure.in.orig 2008-10-26 12:57:20.000000000 +0500
++++ configure.in 2008-10-26 12:57:57.000000000 +0500
@@ -808,6 +813,10 @@
--disable-verbose Decrease build verbosity.
],,)
--- /dev/null
+--- solenv/bin/make_installer.pl.orig 2009-03-14 14:28:15.000000000 +0500
++++ solenv/bin/make_installer.pl 2009-03-14 14:29:33.000000000 +0500
+@@ -1388,11 +1388,11 @@
+ # 1. copy all files that need to be stripped locally
+ # 2. strip all these files
+
+- if ( $installer::globals::strip )
+- {
+- installer::strip::strip_libraries($filesinpackage, $languagestringref);
+- if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
+- }
++ #if ( $installer::globals::strip )
++ #{
++ # installer::strip::strip_libraries($filesinpackage, $languagestringref);
++ # if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . $packagename ."_files.log", $filesinpackage); }
++ #}
+
+ ###############################################################
+ # Searching for files in $filesinpackage with flag LINUXLINK
---- bin/apply.pl.orig 2008-10-18 03:32:19.000000000 +0600
-+++ bin/apply.pl 2008-10-25 21:31:42.000000000 +0600
-@@ -767,7 +767,7 @@
+--- bin/apply.pl.orig 2009-05-30 14:14:39.000000000 +0600
++++ bin/apply.pl 2009-05-30 14:14:53.000000000 +0600
+@@ -918,7 +918,7 @@
my $ver_line;
my $is_old = 1;
-- open ($Patch, "gpatch --version|") || die "Can't run patch: $!";
+- open ($Patch, "/usr/local/bin/gpatch --version|") || die "Can't run patch: $!";
+ open ($Patch, "patch --version|") || die "Can't run patch: $!";
$ver_line = <$Patch>;
$ver_line =~ m/\s+(\d+)\.(\d+)\.(\d+)/ || die "Can't get patch version\n";
if ($1 >= 2 && $2 >= 5 && $3 >= 9) {
-@@ -1118,7 +1118,7 @@
+@@ -1280,7 +1280,7 @@
$opts = join ' ', @arguments;
- my $base_args = " -l -p0 $opts -d $dest_dir";
-- $base_cmd = "gpatch";
-+ $base_cmd = "patch";
+ $patch_args = " -l -p0 $opts -d $dest_dir";
+- $patch_cmd = "/usr/local/bin/gpatch";
++ $patch_cmd = "patch";
if ($pieces) {
# nasty path mess
- $base_cmd = "$patch_dir/../../bin/sloppypatch.pl";
---- bin/enable-dict.orig 2008-10-18 11:48:50.000000000 +0600
-+++ bin/enable-dict 2008-10-25 21:31:52.000000000 +0600
+ $patch_cmd = "$patch_dir/../../bin/sloppypatch.pl";
+--- bin/enable-dict.orig 2009-05-30 13:44:33.000000000 +0600
++++ bin/enable-dict 2009-05-30 13:44:40.000000000 +0600
@@ -6,7 +6,7 @@
test -f $ARC || exit 1
--- /dev/null
+--- patches/dev300/apply.orig 2009-05-31 13:47:16.000000000 +0600
++++ patches/dev300/apply 2009-05-31 13:47:59.000000000 +0600
+@@ -151,6 +151,9 @@
+
+ InfraUnix: LinuxCommon, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, IntegrateExtensions
+ InfraLinux: UbuntuJaunty, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, InfraLinuxOnly
++InfraGentooBase: Gentoo, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly
++InfraGentoo: InfraGentooBase
++InfraGentooPG: InfraGentooBase, InfraUnixPatchesPG, PostgreSQL
+ InfraSolaris: LinuxCommon, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, IntegrateExtensions
+ InfraWin32: Win32Common, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, IntegrateExtensions
+ InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
+@@ -1601,7 +1604,7 @@
+ sc-export-shape-macro-bindings.diff, n#304739, noelpwer
+
+ # export of hlink bindings for shapes
+-# sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
++sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
+
+ # attributes present in the vba streams can override the default shape name
+ # used for the control in the binary format
+@@ -1751,9 +1754,8 @@
+ vba-import-globaltemplate-customizations.diff
+ # fix problem with syntax like 'If LCase(str1) = str2 <> 0 Then'
+ vba-basic-if-compare-fix.diff, i#100600, n#488588, Fong
+-# fix parallel build problems in basic
+-# (probably obsoletes vba-parallel-build.diff)
+-vba-basic-parallel-build.diff
++# fix parallel build problems
++vba-parallel-build.diff
+ # fix parallel build problems in oovbaapi
+ vba-oovbaapi-parallel-build.diff
+
+@@ -2970,7 +2972,7 @@
+ xlsx-shared-import-and-export.diff
+
+ xlsx-arabic-export-crash.diff, n#497419, janneke
+-xlsx-export-notes-avoid-dereferencing-0-svx.diff, n#497417, janneke
++#xlsx-export-notes-avoid-dereferencing-0-svx.diff, n#497417, janneke
+ xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
+ xlsx-export-simple-autofilter.diff, n#497559, janneke
+ # hack to ignore writerfilter when odf-converter is present
+@@ -3090,8 +3092,10 @@
+ sfx2-remove-check-update-on-fileload.diff, kohei
+ default-system-fpicker.diff, michael
+
+-[InfraUnixPatches]
++[InfraUnixPatchesPG]
+ connectivity-freebsd-libs.diff
++
++[InfraUnixPatches]
+ freebsd-store-alloca.diff
+ freebsd-gperf.diff, i#85469, rail
+ freebsd-writerfilter.diff
--- /dev/null
+--- patches/dev300/layout-simple-dialogs-svx.diff.orig 2009-05-30 16:22:25.000000000 +0600
++++ patches/dev300/layout-simple-dialogs-svx.diff 2009-05-30 16:23:35.000000000 +0600
+@@ -38,9 +38,9 @@
+ inline BOOL SvxSearchDialog::HasSearchAttributes() const
+ {
+ int bLen = aSearchAttrText.GetText().Len();
+---- svx/source/dialog/makefile.mk.old 2009-04-06 16:41:56.000000000 +0000
+-+++ svx/source/dialog/makefile.mk 2009-04-06 16:42:13.000000000 +0000
+-@@ -39,10 +39,6 @@ ENABLE_EXCEPTIONS=TRUE
++--- svx/source/dialog/makefile.mk 2009-04-06 16:42:06.000000000 +0000
+++++ svx/source/dialog/makefile.mk 2009-04-06 16:42:13.000000000 +0000
++@@ -39,8 +39,4 @@ ENABLE_EXCEPTIONS=TRUE
+ .INCLUDE : settings.mk
+ .INCLUDE : $(PRJ)$/util$/makefile.pmk
+
+@@ -48,9 +48,9 @@
+ -CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
+ -.ENDIF # ENABLE_LAYOUT == TRUE
+ -
+- .IF "$(ENABLE_GTK)" != ""
+- CFLAGS+=-DENABLE_GTK
+- .ENDIF
++ # --- Files --------------------------------------------------------
++
++ SRS1NAME=dialogs
+ --- svx/source/dialog/srchdlg.cxx.old 2009-04-06 16:42:06.000000000 +0000
+ +++ svx/source/dialog/srchdlg.cxx 2009-04-06 16:42:13.000000000 +0000
+ @@ -78,6 +78,8 @@
--- /dev/null
+--- soltools/mkdepend/makefile.mk.orig 2008-04-11 00:06:06.000000000 +0600
++++ soltools/mkdepend/makefile.mk 2008-10-25 22:25:48.000000000 +0600
+@@ -49,7 +49,7 @@
+ LIBSALCPPRT=
+ UWINAPILIB=
+
+-CDEFS+=-DNO_X11 -DXP_PC -DHW_THREADS
++CDEFS+=-Wno-implicit-function-declaration -DNO_X11 -DXP_PC -DHW_THREADS
+
+ OBJFILES= \
+ $(OBJ)$/cppsetup.obj \
+--- soltools/mkdepend/def.h.orig 2009-05-18 15:28:59.000000000 +0200
++++ soltools/mkdepend/def.h 2009-05-18 15:29:36.000000000 +0200
+@@ -154,7 +154,7 @@
+
+ char *copy();
+ char *base_name();
+-char *getline();
++char *ooo_getline();
+ char *isdefined();
+ struct filepointer *getfile();
+ struct inclist *newinclude();
+--- soltools/mkdepend/main.c.orig 2009-05-18 15:29:08.000000000 +0200
++++ soltools/mkdepend/main.c 2009-05-18 15:30:23.000000000 +0200
+@@ -548,7 +548,7 @@
+ * Get the next line. We only return lines beginning with '#' since that
+ * is all this program is ever interested in.
+ */
+-char *getline(filep)
++char *ooo_getline(filep)
+ register struct filepointer *filep;
+ {
+ register char *p, /* walking pointer */
+--- soltools/mkdepend/parse.c.orig 2009-05-18 15:29:17.000000000 +0200
++++ soltools/mkdepend/parse.c 2009-05-18 15:30:43.000000000 +0200
+@@ -45,7 +45,7 @@
+ register int type;
+ boolean recfailOK;
+
+- while ((line = getline(filep))) {
++ while ((line = ooo_getline(filep))) {
+ switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
+ case IF:
+ doif:
+@@ -168,7 +168,7 @@
+ register char *line;
+ register int type;
+
+- while ((line = getline(filep))) {
++ while ((line = ooo_getline(filep))) {
+ switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
+ case IF:
+ case IFFALSE:
--- /dev/null
+--- patches/vba/vba-parallel-build.diff.orig 2009-05-23 14:37:45.000000000 +0600
++++ patches/vba/vba-parallel-build.diff 2009-05-31 15:26:39.000000000 +0600
+@@ -21,59 +21,36 @@
+ +
+ +$(OBJFILES) : $(MISC)$/$(TARGET).don
+ +
+---- sc/source/ui/vba/makefile.mk 2007-03-01 14:51:01.000000000 +0100
+-+++ sc/source/ui/vba/makefile.mk 2007-03-01 15:24:47.000000000 +0100
+-@@ -1,6 +1,6 @@
+--PRJ=../..$/..
+-+PRJ=..$/..$/..
++--- scripting/source/vbaevents/makefile.mk.orig 2009-05-31 14:11:28.000000000 +0600
+++++ scripting/source/vbaevents/makefile.mk 2009-05-31 15:25:22.000000000 +0600
++@@ -19,15 +19,6 @@
+
+--PRJNAME=
+-+PRJNAME=sc
+- TARGET=vbaobj
+- .IF "$(ENABLE_VBA)"!="YES"
+- dummy:
+-@@ -21,10 +21,6 @@ ALLTAR : \
+- $(MISC)$/$(TARGET).don \
+- $(SLOTARGET)
++ # ------------------------------------------------------------------
+
++-ALLTAR : \
++- $(MISC)$/$(TARGET).don \
++- $(SLOTARGET)
++-
+ -$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+ - +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+ - echo $@
++-# ------------------------------------------------------------------
+ -
+- # ------------------------------------------------------------------
++ #.INCLUDE : ..$/cppumaker.mk
+
+ SLOFILES= \
+-@@ -65,3 +61,10 @@ SLOFILES= \
++@@ -56,3 +47,14 @@
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
+ +
+-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+-+ +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+-+ echo $@
+++ALLTAR : \
+++ $(MISC)$/$(TARGET).don \
+++ $(SLOTARGET)
+ +
+-+$(OBJFILES) : $(MISC)$/$(TARGET).don
+-+
+---- scripting/source/vbaevents/makefile.mk 2007-03-01 16:54:36.000000000 +0100
+-+++ scripting/source/vbaevents/makefile.mk 2007-03-01 16:56:15.000000000 +0100
+-@@ -24,9 +24,6 @@ ALLTAR : \
+- $(MISC)$/$(TARGET).don \
+- $(SLOTARGET)
+-
+--$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+-- +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+-- echo $@
+- # ------------------------------------------------------------------
+-
+- #.INCLUDE : ..$/cppumaker.mk
+-@@ -57,3 +54,10 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
+- # --- Targets ------------------------------------------------------
+-
+- .INCLUDE : target.mk
+++$(SLOFILES) : $(MISC)$/$(TARGET).don
+ +
+ +$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+ + +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+ + echo $@
+ +
+-+$(OBJFILES) : $(MISC)$/$(TARGET).don
+-+
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="1.9"
-EAPI="1"
-
-inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
-
-
-IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk java kde ldap mono odk oodict opengl pam postgres seamonkey xulrunner"
-
-PATCHLEVEL="OOH680"
-MILESTONE="18"
-OOOTAG=${PATCHLEVEL}_m${MILESTONE}
-OOOBUILDTAG=ooh680-m${MILESTONE}
-
-
-SRC="OOo_${PV}_src"
-S="${WORKDIR}/infra-ooo-files_${PV}"
-WORKSRC="${WORKDIR}/${OOOTAG}"
-
-DESCRIPTION="OpenOffice-Infra, office suite with enhanced Russian support from Infra-Resource"
-
-SRC_URI="mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
- mirror://openoffice/stable/${PV}/${SRC}_system.tar.bz2
- mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2
- odk? ( mirror://openoffice/stable/${PV}/${SRC}_sdk.tar.bz2
- java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
- http://download.i-rs.ru/pub/openoffice/${PV}/ru/infra-ooo-files_2.4.2.tar.gz
- http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll"
-
-LANGS1="de fr ru uk"
-LANGS="${LANGS1} en en_US"
-
-# proprt linguas handling
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-for Y in ${LANGS1} ; do
- SRC_URI="${SRC_URI} linguas_${Y}? ( mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2 )"
-done
-
-# detect ARCH variable
-if [[ "${ARCH}" == "amd64" ]] ; then
- ARCH_VAR="x"
-else
- ARCH_VAR="i"
-fi
-
-HOMEPAGE="http://www.i-rs.ru/ http://www.go-oo.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-COMMON_DEPEND="!app-office/openoffice-bin
- x11-libs/libXaw
- x11-libs/libXinerama
- >=dev-lang/perl-5.0
- dbus? ( >=dev-libs/dbus-glib-0.71 )
- gnome? ( >=x11-libs/gtk+-2.10
- >=gnome-base/gnome-vfs-2.6
- >=gnome-base/gconf-2.0
- >=x11-libs/cairo-1.0.2 )
- gtk? ( >=x11-libs/gtk+-2.10
- >=x11-libs/cairo-1.0.2 )
- eds? ( >=gnome-extra/evolution-data-server-1.2 )
- gstreamer? ( >=media-libs/gstreamer-0.10
- >=media-libs/gst-plugins-base-0.10 )
- kde? ( =kde-base/kdelibs-3* )
- java? ( >=dev-java/bsh-2.0_beta4
- >=dev-java/xalan-2.7
- >=dev-java/xalan-serializer-2.7
- >=dev-java/xerces-2.7
- =dev-java/xml-commons-external-1.3*
- >=dev-db/hsqldb-1.8.0.9
- =dev-java/rhino-1.5* )
- mono? ( >=dev-lang/mono-1.2.3.1 )
- opengl? ( virtual/opengl
- virtual/glu )
- xulrunner? ( >=net-libs/xulrunner-1.8
- >=dev-libs/nspr-4.6.6
- >=dev-libs/nss-3.11-r1 )
- !xulrunner? ( firefox? ( >=dev-libs/nspr-4.6.6
- >=dev-libs/nss-3.11-r1 ) )
- !xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1*
- >=dev-libs/nspr-4.6.6
- >=dev-libs/nss-3.11-r1 ) ) )
- >=net-misc/neon-0.24.7
- >=dev-libs/openssl-0.9.8g
- >=x11-libs/startup-notification-0.5
- >=media-libs/freetype-2.1.10-r2
- >=media-libs/fontconfig-2.3.0
- cups? ( net-print/cups )
- media-libs/jpeg
- media-libs/libpng
- app-arch/zip
- app-arch/unzip
- >=app-text/hunspell-1.1.4-r1
- >=app-admin/eselect-oodict-20060706
- dev-libs/expat
- >=dev-libs/icu-3.8
- >=sys-libs/db-4.3
- >=app-text/libwpd-0.8.8
- >=media-libs/libsvg-0.1.4
- >=media-libs/vigra-1.4
- linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
- linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
- linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
- !xulrunner? ( firefox? ( || ( =www-client/mozilla-firefox-2*
- =www-client/mozilla-firefox-bin-2* ) ) )
- ${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- x11-libs/libXrender
- x11-proto/printproto
- x11-proto/xextproto
- x11-proto/xproto
- x11-proto/xineramaproto
- >=sys-apps/findutils-4.1.20-r1
- dev-perl/Archive-Zip
- virtual/perl-Compress-Zlib
- >=virtual/perl-Compress-Raw-Zlib-2.002
- virtual/perl-IO-Compress-Base
- dev-util/pkgconfig
- dev-util/intltool
- >=dev-libs/boost-1.33.1
- sys-devel/flex
- sys-devel/bison
- dev-libs/libxslt
- >=dev-libs/libxml2-2.0
- !xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
- >=dev-util/gperf-3
- >=net-misc/curl-7.12
- sys-libs/zlib
- sys-apps/coreutils
- media-gfx/imagemagick
- pam? ( sys-libs/pam )
- !dev-util/dmake
- >=dev-lang/python-2.3.4
- java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
- dev-java/ant-core )
- ldap? ( net-nds/openldap )
- postgres? ( virtual/postgresql-base )"
-
-PROVIDE="virtual/ooo"
-RESTRICT="strip" # the openoffice.org from infra-resource is already stripped
-
-pkg_setup() {
-
- ewarn
- ewarn " It is important to note that OpenOffice-Infra is a very fragile "
- ewarn " build when it comes to CFLAGS. A number of flags have already "
- ewarn " been filtered out. If you experience difficulty merging this "
- ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to "
- ewarn " merge again. Also note that building OOo takes a lot of time and "
- ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
- ewarn " the minimum requirements. If you have less, use openoffice-infra-bin "
- ewarn " instead. "
- ewarn
-
- # Check if we have enough RAM and free diskspace to build this beast
- CHECKREQS_MEMORY="512"
- use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
- check_reqs
-
- strip-linguas ${LANGS}
-
- if [[ -z "${LINGUAS}" ]]; then
- export LINGUAS_OOO="en-US"
- ewarn
- ewarn " To get a localized build, set the according "
- ewarn " LINGUAS variable(s). LINGUAS=ru for example. "
- ewarn
- else
- export LINGUAS_OOO=`echo ${LINGUAS} | \
- sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
- fi
-
- if [[ "${#LINGUAS_OOO}" == "2" ]]; then
- export BASELNG="${LINGUAS_OOO}"
- else
- export BASELNG="en-US"
- fi
-
- if use !java; then
- ewarn " You are building with java-support disabled, this results in some "
- ewarn " of the OpenOffice.org functionality (i.e. help) 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
- ewarn " If you want the OpenOffice-Infra systray quickstarter to work "
- ewarn " activate the 'gtk' and 'gnome' use flags. "
- ewarn
- fi
-
- if is-flagq -ffast-math ; then
- eerror " You are using -ffast-math, which is known to cause problems. "
- eerror " Please remove it from your CFLAGS, using this globally causes "
- eerror " all sorts of problems. "
- eerror " After that you will also have to - at least - rebuild python otherwise "
- eerror " the openoffice build will break. "
- die
- fi
-
- if use pam; then
- if ! built_with_use sys-apps/shadow pam; then
- eerror " shadow needs to be built with pam-support. "
- eerror " rebuild it accordingly or remove the pam use-flag "
- die
- fi
- fi
-
- if use xulrunner; then
- if pkg-config --exists xulrunner-xpcom; then
- XULR="xulrunner"
- elif pkg-config --exists libxul; then
- XULR="libxul"
- else
- die "USE flag [xulrunner] set but not found!"
- fi
- fi
-
- # Check python
- if ! built_with_use dev-lang/python threads
- then
- eerror "Python needs to be built with threads."
- die
- fi
-
- java-pkg-opt-2_pkg_setup
-
- # sys-libs/db version used
- local db_ver="$(db_findver '>=sys-libs/db-4.3')"
-
-}
-
-src_unpack() {
-
- unpack infra-ooo-files_${PV}.tar.gz
- unpack ${SRC}_system.tar.bz2
- unpack ${SRC}_core.tar.bz2
- unpack ${SRC}_binfilter.tar.bz2
- unpack ${SRC}_l10n.tar.bz2
-
- # Some fixes for our patchset
- cd "${S}"
- epatch "${FILESDIR}/${PV}/gentoo-scripts.diff"
- # Missing includes for amd64 gcc43
- cp -f "${FILESDIR}/${PV}/build-gcc43-missingincludes.diff" "${WORKDIR}"/infra-ooo-files_${PV}/patches/src680/
- # Patch for using Gentoo specific goo team patches InfraGentoo/InfraGentooPG distro targets
- epatch "${FILESDIR}/${PV}/gentoo-infragentoo.diff"
-
- mkdir -p "${WORKSRC}"/solver/680/unxlng${ARCH_VAR}6.pro/pck/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/extra_templates_*.zip "${WORKSRC}"/solver/680/unxlng${ARCH_VAR}6.pro/pck/
-
- cd "${WORKSRC}"; rm -rf "extras/source/autotext/lang/ru/*" ; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras_ru.tar.bz2"
- cd "${WORKSRC}"; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/oox.2008-02-29.tar.bz2"
-
- "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict ru_RU "${WORKDIR}"/infra-ooo-files_${PV}/files/dict_ru_RU.tar.bz2 ${WORKSRC}
- "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict de_DE "${WORKDIR}"/infra-ooo-files_${PV}/files/dict_de_DE.tar.bz2 ${WORKSRC}
- "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict uk_UA "${WORKDIR}"/infra-ooo-files_${PV}/files/dict_uk_UA.tar.bz2 ${WORKSRC}
- "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict fr_FR "${WORKDIR}"/infra-ooo-files_${PV}/files/dict_fr_FR.tar.bz2 ${WORKSRC}
- mkdir -p "${WORKSRC}"/mdbtools/download/
- mkdir -p "${WORKSRC}"/libwps/download/
- mkdir -p "${WORKSRC}"/libwpg/download/
- mkdir -p "${WORKSRC}"/libwpd/download/
- mkdir -p "${WORKSRC}"/libsvg/download/
- mkdir -p "${WORKSRC}"/default_images/sw/res/
- mkdir -p "${WORKSRC}"/ooo_custom_images/nologo/introabout/
- mkdir -p "${WORKSRC}"/default_images/introabout/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/mdbtools*.tar.gz "${WORKSRC}"/mdbtools/download/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libwps*.tar.gz "${WORKSRC}"/libwps/download/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libwpg*.tar.gz "${WORKSRC}"/libwpg/download/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libwpd*.tar.gz "${WORKSRC}"/libwpd/download/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/libsvg*.tar.gz "${WORKSRC}"/libsvg/download/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/infra-logo.png "${WORKSRC}"/default_images/sw/res/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/go-oo-team.png "${WORKSRC}"/default_images/sw/res/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/intro.bmp "${WORKSRC}"/ooo_custom_images/nologo/introabout/
- cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/about.bmp "${WORKSRC}"/default_images/introabout/
-
- local patchconf
- local distro
- if use postgres; then
- distro=InfraGentooPG
- else
- distro=InfraGentoo
- fi
- patchconf="--tag=${OOOBUILDTAG} --distro=${distro} --distro=Localize"
- if use binfilter; then
- patchconf="${patchconf} --distro=Binfilter"
- fi
- "${WORKDIR}"/infra-ooo-files_${PV}/bin/apply.pl "${WORKDIR}"/infra-ooo-files_${PV}/patches/src680 ${WORKSRC} ${patchconf}
- "${WORKDIR}"/infra-ooo-files_${PV}/bin/transform --apply "${WORKDIR}"/infra-ooo-files_${PV} ${WORKSRC}
-
- cp -f "${DISTDIR}"/unowinreg.dll "${WORKSRC}"/external/unowinreg/
-
- # workaround for x86/~x86 hunspell
- export HUNSPELL_LIBS=$(echo "$(pkg-config hunspell --libs)" | sed 's|/|\\/|g')
-
- # missing macolor1/macolor2 properties patch
- epatch "${FILESDIR}/${PV}/gentoo-macolor.diff"
- # completion_matches -> rl_completion_matches
- epatch "${FILESDIR}/${PV}/gentoo-completion_matches.diff"
- if use postgres; then
- # fix using of pg lib
- epatch "${FILESDIR}/${PV}/gentoo-configure-pg.diff"
- fi
- # enable/disable-gstreamer, disable scanning for rpm/dpkg and etc
- epatch "${FILESDIR}/${PV}/gentoo-configure.diff"
- # disable mkdepend warning
- epatch "${FILESDIR}/${PV}/gentoo-mkdepend.diff"
- # fix buildroot issue for rpm >=4.4.7
- epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff"
- if use postgres; then
- # fix handling of system libs for postgresql-base
- epatch "${FILESDIR}/gentoo-system_pgsql.diff"
- fi
- # fix sandbox
- epatch "${FILESDIR}/${PV}/gentoo-fixsandbox.diff"
-
- # Use flag checks
- if use java; then
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-ant-home=${ANT_HOME}"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-jdk-home=$(java-config --jdk-home 2>/dev/null)"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-java-target-version=$(java-pkg_get-target)"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-beanshell"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-xalan"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-xerces"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-xml-apis"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-hsqldb"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-serializer-jar=$(java-pkg_getjar xalan-serializer serializer.jar)"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-xalan-jar=$(java-pkg_getjar xalan xalan.jar)"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-xerces-jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-xml-apis-jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)"
- fi
-
- if use firefox || use seamonkey || use xulrunner; then
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-mozilla"
- local browser
- use seamonkey && browser="seamonkey"
- use firefox && browser="firefox"
- use xulrunner && browser="${XULR}"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-mozilla=${browser}"
- else
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-mozilla"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-system-mozilla"
- fi
-
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable binfilter`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable cups`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable dbus`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable eds evolution2`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gnome gnome-vfs`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gnome lockdown`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gnome systray`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gstreamer`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable ldap`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable opengl`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_with ldap openldap`"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-neon"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-neon"
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-openssl"
-
- CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable debug crashdump`"
-
- # Original branding results in black splash screens for some, so forcing ours
- CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-intro-bitmaps=\\\"${WORKSRC}/ooo_custom_images/nologo/introabout/intro.bmp\\\""
-
- export CONFIGURE_ARGS
-
- cd ${WORKSRC}/config_office
- eautoreconf
-
-}
-
-src_compile() {
-
- # Should the build use multiprocessing? Not enabled by default, as it tends to break
- export JOBS="1"
- if [[ "${WANT_MP}" == "true" ]]; then
- export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
- fi
-
- # Compile problems with these ...
- filter-flags "-funroll-loops"
- filter-flags "-fprefetch-loop-arrays"
- filter-flags "-fno-default-inline"
- filter-flags "-fstack-protector"
- filter-flags "-fstack-protector-all"
- filter-flags "-ftracer"
- filter-flags "-fforce-addr"
- replace-flags "-O?" "-O2"
- # not very clever to disable warning, but ... users afraid it
- append-flags "-Wno-implicit"
- append-flags "-fno-strict-aliasing"
-
- # Build with NVidia cards breaks otherwise
- use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
-
- # Now for our optimization flags ...
- export ARCH_FLAGS="${CXXFLAGS}"
- use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
- # Make sure gnome-users get gtk-support
- local GTKFLAG="--disable-gtk --disable-cairo"
- ( use gtk || use gnome ) && GTKFLAG="--enable-gtk --enable-cairo"
-
- use kde && set-kdedir 3
-
- # workaround for --with-system-*
- export PKG_CONFIG=pkg-config
-
- cd "${WORKSRC}/config_office"
-
- ./configure \
- --srcdir="${DISTDIR}" \
- --with-lang="${LINGUAS_OOO}" \
- --with-build-version=${OOOTAG} \
- ${GTKFLAG} \
- `use_enable mono` \
- `use_enable kde` \
- `use_enable pam` \
- `use_enable debug symbols` \
- `use_enable odk` \
- `use_with java` \
- --with-system-freetype \
- --with-system-libxml \
- --with-system-libwpd \
- --with-system-hunspell \
- --disable-fontooo \
- --disable-qadevooo \
- --enable-sdext \
- --with-system-jpeg \
- --with-system-boost \
- --with-system-curl \
- --with-system-db \
- --with-system-expat \
- --with-system-icu \
- --with-system-libxslt \
- --with-system-vigra \
- --with-system-zlib \
- --with-system-stdlibs \
- --with-system-python \
- --without-stlport \
- --mandir=/usr/share/man \
- --libdir=/usr/$(get_libdir) \
- --with-use-shell=bash \
- --with-epm=internal \
- --with-package-format=native \
- --with-vendor="Infra-Resource" \
- ${CONFIGURE_ARGS} \
- || die "Configuration failed!"
-
- einfo "Building OpenOffice-Infra..."
-
- cd "${WORKSRC}"
-
- if [[ "${ARCH}" == "amd64" ]]; then
- GENTOO_ENV_SET="${WORKSRC}/LinuxX86-64Env.Set.sh"
- else
- GENTOO_ENV_SET="${WORKSRC}/LinuxX86Env.Set.sh"
- fi
-
- source "${GENTOO_ENV_SET}"
-
- ./bootstrap
-
- cd transex3; build.pl -P${JOBS} --all && deliver.pl
-
- cd "${WORKSRC}"
-
- if [[ "${BASELNG}" == "ru" || "${BASELNG}" == "uk" ]]; then
- [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${BASELNG}/${BASELNG}.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${BASELNG} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${BASELNG}/${BASELNG}.sdf
- [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${BASELNG}/${BASELNG}-vendor.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${BASELNG} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${BASELNG}/${BASELNG}-vendor.sdf
- fi
- if [[ "${BASELNG}" == "ru" ]]; then
- [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${BASELNG}/${BASELNG}-patched.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${BASELNG} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${BASELNG}/${BASELNG}-patched.sdf
- fi
-
- if [[ "${JOBS}" != "1" ]]; then
- cd instsetoo_native ; build.pl -P${JOBS} --all || die "Build failed"
- else
- dmake || die "Build failed"
- fi
-
- unset PYTHONPATH
- unset PYTHONHOME
-
-}
-
-src_install() {
-
- einfo "Preparing Installation"
-
- local gentoo_env_set_dst
-
- if [[ "${ARCH}" == "amd64" ]]; then
- gentoo_env_set_dst="linux-2.6-x86_64"
- else
- gentoo_env_set_dst="linux-2.6-intel"
- fi
-
- local instdir="/usr/$(get_libdir)/openoffice"
- local basecomponents="base calc draw impress math writer"
- local allcomponents
-
- allcomponents="${basecomponents}"
- if use cups; then
- allcomponents="${allcomponents} printeradmin"
- fi
-
- if use gtk || use gnome; then
- allcomponents="${allcomponents} qstart"
- fi
-
- dodir "${instdir}"
-
- cp -af "${WORKSRC}"/instsetoo_native/unxlng"${ARCH_VAR}"6.pro/OpenOffice/native/install/"${BASELNG}"/"${gentoo_env_set_dst}"/buildroot/opt/openoffice.org2.4/* \
- "${D}"${instdir}
-
- for i in ${LINGUAS_OOO}; do
- cp -af "${WORKSRC}"/instsetoo_native/unxlng"${ARCH_VAR}"6.pro/OpenOffice_languagepack/native/install/"${i}"/"${gentoo_env_set_dst}"/buildroot/opt/openoffice.org2.4/* \
- "${D}"${instdir}
- done
-
- # oodict
- if use !oodict; then
- rm -rf "${D}"${instdir}/share/dict/ooo/*.dic
- rm -rf "${D}"${instdir}/share/dict/ooo/*.aff
- fi
-
- # Menu entries
- cd "${D}"${instdir}/share/xdg/
-
- for i in ${allcomponents}; do
- if [[ "${i}" == "printeradmin" ]]; then
- sed -i -e s/openoffice.org2.4-/oo/g "${i}".desktop || die "Sed failed"
- else
- sed -i -e s/openoffice.org2.4/ooffice/g "${i}".desktop || die "Sed failed"
- fi
- if [[ "${i}" == "draw" ]]; then
- sed -i -e "s/Name\=OpenOffice\.org 2\.4 Draw/Name\=OpenOffice\.org 2\.4 Draw\nGenericName\=Draw\nGenericName[ru]\=Рисунки, блок-схемы и логотипы/g" \
- "${i}".desktop || die "Sed failed"
- fi
- if [[ "${i}" == "math" ]]; then
- sed -i -e "s/Name\=OpenOffice\.org 2\.4 Math/Name\=OpenOffice\.org 2\.4 Math\nGenericName\=Math\nGenericName[ru]\=Формулы и уравнения/g" \
- "${i}".desktop || die "Sed failed"
- fi
- domenu "${i}".desktop
- done
-
- # Icons
- insinto /usr/share/icons
- doins -r "${WORKSRC}"/sysui/desktop/icons/{hicolor,locolor}
- find "${D}"/usr/share/icons -name 'CVS' | xargs rm -rf
- for color in {hicolor,locolor}; do
- for sizes in "${D}"usr/share/icons/${color}/* ; do
- for i in ${allcomponents}; do
- [[ -f "${sizes}"/apps/"${i}".png ]] && mv "${sizes}"/apps/"${i}".png "${sizes}"/apps/openofficeorg24-"${i}".png
- done
- done
- done
-
- # Gnome icons
- if use gnome; then
- mkdir -p "${D}"/usr/share/icons/gnome
- for size in {16x16,32x32,48x48}; do
- if ! [[ -d "${D}"/usr/share/icons/gnome/"${size}" ]]; then
- mkdir -p "${D}"/usr/share/icons/gnome/"${size}"
- mkdir -p "${D}"/usr/share/icons/gnome/"${size}/apps"
- fi
- for i in ${allcomponents}; do
- dosym /usr/share/icons/hicolor/"${size}"/apps/openofficeorg24-"${i}".png /usr/share/icons/gnome/"${size}"/apps/openofficeorg24-"${i}".png
- done
- done
- fi
-
- for i in ${allcomponents}; do
- dosym /usr/share/icons/hicolor/48x48/apps/openofficeorg24-"${i}".png /usr/share/pixmaps/openofficeorg24-"${i}".png
- done
-
- # Mime types
- insinto /usr/share/mime/packages
- doins "${WORKSRC}"/sysui/unxlng"${ARCH_VAR}"6.pro/misc/openoffice.org/openoffice.org.xml
-
- # Install wrapper script
- newbin "${FILESDIR}"/wrapper.in ooffice
- sed -i -e s/LIBDIR/$(get_libdir)/g "${D}"/usr/bin/ooffice || die "Wrapper script failed"
-
- # Component symlinks
- for i in ${basecomponents}; do
- dosym "${instdir}"/program/s"${i}" /usr/bin/oo"${i}"
- done
-
- if use cups; then
- dosym "${instdir}"/program/spadmin.bin /usr/bin/ooprinteradmin
- fi
- dosym "${instdir}"/program/soffice /usr/bin/soffice
- dosym "${instdir}"/program/unopkg /usr/bin/unopkg
-
- # Install extensions: Sun Report Builder and Sun Presentation Minimizer
- insinto "${instdir}"/share/extension/install
- doins "${WORKSRC}"/solver/680/unxlng"${ARCH_VAR}"6.pro/bin/sun-report-builder.oxt
- doins "${WORKSRC}"/solver/680/unxlng"${ARCH_VAR}"6.pro/bin/minimizer/sun-presentation-minimizer.oxt
-
- # Install PostgreSQL SDBC extension
- if use postgres; then
- insinto /usr/$(get_libdir)/openoffice/share/extension/install
- doins "${WORKSRC}"/connectivity/unxlng"${ARCH_VAR}"6.pro/lib/postgresql-sdbc-0.7.5.zip
- fperms 444 /usr/$(get_libdir)/openoffice/share/extension/install/postgresql-sdbc-0.7.5.zip
- fi
-
- # Fix the permissions for security reasons
-# chown -R root:0 "${D}"
-
- # Non-java weirdness see bug #99366
- use !java && rm -f "${D}"${instdir}/program/javaldx
-
- # record java libraries
- use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar
-
- # install java-set-classpath
- if use java; then
- insinto /usr/$(get_libdir)/openoffice/program
- newins "${FILESDIR}/java-set-classpath.in" java-set-classpath
- fperms 755 /usr/$(get_libdir)/openoffice/program/java-set-classpath
- fi
-
-}
-
-pkg_preinst() {
-
- use java && java-pkg-2_pkg_preinst
-
-}
-
-pkg_postinst() {
-
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-
- use !oodict && eselect oodict update --libdir $(get_libdir)
-
- [[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
-
- # Add available & useful jars to openoffice classpath
- use java && /usr/$(get_libdir)/openoffice/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
-
- elog " To start OpenOffice-Infra, run:"
- elog
- elog " $ ooffice"
- elog
- elog " Also, for individual components, you can use any of:"
- elog
- elog " oobase, oocalc, oodraw, ooimpress, oomath or oowriter"
- elog
- elog " You can find extension in: /usr/$(get_libdir)/openoffice/share/extension/install "
- elog
- if use postgres; then
- elog " PostgreSQL SDBC extension provided in "
- elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
- elog
- fi
- use !oodict && elog " Spell checking is now provided through our own myspell-ebuilds, "
- use !oodict && elog " if you want to use it, please install the correct myspell package "
- use !oodict && elog " according to your language needs. "
- use !oodict && elog " For example, for myspell and the russian language You should do "
- use !oodict && elog
- use !oodict && elog " emerge -av myspell-ru "
- use !oodict && elog " eselect oodict set myspell-ru"
- use !oodict && elog
- use !oodict && elog " If You do not like it re-emerge the package with "
- use !oodict && elog " USE=\"oodict\" "
-
-}
-
-pkg_postrm() {
-
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-
- use !oodict && [[ ! -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && rm -rf /usr/$(get_libdir)/openoffice
-
-}
IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk oodict opengl pam postgres"
-PATCHLEVEL="OOO300"
-MILESTONE="15"
+PATCHLEVEL="OOO310"
+MILESTONE="11"
OOOTAG=${PATCHLEVEL}_m${MILESTONE}
-OOOBUILDTAG=ooo300-m${MILESTONE}
+OOOBUILDTAG=ooo310-m${MILESTONE}
SRC=OOo_${PV}_src
S=${WORKDIR}/infra-ooo-files_${PV}
WORKSRC=${WORKDIR}/${OOOTAG}
-
+BASIS=basis3.1
DESCRIPTION="OpenOffice-Infra, office suite with enhanced Russian support from Infra-Resource"
SRC_URI="binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
http://download.i-rs.ru/pub/openoffice/${PV}/ru/infra-ooo-files_${PV}.tar.gz"
-LANGS1="ru uk"
+LANGS1="ru tr uk"
LANGS="${LANGS1} en en_US"
-# proprt linguas handling
+# proper linguas handling
for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
!app-office/openoffice-bin
x11-libs/libXaw
x11-libs/libXinerama
+ x11-libs/libXrandr
>=dev-lang/perl-5.0
dbus? ( >=dev-libs/dbus-glib-0.71 )
gnome? ( >=x11-libs/gtk+-2.10
kde? ( kde-base/kdelibs:3.5 )
java? ( >=dev-java/bsh-2.0_beta4
>=dev-db/hsqldb-1.8.0.9 )
- mono? ( >=dev-lang/mono-1.2.3.1 )
+ mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
nsplugin? ( || ( net-libs/xulrunner:1.8 net-libs/xulrunner:1.9 =www-client/seamonkey-1* )
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
# Check if we have enough RAM and free diskspace to build this beast
CHECKREQS_MEMORY="512"
- use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
+ use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="6144"
check_reqs
strip-linguas ${LANGS}
if use !java; then
ewarn
ewarn " You are building with java-support disabled, this results in some "
- ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. "
+ ewarn " of the OpenOffice-Infra functionality (i.e. help) being disabled. "
ewarn " If something you need does not work for you, rebuild with "
ewarn " java in your USE-flags. "
ewarn
eerror " Please remove it from your CFLAGS, using this globally causes "
eerror " all sorts of problems. "
eerror " After that you will also have to - at least - rebuild python otherwise "
- eerror " the openoffice build will break. "
+ eerror " the openoffice-infra build will break. "
die
fi
# Some fixes for our patchset
cd "${S}"
- epatch "${FILESDIR}/${PV}/gentoo-scripts.diff"
+ epatch "${FILESDIR}/${PV}/gentoo-infra-builder.diff"
+ epatch "${FILESDIR}/${PV}/gentoo-layout-simple-dialogs-svx.diff"
+ # fix vba parallel build
+ epatch "${FILESDIR}/${PV}/gentoo-vba-parallel-build.diff"
# Patch for using Gentoo specific goo team patches and InfraGentoo/InfraGentooPG distro targets
- epatch "${FILESDIR}/${PV}/gentoo-infragentoo.diff"
+ epatch "${FILESDIR}/${PV}/gentoo-infra-gentoo.diff"
# Patches from go-oo mainstream
- cp -f "${FILESDIR}/${PV}/gentoo-nojavanostax.diff" "${WORKDIR}/infra-ooo-files_${PV}/patches/dev300/nojavanostax.diff" || die
- cp -f "${FILESDIR}/${PV}/gentoo-hunspell.diff" "${WORKDIR}/infra-ooo-files_${PV}/patches/dev300/hunspell-one-dir-nocrash.diff" || die
- cp -f "${FILESDIR}/${PV}/gentoo-buildfix-mono-2-2.diff" "${WORKDIR}/infra-ooo-files_${PV}/patches/dev300/buildfix-mono-2-2.diff" || die
+ cp -f "${FILESDIR}/${PV}/buildfix-gcc44.diff" "${S}/patches/hotfixes" || die
+ cp -f "${FILESDIR}/${PV}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/hotfixes" || die
cd "${WORKSRC}"; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras-templates.tar.bz2"
- cd "${WORKSRC}"; rm -rf "extras/source/autotext/lang/ru/*" ; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras_ru.tar.bz2"
- "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict ru_RU "${WORKDIR}"/infra-ooo-files_${PV}/files/dict_ru_RU.tar.bz2 "${WORKSRC}"
- "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict uk_UA "${WORKDIR}"/infra-ooo-files_${PV}/files/dict_uk_UA.tar.bz2 "${WORKSRC}"
+
+ local longlang
+ for i in ${LINGUAS_OOO}; do
+ if [[ "${i}" == "ru" || "${i}" == "tr" ]]; then
+ cd "${WORKSRC}"; rm -rf "extras/source/autotext/lang/${i}/*" ; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras_${i}.tar.bz2"
+ fi
+ if [[ "${i}" == "ru" || "${i}" == "uk" ]]; then
+ if [[ "${i}" == "ru" ]]; then
+ longlang="ru_RU"
+ else
+ longlang="uk_UA"
+ fi
+ "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict "${longlang}" "${WORKDIR}/infra-ooo-files_${PV}/files/dict_${longlang}.tar.bz2" "${WORKSRC}"
+ fi
+ done
# Infra branding
mkdir -p "${WORKSRC}"/{libwps,libwpg,libwpd,libsvg}/download/
epatch "${FILESDIR}/${PV}/gentoo-configure.diff"
# disable mkdepend warning
epatch "${FILESDIR}/${PV}/gentoo-mkdepend.diff"
- # completion_matches -> rl_completion_matches
- epatch "${FILESDIR}/${PV}/gentoo-completion_matches.diff"
# disable rpm
epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff"
if use postgres; then
# fix handling of system libs for postgresql-base
epatch "${FILESDIR}/gentoo-system_pgsql.diff"
fi
- # more stabillity on multiprocessing build
- epatch "${FILESDIR}/${PV}/gentoo-vba_incl.diff"
- cp -f "${FILESDIR}/${PV}/gentoo-ReturnInteger.hdl" "${WORKSRC}/scripting/source/vbaevents/ReturnInteger.hdl" || die
- cp -f "${FILESDIR}/${PV}/gentoo-ReturnInteger.hpp" "${WORKSRC}/scripting/source/vbaevents/ReturnInteger.hpp" || die
- cp -f "${FILESDIR}/${PV}/gentoo-XVBAToOOEventDescGen.hdl" "${WORKSRC}/scripting/source/vbaevents/XVBAToOOEventDescGen.hdl" || die
- cp -f "${FILESDIR}/${PV}/gentoo-XVBAToOOEventDescGen.hpp" "${WORKSRC}/scripting/source/vbaevents/XVBAToOOEventDescGen.hpp" || die
- # fix ru dict
epatch "${FILESDIR}/${PV}/gentoo-ru_dict.diff"
+ # don't strip libs
+ use debug && epatch "${FILESDIR}/${PV}/gentoo-dont_strip_libs.diff"
- cd "${WORKSRC}/config_office"
+ cd "${WORKSRC}"
eautoreconf
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-ant-home=${ANT_HOME}"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-jdk-home=$(java-config --jdk-home 2>/dev/null)"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-java-target-version=$(java-pkg_get-target)"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-jvm-path=/usr/$(get_libdir)/"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-beanshell"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-hsqldb"
CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
filter-flags "-fstack-protector-all"
filter-flags "-ftracer"
filter-flags "-fforce-addr"
- replace-flags "-O?" "-O2"
+
+ filter-flags "-O[s2-9]"
+
# not very clever to disable warning, but ... users afraid it
append-flags "-Wno-implicit"
append-flags "-fno-strict-aliasing"
# workaround for --with-system-*
export PKG_CONFIG=pkg-config
- cd "${WORKSRC}/config_office"
+ cd "${WORKSRC}"
# distro-configs are not hooked in infra build, passing configure options as commandline arguments
./configure \
- --srcdir="${DISTDIR}" \
+ --srcdir="${WORKSRC}" \
--with-lang="${LINGUAS_OOO}" \
--with-build-version="${OOOTAG}" \
${GTKFLAG} \
src_install() {
+ export PYTHONPATH=""
+
einfo "Preparing Installation ..."
local instdir="/usr/$(get_libdir)/openoffice"
dosym "${instdir}"/program/spadmin /usr/bin/ooprinteradmin
fi
dosym "${instdir}"/program/soffice /usr/bin/soffice
- dosym "${instdir}"/basis3.0/program/setofficelang /usr/bin/setofficelang
+ dosym "${instdir}"/"${BASIS}"/program/setofficelang /usr/bin/setofficelang
dosym "${instdir}"/program/unopkg /usr/bin/unopkg
# Fix the permissions for security reasons
use !java && rm -f "${D}"${instdir}/ure/bin/javaldx
# record java libraries
- use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/basis3.0/program/classes/*.jar
+ if use java; then
+ java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/"${BASIS}"/program/classes/*.jar
+ java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
+ fi
# install java-set-classpath
if use java; then
- insinto /usr/$(get_libdir)/openoffice/basis3.0/program
+ insinto /usr/$(get_libdir)/openoffice/"${BASIS}"/program
newins "${FILESDIR}/java-set-classpath.in" java-set-classpath
- fperms 755 /usr/$(get_libdir)/openoffice/basis3.0/program/java-set-classpath
+ fperms 755 /usr/$(get_libdir)/openoffice/"${BASIS}"/program/java-set-classpath
fi
}
[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
# Add available & useful jars to openoffice classpath
- use java && /usr/$(get_libdir)/openoffice/basis3.0/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+ use java && /usr/$(get_libdir)/openoffice/"${BASIS}"/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
elog " To start OpenOffice-Infra, run:"
elog
elog
}
-
-pkg_postrm() {
-
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-
-}
projects / ~andy / sunrise / commitdiff