1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
--- patches/dev300/apply
+++ patches/dev300/apply
@@ -1596,7 +1596,7 @@
SectionOwner => aprosky
# Allow build to proceed with PaX enabled
-gentoo-pax-fix.diff, aprosky
+#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
@@ -2932,7 +2932,7 @@
l10n-build-only-selected-langs.diff, i#106185, pmladek
[ LocalizeFixes < ooo320-m13 ]
-i109407_BUSCAR.diff
+#i109407_BUSCAR.diff
[ PieceBits ]
# zipintro is not kind to us ...
@@ -3561,7 +3561,6 @@
[ BuildBits ]
# Allow oowintool to detect java sdk 1.6.x
oowintool-java6.diff, fridrich
-connectivity-build-fix-mac.diff, thorsten
vcl-xinerama-clone-fix.diff, n#578730, thorsten
[ HyphenFix ]
--- 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/setup.in
+++ bin/setup.in
@@ -268,7 +268,7 @@
OOO_TARBALL="${UPSTREAM_NAME}_core.tar.bz2"
OOO_SYSTEM_TARBALL="${UPSTREAM_NAME}_system.tar.bz2"
OOO_BINFILTER_TARBALL="${UPSTREAM_NAME}_binfilter.tar.bz2"
- OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n.tar.bz2"
+ OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n-fixed.tar.bz2"
OOO_EXTENSIONS_TARBALL="${UPSTREAM_NAME}_extensions.tar.bz2"
else
OOO_TARBALL="$CVSTAG-core.tar.bz2"
|
GitWeb
