--- deliantra/Deliantra-Client/DC/Main.pm 2011/12/27 09:17:27 1.2
+++ deliantra/Deliantra-Client/DC/Main.pm 2011/12/29 07:13:44 1.3
@@ -19,6 +19,7 @@
use common::sense;
use Carp 'verbose';
+use Cwd ();
use EV;
BEGIN { *time = \&EV::time }
@@ -1133,7 +1134,7 @@
tooltip => "You can override the audio driver to use here. Leaving it empty will result "
. "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
. "drivers though, and can experiment with alsa, dsp, esd, pulse, arts, nas "
- . "or other system-specific drivers. Selecting the wrong driver here will simply result"
+ . "or other system-specific drivers. Selecting the wrong driver here will simply result "
. "in no sound.",
on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
);
@@ -2840,8 +2841,10 @@
}
}
- $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
- $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
+ # fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed
+ $ENV{FONTCONFIG_FILE} = "fonts.conf";
+ $ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts";
+ $ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH};
{
my @fonts = map DC::find_rcfile "fonts/$_", qw(