summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2005-09-24 08:07:22 +0000
committerAndreas Proschofsky <suka@gentoo.org>2005-09-24 08:07:22 +0000
commitfa869c4fc759de73214d64323fe7188d2cfb19f6 (patch)
treed0cd1c425d3aa5495a17aa435d58ef31bf008758 /app-office/openoffice-bin
parentAdded some documentation on why ppc-macos does not do eautoreconf (diff)
downloadgentoo-2-fa869c4fc759de73214d64323fe7188d2cfb19f6.tar.gz
gentoo-2-fa869c4fc759de73214d64323fe7188d2cfb19f6.tar.bz2
gentoo-2-fa869c4fc759de73214d64323fe7188d2cfb19f6.zip
update for the wrapper
(Portage version: 2.0.52-r1)
Diffstat (limited to 'app-office/openoffice-bin')
-rw-r--r--app-office/openoffice-bin/files/1.9/ooo-wrapper270
1 files changed, 25 insertions, 45 deletions
diff --git a/app-office/openoffice-bin/files/1.9/ooo-wrapper2 b/app-office/openoffice-bin/files/1.9/ooo-wrapper2
index f7ee2e0ea9ba..8222add9ae93 100644
--- a/app-office/openoffice-bin/files/1.9/ooo-wrapper2
+++ b/app-office/openoffice-bin/files/1.9/ooo-wrapper2
@@ -54,16 +54,11 @@ if ($Debug && $BinSuffix =~ /^\@/) {
# Parse command line arguments
my @ooo_argv;
my $session_quickstart;
-my $icons_set;
my $widgets_set;
while ($ARGV[0]) {
$_ = shift;
if (m/^--session-quickstart/) {
$session_quickstart = 1;
- } elsif (m/^--icons-set/) {
- $icons_set = shift;
- (defined $icons_set) || die "Error: The option --icons-set requires a value\n" .
- "For example: --icons-set kde\n";
} elsif (m/^--widgets-set/) {
$widgets_set = shift;
(defined $widgets_set) || die "Error: The option --widgets-set requires a value\n" .
@@ -96,52 +91,37 @@ if (defined $widgets_set) {
$ENV{SAL_USE_VCLPLUGIN} = $widgets_set;
}
-# select the preferred icons set by the running windowmanager
-unless (defined $icons_set) {
- if ((exists $ENV{GNOME_DESKTOP_SESSION_ID}) && (-d "$SystemInstallDir/program/resource.gnome")) {
- $icons_set="gnome";
- } elsif ((exists $ENV{KDE_FULL_SESSION}) && (-d "$SystemInstallDir/program/resource.kde")) {
- $icons_set="kde";
- }
-
- if (not defined $icons_set) {
- if ((exists $ENV{WINDOWMANAGER}) && (-d "$SystemInstallDir/program/resource.kde") &&
- ("$ENV{WINDOWMANAGER}" =~ ".*kde\$")) {
- $icons_set="kde";
- } elsif ((exists $ENV{WINDOWMANAGER}) && (-d "$SystemInstallDir/program/resource.gnome") &&
- ("$ENV{WINDOWMANAGER}" =~ ".*gnome\$")) {
- $icons_set="gnome";
- } elsif (-d "$SystemInstallDir/program/resource.default") {
- $icons_set="default";
- } elsif (-d "$SystemInstallDir/program/resource.kde") {
- $icons_set="kde";
- } elsif (-d "$SystemInstallDir/program/resource.gnome") {
- $icons_set="gnome";
- } else {
- $icons_set="default";
- }
- }
-}
-
-# FIXME - re-enable for icon .zip files in due course
-# if (defined $icons_set) {
-# if (-d "$SystemInstallDir/program/resource.$icons_set") {
-# $ENV{OOO_PREFERRED_RESOURCE_PATH} = "$SystemInstallDir/program/resource.$icons_set";
-# } else {
-# print STDERR "\n\n --- Warning - Your installation of OpenOffice.org does not provide\n";
-# print STDERR " the selected icons set \"$icons_set\". ---\n\n\n";
-# }
-# }
-
-if (defined $widgets_set) {
- $ENV{SAL_USE_VCLPLUGIN} = $widgets_set;
-}
+# overcome ghastly up-stream evilness
+$ENV{SAL_NOEXPANDFPICKER}='TRUE';
if ($session_quickstart) {
$Debug && print "Execute quickstarter\n";
push @ooo_argv, '-quickstart';
}
+# FIXME: the following two fixes should be done by OOo itself
+# create the user config directory with safe rights 700 if it we find
+# the right path and the directory does not exist
+if (open BOOTSTRAPRC, "/usr/lib/openoffice/program/bootstraprc") {
+ while (my $line = <BOOTSTRAPRC>) {
+ chomp $line;
+ if (($line =~ m/^\s*UserInstallation\s*=\s*([^\s]*)\s*$/) && ($1)) {
+ my $userConfDir=$1;
+ $userConfDir =~ s|\$SYSUSERCONFIG|$ENV{HOME}|;
+ $userConfDir =~ s|file://||;
+ mkdir ($userConfDir,0700) unless (-d $userConfDir);
+ last;
+ }
+ }
+ close BOOTSTRAPRC;
+}
+# touch ~/.recently-used with safe rights 700 if it does not exist
+if (! -f "$ENV{HOME}/.recently-used") {
+ open (RECENTLY_USED, ">$ENV{HOME}/.recently-used") &&
+ close RECENTLY_USED &&
+ chmod 0600, "$ENV{HOME}/.recently-used";
+}
+
if (!(-f '/proc/version')) {
print STDERR "\n\n --- Warning - OO.o will not work without a mounted /proc filesystem --- \n\n\n";
}