Archives
Archives
| From: | "Andreas Proschofsky (suka)" <suka@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: gentoo-3.2.0.diff |
| Date: | Thu, 25 Feb 2010 09:51:34 |
| Message-Id: | E1NkaNX-0003ms-94@stork.gentoo.org |
| 1 | suka 10/02/25 09:51:31 |
| 2 | |
| 3 | Modified: gentoo-3.2.0.diff |
| 4 | Log: |
| 5 | Properly fix linguas stuff, also brings back templates integration |
| 6 | (Portage version: 2.2_rc63/cvs/Linux i686) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.3 app-office/openoffice/files/gentoo-3.2.0.diff |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.2.0.diff?rev=1.3&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.2.0.diff?rev=1.3&content-type=text/plain |
| 13 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-3.2.0.diff?r1=1.2&r2=1.3 |
| 14 | |
| 15 | Index: gentoo-3.2.0.diff |
| 16 | =================================================================== |
| 17 | RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/files/gentoo-3.2.0.diff,v |
| 18 | retrieving revision 1.2 |
| 19 | retrieving revision 1.3 |
| 20 | diff -u -r1.2 -r1.3 |
| 21 | --- gentoo-3.2.0.diff 21 Feb 2010 17:11:12 -0000 1.2 |
| 22 | +++ gentoo-3.2.0.diff 25 Feb 2010 09:51:30 -0000 1.3 |
| 23 | @@ -17,4 +17,31 @@ |
| 24 | vcl-xinerama-clone-fix.diff, n#578730, thorsten |
| 25 | |
| 26 | [ HyphenFix ] |
| 27 | +--- configure.in |
| 28 | ++++ configure.in |
| 29 | +@@ -1326,12 +1326,18 @@ |
| 30 | + done |
| 31 | + fi |
| 32 | + SUNTEMPLATES_LANG= |
| 33 | +- # check whether the langs are requested at all |
| 34 | +- for lang in $wanted_sun_templates ; do |
| 35 | +- if test -n "`echo $with_lang | grep "$lang"`" ; then |
| 36 | +- SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang" |
| 37 | +- fi |
| 38 | +- done |
| 39 | ++ |
| 40 | ++ # --with-lang="" now used for en-US |
| 41 | ++ if test "z$with_lang" = "z" ; then |
| 42 | ++ SUNTEMPLATES_LANG="en-US" |
| 43 | ++ else |
| 44 | ++ # check whether the langs are requested at all |
| 45 | ++ for lang in $wanted_sun_templates ; do |
| 46 | ++ if test -n "`echo $with_lang | grep "$lang"`" ; then |
| 47 | ++ SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang" |
| 48 | ++ fi |
| 49 | ++ done |
| 50 | ++ fi |
| 51 | + AC_MSG_RESULT([$SUNTEMPLATES_LANG]) |
| 52 | + fi |
| 53 | + AC_SUBST(SUNTEMPLATES_LANG) |