diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 11 | ||||
| -rw-r--r-- | app-office/openoffice/files/base64.diff | 16 | ||||
| -rw-r--r-- | app-office/openoffice/files/gentoo-3.1.0_beta4.diff (renamed from app-office/openoffice/files/gentoo-3.1.0_beta3.diff) | 10 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.1.0_beta4.ebuild (renamed from app-office/openoffice/openoffice-3.1.0_beta3.ebuild) | 23 |
4 files changed, 53 insertions, 7 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 027517c4d86f..1ae297233f02 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.452 2009/04/08 07:23:46 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.453 2009/04/11 21:53:25 suka Exp $ + +*openoffice-3.1.0_beta4 (11 Apr 2009) + + 11 Apr 2009; Andreas Proschofsky <suka@gentoo.org> + +files/gentoo-3.1.0_beta4.diff, +files/base64.diff, + -files/gentoo-3.1.0_beta3.diff, -openoffice-3.1.0_beta3.ebuild, + +openoffice-3.1.0_beta4.ebuild: + Bump to newer beta version of OOo 3.1. Also raise icu dependency, fix java + class registration and bash completion. *openoffice-3.1.0_beta3 (08 Apr 2009) diff --git a/app-office/openoffice/files/base64.diff b/app-office/openoffice/files/base64.diff new file mode 100644 index 000000000000..bcf811139cbb --- /dev/null +++ b/app-office/openoffice/files/base64.diff @@ -0,0 +1,16 @@ +--- filter/source/xsltfilter/makefile.mk 2009-03-27 10:14:39.000000000 +0300 ++++ filter/source/xsltfilter/makefile.mk 2009-03-27 18:14:56.000000000 +0300 +@@ -72,11 +72,11 @@ + CUSTOMMANIFESTFILE = Manifest + + JARCOMPRESS = TRUE +-JARCLASSDIRS = XSLTransformer*.class XSLTFilterOLEExtracter*.class ++JARCLASSDIRS = XSLTransformer*.class XSLTFilterOLEExtracter*.class Base64*.class + JARTARGET = $(TARGET).jar + + # --- Files -------------------------------------------------------- +-JAVACLASSFILES=$(CLASSDIR)$/XSLTransformer.class $(CLASSDIR)$/XSLTFilterOLEExtracter.class ++JAVACLASSFILES=$(CLASSDIR)$/XSLTransformer.class $(CLASSDIR)$/XSLTFilterOLEExtracter.class $(CLASSDIR)$/Base64.class + .ENDIF + + # --- Targets ------------------------------------------------------ diff --git a/app-office/openoffice/files/gentoo-3.1.0_beta3.diff b/app-office/openoffice/files/gentoo-3.1.0_beta4.diff index 758ceb1edf75..2ea5d36b1259 100644 --- a/app-office/openoffice/files/gentoo-3.1.0_beta3.diff +++ b/app-office/openoffice/files/gentoo-3.1.0_beta4.diff @@ -10,6 +10,16 @@ chmod 755 $1 --- patches/dev300/apply +++ patches/dev300/apply + +@@ -106,7 +106,7 @@ + # openmamba + openmamba: LinuxCommon, GlobalDesktopFiles + #Gentoo +-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, Gcc43, IntegrateExtensions ++GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, Gcc43, IntegrateExtensions, OOXMLExport + GentooUnstable: GentooBase, GentooExperimental + Gentoo : GentooBase + Gentoo64: GentooBase @@ -1439,8 +1439,6 @@ # jemalloc, FreeBSD 7 allocator diff --git a/app-office/openoffice/openoffice-3.1.0_beta3.ebuild b/app-office/openoffice/openoffice-3.1.0_beta4.ebuild index cc5f6884d37c..a3090c1c764e 100644 --- a/app-office/openoffice/openoffice-3.1.0_beta3.ebuild +++ b/app-office/openoffice/openoffice-3.1.0_beta4.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0_beta3.ebuild,v 1.1 2009/04/08 07:23:46 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0_beta4.ebuild,v 1.1 2009/04/11 21:53:25 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" -inherit check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs +inherit bash-completion 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 opengl pam templates" -MY_PV=3.0.99.3 +MY_PV=3.0.99.4 PATCHLEVEL=OOO310 SRC=OOo_${PV}_src -MST=ooo310-m7 +MST=ooo310-m9 DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST} S=${WORKDIR}/ooo S_OLD=${WORKDIR}/ooo-build-${MY_PV} @@ -100,7 +100,7 @@ COMMON_DEPEND="!app-office/openoffice-bin app-arch/unzip >=app-text/hunspell-1.1.4-r1 dev-libs/expat - >=dev-libs/icu-3.8 + >=dev-libs/icu-4.0 >=sys-libs/db-4.3 >=app-text/libwpd-0.8.8 >=media-libs/vigra-1.4 @@ -227,6 +227,7 @@ src_unpack() { epatch "${FILESDIR}/gentoo-${PV}.diff" epatch "${FILESDIR}/ooo-env_log.diff" cp -f "${FILESDIR}/buildfix-mono-2-2.diff" "${S}/patches/dev300" || die + cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die #Use flag checks if use java ; then @@ -350,7 +351,16 @@ src_install() { # chown -RP root:0 "${D}" # record java libraries - use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar + if use java; then + java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar + java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar + fi + + # Upstream places the bash-completion module in /etc. Gentoo places them in + # /usr/share/bash-completion. bug 226061 + dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice + rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed" + } @@ -358,6 +368,7 @@ pkg_postinst() { fdo-mime_desktop_database_update fdo-mime_mime_database_update + bash-completion_pkg_postinst [[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/${BASIS}/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/${BASIS}/program/soffice.bin |