diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2010-06-14 11:52:45 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2010-06-14 11:52:45 +0000 |
| commit | ee1e9ec6ace743f0844df183a3411dbb7868176c (patch) | |
| tree | 6cfb96f5751a1bc9814d82b6fe13745d5b6cb4bb /app-office/openoffice/files/gentoo-3.2.1_rc1.diff | |
| parent | Bump to OpenOffice 3.2.1 (diff) | |
| download | gentoo-2-ee1e9ec6ace743f0844df183a3411dbb7868176c.tar.gz gentoo-2-ee1e9ec6ace743f0844df183a3411dbb7868176c.tar.bz2 gentoo-2-ee1e9ec6ace743f0844df183a3411dbb7868176c.zip | |
Bump to OpenOffice.org 3.2.1
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'app-office/openoffice/files/gentoo-3.2.1_rc1.diff')
| -rw-r--r-- | app-office/openoffice/files/gentoo-3.2.1_rc1.diff | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/app-office/openoffice/files/gentoo-3.2.1_rc1.diff b/app-office/openoffice/files/gentoo-3.2.1_rc1.diff deleted file mode 100644 index 0bdfde41f361..000000000000 --- a/app-office/openoffice/files/gentoo-3.2.1_rc1.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- patches/dev300/apply -+++ patches/dev300/apply -@@ -1687,14 +1687,10 @@ - [ GentooOnly ] - SectionOwner => aprosky - --# Allow build to proceed with PaX enabled --gentoo-pax-fix.diff, aprosky - # support server-only versions of 64bit JDKs - 64bit-jdk-server-paths.diff, i#65974, hmth - # use IBM j9vm over IBM classic JVM - ibm-j9vm.diff, hmth --# system db check --system-db-check.diff, i#65979, hmth - # User ~/.ooo3 as user dir - scp2-user-config-ooo3.diff, pmladek - # default inc/lib ---- configure.in -+++ configure.in -@@ -1326,12 +1326,18 @@ - done - fi - SUNTEMPLATES_LANG= -- # check whether the langs are requested at all -- for lang in $wanted_sun_templates ; do -- if test -n "`echo $with_lang | grep "$lang"`" ; then -- SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang" -- fi -- done -+ -+ # --with-lang="" now used for en-US -+ if test "z$with_lang" = "z" ; then -+ SUNTEMPLATES_LANG="en-US" -+ else -+ # check whether the langs are requested at all -+ for lang in $wanted_sun_templates ; do -+ if test -n "`echo $with_lang | grep "$lang"`" ; then -+ SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang" -+ fi -+ done -+ fi - AC_MSG_RESULT([$SUNTEMPLATES_LANG]) - fi - AC_SUBST(SUNTEMPLATES_LANG) -@@ -1584,7 +1584,7 @@ - elif test "$with_tag" = "OOO320_m8" ; then - UPSTREAM_VERSION=3.2.0 - elif test "$with_tag" = "OOO320_m17" ; then -- UPSTREAM_VERSION=3.2.1 -+ UPSTREAM_VERSION=3.2.1rc1_20100506 - fi - if test -n "$UPSTREAM_VERSION"; then - UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src" - |