| 1 |
suka 08/06/01 19:14:35 |
| 2 |
|
| 3 |
Added: gentoo-2.4.1_rc2.diff ooo-env_log.diff |
| 4 |
Log: |
| 5 |
Bump to second release candidate for OOo 2.4.1 |
| 6 |
(Portage version: 2.1.5.3) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-office/openoffice/files/gentoo-2.4.1_rc2.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-2.4.1_rc2.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/gentoo-2.4.1_rc2.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gentoo-2.4.1_rc2.diff |
| 15 |
=================================================================== |
| 16 |
--- bin/package-ooo |
| 17 |
+++ bin/package-ooo |
| 18 |
@@ -33,6 +33,7 @@ |
| 19 |
{ |
| 20 |
cat <<EOT >$1 |
| 21 |
#!/bin/sh |
| 22 |
+unset PYTHONPATH |
| 23 |
$OOINSTBASE/program/soffice $2 "\$@" |
| 24 |
EOT |
| 25 |
chmod 755 $1 |
| 26 |
--- patches/src680/svg-import-filter.diff 2008-04-12 23:55:36.000000000 +0400 |
| 27 |
+++ patches/src680/svg-import-filter.diff 2008-03-06 21:09:06.000000000 +0300 |
| 28 |
@@ -692,7 +692,7 @@ |
| 29 |
+ $(SLO)$/units.obj |
| 30 |
+ |
| 31 |
+.IF "$(COMID)"=="gcc3" |
| 32 |
-+.IF "$(CCNUMVER)">="000400000000" |
| 33 |
++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES" |
| 34 |
+CFLAGS+=-DUSE_MODERN_SPIRIT |
| 35 |
+.ENDIF |
| 36 |
.ENDIF |
| 37 |
--- configure.in |
| 38 |
+++ configure.in |
| 39 |
@@ -1136,7 +1136,7 @@ |
| 40 |
elif test "$with_tag" = "OOH680_m12" ; then |
| 41 |
UPSTREAM_VERSION=2.4.0 |
| 42 |
elif test "$with_tag" = "OOH680_m17" ; then |
| 43 |
- UPSTREAM_VERSION=2.4.1 |
| 44 |
+ UPSTREAM_VERSION=2.4.1rc2 |
| 45 |
fi |
| 46 |
if test -n "$UPSTREAM_VERSION"; then |
| 47 |
UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src" |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 app-office/openoffice/files/ooo-env_log.diff |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/ooo-env_log.diff?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/ooo-env_log.diff?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: ooo-env_log.diff |
| 58 |
=================================================================== |
| 59 |
--- bin/build-ooo.orig 2007-04-18 18:32:06.000000000 +0200 |
| 60 |
+++ bin/build-ooo 2007-04-18 18:32:45.000000000 +0200 |
| 61 |
@@ -21,9 +21,8 @@ |
| 62 |
echo "configuring ..."; |
| 63 |
autoconf || exit 1; |
| 64 |
|
| 65 |
-echo "Env for configure:" |
| 66 |
-set |
| 67 |
-echo "Env for configure ends" |
| 68 |
+echo "Log Env for configure to `pwd`/env.log" |
| 69 |
+set > env.log |
| 70 |
|
| 71 |
eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1; |
| 72 |
|
| 73 |
@@ -88,8 +88,8 @@ |
| 74 |
# similar that gives child nmake's pain. |
| 75 |
unset MAKEFLAGS |
| 76 |
|
| 77 |
-echo "Env:" |
| 78 |
-set |
| 79 |
+echo "Log Env to `pwd`/env.log" |
| 80 |
+set > env.log |
| 81 |
|
| 82 |
# What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not |
| 83 |
# already merged? |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
-- |
| 88 |
gentoo-commits@l.g.o mailing list |
Archives