blob: 0bdfde41f3610706b84e10ef0176427882009124 (
plain)
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
|
--- patches/dev300/apply
+++ patches/dev300/apply
@@ -1687,14 +1687,10 @@
[ 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
--- 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)
@@ -1584,7 +1584,7 @@
elif test "$with_tag" = "OOO320_m8" ; then
UPSTREAM_VERSION=3.2.0
elif test "$with_tag" = "OOO320_m17" ; then
- UPSTREAM_VERSION=3.2.1
+ UPSTREAM_VERSION=3.2.1rc1_20100506
fi
if test -n "$UPSTREAM_VERSION"; then
UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
|