diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-06-17 07:44:24 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-06-17 07:44:24 +0000 |
| commit | 7adf243d192112db461277a2026fe15c87f97135 (patch) | |
| tree | d3d27ca34a00e66942ce1275f7e677e06baf3dbd /app-office/libreoffice | |
| parent | Version BUmp, Cleaned old, #262395 (diff) | |
| download | gentoo-2-7adf243d192112db461277a2026fe15c87f97135.tar.gz gentoo-2-7adf243d192112db461277a2026fe15c87f97135.tar.bz2 gentoo-2-7adf243d192112db461277a2026fe15c87f97135.zip | |
Added missing patch file (bug #371969)
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/gentoo-3.3.3.diff | 49 |
2 files changed, 54 insertions, 1 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 47ddc76befa4..8536aee51aaa 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # 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.29 2011/06/16 18:50:45 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.30 2011/06/17 07:44:24 polynomial-c Exp $ + + 17 Jun 2011; Lars Wendler <polynomial-c@gentoo.org> +files/gentoo-3.3.3.diff: + Non-maintainer commit: Added missing patch file with kind permission from + suka (bug #371969). *libreoffice-3.3.3 (16 Jun 2011) diff --git a/app-office/libreoffice/files/gentoo-3.3.3.diff b/app-office/libreoffice/files/gentoo-3.3.3.diff new file mode 100644 index 000000000000..2a4b293ea2af --- /dev/null +++ b/app-office/libreoffice/files/gentoo-3.3.3.diff @@ -0,0 +1,49 @@ +--- 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 +--- 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 + |