# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Feb 2009; Yar Odin (yarodin) <yarodin@gmail.com>
+ files/2.4.2/build-gcc43-missingincludes.diff,
+ files/2.4.2/gentoo-configure.diff, +files/2.4.2/gentoo-configure-pg.diff,
+ +files/2.4.2/gentoo-infragentoo.diff, files/3.0.1/gentoo-configure.diff,
+ openoffice-infra-2.4.2.ebuild, +files/3.0.1/gentoo-configure-pg.diff,
+ openoffice-infra-3.0.1.ebuild, files/3.0.1/gentoo-infragentoo.diff:
+ Added new use flag 'postgres', fix build of sdbc-postgres extension, some
+ code cleanup - for both versions of openoffice-infra: 2.4.2/3.0.1
+
15 Feb 2009; Yar Odin (yarodin) <yarodin@gmail.com>
openoffice-infra-2.4.2.ebuild:
Some additional fixes for openoffice-infra-2.4.2
-AUX 2.4.2/build-gcc43-missingincludes.diff 3025 RMD160 fe8dad4762cf4ab428313965e9d1892415b0f087 SHA1 d905a3448f933d2a5fd0d1e46f1fad27ad1814cb SHA256 fc57d9a3288258768f9483c1295e75a65d0ac3f295502ecf8e9b731b38f244cf
+AUX 2.4.2/build-gcc43-missingincludes.diff 3310 RMD160 6ea986ae44b5e249035e7d04870e784718619c72 SHA1 bab742a313ed0614fe4fb59ad6391dcfaed01efe SHA256 41ad676a33dec5f3440190b5b4a7cfb355167e992149d64ad1b039a618cc0c2a
AUX 2.4.2/gentoo-completion_matches.diff 698 RMD160 057d3d3b931c88889ef8fe6044bba89646119c76 SHA1 60b7be8278afd35587f465cf4f4a8371c47236ad SHA256 f8890eebea86cc1aa5302041b370bba7f5a31c5cb73430a51915c9d1eb2ae4f9
-AUX 2.4.2/gentoo-configure.diff 2320 RMD160 a75fae055c028e35f28d9e330356908b970ed1a5 SHA1 659ca53218e33252ea59cfffa162fb177abe0341 SHA256 7196efbcdc7d6800ba64c5c0070369c756a2904cf660fda9881da49a51755660
+AUX 2.4.2/gentoo-configure-pg.diff 462 RMD160 b06d8ff48558aa630c5416a476ba76bae2179021 SHA1 d81399ba991dd831eb0a2b8327e15fa55790b77f SHA256 848253d70dd02dfccd945a1d3975fbca687a088f077ca10105ffa239d2123066
+AUX 2.4.2/gentoo-configure.diff 1997 RMD160 48a291e843fe9c037e2809bd692606fb0cb70f8f SHA1 2e5bf003c03df2c3181f05206f83bc8d96e501fd SHA256 002ba3ce94f6b1b99460103e053a2e8cc08f02a93fe45ac04c013f3f5cdd2c09
AUX 2.4.2/gentoo-fixsandbox.diff 486 RMD160 7695ae51e590030c67d746080acf32e4f6ecc07a SHA1 55fa01e5b9ced476744fe2e323bfe179649f47e8 SHA256 235bcf294618f70d52beeb0f276073cc09410a9b23e6b5a94aec60b51fe65e13
AUX 2.4.2/gentoo-gentooinfra.diff 1970 RMD160 c9ecc502d280f8240c671dab8d6e6dca20305331 SHA1 da173eab658deea681ed7ddfc2e2cb1c3fdd6d99 SHA256 db441e3a0304ff3ef3ed3e6614be3063149375194541ae4b9bcb8e4e580eadc9
+AUX 2.4.2/gentoo-infragentoo.diff 3193 RMD160 7914cec43429ec00f1276ca125d29935950ecdb0 SHA1 fd1b18427ec81398a0e9ff3006b390c09b16c1db SHA256 c057c0d56d74ff625f1d75d26ae6fb6453e983f75322eaf55f8bae43ed743607
AUX 2.4.2/gentoo-macolor.diff 619 RMD160 1c8511a7dd573274b47d5f4088f62bb1d5a9137d SHA1 ec0cf61a41e7f93be2ef429017d7ede612ab3e1b SHA256 10d272e96c5a61c86040ea66c577316c869012a9b67f88c8bd6fb5d6d1e3b3a8
AUX 2.4.2/gentoo-mkdepend.diff 411 RMD160 bec06f29b47c604c559765684c39a168b8b561e0 SHA1 41c392a1d4f197cebee49d474b686f318218d6bc SHA256 92627d6662329fb49102f5a0c9a5c1347fe125fec6933f2615a43a39171ea2ae
AUX 2.4.2/gentoo-python-2.3.4.diff 7511 RMD160 65aa0a28399b5741f821ee62f3faed039fe5f64c SHA1 1e3c252952d7dc24e8855102dd559fae64a0b222 SHA256 a15a79c7d8eea20a090c7e9ef376898fc94de48e0b8d39a8dc6759c7e4326289
AUX 3.0.1/gentoo-XVBAToOOEventDescGen.hpp 1649 RMD160 2c16c1e76c8857cd8416008638ce3c004215f967 SHA1 72e4033a48f937cd826564e2439f6d1f1f35bd3d SHA256 34a87b207852869d4d4f5037cfb6e01e81257633047113db5dc6adc301877b02
AUX 3.0.1/gentoo-buildfix-mono-2-2.diff 523 RMD160 993dee1c2ab796980e7f04f8b9c0aeefc19743c7 SHA1 b2aee23fa2a7d6fb0b1a1d1ca97609bfaaa7f696 SHA256 5f807dd7b892dfa30c177ed20e69c19f50541bfec2f94a2ff1caaa5aa656a324
AUX 3.0.1/gentoo-completion_matches.diff 695 RMD160 c4dbf41740073786c31eb543d846282383e5fff6 SHA1 7898aafab4406382a44fb2bd7ce0face0bb11d63 SHA256 6af7c86d8fb6af166c388f202dbff64587cd546715b6d28f49c3188cf0de4594
-AUX 3.0.1/gentoo-configure.diff 2321 RMD160 b632b76c345756ea71457325881fdb70427a0537 SHA1 6458fa22c15b945f95c29af984684b906b53a3f2 SHA256 09dab321d63d1eaf983c1a5d6f9b484275d5734967dd4661f35a214553434b57
+AUX 3.0.1/gentoo-configure-pg.diff 462 RMD160 4a16957ceebc9bde6fbfe60a2503b3439712059c SHA1 fae773f59ee378981ca17edb2b99f62aa251026d SHA256 ede7075103e3633bfb2e3faee1fc4560f835c6929e4c9a0fdb5b755333173bec
+AUX 3.0.1/gentoo-configure.diff 1998 RMD160 bd3afe18b3c354788d49b98905831c47dc7d479b SHA1 658a9456b32800443e7bc76f178d091cab134b65 SHA256 d6063b61830645f0a1297756b47cb299c8430f35f677c95d3458358a10839e72
AUX 3.0.1/gentoo-hunspell.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
-AUX 3.0.1/gentoo-infragentoo.diff 1901 RMD160 c0990c4dd55177fa8bf974cfb170063e2d954d6e SHA1 e39a114de2a8ef26beecd697c5ccdd2bf0e33f36 SHA256 9b9816ee0aa6c1ad5986887d4c0db822d5398f2d84ef00e33a8c8fbe6d5e0393
+AUX 3.0.1/gentoo-infragentoo.diff 2485 RMD160 9a8450b1f41cfcd50422fff650428f7bad639e73 SHA1 4883c20a81e4137378d4805551571329ff5c6bce SHA256 fda31403e5a109ee56625343b2ea7e4244b78feff891028e9b5df13725f091df
AUX 3.0.1/gentoo-mkdepend.diff 345 RMD160 f76234b5fd970d71e6e06af3d50e21459c72a373 SHA1 b0d01f2c6062beec0c836b93ce8f774b928b04e5 SHA256 ef6732854c02b09887f74176b0ea4b330a11ebaf7ecd5f78c595a633af320ae2
AUX 3.0.1/gentoo-nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
AUX 3.0.1/gentoo-ru_dict.diff 3089 RMD160 c24efcedf5b38b0c12a22e301c62172768c44f85 SHA1 5e0ed235bbe3f7e93b9ffe22b062db7a8e6d1658 SHA256 abce1be9aadaaa6ece195edf832ebe68df4e63ac8b748d7ad96451d90350a661
DIST OOo_3.0.1_src_extensions.tar.bz2 13941829 RMD160 e89c7594f642147a95e85612d5646bc3edc869db SHA1 c695982d166422a838560ef7b134a5665bc61198 SHA256 dfc70ba2ac28c0c5f6942499bfd9dfa2fb147695f96ee4ec12d44d4b5f45e5b6
DIST OOo_3.0.1_src_l10n.tar.bz2 86008240 RMD160 a02e8c06c67ac7b2833afa4a54993d81674e8b9b SHA1 13f1bf0989a09c52c57dbc1d6cf1feaec369a085 SHA256 53f0e621d2b38b97742ab67ef18313a868dbde43924ef54f9133121f29d4d75b
DIST OOo_3.0.1_src_system.tar.bz2 45625279 RMD160 35f1822f3e3aa2f6af0c268dd51534568473e636 SHA1 8c73821b542c9c96b071550fe0e3e813e21a1246 SHA256 bb3dadb23570f1d36f0b1bcbe5a39782921b955513db28d05e9ca75eeca2e8fe
-DIST 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.1.tar.gz 20712561 RMD160 76be30a30f6cd859a2342018550fc48637518d06 SHA1 28a79a28769548d0bf39fdb8c1bfa2f14e97576b SHA256 2b4daca6b551f71a31c0746d5be63ce7a126b5d281041222f8c637b3b522d411
-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 23180 RMD160 26385fcd741eb56144b7a2eff3706d0409b8745d SHA1 7d1b7ef46188a55cf07c663100b191bed174f4f8 SHA256 588c1de1af069ee52e99a6643109b00669928d7bc94b8b763b8413136c9f7c56
-EBUILD openoffice-infra-3.0.1.ebuild 23287 RMD160 4f740617237ab1e1a3eda208b4ee197e9f4d0e5b SHA1 6f8c74cb2d7e5fe87a954b5ef1957f528fede59b SHA256 3e5b7f55ea069f7884c5be6ec8c90a4becd81ec0c59a9993c483ce576a571293
-MISC ChangeLog 3034 RMD160 9b174e42ba4ebc2517a84ada81cd525f6a5d8338 SHA1 eabe57add3ebbe1d1c5cf6d91d33fb6778e55187 SHA256 9f32a30de68b1980a497e094fb085278c82bdbcb9ea95f0f07158bc864fc8440
+EBUILD openoffice-infra-2.4.2.ebuild 23901 RMD160 41fbfa75a8ad55bbb8c289960ed839c3b85c6556 SHA1 167c79bf59a3e353150b3ab135ef759fb6d4d796 SHA256 76f973c5bcadfe5c448fe96b0d6c9c0e6d1ff8a4c83dfe643f832b318c9be356
+EBUILD openoffice-infra-3.0.1.ebuild 24115 RMD160 7514a2480a73a99df73dcc290504b877a142aed3 SHA1 3c3155c125bbc3fdbd42a3c2324e78f83d313ae0 SHA256 5dc84dcdc0913fa9160374a681953965d813cdf6138a4882f44fe53290ed810b
+MISC ChangeLog 3574 RMD160 ec81cb8fbccb91f47faae8b6c740f544957f9d84 SHA1 c24a206b29acd0f7a3a0cfffa8e4381cdf30608c SHA256 7f5deb7e79c5e75297f3e1604bb7d79b059036a990ac5b1f772663430acdc58a
MISC metadata.xml 786 RMD160 7ade4465c360cd6e056bb17ad84d734b0632bfa0 SHA1 02dc5171d3660ff4471d40eb9f344b1e7d195254 SHA256 cf87cefd0eca5cfdf69024e119d003b02d7cba4e18cf05a939dcc4766af4ed25
namespace ooxml { namespace tokenmap { namespace elements {
struct token { const char * name; TokenEnum_t nToken; };
+--- crashrep/source/unx/main.cxx.orig 2009-02-21 19:15:51.000000000 +0500
++++ crashrep/source/unx/main.cxx 2009-02-21 19:16:13.000000000 +0500
+@@ -45,6 +45,7 @@
+ #include <unistd.h>
+ #include <pwd.h>
+ #include <pthread.h>
++#include <limits.h>
+
+ #include <hash_map>
+ #include <vector>
--- /dev/null
+--- config_office/configure.in.orig 2008-10-26 12:57:20.000000000 +0500
++++ config_office/configure.in 2008-10-26 12:57:57.000000000 +0500
+@@ -3791,7 +3800,7 @@
+ fi
+ save_CFLAGS=$CFLAGS
+ save_LIBS=$LIBS
+-CFLAGS="-I`pg_config --includedir`"
++CFLAGS="-I`pg_config --includedir` -L`pg_config --libdir`"
+ AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], [])
+ AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR(libpq is needed)], [])
+ CFLAGS=$save_CFLAGS
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
--- /dev/null
+--- patches/src680/apply.orig 2009-02-20 22:00:46.000000000 +0500
++++ patches/src680/apply 2009-02-20 22:01:35.000000000 +0500
+@@ -89,7 +89,7 @@
+ # openmamba
+ openmamba: LinuxCommon, GlobalDesktopFiles
+ #Gentoo
+-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, Gcc43
++GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, Gcc43
+ GentooUnstable: GentooBase, GentooExperimental, TransparentPrinting, PptExport
+ Gentoo : GentooBase
+ Gentoo64: GentooBase
+@@ -131,7 +131,10 @@
+
+ #InfraUnix: LinuxCommon, EMFPlus, CustomUserConfig, PostgreSQL, InfraPatches, InfraNotUbuntu, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding
+ InfraUnix: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, InfraNotUbuntu, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding
+-UbuntuInfra: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraUbuntu
++UbuntuInfra: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraUbuntu
++InfraGentooBase: Gentoo, EMFPlus, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Fpickers, QuickStarter, InfraNotUbuntu, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding
++InfraGentoo: InfraGentooBase
++InfraGentooPG: InfraGentooBase, InfraUnixPatchesPG, PostgreSQL
+ InfraSolaris: LinuxCommon, EMFPlus, CJK, OOXML, CustomUserConfig, InfraPatches, InfraNotUbuntu, Infra1252toLocale, InfraSolaris, NotDebian, CustomKeyBinding
+ InfraWin32: Win32Common, EMFPlus, CJK, OOXML, CustomUserConfig, InfraPatches, InfraNotUbuntu, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding
+ InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
+@@ -1207,7 +1210,7 @@
+ # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
+ libxmlsec-system-nss.diff, i#69368, pmladek
+
+-# xulrunner-1.9.diff, i#86670
++xulrunner-1.9.diff, i#86670
+
+ # allow separate helpcontent build
+
+@@ -1849,7 +1852,7 @@
+ sdbc-postgresql.diff
+ sdbc-postgresql-build-lst.diff
+ sdbc-postgresql-config_office.diff
+-# connectivity-workben-postgresql.diff
++connectivity-workben-postgresql.diff
+ gcc-4.3-postgresql.diff
+
+
+@@ -2304,6 +2307,7 @@
+ [ Gcc43 ]
+ # Make it compile with gcc 4.3
+ cws-gcc430two.diff, i#83276
++build-gcc43-missingincludes.diff
+
+ [ OxygenOfficePalettes ]
+ palette-enhanced-arrow.diff
+@@ -2598,8 +2602,10 @@
+ [InfraUbuntu]
+ disable-scsolver-menu-entry.diff
+
+-[InfraUnixPatches]
++[InfraUnixPatchesPG]
+ connectivity-freebsd-libs.diff
++
++[InfraUnixPatches]
+ freebsd-store-alloca.diff
+ freebsd-writerfilter.diff
+
--- /dev/null
+--- 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
+@@ -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
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
---- patches/dev300/apply.orig 2009-02-07 16:05:00.000000000 +0500
-+++ patches/dev300/apply 2009-02-14 11:27:27.000000000 +0500
-@@ -150,6 +150,7 @@
+--- patches/dev300/apply.orig 2009-02-18 21:55:55.000000000 +0500
++++ patches/dev300/apply 2009-02-18 21:59:02.000000000 +0500
+@@ -150,6 +150,9 @@
InfraUnix: LinuxCommon, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, IntegrateExtensions
InfraLinux: LinuxCommon, SVGImport, UpdaterRemoval, UbuntuBased, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, DebianBaseOnly, UbuntuOnly, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, UbuntuIntrepidOnly
-+InfraGentoo: LinuxCommon, EMFPlus, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, PostgreSQL, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly, Gentoo
++InfraGentooBase: Gentoo, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly
++InfraGentoo: InfraGentooBase
++InfraGentooPG: InfraGentooBase, InfraUnixPatchesPG, PostgreSQL
InfraSolaris: LinuxCommon, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
InfraWin32: Win32Common, CJK, OOXML, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, NotDebian, CustomKeyBinding, IntegrateExtensions
InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock
-@@ -1474,6 +1475,10 @@
+@@ -1474,6 +1477,10 @@
[ GentooOnly ]
SectionOwner => aprosky
# Allow build to proceed with PaX enabled
gentoo-pax-fix.diff, aprosky
# support server-only versions of 64bit JDKs
-@@ -1555,6 +1560,9 @@
+@@ -1555,6 +1562,9 @@
mono-climaker-config.diff
mono-climaker-bridgetest.diff
[ VBAObjects ]
SectionOwner => noelpwer
+@@ -1882,7 +1892,7 @@
+ sdbc-postgresql.diff
+ sdbc-postgresql-build-lst.diff
+ sdbc-postgresql-config_office.diff
+-# connectivity-workben-postgresql.diff
++connectivity-workben-postgresql.diff
+ gcc-4.3-postgresql.diff
+
+
+@@ -2807,8 +2817,10 @@
+ instset-prefer-langpacks.diff, thorsten
+ sfx2-remove-check-update-on-fileload.diff, kohei
+
+-[InfraUnixPatches]
++[InfraUnixPatchesPG]
+ connectivity-freebsd-libs.diff
++
++[InfraUnixPatches]
+ freebsd-store-alloca.diff
+ freebsd-gperf.diff, i#85469, rail
+ freebsd-writerfilter.diff
inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
-IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk java kde ldap mono odk oodict opengl pam seamonkey xulrunner"
+IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk java kde ldap mono odk oodict opengl pam postgres seamonkey xulrunner"
PATCHLEVEL="OOH680"
MILESTONE="18"
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"
java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
dev-java/ant-core )
ldap? ( net-nds/openldap )
- virtual/postgresql-base"
+ postgres? ( virtual/postgresql-base )"
PROVIDE="virtual/ooo"
RESTRICT="strip" # the openoffice.org from infra-resource is already stripped
ewarn
fi
+ if use !gtk && use !gnome; then
+ ewarn
+ ewarn " If you want the OpenOffice-Infra systray quickstarter to work "
+ ewarn " activate the 'gtk' and 'gnome' use flags. "
+ ewarn
+ fi
+
if is-flagq -ffast-math ; then
eerror " You are using -ffast-math, which is known to cause problems. "
eerror " Please remove it from your CFLAGS, using this globally causes "
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"
+ # Patch for using Gentoo specific goo team patches InfraGentoo/InfraGentooPG distro targets
+ epatch "${FILESDIR}/${PV}/gentoo-infragentoo.diff"
mkdir -p "${WORKSRC}"/solver/680/unxlng${ARCH_VAR}6.pro/pck/
cp -f "${WORKDIR}"/infra-ooo-files_${PV}/files/extra_templates_*.zip "${WORKSRC}"/solver/680/unxlng${ARCH_VAR}6.pro/pck/
cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/about.bmp "${WORKSRC}"/default_images/introabout/
local patchconf
- patchconf="--tag=${OOOBUILDTAG} --distro=GentooInfra --distro=Localize"
+ local distro
+ if use postgres; then
+ distro=InfraGentooPG
+ else
+ distro=InfraGentoo
+ fi
+ patchconf="--tag=${OOOBUILDTAG} --distro=${distro} --distro=Localize"
if use binfilter; then
patchconf="${patchconf} --distro=Binfilter"
fi
epatch "${FILESDIR}/${PV}/gentoo-macolor.diff"
# completion_matches -> rl_completion_matches
epatch "${FILESDIR}/${PV}/gentoo-completion_matches.diff"
+ if use postgres; then
+ # fix using of pg lib
+ epatch "${FILESDIR}/${PV}/gentoo-configure-pg.diff"
+ fi
# enable/disable-gstreamer, disable scanning for rpm/dpkg and etc
epatch "${FILESDIR}/${PV}/gentoo-configure.diff"
# disable mkdepend warning
epatch "${FILESDIR}/${PV}/gentoo-mkdepend.diff"
# fix buildroot issue for rpm >=4.4.7
epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff"
- # fix handling of system libs for postgresql-base
- epatch "${FILESDIR}/gentoo-system_pgsql.diff"
+ if use postgres; then
+ # fix handling of system libs for postgresql-base
+ epatch "${FILESDIR}/gentoo-system_pgsql.diff"
+ fi
# fix sandbox
epatch "${FILESDIR}/${PV}/gentoo-fixsandbox.diff"
- # fix python 2.3.4 build
- epatch "${FILESDIR}/${PV}/gentoo-python-2.3.4.diff"
# Use flag checks
if use java; then
--disable-fontooo \
--disable-qadevooo \
--enable-sdext \
+ --with-system-jpeg \
--with-system-boost \
--with-system-curl \
--with-system-db \
--with-system-icu \
--with-system-libxslt \
--with-system-vigra \
+ --with-system-zlib \
+ --with-system-stdlibs \
+ --with-system-python \
--without-stlport \
--mandir=/usr/share/man \
--libdir=/usr/$(get_libdir) \
doins "${WORKSRC}"/solver/680/unxlng"${ARCH_VAR}"6.pro/bin/sun-report-builder.oxt
doins "${WORKSRC}"/solver/680/unxlng"${ARCH_VAR}"6.pro/bin/minimizer/sun-presentation-minimizer.oxt
+ # Install PostgreSQL SDBC extension
+ if use postgres; then
+ insinto /usr/$(get_libdir)/openoffice/share/extension/install
+ doins "${WORKSRC}"/connectivity/unxlng"${ARCH_VAR}"6.pro/lib/postgresql-sdbc-0.7.5.zip
+ fperms 444 /usr/$(get_libdir)/openoffice/share/extension/install/postgresql-sdbc-0.7.5.zip
+ fi
+
# Fix the permissions for security reasons
# chown -R root:0 "${D}"
}
+pkg_preinst() {
+
+ use java && java-pkg-2_pkg_preinst
+
+}
+
pkg_postinst() {
fdo-mime_desktop_database_update
elog
elog " You can find extension in: /usr/$(get_libdir)/openoffice/share/extension/install "
elog
+ if use postgres; then
+ elog " PostgreSQL SDBC extension provided in "
+ elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+ elog
+ fi
use !oodict && elog " Spell checking is now provided through our own myspell-ebuilds, "
use !oodict && elog " if you want to use it, please install the correct myspell package "
use !oodict && elog " according to your language needs. "
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"
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk oodict opengl pam postgres"
PATCHLEVEL="OOO300"
MILESTONE="15"
java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
>=dev-java/ant-core-1.7 )
ldap? ( net-nds/openldap )
- virtual/postgresql-base"
+ postgres? ( virtual/postgresql-base )"
PROVIDE="virtual/ooo"
RESTRICT="strip" # the openoffice.org from infra-resource is already stripped
fi
if use !gtk && use !gnome; then
- ewarn " If you want the OpenOffice.org systray quickstarter to work "
+ ewarn
+ ewarn " If you want the OpenOffice-Infra systray quickstarter to work "
ewarn " activate the 'gtk' and 'gnome' use flags. "
ewarn
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
+ # Patch for using Gentoo specific goo team patches and InfraGentoo/InfraGentooPG distro targets
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 "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/backing*.png "${WORKSRC}"/default_images/framework/res/
local patchconf
- patchconf="--tag=${OOOBUILDTAG} --distro=InfraGentoo --distro=Localize"
+ local distro
+ if use postgres; then
+ distro=InfraGentooPG
+ else
+ distro=InfraGentoo
+ fi
+ patchconf="--tag=${OOOBUILDTAG} --distro=${distro} --distro=Localize"
if use binfilter; then
- patchconf="${patchconf} --distro=Binfilter"
+ 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}
+ if use postgres; then
+ # fix using of pg lib
+ epatch "${FILESDIR}/${PV}/gentoo-configure-pg.diff"
+ fi
# enable/disable-gstreamer, disable scanning for rpm/dpkg and etc
epatch "${FILESDIR}/${PV}/gentoo-configure.diff"
# disable mkdepend warning
epatch "${FILESDIR}/${PV}/gentoo-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"
+ if use postgres; then
+ # fix handling of system libs for postgresql-base
+ epatch "${FILESDIR}/gentoo-system_pgsql.diff"
+ fi
# more stabillity on multiprocessing build
epatch "${FILESDIR}/${PV}/gentoo-vba_incl.diff"
cp -f "${FILESDIR}/${PV}/gentoo-ReturnInteger.hdl" "${WORKSRC}/scripting/source/vbaevents/ReturnInteger.hdl" || die
newbin "${FILESDIR}"/wrapper.in ooffice
sed -i -e s/LIBDIR/$(get_libdir)/g "${D}"/usr/bin/ooffice || die "Wrapper script failed"
+ # Install PostgreSQL SDBC extension
+ if use postgres; then
+ insinto /usr/$(get_libdir)/openoffice/share/extension/install
+ doins "${WORKSRC}"/connectivity/unxlng"${arch_var}"6.pro/lib/postgresql-sdbc-0.7.6.zip
+ fperms 444 /usr/$(get_libdir)/openoffice/share/extension/install/postgresql-sdbc-0.7.6.zip
+ fi
+
# Component symlinks
for i in ${basecomponents}; do
dosym "${instdir}"/program/s"${i}" /usr/bin/oo"${i}"
}
+pkg_preinst() {
+
+ use java && java-pkg-2_pkg_preinst
+
+}
+
pkg_postinst() {
fdo-mime_desktop_database_update
elog " Please use the packages provided in "
elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
elog " instead of those from the SUN extension site. "
+ if use postgres; then
+ elog
+ elog " PostgreSQL SDBC extension provided in "
+ elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
+ fi
elog
}
projects / ~andy / sunrise / commitdiff