diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-24 14:21:34 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-24 14:21:34 +0200 |
| commit | 07646a1df6d2f6ecce028f2baaa6f35a09e2fe5c (patch) | |
| tree | dd01443d358bb14af47aadaded74a60705ff4bf9 /app-office/libreoffice/files/gentoo-3.3.1.diff | |
| parent | [sci-mathematics/lpsolve] Move lpsolve to main tree. (diff) | |
| download | scarabeus-07646a1df6d2f6ecce028f2baaa6f35a09e2fe5c.tar.gz scarabeus-07646a1df6d2f6ecce028f2baaa6f35a09e2fe5c.tar.bz2 scarabeus-07646a1df6d2f6ecce028f2baaa6f35a09e2fe5c.zip | |
[app-office/libreoffice] Moved to main tree.
Diffstat (limited to 'app-office/libreoffice/files/gentoo-3.3.1.diff')
| -rw-r--r-- | app-office/libreoffice/files/gentoo-3.3.1.diff | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/app-office/libreoffice/files/gentoo-3.3.1.diff b/app-office/libreoffice/files/gentoo-3.3.1.diff deleted file mode 100644 index 8f0bcc1..0000000 --- a/app-office/libreoffice/files/gentoo-3.3.1.diff +++ /dev/null @@ -1,68 +0,0 @@ ---- distro-configs/Gentoo.conf.in -+++ distro-configs/Gentoo.conf.in -@@ -1,5 +1,3 @@ ----disable-fontooo ----disable-qadevooo - --enable-neon - --enable-xrender-link - --with-external-dict-dir=/usr/share/myspell ---- patches/dev300/apply -+++ patches/dev300/apply -@@ -1687,16 +1687,8 @@ - [ 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 - config_office-XINC-XLIB-defaults.diff, i#65976 - # Sandbox problem with wrong path ---- 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) ---- bin/package-ooo -+++ bin/package-ooo -@@ -126,8 +126,8 @@ - fi - - # create bash completion --mkdir -p $OODESTDIR/etc/bash_completion.d --$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh -+mkdir -p $SYSCONFDIR/bash_completion.d -+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh - if test "$COMPAT_OOWRAPPERS" = "YES" ; then - $TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh - fi - |