1 |
suka 07/12/04 21:24:54 |
2 |
|
3 |
Added: disable-regcomp-python.diff |
4 |
config_office-fix-system-icu-check.diff |
5 |
stlport-ppc-buildfix-apply.diff ooo-env_log.diff |
6 |
regcompapply.diff disable-regcomp-java.diff |
7 |
gentoo-2.3.1.diff stlport-ppc-buildfix.diff |
8 |
Log: |
9 |
OpenOffice.org 2.3.1 release |
10 |
(Portage version: 2.1.4_rc7) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 app-office/openoffice/files/2.3.1/disable-regcomp-python.diff |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/disable-regcomp-python.diff?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: disable-regcomp-python.diff |
19 |
=================================================================== |
20 |
Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026 |
21 |
--- solenv/bin/modules/installer/servicesfile.pm.orig 2006-10-23 13:49:24.000000000 +0200 |
22 |
+++ solenv/bin/modules/installer/servicesfile.pm 2006-10-23 13:50:04.000000000 +0200 |
23 |
@@ -472,7 +472,7 @@ |
24 |
|
25 |
if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); } |
26 |
if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); } |
27 |
- if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } |
28 |
+ if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } |
29 |
|
30 |
if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; } |
31 |
|
32 |
|
33 |
|
34 |
|
35 |
1.1 app-office/openoffice/files/2.3.1/config_office-fix-system-icu-check.diff |
36 |
|
37 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/config_office-fix-system-icu-check.diff?rev=1.1&view=markup |
38 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/config_office-fix-system-icu-check.diff?rev=1.1&content-type=text/plain |
39 |
|
40 |
Index: config_office-fix-system-icu-check.diff |
41 |
=================================================================== |
42 |
--- config_office/configure.in.orig 2007-11-30 23:50:32.000000000 +0100 |
43 |
+++ config_office/configure.in 2007-11-30 23:47:39.000000000 +0100 |
44 |
@@ -4061,8 +4061,8 @@ |
45 |
} |
46 |
], [AC_MSG_RESULT(OK)], [AC_MSG_RESULT([not suitable, only 3.6 supported currently])]) |
47 |
AC_MSG_CHECKING(whether setBreakType is public) |
48 |
- save_LDFLAGS="$LDFLAGS" |
49 |
- LDFLAGS="$LDFLAGS -licuuc" |
50 |
+ save_LIBS="$LIBS" |
51 |
+ LIBS="$LIBS -licuuc" |
52 |
AC_TRY_LINK([#include <unicode/rbbi.h>], [ |
53 |
RuleBasedBreakIterator *rbi = NULL; |
54 |
rbi = new RuleBasedBreakIterator(); |
55 |
@@ -4073,7 +4073,7 @@ |
56 |
else |
57 |
AC_MSG_RESULT(yes) |
58 |
fi |
59 |
- LDFLAGS="$save_LDFLAGS" |
60 |
+ LIBS="$save_LIBS" |
61 |
else |
62 |
AC_MSG_RESULT([internal]) |
63 |
SYSTEM_ICU=NO |
64 |
|
65 |
|
66 |
|
67 |
1.1 app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff |
68 |
|
69 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff?rev=1.1&view=markup |
70 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix-apply.diff?rev=1.1&content-type=text/plain |
71 |
|
72 |
Index: stlport-ppc-buildfix-apply.diff |
73 |
=================================================================== |
74 |
--- patches/src680/apply |
75 |
+++ patches/src680/apply |
76 |
@@ -1063,6 +1063,8 @@ |
77 |
vcl_font-NO_LIST.diff |
78 |
# linux-headers-2.6.22 issue?! |
79 |
linux-headers.diff |
80 |
+# stlport build problem on ppc |
81 |
+stlport-ppc-buildfix.diff |
82 |
|
83 |
[ DebianBaseOnly ] |
84 |
SectionOwner => rengelha |
85 |
|
86 |
|
87 |
|
88 |
|
89 |
1.1 app-office/openoffice/files/2.3.1/ooo-env_log.diff |
90 |
|
91 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/ooo-env_log.diff?rev=1.1&view=markup |
92 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/ooo-env_log.diff?rev=1.1&content-type=text/plain |
93 |
|
94 |
Index: ooo-env_log.diff |
95 |
=================================================================== |
96 |
--- bin/build-ooo.orig 2007-04-18 18:32:06.000000000 +0200 |
97 |
+++ bin/build-ooo 2007-04-18 18:32:45.000000000 +0200 |
98 |
@@ -21,9 +21,8 @@ |
99 |
echo "configuring ..."; |
100 |
autoconf || exit 1; |
101 |
|
102 |
-echo "Env for configure:" |
103 |
-set |
104 |
-echo "Env for configure ends" |
105 |
+echo "Log Env for configure to `pwd`/env.log" |
106 |
+set > env.log |
107 |
|
108 |
eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1; |
109 |
|
110 |
@@ -88,8 +88,8 @@ |
111 |
# similar that gives child nmake's pain. |
112 |
unset MAKEFLAGS |
113 |
|
114 |
-echo "Env:" |
115 |
-set |
116 |
+echo "Log Env to `pwd`/env.log" |
117 |
+set > env.log |
118 |
|
119 |
# What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not |
120 |
# already merged? |
121 |
|
122 |
|
123 |
|
124 |
1.1 app-office/openoffice/files/2.3.1/regcompapply.diff |
125 |
|
126 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/regcompapply.diff?rev=1.1&view=markup |
127 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/regcompapply.diff?rev=1.1&content-type=text/plain |
128 |
|
129 |
Index: regcompapply.diff |
130 |
=================================================================== |
131 |
--- patches/src680/apply |
132 |
+++ patches/src680/apply |
133 |
@@ -1087,6 +1087,9 @@ |
134 |
[ GentooOnly ] |
135 |
SectionOwner => aprosky |
136 |
|
137 |
+#fix build on ppc |
138 |
+disable-regcomp-java.diff |
139 |
+disable-regcomp-python.diff |
140 |
# Allow build to proceed with PaX enabled |
141 |
gentoo-pax-fix.diff, aprosky |
142 |
# support server-only versions of 64bit JDKs |
143 |
|
144 |
|
145 |
|
146 |
|
147 |
1.1 app-office/openoffice/files/2.3.1/disable-regcomp-java.diff |
148 |
|
149 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff?rev=1.1&view=markup |
150 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/disable-regcomp-java.diff?rev=1.1&content-type=text/plain |
151 |
|
152 |
Index: disable-regcomp-java.diff |
153 |
=================================================================== |
154 |
Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026 |
155 |
--- solenv/bin/modules/installer/servicesfile.pm.orig 2006-04-29 11:25:25.000000000 +0200 |
156 |
+++ solenv/bin/modules/installer/servicesfile.pm 2006-04-29 12:24:45.000000000 +0200 |
157 |
@@ -471,7 +473,7 @@ |
158 |
$python_error_occured = 0; |
159 |
|
160 |
if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); } |
161 |
- if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); } |
162 |
+ if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); } |
163 |
if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); } |
164 |
|
165 |
if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; } |
166 |
|
167 |
|
168 |
|
169 |
1.1 app-office/openoffice/files/2.3.1/gentoo-2.3.1.diff |
170 |
|
171 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/gentoo-2.3.1.diff?rev=1.1&view=markup |
172 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/gentoo-2.3.1.diff?rev=1.1&content-type=text/plain |
173 |
|
174 |
Index: gentoo-2.3.1.diff |
175 |
=================================================================== |
176 |
--- bin/package-ooo |
177 |
+++ bin/package-ooo |
178 |
@@ -33,6 +33,7 @@ |
179 |
{ |
180 |
cat <<EOT >$1 |
181 |
#!/bin/sh |
182 |
+unset PYTHONPATH |
183 |
$OOINSTBASE/program/soffice $2 "\$@" |
184 |
EOT |
185 |
chmod 755 $1 |
186 |
--- distro-configs/Gentoo.conf.in |
187 |
+++ distro-configs/Gentoo.conf.in |
188 |
@@ -3,12 +3,11 @@ |
189 |
--enable-libsn |
190 |
--enable-xsltproc |
191 |
--with-dynamic-xinerama |
192 |
---with-stlport=/usr |
193 |
--with-system-boost |
194 |
--with-system-curl |
195 |
--with-system-db |
196 |
--with-system-expat |
197 |
---with-system-icu |
198 |
+--without-system-icu |
199 |
--with-system-libxslt |
200 |
--with-system-xmlsec |
201 |
--with-system-xrender-headers |
202 |
|
203 |
|
204 |
|
205 |
|
206 |
1.1 app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff |
207 |
|
208 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff?rev=1.1&view=markup |
209 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.3.1/stlport-ppc-buildfix.diff?rev=1.1&content-type=text/plain |
210 |
|
211 |
Index: stlport-ppc-buildfix.diff |
212 |
=================================================================== |
213 |
--- stlport/STLport-4.5.patch 2005-01-06 12:26:48.770546592 +1100 |
214 |
+++ stlport/STLport-4.5.patch 2005-01-06 12:26:01.125789696 +1100 |
215 |
@@ -509,6 +509,45 @@ |
216 |
|
217 |
CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g |
218 |
CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC |
219 |
+--- misc/build/STLport-4.5/src/gcc-linux.mak.old 2005-01-06 12:22:54.127217800 +1100 |
220 |
++++ misc/build/STLport-4.5/src/gcc-linux.mak 2005-01-06 12:24:28.192917640 +1100 |
221 |
+@@ -46,8 +46,8 @@ |
222 |
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g |
223 |
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC |
224 |
+ |
225 |
+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG |
226 |
+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC |
227 |
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) |
228 |
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC |
229 |
+ |
230 |
+ include common_percent_rules.mak |
231 |
+ include common_rules.mak |
232 |
+--- misc/build/STLport-4.5/src/gcc.mak.old 2005-01-06 15:20:18.840975336 +1100 |
233 |
++++ misc/build/STLport-4.5/src/gcc.mak 2005-01-06 15:21:00.373661408 +1100 |
234 |
+@@ -44,8 +44,8 @@ |
235 |
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g |
236 |
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC |
237 |
+ |
238 |
+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG |
239 |
+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG |
240 |
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) |
241 |
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) |
242 |
+ |
243 |
+ include common_percent_rules.mak |
244 |
+ include common_rules.mak |
245 |
+--- misc/build/STLport-4.5/src/gcc-3.0.mak.orig |
246 |
++++ misc/build/STLport-4.5/src/gcc-3.0.mak |
247 |
+@@ -43,8 +43,8 @@ |
248 |
+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC |
249 |
+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC |
250 |
+ |
251 |
+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG |
252 |
+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG |
253 |
++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) |
254 |
++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) |
255 |
+ |
256 |
+ include common_percent_rules.mak |
257 |
+ include common_rules.mak |
258 |
*** misc/STLport-4.5/stlport/config/stl_gcc.h Tue Sep 4 19:10:16 2001 |
259 |
--- misc/build/STLport-4.5/stlport/config/stl_gcc.h Thu Jul 26 12:13:03 2007 |
260 |
*************** |
261 |
|
262 |
|
263 |
|
264 |
|
265 |
-- |
266 |
gentoo-commits@g.o mailing list |