From c1bd1fdc72a0d4273345acfc3e901eff9aa45f1a Mon Sep 17 00:00:00 2001 From: "Yar Odin (yarodin)" Date: Mon, 15 Jun 2009 13:59:14 +0000 Subject: app-office/openoffice-infra: Close to original Infra-Resource build. Take your attention to use flags changes: oodict - removed, infradicts - added, infradicts and postgres - enabled by default. And a number of small fixes. svn path=/sunrise/; revision=8659 --- app-office/openoffice-infra/ChangeLog | 8 + app-office/openoffice-infra/Manifest | 11 +- .../files/3.1.0/gentoo-configure-pg.diff | 4 +- .../files/3.1.0/gentoo-infra-gentoo.diff | 53 ++++- .../files/3.1.0/gentoo-ru_dict.diff | 71 ------ app-office/openoffice-infra/metadata.xml | 2 +- .../openoffice-infra/openoffice-infra-3.1.0.ebuild | 257 ++++++++++++--------- 7 files changed, 204 insertions(+), 202 deletions(-) delete mode 100644 app-office/openoffice-infra/files/3.1.0/gentoo-ru_dict.diff (limited to 'app-office') diff --git a/app-office/openoffice-infra/ChangeLog b/app-office/openoffice-infra/ChangeLog index 4854751f4..5a3993b42 100644 --- a/app-office/openoffice-infra/ChangeLog +++ b/app-office/openoffice-infra/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Jun 2009; Yar Odin (yarodin) + files/3.1.0/gentoo-configure-pg.diff, openoffice-infra-3.1.0.ebuild, + files/3.1.0/gentoo-infra-gentoo.diff, -files/3.1.0/gentoo-ru_dict.diff, + metadata.xml: + Close to original Infra-Resource build. Take your attention to use flags + changes: oodict - removed, infradicts - added, infradicts and postgres - + enabled by default. And a number of small fixes. + 05 Jun 2009; Yar Odin (yarodin) openoffice-infra-3.1.0.ebuild: Fix gconf issue diff --git a/app-office/openoffice-infra/Manifest b/app-office/openoffice-infra/Manifest index f1f00d2ba..863c4aa4f 100644 --- a/app-office/openoffice-infra/Manifest +++ b/app-office/openoffice-infra/Manifest @@ -1,12 +1,11 @@ AUX 3.1.0/buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff -AUX 3.1.0/gentoo-configure-pg.diff 462 RMD160 4a16957ceebc9bde6fbfe60a2503b3439712059c SHA1 fae773f59ee378981ca17edb2b99f62aa251026d SHA256 ede7075103e3633bfb2e3faee1fc4560f835c6929e4c9a0fdb5b755333173bec +AUX 3.1.0/gentoo-configure-pg.diff 434 RMD160 2abaf9c212edb9cdf60445756a998637bf9a8f06 SHA1 d5da7bbc98c5b2852bd5a4a7d3873404903dac7f SHA256 6140c9ace18b4d338f2e5d68920e12e553d34bddb039fbf9073bcdd775d90f29 AUX 3.1.0/gentoo-configure.diff 1453 RMD160 cd74d0dfcd1c0ff9c560ad778c01da23984f928b SHA1 994e990bcce9e9418ed2e7be9558eeb95f1442fc SHA256 70c44f6f8cfaec3024fc46ff60a04a4766fd52be3bcfee6fe79c00bc74a5a10e AUX 3.1.0/gentoo-dont_strip_libs.diff 955 RMD160 3815892d75a70966533372ab72da73200037958b SHA1 e57b5b49e0d9f918e90b36570c0a8a0125d54709 SHA256 c7410c402ac8322e63686c2e6d725ed3c2242a6b4026705c8344684fa34b108e AUX 3.1.0/gentoo-infra-builder.diff 1118 RMD160 bd16e8064c89469cac0ea291b31c9f5caba8a028 SHA1 a731a03ef25f6a884e722bc2a4b4da80f5f46132 SHA256 1d6fcb2b31e605edad597ff8da44e2a8adfdb67eec65ca821c453a958718ca50 -AUX 3.1.0/gentoo-infra-gentoo.diff 2733 RMD160 83e0fe2c473b46b49fe2925d141ac812cdf96058 SHA1 1d9dc4b7502bdd9e5b2c9d8b14d43ad23e9431a0 SHA256 611eb79726c82bce001a1e4c7f9c0a5985900bccb40475162b0568d83e624fa9 +AUX 3.1.0/gentoo-infra-gentoo.diff 3560 RMD160 f152cbebbf5fec19a9a094dba2db36bd86b00193 SHA1 ef6b933a4a5e4a0d5628399522e3e1df7c625808 SHA256 9b86b8c06296759d11e0a3b18f0705af812a8db3f49293458ea30f9c1006a266 AUX 3.1.0/gentoo-layout-simple-dialogs-svx.diff 1207 RMD160 28c8f2394cebf860701b36d3b5c4f0d7583736bd SHA1 807ba97128197fa1d16be3fb7bb0948a444d06da SHA256 7135bb29a6b36e3deca6094119c34b17549d4959a12bac91ec30aa22bcc141f4 AUX 3.1.0/gentoo-mkdepend.diff 1694 RMD160 e6970418012f5cdf569188907543c6e4a51b7851 SHA1 a6c941492d69840b2705fbe885ad655a9922cbc5 SHA256 9596bf24a44b8b55a46c5a039944c3b2dc40adafae125ed77c81704255ec901b -AUX 3.1.0/gentoo-ru_dict.diff 3089 RMD160 c24efcedf5b38b0c12a22e301c62172768c44f85 SHA1 5e0ed235bbe3f7e93b9ffe22b062db7a8e6d1658 SHA256 abce1be9aadaaa6ece195edf832ebe68df4e63ac8b748d7ad96451d90350a661 AUX 3.1.0/gentoo-vba-parallel-build.diff 2725 RMD160 b5952a1d86c0ac8a242d2c1bff63dd052e270f6a SHA1 ce5b638b54ddabc08c30511141ddfc3516427790 SHA256 0dc84f44e27af0191b4b2ef561b2e30ae85dcb9a4ae941658a49bf73a3debab4 AUX 3.1.0/solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e AUX gentoo-epm-3.7.patch.diff 2627 RMD160 18d2ac9bea7e9ceb5adc40599cfb151ac3de1f84 SHA1 d2e6b612ce7df5606e7101fffe2cff2f0d16c0e3 SHA256 eb801d90856c48f04b4fee8d21b01d0dd2951288efd6aa4ed5cf6807074c2c12 @@ -20,6 +19,6 @@ DIST OOo_3.1.0_src_l10n.tar.bz2 96360273 RMD160 35ea76f926342a8bfa8b6b30edd08f04 DIST OOo_3.1.0_src_system.tar.bz2 53314585 RMD160 9ffd6694d4cdd7d3f4f8fd6aaf1ffa6c64b39d27 SHA1 a73c6aa867b7686d33611694e33d6351110d2a0a SHA256 52d74c30fa333498e4236d876ad31d4dc5d08eb5b72a42e2c378cb8f59162694 DIST infra-ooo-files_3.1.0.tar.gz 14893448 RMD160 137a78f9c77bff141e6f8138c53a11d2217719d8 SHA1 9f86b12773ab781b8ea4c18261eccce850807c11 SHA256 e70ca0680388e1355e4ab9136888972724698fec1c9e9079d89509e91f09e0e0 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -EBUILD openoffice-infra-3.1.0.ebuild 23245 RMD160 7c2f69c264fb820372859f623d2d89d1cc9bda29 SHA1 dbd4b3b0b6eff07949868538d3f48f4a5d539dfd SHA256 c61d77adb1ec8c788f04bd66f6b201d40733a66bd72e063b9d0dfbca3ce964b9 -MISC ChangeLog 5948 RMD160 572687e9417bdacb90fc65eb156771f1f8106866 SHA1 0b0f66a31b764f64e1e9f4aaa557f56f5d87a06d SHA256 5d6f10a3b2e33659fdb2061c48d4f85e814fe12a56a613cac12aab1ec352dfb2 -MISC metadata.xml 786 RMD160 7ade4465c360cd6e056bb17ad84d734b0632bfa0 SHA1 02dc5171d3660ff4471d40eb9f344b1e7d195254 SHA256 cf87cefd0eca5cfdf69024e119d003b02d7cba4e18cf05a939dcc4766af4ed25 +EBUILD openoffice-infra-3.1.0.ebuild 23472 RMD160 7e939660843aa6ade52835c1276d7b266fc9b191 SHA1 5078fb67cb5a9c33b4ebc3aafb4510ed7ea8b994 SHA256 df5017cf43978662200ed67a0fe92a887ef5152fca60e7057efbedc52788fe3f +MISC ChangeLog 6365 RMD160 2b7cb36af2b0b271bad76890f1fb1f23a7bdb50d SHA1 0d487b428af35418ba7e965a81055aab414dac34 SHA256 d993fdd2a0fe92ab78d31b6e748c451603767d01bca4c347fd4fd1a2d083cc4e +MISC metadata.xml 792 RMD160 49e85491fc9d94fe35bc920ce42fd8d50b9d3c83 SHA1 8dc753d1070e92d715be182de51d9168d13368c6 SHA256 a41c190a51e34cfa042f6aa1914dd646fa6ab47ad25a1bab4d011c33a5d4f154 diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff index 191f675ca..8437d4c75 100644 --- a/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff +++ b/app-office/openoffice-infra/files/3.1.0/gentoo-configure-pg.diff @@ -1,5 +1,5 @@ ---- 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 +--- configure.in.orig 2008-10-26 12:57:20.000000000 +0500 ++++ configure.in 2008-10-26 12:57:57.000000000 +0500 @@ -3990,7 +4000,7 @@ fi save_CFLAGS=$CFLAGS diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff index b82993a46..a76d65e6f 100644 --- a/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff +++ b/app-office/openoffice-infra/files/3.1.0/gentoo-infra-gentoo.diff @@ -1,16 +1,19 @@ ---- patches/dev300/apply.orig 2009-05-31 13:47:16.000000000 +0600 -+++ patches/dev300/apply 2009-05-31 13:47:59.000000000 +0600 -@@ -151,6 +151,9 @@ +--- patches/dev300/apply.orig 2009-06-13 20:41:03.000000000 +0600 ++++ patches/dev300/apply 2009-06-13 20:41:21.000000000 +0600 +@@ -151,6 +151,12 @@ InfraUnix: LinuxCommon, CJK, OOXML, CustomUserConfig, PostgreSQL, InfraPatches, NotInfraLinux, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, IntegrateExtensions InfraLinux: UbuntuJaunty, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, InfraLinuxOnly -+InfraGentooBase: Gentoo, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly ++InfraGentooBase: Gentoo, SVGImport, UpdaterRemoval, Layout, LayoutDialogs, CJK, OOXML, Split, Fpickers, QuickStarter, CustomUserConfig, NotInfraLinux, InfraPatches, InfraUnixPatches, Infra1252toLocale, InfraNotSolaris, CustomKeyBinding, InfraLinuxOnly +InfraGentoo: InfraGentooBase +InfraGentooPG: InfraGentooBase, InfraUnixPatchesPG, PostgreSQL ++InfraDictru: InfraDictRU ++InfraDictuk: InfraDictUK ++InfraDicttr: InfraDictTR InfraSolaris: LinuxCommon, CustomUserConfig, InfraPatches, NotInfraLinux, Infra1252toLocale, InfraSolaris, NotDebian, IntegrateExtensions InfraWin32: Win32Common, CustomUserConfig, InfraPatches, NotInfraLinux, InfraWin32Patches, Infra1252toLocale, InfraNotSolaris, IntegrateExtensions InfraFake: QuickStarter, WMF, SVGImport, UnitTesting, Layout, CJK, EMFPlus, Fpickers, LayoutDialogs, UnitBootstrap, AutoCorrectCapsLock -@@ -1601,7 +1604,7 @@ +@@ -1601,7 +1607,7 @@ sc-export-shape-macro-bindings.diff, n#304739, noelpwer # export of hlink bindings for shapes @@ -19,7 +22,7 @@ # attributes present in the vba streams can override the default shape name # used for the control in the binary format -@@ -1751,9 +1754,8 @@ +@@ -1751,9 +1757,8 @@ vba-import-globaltemplate-customizations.diff # fix problem with syntax like 'If LCase(str1) = str2 <> 0 Then' vba-basic-if-compare-fix.diff, i#100600, n#488588, Fong @@ -31,7 +34,7 @@ # fix parallel build problems in oovbaapi vba-oovbaapi-parallel-build.diff -@@ -2970,7 +2972,7 @@ +@@ -2970,7 +2975,7 @@ xlsx-shared-import-and-export.diff xlsx-arabic-export-crash.diff, n#497419, janneke @@ -40,7 +43,41 @@ xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke xlsx-export-simple-autofilter.diff, n#497559, janneke # hack to ignore writerfilter when odf-converter is present -@@ -3090,8 +3092,10 @@ +@@ -3065,15 +3070,22 @@ + sc-toogle-grid-menubar.diff + infra-palette.diff + ++[InfraDictRU] ++dictionaries-ru-RU.diff ++ ++[InfraDictUK] ++dict-uk.diff ++ ++[InfraDictTR] ++extensions-zemberek.diff ++ + [NotInfraLinux] + build-xterm-title.diff +-no-ure-sdk.diff ++#no-ure-sdk.diff + enable-quickstart.diff + updates.diff + build-javainstaller2.diff + icons-galaxy-as-default.diff +-dictionaries-ru-RU.diff +-dict-uk.diff + extras-add-educate-officorr-misc-offimisc.diff + reportbuilder-no-license-infra.diff + wikipublisher-no-license-infra.diff +@@ -3081,7 +3093,6 @@ + scp2_extensions-remove-SUN.diff + extensions-dont-install-by-default.diff + extensions-separate-java-based.diff +-extensions-zemberek.diff + officecfg-create-backups.diff + + [InfraLinuxOnly] +@@ -3090,8 +3101,10 @@ sfx2-remove-check-update-on-fileload.diff, kohei default-system-fpicker.diff, michael diff --git a/app-office/openoffice-infra/files/3.1.0/gentoo-ru_dict.diff b/app-office/openoffice-infra/files/3.1.0/gentoo-ru_dict.diff deleted file mode 100644 index c3b60c910..000000000 --- a/app-office/openoffice-infra/files/3.1.0/gentoo-ru_dict.diff +++ /dev/null @@ -1,71 +0,0 @@ ---- 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 @@ - - -- - -- -- Russian hyphenation dictionary and thesaurus -- -- -+ - -- -+ - -+ -+ -+ -+ Словари для русского языка -+ Russian Dictionaries -+ - -- ---- 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 @@ - - - -+ -+ -+ %origin%/ru_RU.aff %origin%/ru_RU.dic -+ -+ -+ DICT_SPELL -+ -+ -+ ru-RU -+ -+ - - - %origin%/hyph_ru_RU.dic ---- 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) - diff --git a/app-office/openoffice-infra/metadata.xml b/app-office/openoffice-infra/metadata.xml index aac41f1d7..0de9fcaf8 100644 --- a/app-office/openoffice-infra/metadata.xml +++ b/app-office/openoffice-infra/metadata.xml @@ -12,6 +12,6 @@ version Enable support for legacy StarOffice 5.x and earlier file formats Build the Office Development Kit - Use Open Office dicts instead of system + Use all bundled dicts from Infra-Resource diff --git a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild b/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild index 2f45dee3d..0d5e3b2ae 100644 --- a/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild +++ b/app-office/openoffice-infra/openoffice-infra-3.1.0.ebuild @@ -7,7 +7,7 @@ EAPI="2" 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 postgres" +IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk +infradicts opengl pam +postgres" PATCHLEVEL="OOO310" MILESTONE="11" @@ -156,6 +156,18 @@ pkg_setup() { export LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/g;s/_/-/g') fi + # dicts + if use infradicts; then + export DICTS_OOO="en-US ru uk" + else + for i in ${LINGUAS_OOO}; do + if [[ "${i}" != "tr" ]]; then + DICTS_OOO="${DICTS_OOO} ${i}" + fi + done + export DICTS_OOO + fi + if use !java; then ewarn ewarn " You are building with java-support disabled, this results in some " @@ -233,26 +245,27 @@ src_prepare() { cd "${WORKSRC}"; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras-templates.tar.bz2" - local longlang for i in ${LINGUAS_OOO}; do - if [[ "${i}" == "ru" || "${i}" == "tr" ]]; then - cd "${WORKSRC}"; rm -rf "extras/source/autotext/lang/${i}/*" ; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras_${i}.tar.bz2" - fi - if [[ "${i}" == "ru" || "${i}" == "uk" ]]; then - if [[ "${i}" == "ru" ]]; then - longlang="ru_RU" - else - longlang="uk_UA" + if [[ "${i}" == "ru" || "${i}" == "tr" ]]; then + cd "${WORKSRC}"; rm -rf "extras/source/autotext/lang/${i}/*" ; tar xjf "${WORKDIR}/infra-ooo-files_${PV}/files/extras_${i}.tar.bz2" + fi + done + local longlang + for i in ${DICTS_OOO}; do + if [[ "${i}" == "ru" || "${i}" == "uk" ]]; then + if [[ "${i}" == "ru" ]]; then + longlang="ru_RU" + else + longlang="uk_UA" + fi + "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict "${longlang}" "${WORKDIR}/infra-ooo-files_${PV}/files/dict_${longlang}.tar.bz2" "${WORKSRC}" fi - "${WORKDIR}"/infra-ooo-files_${PV}/bin/enable-dict "${longlang}" "${WORKDIR}/infra-ooo-files_${PV}/files/dict_${longlang}.tar.bz2" "${WORKSRC}" - fi done # Infra branding - mkdir -p "${WORKSRC}"/{libwps,libwpg,libwpd,libsvg}/download/ + mkdir -p "${WORKSRC}"/{libwps,libwpg,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/ @@ -261,23 +274,34 @@ src_prepare() { cp -f "${WORKDIR}"/infra-ooo-files_${PV}/res/infra/backing*.png "${WORKSRC}"/default_images/framework/res/ local patchconf + patchconf="--tag=${OOOBUILDTAG} --distro=Localize" + local distros local distro if use postgres; then - distro=InfraGentooPG + distros="InfraGentooPG" else - distro=InfraGentoo + distros="InfraGentoo" fi - patchconf="--tag=${OOOBUILDTAG} --distro=${distro} --distro=Localize" + # add basic support of zemberek/tr + local dicts="${DICTS_OOO} tr" + for i in ${dicts}; do + if [[ "${i}" != "en-US" ]]; then + distros="${distros} InfraDict${i}" + fi + done + for i in ${distros}; do + distro="${distro} --distro=${i}" + done + patchconf="${patchconf} ${distro}" 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" + # 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" @@ -286,12 +310,13 @@ src_prepare() { # disable rpm epatch "${FILESDIR}/gentoo-epm-3.7.patch.diff" if use postgres; then - # fix handling of system libs for postgresql-base - epatch "${FILESDIR}/gentoo-system_pgsql.diff" + # fix handling of system libs for postgresql-base + epatch "${FILESDIR}/gentoo-system_pgsql.diff" fi - epatch "${FILESDIR}/${PV}/gentoo-ru_dict.diff" # don't strip libs use debug && epatch "${FILESDIR}/${PV}/gentoo-dont_strip_libs.diff" + # fix jfreereport cr issue + sed -i -e 's/\x0D$//' "${WORKSRC}"/jfreereport/patches/*.patch || die "sed failed" cd "${WORKSRC}" @@ -322,24 +347,22 @@ src_configure() { 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;s/\///g' | tr '[a-z]' '[A-Z]') - tempdicts="${tempdicts},${tempdict}" - fi - done - CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-dict=${tempdicts}" + CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-myspell-dicts" + local dicts + if use infradicts; then + dicts="${DICTS_OOO}" 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" + dicts="${LINGUAS_OOO}" fi + local tempdicts=ENUS + local tempdict + for i in ${dicts}; do + if [[ "${i}" != "en-US" ]]; then + tempdict=$(ls ${WORKSRC}/dictionaries/ | grep ${i} | sed -e 's/_//g;s/\///g' | tr '[a-z]' '[A-Z]') + tempdicts="${tempdicts},${tempdict}" + fi + done + CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-dict=${tempdicts}" CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable binfilter)" CONFIGURE_ARGS="${CONFIGURE_ARGS} $(use_enable cups)" @@ -465,9 +488,9 @@ src_compile() { local gentoo_env_set if [[ "${ARCH}" == "amd64" ]]; then - gentoo_env_set="${WORKSRC}/LinuxX86-64Env.Set.sh" + gentoo_env_set="${WORKSRC}/LinuxX86-64Env.Set.sh" else - gentoo_env_set="${WORKSRC}/LinuxX86Env.Set.sh" + gentoo_env_set="${WORKSRC}/LinuxX86Env.Set.sh" fi source "${gentoo_env_set}" @@ -479,19 +502,19 @@ src_compile() { 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 + 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" + cd instsetoo_native ; build.pl --checkmodules ; build.pl -P${JOBS} --all --html --dontgraboutput -- -P${JOBS} || die "Build failed" else - dmake || die "Build failed" + dmake || die "Build failed" fi } @@ -509,11 +532,11 @@ src_install() { local gentoo_env_set_dst if [[ "${ARCH}" == "amd64" ]]; then - arch_var="x" - gentoo_env_set_dst="linux-2.6-x86_64" + arch_var="x" + gentoo_env_set_dst="linux-2.6-x86_64" else - arch_var="i" - gentoo_env_set_dst="linux-2.6-intel" + arch_var="i" + gentoo_env_set_dst="linux-2.6-intel" fi allcomponents="${basecomponents}" @@ -523,38 +546,49 @@ src_install() { 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} + "${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 + 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 + # manual install Wiki Publisher, Report Builder, Presenter Screen (Console) extensions + if use java; then + cp -f "${WORKSRC}"/swext/unxlng"${arch_var}"6.pro/bin/wiki-publisher.oxt "${D}"${instdir}/share/extension/install/ + cp -f "${WORKSRC}"/reportbuilder/unxlng"${arch_var}"6.pro/bin/sun-report-builder.oxt "${D}"${instdir}/share/extension/install/ + fi + cp -f "${WORKSRC}"/sdext/unxlng"${arch_var}"6.pro/bin/presenter-screen.oxt "${D}"${instdir}/share/extension/install/ + # 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 + local dicts + if use infradicts; then + dicts="${DICTS_OOO}" + else + dicts="${LINGUAS_OOO}" + fi + rm -f "${D}"${instdir}/share/extension/install/dict-*.oxt + insinto ${instdir}/share/extension/install + local dictlang + for i in ${dicts}; do if [[ "${i}" == "en-US" ]]; then - dictlang=en + dictlang=en else - dictlang=${i} + dictlang=${i} fi doins "${WORKSRC}"/dictionaries/unxlng"${arch_var}"6.pro/bin/dict-"${dictlang}".oxt - done - fi + done # Menu entries cd "${D}"${instdir}/share/xdg/ for i in ${allcomponents}; do if [[ "${i}" == "printeradmin" ]]; then - sed -i -e s/openoffice.org3-/oo/g "${i}".desktop || die "Sed failed" + sed -i -e s/openoffice.org3-/oo/g "${i}".desktop || die "Sed failed" else - sed -i -e s/openoffice.org3/ooffice/g "${i}".desktop || die "Sed failed" + sed -i -e s/openoffice.org3/ooffice/g "${i}".desktop || die "Sed failed" fi domenu "${i}".desktop done @@ -564,29 +598,29 @@ src_install() { doins -r "${WORKSRC}"/sysui/desktop/icons/{hicolor,locolor} ecvs_clean "${D}/usr/share/icons" 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 + 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 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 + 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 - done fi for i in ${allcomponents}; do - dosym /usr/share/icons/hicolor/48x48/apps/openofficeorg3-"${i}".png /usr/share/pixmaps/openofficeorg3-"${i}".png + dosym /usr/share/icons/hicolor/48x48/apps/openofficeorg3-"${i}".png /usr/share/pixmaps/openofficeorg3-"${i}".png done # Mime types @@ -599,18 +633,18 @@ src_install() { # 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 + 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}" + dosym "${instdir}"/program/s"${i}" /usr/bin/oo"${i}" done if use cups; then - dosym "${instdir}"/program/spadmin /usr/bin/ooprinteradmin + dosym "${instdir}"/program/spadmin /usr/bin/ooprinteradmin fi dosym "${instdir}"/program/soffice /usr/bin/soffice dosym "${instdir}"/"${BASIS}"/program/setofficelang /usr/bin/setofficelang @@ -624,15 +658,15 @@ src_install() { # record java libraries if use java; then - java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/"${BASIS}"/program/classes/*.jar - java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar + java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/"${BASIS}"/program/classes/*.jar + java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar fi # install java-set-classpath if use java; then - insinto /usr/$(get_libdir)/openoffice/"${BASIS}"/program - newins "${FILESDIR}/java-set-classpath.in" java-set-classpath - fperms 755 /usr/$(get_libdir)/openoffice/"${BASIS}"/program/java-set-classpath + insinto /usr/$(get_libdir)/openoffice/"${BASIS}"/program + newins "${FILESDIR}/java-set-classpath.in" java-set-classpath + fperms 755 /usr/$(get_libdir)/openoffice/"${BASIS}"/program/java-set-classpath fi } @@ -655,36 +689,31 @@ pkg_postinst() { 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. " + if use infradicts; then + elog " If You dont want to build extensions for all bundled dicts from Infra-Resource " + elog " re-emerge the package with USE=\"-infradicts\" " + elog fi + 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. " 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 " + if use java; then + elog " *) Wiki Publisher " + elog " *) Report Builder " + fi 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. " if use postgres; then - elog - elog " PostgreSQL SDBC extension provided in " - elog " /usr/$(get_libdir)/openoffice/share/extension/install/ " + elog + elog " PostgreSQL SDBC extension provided in " + elog " /usr/$(get_libdir)/openoffice/share/extension/install/ " fi elog -- cgit v1.2.3-65-gdbad