blob: 2f6c8fc22da0321886006eaa4e2f98dc7c34f49b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- bin/package-ooo
+++ bin/package-ooo
@@ -33,6 +33,7 @@
{
cat <<EOT >$1
#!/bin/sh
+unset PYTHONPATH
$OOINSTBASE/program/soffice $2 "\$@"
EOT
chmod 755 $1
--- patches/src680/svg-import-filter.diff 2008-04-12 23:55:36.000000000 +0400
+++ patches/src680/svg-import-filter.diff 2008-03-06 21:09:06.000000000 +0300
@@ -692,7 +692,7 @@
+ $(SLO)$/units.obj
+
+.IF "$(COMID)"=="gcc3"
-+.IF "$(CCNUMVER)">="000400000000"
++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES"
+CFLAGS+=-DUSE_MODERN_SPIRIT
+.ENDIF
.ENDIF
--- configure.in
+++ configure.in
@@ -1136,7 +1136,7 @@
elif test "$with_tag" = "OOH680_m12" ; then
UPSTREAM_VERSION=2.4.0
elif test "$with_tag" = "OOH680_m17" ; then
- UPSTREAM_VERSION=2.4.1
+ UPSTREAM_VERSION=2.4.1rc2
fi
if test -n "$UPSTREAM_VERSION"; then
UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
|
GitWeb
