1 --- gcfilms/bin/gcfilms 2005-06-26 17:28:53.000000000 +0200
2 +++ bin/gcfilms 2005-08-08 00:33:40.000000000 +0200
7 -use FindBin qw($RealBin);
8 use POSIX qw(locale_h);
10 -use lib "$RealBin/../lib/gcfilms";
11 +use lib qw(/usr/share/gcfilms/lib);
14 my $home = $ENV{'HOME'};
15 -$home =~ s/\\/\//g if ($^O =~ /win32/i);
17 -$ENV{XDG_CONFIG_HOME} = $RealBin.'/../config' if ($^O =~ /win32/i);
18 $ENV{XDG_CONFIG_HOME} = $home.'/.config' if ! exists $ENV{XDG_CONFIG_HOME};
19 mkpath $ENV{XDG_CONFIG_HOME};
21 -$ENV{XDG_DATA_HOME} = $RealBin.'/../data' if ($^O =~ /win32/i);
22 $ENV{XDG_DATA_HOME} = $home.'/.local/share' if ! exists $ENV{XDG_DATA_HOME};
23 mkpath $ENV{XDG_DATA_HOME};
25 $ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME}.'/gcfilms';
26 -$ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME} if ($^O =~ /win32/i);
27 mkdir $ENV{GCF_CONFIG_HOME};
28 $ENV{GCF_CONFIG_FILE} = $ENV{GCF_CONFIG_HOME}.'/gcfilms.conf';
29 $ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME}.'/gcfilms';
30 -$ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME} if ($^O =~ /win32/i);
31 mkdir $ENV{GCF_DATA_HOME};
33 -$ENV{GCF_BIN_DIR} = $RealBin;
34 -($ENV{GCF_LIB_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/lib\/gcfilms/;
36 -($ENV{GCF_SHARE_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/share\/gcfilms/;
37 +$ENV{GCF_BIN_DIR} = '/usr/bin';
38 +$ENV{GCF_LIB_DIR} = '/usr/share/gcfilms/lib';
39 +$ENV{GCF_SHARE_DIR} = '/usr/share/gcfilms';
41 my $options = new GCOptionLoader($ENV{GCF_CONFIG_FILE});
43 --- gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 01:44:54.000000000 +0300
44 +++ GCStyle.pm 2005-08-08 01:48:39.766115248 +0300
47 our @EXPORT = qw(%styles);
49 - use FindBin qw($RealBin);
54 - my $oldCwd = getcwd;
56 foreach (glob "../share/gcfilms/style/*")
58 my $style = basename($_);
59 next if $style eq 'CVS';
61 - $tmpStyle{dir} = $RealBin.'/'.$_;
62 + $tmpStyle{dir} = $_;
63 $tmpStyle{rcFile} = $tmpStyle{dir}.'/gtkrc';
64 $tmpStyle{name} = $style;
65 $styles{$style} = \%tmpStyle;
67 # $tmpStyle{dir} = '';
68 # $tmpStyle{name} = 'Gtk';
69 # $styles{Gtk} = \%tmpStyle;
75 --- ./lib/gcfilms/GCOptions.pm 2005-07-14 16:39:08.000000000 +0200
76 +++ ../../lib/gcfilms/GCOptions.pm 2005-08-08 00:56:04.000000000 +0200
78 open OPTIONS, ">$file" or $self->{parent}->optionsError('create');
79 printf OPTIONS 'images='.$ENV{GCF_DATA_HOME}.'/images/
82 +browser=mozilla-firefox
83 file='.$ENV{GCF_DATA_HOME}.'/films.gcf
86 --- gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 01:59:05.000000000 +0300
87 +++ GCStyle.pm 2005-08-08 02:01:04.210942432 +0300
92 - foreach (glob "../share/gcfilms/style/*")
93 + foreach (glob "/usr/share/gcfilms/*")
95 my $style = basename($_);
96 next if $style eq 'CVS';
97 diff -Nur bla/lib/gcfilms/GCExport.pm ../BUILD/gcfilms/lib/gcfilms/GCExport.pm
98 --- bla/lib/gcfilms/GCExport.pm 2005-04-07 19:18:45.000000000 +0200
99 +++ ../BUILD/gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 01:04:54.000000000 +0200
104 -foreach (glob "../lib/gcfilms/GCExport/*.pm")
105 +foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm")
107 my $export = basename($_, '.pm')."\n";
108 next if $export =~ /GCExportBase/;
109 diff -Nur bla/lib/gcfilms/GCImport.pm ../BUILD/gcfilms/lib/gcfilms/GCImport.pm
110 --- bla/lib/gcfilms/GCImport.pm 2005-04-10 14:24:33.000000000 +0200
111 +++ ../BUILD/gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 01:04:54.000000000 +0200
116 -foreach (glob "../lib/gcfilms/GCImport/*.pm")
117 +foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm")
119 my $import = basename($_, '.pm')."\n";
120 next if $import =~ /GCImportBase/;
121 diff -Nur bla/lib/gcfilms/GCLang.pm ../BUILD/gcfilms/lib/gcfilms/GCLang.pm
122 --- bla/lib/gcfilms/GCLang.pm 2005-06-11 14:18:36.000000000 +0200
123 +++ ../BUILD/gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 01:04:54.000000000 +0200
128 - use lib '../lib/gcfilms/';
129 - foreach (glob "../lib/gcfilms/GCLang/*.pm")
130 + use lib '/usr/share/gcfilms/lib/';
131 + foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm")
133 my $lang = basename($_, '.pm');
134 eval "use GCLang::$lang";
135 diff -Nur bla/lib/gcfilms/GCPlugins.pm ../BUILD/gcfilms/lib/gcfilms/GCPlugins.pm
136 --- bla/lib/gcfilms/GCPlugins.pm 2005-06-30 22:51:37.000000000 +0200
137 +++ ../BUILD/gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 01:04:54.000000000 +0200
142 - foreach (glob "../lib/gcfilms/GCPlugins/*.pm")
143 + foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm")
145 my $plugin = basename($_, '.pm')."\n";
146 next if $plugin =~ /GCPluginsBase/;
147 diff -Nur ../gcfilms/lib/gcfilms/GCExport.pm ./lib/gcfilms/GCExport.pm
148 --- ../gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 11:25:21.000000000 +0200
149 +++ ./lib/gcfilms/GCExport.pm 2005-08-08 01:14:15.000000000 +0200
154 -use FindBin qw($RealBin);
157 our @EXPORT = qw(@exportersArray);
162 -my $oldCwd = getcwd;
164 foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm")
166 my $export = basename($_, '.pm')."\n";
168 die "Fatal error with exporter $export\n$@" if $@;
169 push @exportersArray, $obj if ! $obj->{errors};
175 diff -Nur ../gcfilms/lib/gcfilms/GCImport.pm ./lib/gcfilms/GCImport.pm
176 --- ../gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 11:25:21.000000000 +0200
177 +++ ./lib/gcfilms/GCImport.pm 2005-08-08 01:14:24.000000000 +0200
179 ###################################################
182 -use FindBin qw($RealBin);
185 our @EXPORT = qw(@importersArray);
190 -my $oldCwd = getcwd;
192 foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm")
194 my $import = basename($_, '.pm')."\n";
196 die "Fatal error with importer $import\n$@" if $@;
197 push @importersArray, $obj if ! $obj->{errors};
203 diff -Nur ../gcfilms/lib/gcfilms/GCLang.pm ./lib/gcfilms/GCLang.pm
204 --- ../gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 11:25:21.000000000 +0200
205 +++ ./lib/gcfilms/GCLang.pm 2005-08-08 11:23:49.000000000 +0200
207 our @EXPORT = qw(%langs @langsNames);
210 - use FindBin qw($RealBin $Script);
212 - my $baseDir = $RealBin;
213 - $baseDir .= '/bin' if $Script =~ m/install$/;
214 - $baseDir = '..' if $Script eq '-e';
219 - my $oldCwd = getcwd;
221 - use lib '/usr/share/gcfilms/lib/';
222 + use lib '/usr/share/gcfilms/lib';
223 foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm")
225 my $lang = basename($_, '.pm');
227 eval "%tmpLang = %GCLang::${lang}::lang";
228 $langs{$lang} = \%tmpLang;
232 foreach (keys %langs)
234 diff -Nur ../gcfilms/lib/gcfilms/GCPlugins.pm ./lib/gcfilms/GCPlugins.pm
235 --- ../gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 11:25:21.000000000 +0200
236 +++ ./lib/gcfilms/GCPlugins.pm 2005-08-08 11:24:49.000000000 +0200
241 - use FindBin qw($RealBin);
244 our @EXPORT = qw(%pluginsMap @pluginsNameArray);
249 - my $oldCwd = getcwd;
252 foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm")
254 my $plugin = basename($_, '.pm')."\n";
255 --- fcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 12:26:47.000000000 +0300
256 +++ GCPlugins.pm 2005-08-08 12:30:04.062612904 +0300
258 #push @pluginsArray, $obj;
259 $pluginsMap{$obj->getName} = $obj;
263 our @pluginsNameArray = sort keys %pluginsMap;
265 --- gcfilms/lib/gcfilms/GCMainWindow.pm 2005-07-20 20:46:17.000000000 +0300
266 +++ GCMainWindow.pm 2005-08-08 12:34:15.674362104 +0300
269 use base "Gtk2::Window";
271 - if ($^O =~ /win32/i)
273 - use File::DosGlob 'glob';
278 use GCGraphicComponents;
279 --- gcfilms/lib/gcfilms/GCExport/GCExportBase.pm 2005-07-22 16:29:09.000000000 +0300
280 +++ GCExport/GCExportBase.pm 2005-08-08 12:35:51.802748368 +0300
285 - if ($^O =~ /win32/i)
287 - use File::DosGlob 'glob';
290 #Methods to be overriden in specific classes