diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2008-04-18 12:45:07 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2008-04-18 12:45:07 +0000 |
| commit | b81b81139a4535bbd93b7cfcb29e1f64985c5f3f (patch) | |
| tree | bc0a4e0ff7d68a9316d160c272610c10c4d0a67b /app-office | |
| parent | swfdec only builds with <media-video/ffmpeg-0.4.9_p20080326, #216978 (diff) | |
| download | gentoo-2-b81b81139a4535bbd93b7cfcb29e1f64985c5f3f.tar.gz gentoo-2-b81b81139a4535bbd93b7cfcb29e1f64985c5f3f.tar.bz2 gentoo-2-b81b81139a4535bbd93b7cfcb29e1f64985c5f3f.zip | |
Silent bump to ooo-build 2.4.0.7, other minor fixes
(Portage version: 2.1.5_rc4)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff | 22 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.4.0.ebuild | 10 |
3 files changed, 10 insertions, 29 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 7d4e06fd7b7a..45df41d5ed81 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.387 2008/04/15 18:58:30 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.388 2008/04/18 12:45:06 suka Exp $ + + 18 Apr 2008; Andreas Proschofsky <suka@gentoo.org> + files/2.4.0/gentoo-2.4.0.diff, openoffice-2.4.0.ebuild: + Silent bump to ooo-build 2.4.0.7, muchos bugfixes. Also reintroduce + branding use-flag and remove some cruft 15 Apr 2008; Andreas Proschofsky <suka@gentoo.org> openoffice-2.4.0.ebuild: diff --git a/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff b/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff index e711a3e4b46c..962d2ae9f283 100644 --- a/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff +++ b/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff @@ -8,28 +8,6 @@ $OOINSTBASE/program/soffice $2 "\$@" EOT chmod 755 $1 -@@ -431,7 +431,7 @@ - chmod go-w $OOINSTDIR/sdk/settings/component.uno.map - fi - --if test "$DISTRO" = "SUSE" || ! echo "$DISTRO" | grep -q "SUSE-10" ; then -+if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then - # branding stuff for openSUSE >= 11.0 and SLED >= 11 - mkdir -p $DATADIR/$OOOINSTALLDIRNAME/program - echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME" >$BUILDDIR/upstream_branding_list.txt ---- patches/src680/apply -+++ patches/src680/apply -@@ -88,8 +88,8 @@ - # openmamba - openmamba: LinuxCommon, GlobalDesktopFiles - #Gentoo --GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43 --GentooUnstable: GentooBase, GentooExperimental, Gcc43, TransparentPrinting -+GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CalcSolver, CairoFonts, BerkeleyDB43, Gcc43 -+GentooUnstable: GentooBase, GentooExperimental, TransparentPrinting - Gentoo : GentooBase - Gentoo64: GentooBase - # rPath Linux --- patches/src680/svg-import-filter.diff 2008-04-12 23:55:36.000000000 +0400 +++ patches/src680/svg-import-filter.diff 2008-03-06 21:09:06.000000000 +0300 @@ -692,7 +692,7 @@ diff --git a/app-office/openoffice/openoffice-2.4.0.ebuild b/app-office/openoffice/openoffice-2.4.0.ebuild index a955b8728f5f..2e2add3f5e46 100644 --- a/app-office/openoffice/openoffice-2.4.0.ebuild +++ b/app-office/openoffice/openoffice-2.4.0.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.9 2008/04/15 18:58:30 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.10 2008/04/18 12:45:06 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" 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 kde ldap mono odk pam seamonkey webdav xulrunner" +IUSE="binfilter branding cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk pam seamonkey webdav xulrunner" -MY_PV="2.4.0.6" +MY_PV="2.4.0.7" PATCHLEVEL="OOH680" SRC="OOo_${PV}_src" S="${WORKDIR}/ooo" @@ -243,7 +243,7 @@ src_unpack() { fi # Upstream bitmaps are broken, so force ours for now - echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE} + use branding && echo "--with-intro-bitmaps=\\\"${S}/src/openintro_gentoo.bmp\\\"" >> ${CONFFILE} echo "`use_enable binfilter`" >> ${CONFFILE} @@ -301,7 +301,6 @@ src_compile() { filter-flags "-ftracer" filter-flags "-fforce-addr" replace-flags "-O?" "-O2" - append-flags "-DGL_GLEXT_PROTOTYPES" # Now for our optimization flags ... export ARCH_FLAGS="${CXXFLAGS}" @@ -325,7 +324,6 @@ src_compile() { ${GTKFLAG} \ `use_enable mono` \ `use_enable kde` \ - `use_enable gnome quickstart` \ `use_enable pam` \ `use_enable !debug strip` \ `use_enable odk` \ |