| 1 |
suka 11/02/23 13:46:58 |
| 2 |
|
| 3 |
Added: gentoo-3.3.1.diff |
| 4 |
Removed: gentoo-3.3.1_rc1.diff |
| 5 |
Log: |
| 6 |
Bump to LibreOffice 3.3.1, bugfix release |
| 7 |
|
| 8 |
(Portage version: 2.1.9.41/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-office/libreoffice/files/gentoo-3.3.1.diff |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/gentoo-3.3.1.diff?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/gentoo-3.3.1.diff?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gentoo-3.3.1.diff |
| 17 |
=================================================================== |
| 18 |
--- distro-configs/Gentoo.conf.in |
| 19 |
+++ distro-configs/Gentoo.conf.in |
| 20 |
@@ -1,5 +1,3 @@ |
| 21 |
---disable-fontooo |
| 22 |
---disable-qadevooo |
| 23 |
--enable-neon |
| 24 |
--enable-xrender-link |
| 25 |
--with-external-dict-dir=/usr/share/myspell |
| 26 |
--- patches/dev300/apply |
| 27 |
+++ patches/dev300/apply |
| 28 |
@@ -1687,16 +1687,8 @@ |
| 29 |
[ GentooOnly ] |
| 30 |
SectionOwner => aprosky |
| 31 |
|
| 32 |
-# Allow build to proceed with PaX enabled |
| 33 |
-gentoo-pax-fix.diff, aprosky |
| 34 |
# support server-only versions of 64bit JDKs |
| 35 |
64bit-jdk-server-paths.diff, i#65974, hmth |
| 36 |
-# use IBM j9vm over IBM classic JVM |
| 37 |
-ibm-j9vm.diff, hmth |
| 38 |
-# system db check |
| 39 |
-system-db-check.diff, i#65979, hmth |
| 40 |
-# User ~/.ooo3 as user dir |
| 41 |
-scp2-user-config-ooo3.diff, pmladek |
| 42 |
# default inc/lib |
| 43 |
config_office-XINC-XLIB-defaults.diff, i#65976 |
| 44 |
# Sandbox problem with wrong path |
| 45 |
--- configure.in |
| 46 |
+++ configure.in |
| 47 |
@@ -1326,12 +1326,18 @@ |
| 48 |
done |
| 49 |
fi |
| 50 |
SUNTEMPLATES_LANG= |
| 51 |
- # check whether the langs are requested at all |
| 52 |
- for lang in $wanted_sun_templates ; do |
| 53 |
- if test -n "`echo $with_lang | grep "$lang"`" ; then |
| 54 |
- SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang" |
| 55 |
- fi |
| 56 |
- done |
| 57 |
+ |
| 58 |
+ # --with-lang="" now used for en-US |
| 59 |
+ if test "z$with_lang" = "z" ; then |
| 60 |
+ SUNTEMPLATES_LANG="en-US" |
| 61 |
+ else |
| 62 |
+ # check whether the langs are requested at all |
| 63 |
+ for lang in $wanted_sun_templates ; do |
| 64 |
+ if test -n "`echo $with_lang | grep "$lang"`" ; then |
| 65 |
+ SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang" |
| 66 |
+ fi |
| 67 |
+ done |
| 68 |
+ fi |
| 69 |
AC_MSG_RESULT([$SUNTEMPLATES_LANG]) |
| 70 |
fi |
| 71 |
AC_SUBST(SUNTEMPLATES_LANG) |
| 72 |
--- bin/package-ooo |
| 73 |
+++ bin/package-ooo |
| 74 |
@@ -126,8 +126,8 @@ |
| 75 |
fi |
| 76 |
|
| 77 |
# create bash completion |
| 78 |
-mkdir -p $OODESTDIR/etc/bash_completion.d |
| 79 |
-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/libreoffice${BINSUFFIX}.sh |
| 80 |
+mkdir -p $SYSCONFDIR/bash_completion.d |
| 81 |
+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/libreoffice${BINSUFFIX}.sh |
| 82 |
if test "$COMPAT_OOWRAPPERS" = "YES" ; then |
| 83 |
$TOOLSDIR/bin/generate-bash-completion --compat-oowrappers --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh |
| 84 |
fi |
Archives