projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.24.tar.gz
[xscreensaver]
/
OSX
/
update-info-plist.pl
diff --git
a/OSX/update-info-plist.pl
b/OSX/update-info-plist.pl
index c5233ae7a370afe3e3cee024a6b636f5f15a6c47..0d933cb7f6d69fa081a03f02dfc1f04bb2b759f9 100755
(executable)
--- a/
OSX/update-info-plist.pl
+++ b/
OSX/update-info-plist.pl
@@
-27,7
+27,7
@@
use IO::Compress::Gzip qw(gzip $GzipError);
my ($exec_dir, $progname) = ($0 =~ m@^(.*?)/([^/]+)$@);
my ($exec_dir, $progname) = ($0 =~ m@^(.*?)/([^/]+)$@);
-my $version = q{ $Revision: 1.2
6
$ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.2
8
$ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
$ENV{PATH} = "/usr/local/bin:$ENV{PATH}"; # for seticon
$ENV{PATH} = "/usr/local/bin:$ENV{PATH}"; # for seticon
@@
-85,6
+85,7
@@
sub read_saver_xml($) {
return () if ($name eq 'XScreenSaver');
return () if ($name eq 'SaverTester');
return () if ($name eq 'XScreenSaver');
return () if ($name eq 'SaverTester');
+ return () if ($name eq 'XScreenSaverUpdater');
my $file = "$app_dir/Contents/Resources/" . lc($name) . ".xml";
my $file2 = "$app_dir/" . lc($name) . ".xml";
my $file = "$app_dir/Contents/Resources/" . lc($name) . ".xml";
my $file2 = "$app_dir/" . lc($name) . ".xml";
@@
-178,7
+179,7
@@
sub update_saver_xml($$) {
"\n" .
"From the XScreenSaver collection: " .
"http://www.jwz.org/xscreensaver/\n" .
"\n" .
"From the XScreenSaver collection: " .
"http://www.jwz.org/xscreensaver/\n" .
- "Copyright \251 $year by $authors.\n");
+ "Copyright \
302\
251 $year by $authors.\n");
my $desc2 = ("$name $vers,\n" . # Info.plist
"\302\251 $year $authors.\n" .
my $desc2 = ("$name $vers,\n" . # Info.plist
"\302\251 $year $authors.\n" .
@@
-197,6
+198,10
@@
sub update_saver_xml($$) {
$body =~ s@(<_description>)(.*?)(</_description>)@$1$desc1$3@s;
$body =~ s@(<_description>)(.*?)(</_description>)@$1$desc1$3@s;
+ # NSXMLParser doesn't seem to work properly on Latin1 XML documents,
+ # so we convert these to UTF8 when embedding them in the .saver bundle.
+ $body =~ s@encoding="ISO-8859-1"@encoding="UTF-8"@gsi;
+
if ($obody eq $body && $was_compressed_p) {
print STDERR "$progname: $filename: unchanged\n" if ($verbose > 1);
} else {
if ($obody eq $body && $was_compressed_p) {
print STDERR "$progname: $filename: unchanged\n" if ($verbose > 1);
} else {