Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: gentoo-3.3.0.diff gentoo-3.3.0_rc4.diff
Date: Tue, 25 Jan 2011 11:00:09
Message-Id: 20110125105958.852FF20054@flycatcher.gentoo.org
1 suka 11/01/25 10:59:58
2
3 Added: gentoo-3.3.0.diff
4 Removed: gentoo-3.3.0_rc4.diff
5 Log:
6 Bump to final release of LibreOffice 3.3.0
7
8 (Portage version: 2.1.9.35/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 app-office/libreoffice/files/gentoo-3.3.0.diff
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/gentoo-3.3.0.diff?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/gentoo-3.3.0.diff?rev=1.1&content-type=text/plain
15
16 Index: gentoo-3.3.0.diff
17 ===================================================================
18 --- patches/dev300/apply
19 +++ patches/dev300/apply
20 @@ -1687,16 +1687,8 @@
21 [ GentooOnly ]
22 SectionOwner => aprosky
23
24 -# Allow build to proceed with PaX enabled
25 -gentoo-pax-fix.diff, aprosky
26 # support server-only versions of 64bit JDKs
27 64bit-jdk-server-paths.diff, i#65974, hmth
28 -# use IBM j9vm over IBM classic JVM
29 -ibm-j9vm.diff, hmth
30 -# system db check
31 -system-db-check.diff, i#65979, hmth
32 -# User ~/.ooo3 as user dir
33 -scp2-user-config-ooo3.diff, pmladek
34 # default inc/lib
35 config_office-XINC-XLIB-defaults.diff, i#65976
36 # Sandbox problem with wrong path
37 --- configure.in
38 +++ configure.in
39 @@ -1326,12 +1326,18 @@
40 done
41 fi
42 SUNTEMPLATES_LANG=
43 - # check whether the langs are requested at all
44 - for lang in $wanted_sun_templates ; do
45 - if test -n "`echo $with_lang | grep "$lang"`" ; then
46 - SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
47 - fi
48 - done
49 +
50 + # --with-lang="" now used for en-US
51 + if test "z$with_lang" = "z" ; then
52 + SUNTEMPLATES_LANG="en-US"
53 + else
54 + # check whether the langs are requested at all
55 + for lang in $wanted_sun_templates ; do
56 + if test -n "`echo $with_lang | grep "$lang"`" ; then
57 + SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
58 + fi
59 + done
60 + fi
61 AC_MSG_RESULT([$SUNTEMPLATES_LANG])
62 fi
63 AC_SUBST(SUNTEMPLATES_LANG)