--- /dev/null
+# ChangeLog for app-office/openoffice-infra
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 12 Jan 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/2.4.2/gentoo-gentooinfra.diff,
+ +files/2.4.2/gentoo-mkdepend.diff, +files/2.4.2/gentoo-scripts.diff,
+ +files/3.0.0, +files/3.0.0/gentoo-ReturnInteger.hdl,
+ +files/gentoo-epm-3.7.patch.diff, +files/2.4.2/gentoo-macolor.diff,
+ +files/3.0.0/gentoo-ReturnInteger.hpp,
+ +files/3.0.0/gentoo-XVBAToOOEventDescGen.hdl,
+ +files/3.0.0/gentoo-XVBAToOOEventDescGen.hpp,
+ +files/3.0.0/gentoo-completion_matches.diff,
+ +files/3.0.0/gentoo-configure.diff, +files/3.0.0/gentoo-hunspell.diff,
+ +files/3.0.0/gentoo-infragentoo.diff, +files/3.0.0/gentoo-mkdepend.diff,
+ +files/3.0.0/gentoo-nojavanostax.diff, +files/3.0.0/gentoo-ru_dict.diff,
+ +files/3.0.0/gentoo-scripts.diff,
+ +files/3.0.0/gentoo-solenv_kde_mess.diff,
+ +files/3.0.0/gentoo-vba_incl.diff, +openoffice-infra-2.4.2.ebuild,
+ +openoffice-infra-3.0.0.ebuild, +files/gentoo-fixsandbox.diff,
+ +files/gentoo-system_pgsql.diff, +files/java-set-classpath.in,
+ +files/wrapper.in, +metadata.xml:
+ New Ebuild for bug 254572 thanks to Peter Volkov <pva@gentoo.org>
+
--- /dev/null
+AUX 2.4.2/build-gcc43-missingincludes.diff 3025 RMD160 fe8dad4762cf4ab428313965e9d1892415b0f087 SHA1 d905a3448f933d2a5fd0d1e46f1fad27ad1814cb SHA256 fc57d9a3288258768f9483c1295e75a65d0ac3f295502ecf8e9b731b38f244cf
+AUX 2.4.2/gentoo-completion_matches.diff 698 RMD160 057d3d3b931c88889ef8fe6044bba89646119c76 SHA1 60b7be8278afd35587f465cf4f4a8371c47236ad SHA256 f8890eebea86cc1aa5302041b370bba7f5a31c5cb73430a51915c9d1eb2ae4f9
+AUX 2.4.2/gentoo-configure.diff 2320 RMD160 a75fae055c028e35f28d9e330356908b970ed1a5 SHA1 659ca53218e33252ea59cfffa162fb177abe0341 SHA256 7196efbcdc7d6800ba64c5c0070369c756a2904cf660fda9881da49a51755660
+AUX 2.4.2/gentoo-gentooinfra.diff 1970 RMD160 c9ecc502d280f8240c671dab8d6e6dca20305331 SHA1 da173eab658deea681ed7ddfc2e2cb1c3fdd6d99 SHA256 db441e3a0304ff3ef3ed3e6614be3063149375194541ae4b9bcb8e4e580eadc9
+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-scripts.diff 1181 RMD160 9e86bc9a137cad7d16c6a75c0479cc6fab3f0b63 SHA1 4dc205ad2841756742ac0c6defc2e1047f29cc18 SHA256 62e2c280b988e2cd9258eedaacbed9c8a9e96e7aea0bc8d8fd61c6e3edf0a049
+AUX 3.0.0/gentoo-ReturnInteger.hdl 754 RMD160 2e2ad754d338e458ae39ab953d0bf00895b00e40 SHA1 39c1e2648c90813e8d1cf80ae54d44f90cf3879f SHA256 8f6adc5108b52872a3dddc4b261be71e9ecebcf1290cc7c2c512b93ac26aa8d2
+AUX 3.0.0/gentoo-ReturnInteger.hpp 1402 RMD160 aafa5507e5b39f2a37d6b2c83d7863791f44bf62 SHA1 3078a431f3055786784528f5b0eb741c10bc488b SHA256 d26cc55eabe836bdd3e21fc46e3cd0883dfa51139c039bba540779f3442243a9
+AUX 3.0.0/gentoo-XVBAToOOEventDescGen.hdl 1722 RMD160 3988f9a0d8279b4290afbdec45282894a3ba5f2f SHA1 0ec7c9351f80746c51fcc8c1e3ba086639b5b7b5 SHA256 95abb7e536b09a91b06f4cd3ba94e0540a4cf990aff50e36363a7aa9edb8c883
+AUX 3.0.0/gentoo-XVBAToOOEventDescGen.hpp 1649 RMD160 2c16c1e76c8857cd8416008638ce3c004215f967 SHA1 72e4033a48f937cd826564e2439f6d1f1f35bd3d SHA256 34a87b207852869d4d4f5037cfb6e01e81257633047113db5dc6adc301877b02
+AUX 3.0.0/gentoo-completion_matches.diff 695 RMD160 c4dbf41740073786c31eb543d846282383e5fff6 SHA1 7898aafab4406382a44fb2bd7ce0face0bb11d63 SHA256 6af7c86d8fb6af166c388f202dbff64587cd546715b6d28f49c3188cf0de4594
+AUX 3.0.0/gentoo-configure.diff 2321 RMD160 b632b76c345756ea71457325881fdb70427a0537 SHA1 6458fa22c15b945f95c29af984684b906b53a3f2 SHA256 09dab321d63d1eaf983c1a5d6f9b484275d5734967dd4661f35a214553434b57
+AUX 3.0.0/gentoo-hunspell.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
+AUX 3.0.0/gentoo-infragentoo.diff 3465 RMD160 73b1a3bc4f053c46c47aecccb3a964d5f565962e SHA1 00bc8f288c0062415ab12157308fa85255f44ed2 SHA256 26f4ecb3bda5f60b3864c04cd6d35a202daa330cd8adb73b0961ab0dddb1f6a3
+AUX 3.0.0/gentoo-mkdepend.diff 345 RMD160 f76234b5fd970d71e6e06af3d50e21459c72a373 SHA1 b0d01f2c6062beec0c836b93ce8f774b928b04e5 SHA256 ef6732854c02b09887f74176b0ea4b330a11ebaf7ecd5f78c595a633af320ae2
+AUX 3.0.0/gentoo-nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
+AUX 3.0.0/gentoo-ru_dict.diff 3089 RMD160 c24efcedf5b38b0c12a22e301c62172768c44f85 SHA1 5e0ed235bbe3f7e93b9ffe22b062db7a8e6d1658 SHA256 abce1be9aadaaa6ece195edf832ebe68df4e63ac8b748d7ad96451d90350a661
+AUX 3.0.0/gentoo-scripts.diff 1086 RMD160 53dfcce0407d2fc7b00cf7c478a64de0f7201049 SHA1 d238824eccbd0741047807c2f47902dba973095a SHA256 774e3a26d31838796e0cfa822d51589c6a07b8ce2481233c1b1113a81bf0a612
+AUX 3.0.0/gentoo-solenv_kde_mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
+AUX 3.0.0/gentoo-vba_incl.diff 697 RMD160 63c4f319bf879e2287c45d9e685845b99473595c SHA1 d23061f3079ff121dec57a0b09313d2849dee513 SHA256 29f7a8297f9fcbe6cdd50fefbe2beedfbc3003c9333fc6bb4af692f1db853157
+AUX gentoo-epm-3.7.patch.diff 2627 RMD160 18d2ac9bea7e9ceb5adc40599cfb151ac3de1f84 SHA1 d2e6b612ce7df5606e7101fffe2cff2f0d16c0e3 SHA256 eb801d90856c48f04b4fee8d21b01d0dd2951288efd6aa4ed5cf6807074c2c12
+AUX gentoo-fixsandbox.diff 486 RMD160 7695ae51e590030c67d746080acf32e4f6ecc07a SHA1 55fa01e5b9ced476744fe2e323bfe179649f47e8 SHA256 235bcf294618f70d52beeb0f276073cc09410a9b23e6b5a94aec60b51fe65e13
+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.0_src_binfilter.tar.bz2 6596201 RMD160 edc71b8b0596d63e60431c7266140bf5188abc6d SHA1 09ff91fd871f00c696befa8064fe04d7a88a3c8a SHA256 465cd3f28ce687634cd658fd937f9062f1a2ceb209cb361ce7910fb0720204b2
+DIST OOo_3.0.0_src_core.tar.bz2 183003517 RMD160 43be2cf77523d0d95ec4c684fe705fa9b4ee4b9d SHA1 8fc1e6140f8a0695accf8d34746253af431c2542 SHA256 6949513a20844cd5fb451dd045ccc615b35880a68f6fc8726b8bcc083ce3ad85
+DIST OOo_3.0.0_src_extensions.tar.bz2 13941316 RMD160 a19bdd687abc7829de937b46e4e484a4b27f045b SHA1 1632374bf75eb6080c0d36e88fd981529be17a0f SHA256 fbd38f406b337fe76570eb399a12bcf70ddc613e2ba7f183dc841355111584ad
+DIST OOo_3.0.0_src_l10n.tar.bz2 86009445 RMD160 cb3eac1537b75cb34485037b916b634b90c6ff13 SHA1 0ee7f44cea5549a3d3473ff7669974e8914caf97 SHA256 b9b1bafc9890b8a27c73204be379a1a96621a87d67e77ef6ff834de9b8da0da7
+DIST OOo_3.0.0_src_system.tar.bz2 44882699 RMD160 10c8b58ade00cf22fdb699f38d60abee8e150436 SHA1 b8af1787bd4651c808d298e81ee797bf2b7ebdcd SHA256 ad8ecc0ab3f24565ea583ec20628cf89751c59a6484ecf355bac32ce96c130b5
+DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
+DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
+DIST infra-ooo-files_2.4.2.tar.gz 16480053 RMD160 8b14a6b019c10d1ddb073d85a596aeb2471e3a4d SHA1 0da8caabf9d778d232e118418337b56a5c1629af SHA256 57cb12e730a74e1518ab4444fbfb07c268bdb1485c2bc4512aba7a98f8ad40a1
+DIST infra-ooo-files_3.0.0.tar.gz 20610327 RMD160 84e5b6af75a40bc0e366a49659b1612543b928b8 SHA1 a619920cd5799836af4c23c3b6c1085b33121f26 SHA256 8487cd58447100bb2c1418979a05c34d53dbe60275a79d69ee5bffc555443625
+DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
+DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
+DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
+DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
+EBUILD openoffice-infra-2.4.2.ebuild 23505 RMD160 f87a05cf431ec22516dc3d8edede3005a4208193 SHA1 f7a5ea3e9c2ad63060c3eca8bd866da4870ecc24 SHA256 9900637289223163fb055842bb7fa912dbedbb52d8e340125ec40c01a4b2d535
+EBUILD openoffice-infra-3.0.0.ebuild 23432 RMD160 54fc780f6e892ca5e251063b2762c259d1b37118 SHA1 d9976a084f8589f220cfe3cbe4b70fb7dc6cf7ad SHA256 530d821683d5e18284e3bef89eace9581d154833d5964d1e0a13fb9b0994b8b5
+MISC ChangeLog 1355 RMD160 a80e7d9c96adcf3d656637224f029f91e3b24cae SHA1 2573dd528fd2aaaaaf9b3246ca90601e7839ebab SHA256 09e838b08175bf8d5002686f6a1108832734dbd67ce8632d150d43c16abf2e97
+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; };
--- /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-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
+@@ -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
+@@ -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
+--- patches/src680/apply.orig 2008-07-12 22:09:40.000000000 +0600
++++ patches/src680/apply 2008-08-19 20:42:51.000000000 +0600
+@@ -134,6 +134,8 @@
+ #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
++GentooInfra: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, InfraNotUbuntu, NotDebian, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, \
++ GentooOnly, Lockdown, CairoFonts, BerkeleyDB43, Gcc43
+ 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
+@@ -1173,7 +1175,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
+
+@@ -2252,6 +2254,7 @@
+ [ Gcc43 ]
+ # Make it compile with gcc 4.3
+ cws-gcc430two.diff, i#83276
++build-gcc43-missingincludes.diff
+
+ [ OxygenOfficePalettes ]
+ palette-enhanced-arrow.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
+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
+--- 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
+--- 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.
+@@ -808,6 +813,10 @@
+ --disable-verbose Decrease build verbosity.
+ ],,)
+
++AC_ARG_ENABLE(gstreamer,
++[ --enable-gstreamer Enables GStreamer avmedia backend
++],,)
++
+ BUILD_TYPE="OOo"
+
+ dnl ===================================================================
+@@ -3367,12 +3376,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
+@@ -3385,7 +3394,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
+@@ -3990,7 +4000,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
+@@ -4171,7 +4181,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
+? 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 2008-10-19 13:05:05.000000000 +0600
++++ patches/dev300/apply 2009-01-11 01:31:19.000000000 +0500
+@@ -142,6 +142,7 @@
+
+ InfraUnix: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, IntegrateExtensions
+ InfraLinux: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, UbuntuIntrepidOnly
++InfraGentoo: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, Gentoo
+ InfraSolaris: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
+ InfraWin32: Win32Common, EMFPlus, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
+ InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
+@@ -265,6 +266,9 @@
+ # (happened to me with DirectX SDK)
+ buildfix-directx-path.diff, i#93333, jholesov
+
++# workaround for building with KDE when both KDE 3.5 and 4.1 are present
++solenv.workaround-for-the-kde-mess.diff, i#95552, dtardon
++
+ [ CJK ]
+ #set default CJK font fontsize as 10.5pt
+ sw-default-cjk-fontsize.diff i#72010, jianhua
+@@ -1436,7 +1440,11 @@
+ SectionOwner => aprosky
+
+ # system lucene classpath
+-gentoo-system-lucene.diff
++#gentoo-system-lucene.diff
++# 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
+--- patches/dev300/scp2_build_extensions.diff.orig 2009-01-11 11:57:12.000000000 +0100
++++ patches/dev300/scp2_build_extensions.diff 2009-01-11 11:57:24.000000000 +0100
+@@ -4,7 +4,7 @@
+ cp scp2\source\canvas nmake - all cp_canvas cp_langmacros cp_langtemplates NULL
+ cp scp2\source\crashrep nmake - all cp_crashrep cp_langmacros cp_langtemplates NULL
+ cp scp2\source\draw nmake - all cp_draw cp_langmacros cp_langtemplates NULL
+-+cp scp2\source\extensions nmake - all cp_extensions cp_langmacros NULL
+++cp scp2\source\extensions nmake - all cp_extensions cp_langmacros cp_langtemplates NULL
+ cp scp2\source\gnome nmake - all cp_gnome cp_langmacros cp_langtemplates NULL
+ cp scp2\source\graphicfilter nmake - all cp_graphicfilter cp_langmacros cp_langtemplates NULL
+ cp scp2\source\impress nmake - all cp_impress cp_langmacros cp_langtemplates NULL
+--- patches/dev300/svg-import-filter.diff
++++ patches/dev300/svg-import-filter.diff
+@@ -787,7 +787,7 @@
+ + $(SLO)$/units.obj
+ +
+ +.IF "$(COMID)"=="gcc3"
+-+.IF "$(CCNUMVER)">="000400000000"
+++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES"
+ +CFLAGS+=-DUSE_MODERN_SPIRIT
+ +.ENDIF
+ .ENDIF
--- /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
+--- dictionaries/ru_RU/dictionary.lst.orig 2008-10-28 20:45:36.000000000 +0500
++++ dictionaries/ru_RU/dictionary.lst 2008-10-28 20:45:43.000000000 +0500
+@@ -1,2 +1,3 @@
++DICT ru RU ru_RU
+ HYPH ru RU hyph_ru_RU
+ THES ru RU th_ru_RU_v2
+--- dictionaries/ru_RU/description.xml.orig 2008-10-28 20:45:05.000000000 +0500
++++ dictionaries/ru_RU/description.xml 2008-10-28 20:47:10.000000000 +0500
+@@ -1,13 +1,14 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
+- <version value="2008.07.01" />
+ <identifier value="org.openoffice.ru.hunspell.dictionaries" />
+- <display-name>
+- <name lang="en">Russian hyphenation dictionary and thesaurus</name>
+- </display-name>
+- <platform value="all" />
++ <version value="0.4" />
+ <dependencies>
+- <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0" />
++ <OpenOffice.org-minimal-version value="3.0" d:name="Russian Dictionaries for OpenOffice.org 3.0"/>
+ </dependencies>
++ <registration>
++ </registration>
++ <display-name>
++ <name lang="ru">Словари для русского языка</name>
++ <name lang="en">Russian Dictionaries</name>
++ </display-name>
+ </description>
+-
+--- dictionaries/ru_RU/dictionaries.xcu.orig 2008-10-28 20:45:30.000000000 +0500
++++ dictionaries/ru_RU/dictionaries.xcu 2008-10-28 20:47:40.000000000 +0500
+@@ -2,6 +2,17 @@
+ <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Linguistic" oor:package="org.openoffice.Office">
+ <node oor:name="ServiceManager">
+ <node oor:name="Dictionaries">
++ <node oor:name="HunSpellDic_ru-RU" oor:op="fuse">
++ <prop oor:name="Locations" oor:type="oor:string-list">
++ <value>%origin%/ru_RU.aff %origin%/ru_RU.dic</value>
++ </prop>
++ <prop oor:name="Format" oor:type="xs:string">
++ <value>DICT_SPELL</value>
++ </prop>
++ <prop oor:name="Locales" oor:type="oor:string-list">
++ <value>ru-RU</value>
++ </prop>
++ </node>
+ <node oor:name="HyphDic_ru-RU" oor:op="fuse">
+ <prop oor:name="Locations" oor:type="oor:string-list">
+ <value>%origin%/hyph_ru_RU.dic</value>
+--- dictionaries/ru_RU/makefile.mk.orig 2008-08-15 16:41:32.000000000 +0600
++++ dictionaries/ru_RU/makefile.mk 2008-10-28 20:40:59.000000000 +0500
+@@ -53,6 +53,9 @@
+
+ # just copy:
+ COMPONENT_FILES= \
++ $(EXTENSIONDIR)$/ru_RU.aff \
++ $(EXTENSIONDIR)$/ru_RU.dic \
++ $(EXTENSIONDIR)$/README_thes_ru_RU.txt \
+ $(EXTENSIONDIR)$/hyph_ru_RU.dic
+
+ COMPONENT_CONFIGDEST=.
+@@ -60,7 +63,7 @@
+ $(EXTENSIONDIR)$/dictionaries.xcu
+
+ # disable fetching default OOo license text
+-CUSTOM_LICENSE=README_thes_ru_RU.txt
++CUSTOM_LICENSE=README_ru_RU.txt
+ # override default license destination
+ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
+
--- /dev/null
+--- 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 @@
+ my $ver_line;
+ my $is_old = 1;
+
+- open ($Patch, "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 @@
+
+ $opts = join ' ', @arguments;
+ my $base_args = " -l -p0 $opts -d $dest_dir";
+- $base_cmd = "gpatch";
++ $base_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
+@@ -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 NULL"
+ echo "$line" >> prj/build.lst
--- /dev/null
+unchanged:
+--- solenv/inc/_tg_shl.mk
++++ solenv/inc/_tg_shl.mk
+@@ -441,10 +441,10 @@ $(SHL1TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
+- @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
++ @echo $(SHL1LINKER) $(SHL1LINKFLAGS) $(SHL1SONAME) $(LINKFLAGSSHL) $(SHL1VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL1OBJS:s/.obj/.o/) \
+ $(SHL1VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
++ $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -981,10 +981,10 @@ $(SHL2TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
+- @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
++ @echo $(SHL2LINKER) $(SHL2LINKFLAGS) $(SHL2SONAME) $(LINKFLAGSSHL) $(SHL2VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL2OBJS:s/.obj/.o/) \
+ $(SHL2VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
++ $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -1521,10 +1521,10 @@ $(SHL3TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
+- @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
++ @echo $(SHL3LINKER) $(SHL3LINKFLAGS) $(SHL3SONAME) $(LINKFLAGSSHL) $(SHL3VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL3OBJS:s/.obj/.o/) \
+ $(SHL3VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
++ $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -2061,10 +2061,10 @@ $(SHL4TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
+- @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
++ @echo $(SHL4LINKER) $(SHL4LINKFLAGS) $(SHL4SONAME) $(LINKFLAGSSHL) $(SHL4VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL4OBJS:s/.obj/.o/) \
+ $(SHL4VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
++ $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -2601,10 +2601,10 @@ $(SHL5TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
+- @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
++ @echo $(SHL5LINKER) $(SHL5LINKFLAGS) $(SHL5SONAME) $(LINKFLAGSSHL) $(SHL5VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL5OBJS:s/.obj/.o/) \
+ $(SHL5VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
++ $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -3141,10 +3141,10 @@ $(SHL6TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
+- @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
++ @echo $(SHL6LINKER) $(SHL6LINKFLAGS) $(SHL6SONAME) $(LINKFLAGSSHL) $(SHL6VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL6OBJS:s/.obj/.o/) \
+ $(SHL6VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
++ $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -3681,10 +3681,10 @@ $(SHL7TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
+- @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
++ @echo $(SHL7LINKER) $(SHL7LINKFLAGS) $(SHL7SONAME) $(LINKFLAGSSHL) $(SHL7VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL7OBJS:s/.obj/.o/) \
+ $(SHL7VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
++ $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -4221,10 +4221,10 @@ $(SHL8TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
+- @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
++ @echo $(SHL8LINKER) $(SHL8LINKFLAGS) $(SHL8SONAME) $(LINKFLAGSSHL) $(SHL8VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL8OBJS:s/.obj/.o/) \
+ $(SHL8VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
++ $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -4761,10 +4761,10 @@ $(SHL9TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
+- @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
++ @echo $(SHL9LINKER) $(SHL9LINKFLAGS) $(SHL9SONAME) $(LINKFLAGSSHL) $(SHL9VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL9OBJS:s/.obj/.o/) \
+ $(SHL9VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
++ $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ .IF "$(UPDATER)"=="YES"
+@@ -5301,10 +5301,10 @@ $(SHL10TARGETN) : \
+ .ENDIF
+ .ELSE # "$(OS)"=="MACOSX"
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
+- @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
++ @echo $(SHL10LINKER) $(SHL10LINKFLAGS) $(SHL10SONAME) $(LINKFLAGSSHL) $(SHL10VERSIONMAPPARA) -L$(PRJ)$/$(ROUT)$/lib $(STDSLO) $(SHL10OBJS:s/.obj/.o/) \
+ $(SHL10VERSIONOBJ) -o $@ \
+ `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
+- $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
++ $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(SOLARLIB) $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ @cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ .IF "$(UPDATER)"=="YES"
+diff -u solenv/inc/_tg_app.mk solenv/inc/_tg_app.mk
+--- solenv/inc/_tg_app.mk (working copy)
++++ solenv/inc/_tg_app.mk
+@@ -116,10 +116,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
+- @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP1OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+- @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
++ @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
+ @ls -l $@
+@@ -400,10 +400,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
+- @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP2OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+- @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
++ @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
+ @ls -l $@
+@@ -684,10 +684,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
+- @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP3OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+- @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
++ @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
+ @ls -l $@
+@@ -968,10 +968,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
+- @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP4OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+- @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
++ @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
+ @ls -l $@
+@@ -1252,10 +1252,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
+- @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP5OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+- @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
++ @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
+ @ls -l $@
+@@ -1536,10 +1536,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
+- @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP6OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+- @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
++ @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
+ @ls -l $@
+@@ -1820,10 +1820,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
+- @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP7OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+- @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
++ @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
+ @ls -l $@
+@@ -2104,10 +2104,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
+- @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP8OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
+- @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
++ @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
+ @ls -l $@
+@@ -2388,10 +2388,10 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
+- @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP9OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
+- @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
++ @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) $(SOLARLIB) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
+ @ls -l $@
+@@ -2672,7 +2672,7 @@
+ .ELSE # "$(OS)"=="MACOSX"
+ @echo unx
+ @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
+- @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
++ @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(STDSLO) \
+ $(APP10OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
+ @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
--- /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
+--- epm/epm-3.7.patch.orig 2008-09-21 21:01:59.000000000 +0600
++++ epm/epm-3.7.patch 2008-09-21 22:31:54.000000000 +0600
+@@ -98,8 +98,8 @@
+ *** misc/epm-3.7/configure Thu Jul 24 03:20:54 2003
+ --- misc/build/epm-3.7/configure Mon Nov 20 15:01:11 2006
+ ***************
+-*** 1238,1244 ****
+---- 1238,1249 ----
++*** 1238,1243 ****
++--- 1238,1248 ----
+ fi
+ fi;
+
+@@ -107,11 +107,48 @@
+ + if test "${enable_fltk+set}" = set; then
+ + enableval="$enable_fltk"
+ + fi;
+-
+ +
++
+ # Check whether --with-docdir or --without-docdir was given.
+ if test "${with_docdir+set}" = set; then
+- withval="$with_docdir"
++***************
++*** 2683,2690 ****
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++! ac_cv_path_RPM="$as_dir/$ac_word$ac_exec_ext"
++! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++ done
++--- 2688,2695 ----
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++! # ac_cv_path_RPM="$as_dir/$ac_word$ac_exec_ext"
++! # echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++ done
++***************
++*** 2722,2729 ****
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++! ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
++! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++ done
++--- 2727,2734 ----
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++! # ac_cv_path_RPMBUILD="$as_dir/$ac_word$ac_exec_ext"
++! # echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++ done
+ ***************
+ *** 4904,4939 ****
+ fi
+@@ -410,8 +447,22 @@
+ *** misc/epm-3.7/epm.c Tue Oct 28 15:48:30 2003
+ --- misc/build/epm-3.7/epm.c Mon Nov 20 14:54:51 2006
+ ***************
++*** 184,194 ****
++ /*
++ * Use dpkg as the native format, if installed...
++ */
++-
++- if (access("/usr/bin/dpkg", 0))
++ format = PACKAGE_RPM;
++- else
++- format = PACKAGE_DEB;
++ }
++ #elif defined(__sgi)
++ format = PACKAGE_INST;
++--- 184,190 ----
++***************
+ *** 547,552 ****
+---- 547,553 ----
++--- 543,549 ----
+ {
+ puts(EPM_VERSION);
+ puts("Copyright 1999-2003 by Easy Software Products.");
--- /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
+--- connectivity/source/drivers/postgresql/makefile.mk.orig 2008-11-22 13:45:15.000000000 +0500
++++ connectivity/source/drivers/postgresql/makefile.mk 2008-11-22 13:46:58.000000000 +0500
+@@ -94,6 +94,10 @@
+ POSTGRESQL_INCLUDES=-I`pg_config --includedir`
+ .ENDIF
+
++.IF "$(SYSTEM_POSTGRESQL)" = "YES"
++POSTGRESQL_LIBS=-L`pg_config --libdir`
++.ENDIF
++
+ CFLAGS+=$(POSTGRESQL_INCLUDES) \
+ -DPOSTGRESQL_MAJOR=$(POSTGRESQL_MAJOR) \
+ -DPOSTGRESQL_MINOR=$(POSTGRESQL_MINOR) \
+@@ -124,6 +128,8 @@
+ PQLIB=-lpq -lcrypt
+ .IF "$(OS)"=="FREEBSD"
+ PQLIB+=-L/usr/local/lib
++.ELSE
++PQLIB+=$(POSTGRESQL_LIBS)
+ .ENDIF
+ .ENDIF
+ SHL2TARGET=postgresql-sdbc-impl.uno
--- /dev/null
+#!/bin/sh
+
+#*****************************************************************************
+#
+# java-set-classpath - Utility to update the default CLASSPATH for OpenOffice.org
+#
+# Initial version by: Petr Mladek <pmladek@suse.cz>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#*****************************************************************************
+
+if test "z$1" = "z" ; then
+ echo "Update the default CLASSPATH for OpenOffice.org"
+ echo ""
+ echo "Usage: $0 [dir|jar]..."
+ echo ""
+ echo "The utility updates the OpenOffice.org system setting. It adds or removes"
+ echo "the given directories and jar-files to or from the default CLASSPATH"
+ echo "depending on if they are available on the system or not."
+ echo ""
+ echo "Parameters:"
+ echo " dir - absolute path to a directory"
+ echo " jar - absolute path to a jar-file"
+ exit 0;
+fi
+
+JVM_CONFIG_FILE=@OOINSTBASE@/program/jvmfwk3rc
+
+for path in $@ ; do
+ if test "z${path%%/*}" != "z" ; then
+ echo "Warning: the path "$path" is not absolute and will be ignored"
+ continue
+ fi
+ if test -e $path ; then
+ # the file exist
+ grep "UNO_JAVA_JFW_CLASSPATH_URLS.*file:/*$path\([[:space:]].*\)\?$" $JVM_CONFIG_FILE >/dev/null && continue
+ # it is not registered
+ TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1
+ sed -e "s|^\(.*UNO_JAVA_JFW_CLASSPATH_URLS.*\)$|\1 file:$path|" $JVM_CONFIG_FILE >$TMP_FILE
+ mv -f $TMP_FILE $JVM_CONFIG_FILE
+ chmod 644 $JVM_CONFIG_FILE
+ else
+ # the file does not exist, remove it from the configuration
+ TMP_FILE=`mktemp /tmp/ooset-java-class.XXXXXXXXXX` || exit 1;
+ sed -e "s|^\(.*UNO_JAVA_JFW_CLASSPATH_URLS.*\)file:/*$path\([[:space:]].*\)\?$|\1\2|" \
+ -e "s/\(UNO_JAVA_JFW_CLASSPATH_URLS=\)[[:space:]]\+/\1/" \
+ -e "/^.*UNO_JAVA_JFW_CLASSPATH_URLS/s/[[:space:]]\+/ /g" \
+ -e "/^.*UNO_JAVA_JFW_CLASSPATH_URLS/s/[[:space:]]*$//" $JVM_CONFIG_FILE >$TMP_FILE
+ mv -f $TMP_FILE $JVM_CONFIG_FILE
+ chmod 644 $JVM_CONFIG_FILE
+ fi
+done
--- /dev/null
+#!/bin/sh
+export OOO_EXTRA_ARG=''
+unset PYTHONPATH
+/usr/LIBDIR/openoffice/program/soffice "$@"
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+<longdescription>Openoffice-infra is the opensource version of staroffice
+with some extra patches from Infra-Resource and enhanced Russian support.
+This ebuild allows you to compile it yourself. Unfortunately this
+compilation can take up to a day depending on the speed of your
+computer. It will however make a snappier openoffice than the binary
+version</longdescription>
+<use>
+ <flag name='binfilter'>Enable support for legacy StarOffice 5.x and earlier
+ file formats</flag>
+ <flag name='odk'>Build the Office Development Kit</flag>
+ <flag name='oodict'>Use Open Office dicts instead of system</flag>
+</use>
+</pkgmetadata>
--- /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 gnome2-utils 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 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.go-oo.org/SRC680/extras-2.tar.bz2
+ http://download.go-oo.org/SRC680/biblio.tar.bz2
+ http://download.go-oo.org/SRC680/lp_solve_5.5.0.10_source.tar.gz
+ http://download.go-oo.org/SRC680/oox.2008-02-29.tar.bz2
+ http://download.go-oo.org/SRC680/writerfilter.2008-02-29.tar.bz2
+ 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 )
+ 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 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 and GentooInfra distro target
+ epatch "${FILESDIR}/${PV}/gentoo-gentooinfra.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
+ patchconf="--tag=${OOOBUILDTAG} --distro=GentooInfra --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"
+ # 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"
+ # fix handling of system libs for postgresql-base
+ epatch "${FILESDIR}/gentoo-system_pgsql.diff"
+ # fix sandbox
+ epatch "${FILESDIR}/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-boost \
+ --with-system-curl \
+ --with-system-db \
+ --with-system-expat \
+ --with-system-icu \
+ --with-system-libxslt \
+ --with-system-vigra \
+ --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
+
+ if use cups; then
+ allcomponents="${basecomponents} extension printeradmin"
+ else
+ allcomponents="${basecomponents} extension"
+ 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
+ mv "${i}".desktop openoffice.org2.4-"${i}".desktop
+ if [[ "${i}" == "printeradmin" ]]; then
+ sed -i -e s/openoffice.org2.4-/oo/g openoffice.org2.4-"${i}".desktop || die "Sed failed"
+ else
+ sed -i -e s/openoffice.org2.4/ooffice/g openoffice.org2.4-"${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" \
+ openoffice.org2.4-"${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" \
+ openoffice.org2.4-"${i}".desktop || die "Sed failed"
+ fi
+ domenu openoffice.org2.4-"${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
+
+ # Fix the permissions for security reasons
+# chown -R root:0 "${D}"
+
+ # Fix lib handling for internal old python 2.3
+ if [[ ! -e /usr/$(get_libdir)/libpython2.3.so.1.0 ]]; then
+ dolib.so "${D}"${instdir}/program/libpython2.3.so.1.0
+ fi
+
+ # 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_postinst() {
+
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ if use gtk || use gnome; then
+ gnome2_icon_cache_update
+ fi
+
+ 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
+ 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
+ if use gtk || use gnome; then
+ gnome2_icon_cache_update
+ fi
+
+ use !oodict && [[ ! -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && rm -rf /usr/$(get_libdir)/openoffice
+
+}
--- /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 toolchain-funcs
+
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk oodict opengl pam"
+
+PATCHLEVEL="OOO300"
+MILESTONE="9"
+OOOTAG=${PATCHLEVEL}_m${MILESTONE}
+OOOBUILDTAG=ooo300-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="binfilter? ( mirror://openoffice/stable/${PV}/${SRC}_binfilter.tar.bz2 )
+ mirror://openoffice/stable/${PV}/${SRC}_core.tar.bz2
+ mirror://openoffice/stable/${PV}/${SRC}_l10n.tar.bz2
+ mirror://openoffice/stable/${PV}/${SRC}_extensions.tar.bz2
+ mirror://openoffice/stable/${PV}/${SRC}_system.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"
+LANGS="${LANGS1} en en_US"
+
+# proprt linguas handling
+for X in ${LANGS} ; do
+ IUSE="${IUSE} linguas_${X}"
+done
+
+HOMEPAGE="http://www.i-rs.ru/ http://www.go-oo.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="!app-office/openoffice-infra-bin
+ !app-office/openoffice
+ !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.5 )
+ java? ( >=dev-java/bsh-2.0_beta4
+ >=dev-db/hsqldb-1.8.0.9 )
+ mono? ( >=dev-lang/mono-1.2.3.1 )
+ opengl? ( virtual/opengl
+ virtual/glu )
+ >=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
+ dev-libs/expat
+ >=dev-libs/icu-3.8
+ >=sys-libs/db-4.3
+ >=app-text/libwpd-0.8.8
+ >=media-libs/vigra-1.4
+ >=app-text/poppler-0.8.0"
+
+RDEPEND="java? ( >=virtual/jre-1.5 )
+ ${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+ x11-libs/libXrender
+ x11-libs/libXtst
+ 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
+ >=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
+ 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 )
+ java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
+ >=dev-java/ant-core-1.7 )
+ ldap? ( net-nds/openldap )
+ 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
+ ewarn " Also if you experience a build break, please make sure to retry "
+ ewarn " with MAKEOPTS="-j1" before filing a bug. "
+ 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 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 " If something you need does not work for you, rebuild with "
+ ewarn " java in your USE-flags. "
+ ewarn
+ fi
+
+ if is-flagq -ffast-math ; then
+ eerror
+ 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
+ eerror " shadow needs to be built with pam-support. "
+ eerror " rebuild it accordingly or remove the pam use-flag "
+ die
+ fi
+ fi
+
+ if use nsplugin; then
+ if pkg-config --exists libxul; then
+ BRWS="libxul"
+ elif pkg-config --exists xulrunner-xpcom; then
+ BRWS="xulrunner"
+ elif pkg-config --exists seamonkey-xpcom; then
+ BRWS="seamonkey"
+ else
+ die "USE flag [nsplugin] set but no installed xulrunner or seamonkey 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
+ use binfilter && unpack ${SRC}_binfilter.tar.bz2
+ unpack ${SRC}_core.tar.bz2
+ unpack ${SRC}_l10n.tar.bz2
+ unpack ${SRC}_extensions.tar.bz2
+ unpack ${SRC}_system.tar.bz2
+
+ if use odk && use java; then
+ cp -f "${DISTDIR}"/unowinreg.dll "${WORKSRC}"/external/unowinreg/
+ fi
+
+ # Some fixes for our patchset
+ cd "${S}"
+ epatch "${FILESDIR}/${PV}/gentoo-scripts.diff"
+ # Patch for using Gentoo specific goo team patches and GentooInfra distro target
+ epatch "${FILESDIR}/${PV}/gentoo-infragentoo.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-solenv_kde_mess.diff" "${WORKDIR}/infra-ooo-files_${PV}/patches/dev300/solenv.workaround-for-the-kde-mess.diff" || 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}
+
+ mkdir -p "${WORKSRC}"/libwps/download/
+ mkdir -p "${WORKSRC}"/libwpg/download/
+ mkdir -p "${WORKSRC}"/libwpd/download/
+ mkdir -p "${WORKSRC}"/libsvg/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-team.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/
+ cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/backing*.png "${WORKSRC}"/default_images/framework/res/
+
+ local patchconf
+ patchconf="--tag=${OOOBUILDTAG} --distro=InfraGentoo --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/dev300 ${WORKSRC} ${patchconf}
+ "${WORKDIR}"/infra-ooo-files_${PV}/bin/transform --apply "${WORKDIR}"/infra-ooo-files_${PV} ${WORKSRC}
+
+ # 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"
+ # completion_matches -> rl_completion_matches
+ epatch "${FILESDIR}/${PV}/gentoo-completion_matches.diff"
+ # disable rpm
+ epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff"
+ # fix handling of system libs for postgresql-base
+ epatch "${FILESDIR}/gentoo-system_pgsql.diff"
+ # fix sandbox
+ epatch "${FILESDIR}/gentoo-fixsandbox.diff"
+ # 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"
+
+ # 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-hsqldb"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)"
+ fi
+
+ if use nsplugin ; then
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-mozilla"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-mozilla=${BRWS}"
+ else
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-mozilla"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-system-mozilla"
+ fi
+
+ # Handle new dicts system
+ if use oodict ; then
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-myspell-dicts"
+ local tempdicts=ENUS
+ local tempdict
+ for i in ${LINGUAS_OOO}; do
+ if [[ "${i}" != "en-US" ]]; then
+ tempdict=`ls ${WORKSRC}/dictionaries/ | grep ${i} | sed -e 's/_//g' -e 's/\///g' | tr '[a-z]' '[A-Z]'`
+ tempdicts="${tempdicts},${tempdict}"
+ fi
+ done
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-dict=${tempdicts}"
+ else
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --without-myspell-dicts"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-system-dicts"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-external-dict-dir=/usr/share/myspell"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-external-hyph-dir=/usr/share/myspell"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-external-thes-dir=/usr/share/myspell"
+ 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 gstreamer`"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable gnome systray`"
+ 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} `use_enable debug crashdump`"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} `use_enable debug strip-solver`"
+
+ # Extension stuff
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-extension-integration"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-minimizer"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-pdfimport"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-presenter-console"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-wiki-publisher"
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-report-builder"
+
+ # Fix kdefilepicker crash on exit
+ CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-alloc=system"
+
+ # 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"
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
+ fi
+
+ # 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 --without-system-cairo"
+ ( use gtk || use gnome ) && GTKFLAG="--enable-gtk --enable-cairo --with-system-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 debug symbols` \
+ `use_enable odk` \
+ `use_enable pam` \
+ `use_with java` \
+ --with-system-libxml \
+ --with-system-libwpd \
+ --with-system-hunspell \
+ --disable-fontooo \
+ --disable-qadevooo \
+ --with-system-boost \
+ --with-system-curl \
+ --with-system-db \
+ --with-system-expat \
+ --with-system-icu \
+ --with-system-libxslt \
+ --with-system-vigra \
+ --without-stlport \
+ --with-system-zlib \
+ --with-system-stdlibs \
+ --enable-neon \
+ --with-system-neon \
+ --enable-xrender-link \
+ --with-system-xrender \
+ --with-system-openssl \
+ --mandir=/usr/share/man \
+ --libdir=/usr/$(get_libdir) \
+ --with-use-shell=bash \
+ --with-epm=internal \
+ --with-linker-hash-style=both \
+ --with-package-format=native \
+ --with-vendor="Infra-Resource" \
+ ${CONFIGURE_ARGS} \
+ || die "Configuration failed!"
+
+ einfo "Building OpenOffice-Infra..."
+
+ cd "${WORKSRC}"
+
+ local gentoo_env_set
+ 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 --checkmodules ; build.pl -P${JOBS} --all --html --dontgraboutput -- -P${JOBS} && deliver.pl
+
+ cd "${WORKSRC}"
+
+ for i in ${LINGUAS_OOO}; do
+ if [[ "${i}" == "ru" || "${i}" == "uk" ]]; then
+ [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-vendor.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-vendor.sdf
+ fi
+ if [[ "${i}" == "ru" ]]; then
+ [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}.sdf
+ [ -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-patched.sdf ] && "${WORKSRC}"/transex3/scripts/localize -m -l ${i} -f "${WORKDIR}"/infra-ooo-files_${PV}/sdf/${i}/${i}-patched.sdf
+ fi
+ done
+
+ if [[ "${JOBS}" != "1" ]]; then
+ cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${JOBS} --all --html --dontgraboutput -- -P${JOBS} || die "Build failed"
+ else
+ dmake || die "Build failed"
+ fi
+
+ unset PYTHONPATH
+ unset PYTHONHOME
+
+}
+
+src_install() {
+
+ einfo "Preparing Installation ..."
+
+ local instdir="/usr/$(get_libdir)/openoffice"
+ local basecomponents="base calc draw impress math writer"
+ local allcomponents
+ local arch_var
+ local gentoo_env_set_dst
+
+ if [[ "${ARCH}" == "amd64" ]]; then
+ arch_var="x"
+ gentoo_env_set_dst="linux-2.6-x86_64"
+ else
+ arch_var="i"
+ gentoo_env_set_dst="linux-2.6-intel"
+ fi
+
+ if use cups; then
+ allcomponents="${basecomponents} printeradmin"
+ else
+ allcomponents="${basecomponents}"
+ fi
+
+ dodir "${instdir}"
+
+ cp -af "${WORKSRC}"/instsetoo_native/unxlng"${arch_var}"6.pro/OpenOffice/native/install/en-US/"${gentoo_env_set_dst}"/buildroot/opt/* \
+ "${D}"${instdir}
+
+ for i in ${LINGUAS_OOO}; do
+ if [[ "${i}" != "en-US" ]]; then
+ cp -af "${WORKSRC}"/instsetoo_native/unxlng"${arch_var}"6.pro/OpenOffice_languagepack/native/install/"${i}"/"${gentoo_env_set_dst}"/buildroot/opt/* \
+ "${D}"${instdir}
+ fi
+ done
+
+ # dict extensions
+ if use oodict; then
+ rm -f "${D}"${instdir}/share/extension/install/dict-*.oxt
+ insinto ${instdir}/share/extension/install
+ local dictlang
+ for i in ${LINGUAS_OOO}; do
+ if [[ "${i}" == "en-US" ]]; then
+ dictlang=en
+ else
+ dictlang=${i}
+ fi
+ doins "${WORKSRC}"/dictionaries/unxlng"${arch_var}"6.pro/bin/dict-"${dictlang}".oxt
+ done
+ fi
+
+ # Menu entries
+ cd "${D}"${instdir}/share/xdg/
+
+ for i in ${allcomponents}; do
+ mv "${i}".desktop openoffice.org3-"${i}".desktop
+ if [[ "${i}" == "printeradmin" ]]; then
+ sed -i -e s/openoffice.org3-/oo/g openoffice.org3-"${i}".desktop || die "Sed failed"
+ else
+ sed -i -e s/openoffice.org3/ooffice/g openoffice.org3-"${i}".desktop || die "Sed failed"
+ fi
+ domenu openoffice.org3-"${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/openofficeorg3-"${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/openofficeorg3-"${i}".png /usr/share/icons/gnome/"${size}"/apps/openofficeorg3-"${i}".png
+ done
+ done
+ fi
+
+ for i in ${allcomponents}; do
+ dosym /usr/share/icons/hicolor/48x48/apps/openofficeorg3-"${i}".png /usr/share/pixmaps/openofficeorg3-"${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 /usr/bin/ooprinteradmin
+ fi
+ dosym "${instdir}"/program/soffice /usr/bin/soffice
+ dosym "${instdir}"/basis3.0/program/setofficelang /usr/bin/setofficelang
+ dosym "${instdir}"/program/unopkg /usr/bin/unopkg
+
+ # Fix the permissions for security reasons
+# chown -R root:0 "${D}"
+
+ # Fix lib handling for internal old python 2.3
+ if [[ ! -e /usr/$(get_libdir)/libpython2.3.so.1.0 ]]; then
+ dolib.so "${D}"${instdir}/basis3.0/program/libpython2.3.so.1.0
+ fi
+
+ # Non-java weirdness see bug #99366
+ 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
+
+ # install java-set-classpath
+ if use java; then
+ insinto /usr/$(get_libdir)/openoffice/basis3.0/program
+ newins "${FILESDIR}/java-set-classpath.in" java-set-classpath
+ fperms 755 /usr/$(get_libdir)/openoffice/basis3.0/program/java-set-classpath
+ fi
+
+}
+
+pkg_postinst() {
+
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ if use gtk || use gnome; then
+ gnome2_icon_cache_update
+ 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
+
+ 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
+ if use !oodict; then
+ elog " Spell checking is now provided through your own myspell-ebuilds, "
+ elog " if you want to use it, please install the correct myspell package "
+ elog " according to your language needs. "
+ elog " For example, for myspell and the russian language You should do "
+ elog
+ elog " emerge -av myspell-ru "
+ elog
+ elog " If You want to use internal openoffice extensions dicts re-emerge the package with "
+ elog " USE=\"oodict\" "
+ else
+ elog " Spell checking is now provided through OO own dicts extensions, "
+ elog " please install the correct extension from /usr/$(get_libdir)/openoffice/share/extension/install/ "
+ elog " via Extension Manager according to your language needs. "
+ fi
+ elog
+ elog " Some aditional functionality can be installed via Extension Manager: "
+ elog " *) PDF Import "
+ elog " *) Presentation Console "
+ elog " *) Presentation Minimizer "
+ elog " *) Wiki Publisher "
+ elog " *) Report Builder "
+ elog
+ elog " Please use the packages provided in "
+ elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+ elog " instead of those from the SUN extension site. "
+ elog
+
+}
+
+pkg_postrm() {
+
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ if use gtk || use gnome; then
+ gnome2_icon_cache_update
+ fi
+
+}
projects / ~andy / sunrise / commitdiff