| 1 |
--- distro-configs/Gentoo.conf.in
|
| 2 |
+++ distro-configs/Gentoo.conf.in
|
| 3 |
@@ -1,5 +1,3 @@
|
| 4 |
---disable-fontooo
|
| 5 |
---disable-qadevooo
|
| 6 |
--enable-neon
|
| 7 |
--enable-xrender-link
|
| 8 |
--with-external-dict-dir=/usr/share/myspell
|
| 9 |
--- patches/dev300/apply
|
| 10 |
+++ patches/dev300/apply
|
| 11 |
@@ -1687,16 +1687,8 @@
|
| 12 |
[ GentooOnly ]
|
| 13 |
SectionOwner => aprosky
|
| 14 |
|
| 15 |
-# Allow build to proceed with PaX enabled
|
| 16 |
-gentoo-pax-fix.diff, aprosky
|
| 17 |
# support server-only versions of 64bit JDKs
|
| 18 |
64bit-jdk-server-paths.diff, i#65974, hmth
|
| 19 |
-# use IBM j9vm over IBM classic JVM
|
| 20 |
-ibm-j9vm.diff, hmth
|
| 21 |
-# system db check
|
| 22 |
-system-db-check.diff, i#65979, hmth
|
| 23 |
-# User ~/.ooo3 as user dir
|
| 24 |
-scp2-user-config-ooo3.diff, pmladek
|
| 25 |
# default inc/lib
|
| 26 |
config_office-XINC-XLIB-defaults.diff, i#65976
|
| 27 |
# Sandbox problem with wrong path
|
| 28 |
--- configure.in
|
| 29 |
+++ configure.in
|
| 30 |
@@ -1326,12 +1326,18 @@
|
| 31 |
done
|
| 32 |
fi
|
| 33 |
SUNTEMPLATES_LANG=
|
| 34 |
- # check whether the langs are requested at all
|
| 35 |
- for lang in $wanted_sun_templates ; do
|
| 36 |
- if test -n "`echo $with_lang | grep "$lang"`" ; then
|
| 37 |
- SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
|
| 38 |
- fi
|
| 39 |
- done
|
| 40 |
+
|
| 41 |
+ # --with-lang="" now used for en-US
|
| 42 |
+ if test "z$with_lang" = "z" ; then
|
| 43 |
+ SUNTEMPLATES_LANG="en-US"
|
| 44 |
+ else
|
| 45 |
+ # check whether the langs are requested at all
|
| 46 |
+ for lang in $wanted_sun_templates ; do
|
| 47 |
+ if test -n "`echo $with_lang | grep "$lang"`" ; then
|
| 48 |
+ SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
|
| 49 |
+ fi
|
| 50 |
+ done
|
| 51 |
+ fi
|
| 52 |
AC_MSG_RESULT([$SUNTEMPLATES_LANG])
|
| 53 |
fi
|
| 54 |
AC_SUBST(SUNTEMPLATES_LANG)
|
| 55 |
--- bin/package-ooo
|
| 56 |
+++ bin/package-ooo
|
| 57 |
@@ -126,8 +126,8 @@
|
| 58 |
fi
|
| 59 |
|
| 60 |
# create bash completion
|
| 61 |
-mkdir -p $OODESTDIR/etc/bash_completion.d
|
| 62 |
-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh
|
| 63 |
+mkdir -p $SYSCONFDIR/bash_completion.d
|
| 64 |
+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh
|
| 65 |
if test "$COMPAT_OOWRAPPERS" = "YES" ; then
|
| 66 |
$TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
|
| 67 |
fi
|
| 68 |
|
Parent Directory
| 
Revision Log