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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
--- bin/package-ooo
+++ bin/package-ooo
@@ -57,6 +57,7 @@
#!/bin/sh
export OOO_EXTRA_ARG='$2'
+unset PYTHONPATH
$OOINSTBASE/program/ooqstart $3 "\$@"
EOT
chmod 755 $1
}
--- bin/ooo-wrapper.in
+++ bin/ooo-wrapper.in
@@ -92,6 +89,9 @@
print STDERR "\n\n --- Warning - OO.o will not work without a mounted /proc filesystem --- \n\n\n";
}
+# Clear PYTHONPATH, otherwise Python scripting does not work
+delete $ENV{'PYTHONPATH'};
+
# And here we go.
exec "$SystemInstallDir/program/$Binary", @ooo_argv
--- bin/unpack
+++ bin/unpack
@@ -89,7 +89,7 @@
# it is necessary in ODK
# it can be built even on linux by mingw32, though
if test "$USE_PREBUILD_UNOWINREG_DLL" = "YES" ; then
- cp -f $TOOLSDIR/src/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
+ cp -f $SRCDIR/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
fi
# copy in misc Mono related dlls if we need to
@@ -319,7 +319,7 @@
cp -af $TOOLSDIR/src/evolocal.odb $OOBUILDDIR/extras/source/database || exit 1;
echo "Installing bibliography overwrides";
-tar xjf $TOOLSDIR/src/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database
+tar xjf $SRCDIR/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database
echo "Copying custom user-dicts into tree"
cp -af $TOOLSDIR/src/*.dic $OOBUILDDIR/extras/source/wordbook || exit 1;
--- patches/src680/apply
+++ patches/src680/apply
@@ -150,6 +150,9 @@
# add SPARC platform to automation
automation-sparc-platform.diff, i#66140, rengelha
+
+#Fix new file save error in ood-m1 and ood-m2
+sfx2-docfile-newfilesave.diff, i#69232 jianhua
# [ LinuxOnly ]
@@ -1008,16 +1011,10 @@
# system STLport
dont-copy-and-install-stlport.diff, i#63732, rengelha
-# support server-only versions of 64bit JDKs
-64bit-jdk-server-paths.diff, i#65974
# throw also Java exception on JNI error
jni-throw-exception.diff, i#65977
# system db check
system-db-check.diff, i#65979
-# Gentoo's portaudio ...
-system-portaudio-use-lpthread.diff
-# use IBM j9vm over IBM classic JVM
-ibm-j9vm.diff
[ GentooOnly ]
SectionOwner => aprosky
@@ -1031,7 +1028,14 @@
gentoo-gcc-naming-and-versioning.diff, hmth
# build with -fomit-frame-pointer
#omit-fp-workaround.diff, i#50625, hmth
-
+# use libxslt from system for xmlhelp / disable sablot
+xmlhelp-use-libxslt-from-system.diff, i#30380, rengelha
+# Gentoo's portaudio ...
+system-portaudio-use-lpthread.diff, hmth
+# support server-only versions of 64bit JDKs
+64bit-jdk-server-paths.diff, i#65974, hmth
+# use IBM j9vm over IBM classic JVM
+ibm-j9vm.diff, hmth
[ DebianBaseOnly ]
SectionOwner => rengelha
@@ -1494,8 +1498,6 @@
[ GentooExperimental ]
SectionOwner => hmth
-# use libxslt from system for xmlhelp / disable sablot
-xmlhelp-use-libxslt-from-system.diff, i#30380
# Gnu JRE paths.
gentooexperimental-gnujre.diff
|
GitWeb