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/2.4.0: gentoo-2.4.0.diff ooo-env_log.diff |
| Date: | Thu, 27 Mar 2008 08:07:58 |
| Message-Id: | E1Jen9P-000580-UU@stork.gentoo.org |
| 1 | suka 08/03/27 08:07:55 |
| 2 | |
| 3 | Added: gentoo-2.4.0.diff ooo-env_log.diff |
| 4 | Log: |
| 5 | OpenOffice.org 2.4.0 is released |
| 6 | (Portage version: 2.1.4.4) |
| 7 | (Unsigned Manifest commit) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.4.0/gentoo-2.4.0.diff?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: gentoo-2.4.0.diff |
| 16 | =================================================================== |
| 17 | --- bin/package-ooo |
| 18 | +++ bin/package-ooo |
| 19 | @@ -33,6 +33,7 @@ |
| 20 | { |
| 21 | cat <<EOT >$1 |
| 22 | #!/bin/sh |
| 23 | +unset PYTHONPATH |
| 24 | $OOINSTBASE/program/soffice $2 "\$@" |
| 25 | EOT |
| 26 | chmod 755 $1 |
| 27 | --- configure.in |
| 28 | +++ configure.in |
| 29 | @@ -1077,7 +1077,7 @@ |
| 30 | UPSTREAM_VERSION=2.3.0 |
| 31 | elif test "$with_tag" = "OOG680_m9" ; then |
| 32 | UPSTREAM_VERSION=2.3.1 |
| 33 | -elif test "$with_tag" = "OOH680_m11" ; then |
| 34 | +elif test "$with_tag" = "OOH680_m12" ; then |
| 35 | UPSTREAM_VERSION=2.4.0 |
| 36 | fi |
| 37 | if test -n "$UPSTREAM_VERSION"; then |
| 38 | |
| 39 | |
| 40 | |
| 41 | |
| 42 | 1.1 app-office/openoffice/files/2.4.0/ooo-env_log.diff |
| 43 | |
| 44 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.4.0/ooo-env_log.diff?rev=1.1&view=markup |
| 45 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.4.0/ooo-env_log.diff?rev=1.1&content-type=text/plain |
| 46 | |
| 47 | Index: ooo-env_log.diff |
| 48 | =================================================================== |
| 49 | --- bin/build-ooo.orig 2007-04-18 18:32:06.000000000 +0200 |
| 50 | +++ bin/build-ooo 2007-04-18 18:32:45.000000000 +0200 |
| 51 | @@ -21,9 +21,8 @@ |
| 52 | echo "configuring ..."; |
| 53 | autoconf || exit 1; |
| 54 | |
| 55 | -echo "Env for configure:" |
| 56 | -set |
| 57 | -echo "Env for configure ends" |
| 58 | +echo "Log Env for configure to `pwd`/env.log" |
| 59 | +set > env.log |
| 60 | |
| 61 | eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1; |
| 62 | |
| 63 | @@ -88,8 +88,8 @@ |
| 64 | # similar that gives child nmake's pain. |
| 65 | unset MAKEFLAGS |
| 66 | |
| 67 | -echo "Env:" |
| 68 | -set |
| 69 | +echo "Log Env to `pwd`/env.log" |
| 70 | +set > env.log |
| 71 | |
| 72 | # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not |
| 73 | # already merged? |
| 74 | |
| 75 | |
| 76 | |
| 77 | -- |
| 78 | gentoo-commits@l.g.o mailing list |