diff options
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 10 | ||||
| -rw-r--r-- | app-office/libreoffice/files/gentoo-3.3.2.diff (renamed from app-office/libreoffice/files/gentoo-3.3.2_rc2.diff) | 0 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff | 25 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.3.2.ebuild (renamed from app-office/libreoffice/libreoffice-3.3.2_rc2.ebuild) | 16 |
4 files changed, 42 insertions, 9 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 8037a6b6062e..16db94422d1d 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.24 2011/03/18 22:39:38 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.25 2011/03/22 21:01:09 suka Exp $ + +*libreoffice-3.3.2 (22 Mar 2011) + + 22 Mar 2011; Andreas Proschofsky <suka@gentoo.org> + -libreoffice-3.3.2_rc2.ebuild, +files/gentoo-3.3.2.diff, + +files/libreoffice-libdb5-fix-check.diff, +libreoffice-3.3.2.ebuild, + -files/gentoo-3.3.2_rc2.diff: + Bump to LibreOffice 3.3.2, also fix db-5 support 18 Mar 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.2_rc2.ebuild: diff --git a/app-office/libreoffice/files/gentoo-3.3.2_rc2.diff b/app-office/libreoffice/files/gentoo-3.3.2.diff index 2a4b293ea2af..2a4b293ea2af 100644 --- a/app-office/libreoffice/files/gentoo-3.3.2_rc2.diff +++ b/app-office/libreoffice/files/gentoo-3.3.2.diff diff --git a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff new file mode 100644 index 000000000000..0c59f0202d6b --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff @@ -0,0 +1,25 @@ +--- configure.in.orig 2011-01-13 21:12:40.420005851 +0100 ++++ configure.in 2011-01-13 21:15:23.680008513 +0100 +@@ -4456,16 +4456,17 @@ + else return 1; + } + ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])]) +- DB_LIB= +- for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do +- AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] , +- AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ++ save_LIBS="$LIBS" ++ for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do ++ AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ] , ++ AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ] + ) + ) + done + if test -z "$DB_LIB" ; then +- AC_MSG_ERROR([db not installed or functional]) ++ AC_CHECK_FUNC(dbopen, [], [ AC_MSG_ERROR([db not installed or functional]) ]) + fi ++ LIBS="$save_LIBS" + SCPDEFS="$SCPDEFS -DSYSTEM_DB" + else + AC_MSG_RESULT([internal]) diff --git a/app-office/libreoffice/libreoffice-3.3.2_rc2.ebuild b/app-office/libreoffice/libreoffice-3.3.2.ebuild index 765e66f340d6..6ece8ebdafe1 100644 --- a/app-office/libreoffice/libreoffice-3.3.2_rc2.ebuild +++ b/app-office/libreoffice/libreoffice-3.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.2_rc2.ebuild,v 1.2 2011/03/18 22:39:38 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.2.ebuild,v 1.1 2011/03/22 21:01:09 suka Exp $ EAPI="3" @@ -20,12 +20,13 @@ MY_PV=3.3.2.2 MY_P="${PN}-build-${MY_PV}" PATCHLEVEL=OOO320 SRC=OOo_${PV}_src -DEVPATH="http://download.documentfoundation.org/libreoffice/src" S="${WORKDIR}/${MY_P}" +DEVPATH="http://download.documentfoundation.org/libreoffice/src" CONFFILE=${S}/distro-configs/Gentoo.conf.in BASIS=basis3.3 -DESCRIPTION="LibreOffice, a full office productivity suite." +DESCRIPTION="LibreOffice, a full office productivity suite." +HOMEPAGE="http://www.libreoffice.org" SRC_URI="${DEVPATH}/${PN}-build-${MY_PV}.tar.gz templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt @@ -115,8 +116,6 @@ for X in ${SPELL_DIRS} ; do SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )" done -HOMEPAGE="http://www.libreoffice.org" - LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" @@ -265,9 +264,10 @@ src_prepare() { epatch "${FILESDIR}/scrap-pixmap-links.diff" epatch "${FILESDIR}/enable-startup-notification.diff" use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes" - cp -f "${FILESDIR}/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes" - cp -f "${FILESDIR}/libreoffice-3.3-libpng-1.5.diff" "${S}/patches/hotfixes" - cp -f "${FILESDIR}/libreoffice-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes" + cp -f "${FILESDIR}/${PN}-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes" + cp -f "${FILESDIR}/${PN}-3.3-libpng-1.5.diff" "${S}/patches/hotfixes" + cp -f "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes" + cp -f "${FILESDIR}/${PN}-libdb5-fix-check.diff" "${S}/patches/hotfixes" #Use flag checks if use java ; then |