SOURCES: gcfilms-path.patch - rediff whole patch
glen
glen at pld-linux.org
Mon Aug 8 11:42:32 CEST 2005
Author: glen Date: Mon Aug 8 09:42:32 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- rediff whole patch
---- Files affected:
SOURCES:
gcfilms-path.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/gcfilms-path.patch
diff -u SOURCES/gcfilms-path.patch:1.2 SOURCES/gcfilms-path.patch:1.3
--- SOURCES/gcfilms-path.patch:1.2 Mon Aug 8 11:39:31 2005
+++ SOURCES/gcfilms-path.patch Mon Aug 8 11:42:27 2005
@@ -1,5 +1,6 @@
---- gcfilms/bin/gcfilms 2005-06-26 17:28:53.000000000 +0200
-+++ bin/gcfilms 2005-08-08 00:33:40.000000000 +0200
+diff -Nur gcfilms-pre/bin/gcfilms gcfilms/bin/gcfilms
+--- gcfilms-pre/bin/gcfilms 2005-06-26 17:28:53.000000000 +0200
++++ gcfilms/bin/gcfilms 2005-08-08 11:40:26.000000000 +0200
@@ -26,35 +26,28 @@
use utf8;
@@ -40,114 +41,25 @@
my $options = new GCOptionLoader($ENV{GCF_CONFIG_FILE});
---- gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 01:44:54.000000000 +0300
-+++ GCStyle.pm 2005-08-08 01:48:39.766115248 +0300
-@@ -28,19 +28,15 @@
- use base 'Exporter';
- our @EXPORT = qw(%styles);
-
-- use FindBin qw($RealBin);
+diff -Nur gcfilms-pre/lib/gcfilms/GCExport/GCExportBase.pm gcfilms/lib/gcfilms/GCExport/GCExportBase.pm
+--- gcfilms-pre/lib/gcfilms/GCExport/GCExportBase.pm 2005-07-22 15:29:09.000000000 +0200
++++ gcfilms/lib/gcfilms/GCExport/GCExportBase.pm 2005-08-08 11:40:26.000000000 +0200
+@@ -29,11 +29,6 @@
use File::Basename;
- our %styles;
-
-- use Cwd;
-- my $oldCwd = getcwd;
-- chdir $RealBin;
- foreach (glob "../share/gcfilms/style/*")
- {
- my $style = basename($_);
- next if $style eq 'CVS';
- my %tmpStyle;
-- $tmpStyle{dir} = $RealBin.'/'.$_;
-+ $tmpStyle{dir} = $_;
- $tmpStyle{rcFile} = $tmpStyle{dir}.'/gtkrc';
- $tmpStyle{name} = $style;
- $styles{$style} = \%tmpStyle;
-@@ -49,8 +45,6 @@
- # $tmpStyle{dir} = '';
- # $tmpStyle{name} = 'Gtk';
- # $styles{Gtk} = \%tmpStyle;
+ use File::Copy;
+
+- if ($^O =~ /win32/i)
+- {
+- use File::DosGlob 'glob';
+- }
-
-- chdir $oldCwd;
- }
-
- 1;
---- ./lib/gcfilms/GCOptions.pm 2005-07-14 16:39:08.000000000 +0200
-+++ ../../lib/gcfilms/GCOptions.pm 2005-08-08 00:56:04.000000000 +0200
-@@ -65,7 +65,7 @@
- open OPTIONS, ">$file" or $self->{parent}->optionsError('create');
- printf OPTIONS 'images='.$ENV{GCF_DATA_HOME}.'/images/
- autosave=1
--browser=firefox
-+browser=mozilla-firefox
- file='.$ENV{GCF_DATA_HOME}.'/films.gcf
- order==0
- split=300
---- gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 01:59:05.000000000 +0300
-+++ GCStyle.pm 2005-08-08 02:01:04.210942432 +0300
-@@ -31,7 +31,7 @@
- use File::Basename;
- our %styles;
-
-- foreach (glob "../share/gcfilms/style/*")
-+ foreach (glob "/usr/share/gcfilms/*")
- {
- my $style = basename($_);
- next if $style eq 'CVS';
-diff -Nur bla/lib/gcfilms/GCExport.pm ../BUILD/gcfilms/lib/gcfilms/GCExport.pm
---- bla/lib/gcfilms/GCExport.pm 2005-04-07 19:18:45.000000000 +0200
-+++ ../BUILD/gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 01:04:54.000000000 +0200
-@@ -35,7 +35,7 @@
- use Cwd;
- my $oldCwd = getcwd;
- chdir $RealBin;
--foreach (glob "../lib/gcfilms/GCExport/*.pm")
-+foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm")
- {
- my $export = basename($_, '.pm')."\n";
- next if $export =~ /GCExportBase/;
-diff -Nur bla/lib/gcfilms/GCImport.pm ../BUILD/gcfilms/lib/gcfilms/GCImport.pm
---- bla/lib/gcfilms/GCImport.pm 2005-04-10 14:24:33.000000000 +0200
-+++ ../BUILD/gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 01:04:54.000000000 +0200
-@@ -33,7 +33,7 @@
- use Cwd;
- my $oldCwd = getcwd;
- chdir $RealBin;
--foreach (glob "../lib/gcfilms/GCImport/*.pm")
-+foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm")
- {
- my $import = basename($_, '.pm')."\n";
- next if $import =~ /GCImportBase/;
-diff -Nur bla/lib/gcfilms/GCLang.pm ../BUILD/gcfilms/lib/gcfilms/GCLang.pm
---- bla/lib/gcfilms/GCLang.pm 2005-06-11 14:18:36.000000000 +0200
-+++ ../BUILD/gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 01:04:54.000000000 +0200
-@@ -40,8 +40,8 @@
- use Cwd;
- my $oldCwd = getcwd;
- chdir $baseDir;
-- use lib '../lib/gcfilms/';
-- foreach (glob "../lib/gcfilms/GCLang/*.pm")
-+ use lib '/usr/share/gcfilms/lib/';
-+ foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm")
- {
- my $lang = basename($_, '.pm');
- eval "use GCLang::$lang";
-diff -Nur bla/lib/gcfilms/GCPlugins.pm ../BUILD/gcfilms/lib/gcfilms/GCPlugins.pm
---- bla/lib/gcfilms/GCPlugins.pm 2005-06-30 22:51:37.000000000 +0200
-+++ ../BUILD/gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 01:04:54.000000000 +0200
-@@ -37,7 +37,7 @@
- my $oldCwd = getcwd;
- chdir $RealBin;
-
-- foreach (glob "../lib/gcfilms/GCPlugins/*.pm")
-+ foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm")
- {
- my $plugin = basename($_, '.pm')."\n";
- next if $plugin =~ /GCPluginsBase/;
-diff -Nur ../gcfilms/lib/gcfilms/GCExport.pm ./lib/gcfilms/GCExport.pm
---- ../gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 11:25:21.000000000 +0200
-+++ ./lib/gcfilms/GCExport.pm 2005-08-08 01:14:15.000000000 +0200
-@@ -25,16 +25,12 @@
+ #Methods to be overriden in specific classes
+
+ sub new
+diff -Nur gcfilms-pre/lib/gcfilms/GCExport.pm gcfilms/lib/gcfilms/GCExport.pm
+--- gcfilms-pre/lib/gcfilms/GCExport.pm 2005-04-07 19:18:45.000000000 +0200
++++ gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 11:40:26.000000000 +0200
+@@ -25,17 +25,13 @@
use strict;
use File::Basename;
@@ -161,9 +73,11 @@
-use Cwd;
-my $oldCwd = getcwd;
-chdir $RealBin;
- foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm")
+-foreach (glob "../lib/gcfilms/GCExport/*.pm")
++foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm")
{
my $export = basename($_, '.pm')."\n";
+ next if $export =~ /GCExportBase/;
@@ -46,7 +42,6 @@
die "Fatal error with exporter $export\n$@" if $@;
push @exportersArray, $obj if ! $obj->{errors};
@@ -172,10 +86,10 @@
use Gtk2;
use GCDialogs;
-diff -Nur ../gcfilms/lib/gcfilms/GCImport.pm ./lib/gcfilms/GCImport.pm
---- ../gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 11:25:21.000000000 +0200
-+++ ./lib/gcfilms/GCImport.pm 2005-08-08 01:14:24.000000000 +0200
-@@ -23,16 +23,12 @@
+diff -Nur gcfilms-pre/lib/gcfilms/GCImport.pm gcfilms/lib/gcfilms/GCImport.pm
+--- gcfilms-pre/lib/gcfilms/GCImport.pm 2005-04-10 14:24:33.000000000 +0200
++++ gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 11:40:26.000000000 +0200
+@@ -23,17 +23,13 @@
###################################################
use File::Basename;
@@ -189,9 +103,11 @@
-use Cwd;
-my $oldCwd = getcwd;
-chdir $RealBin;
- foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm")
+-foreach (glob "../lib/gcfilms/GCImport/*.pm")
++foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm")
{
my $import = basename($_, '.pm')."\n";
+ next if $import =~ /GCImportBase/;
@@ -44,7 +40,6 @@
die "Fatal error with importer $import\n$@" if $@;
push @importersArray, $obj if ! $obj->{errors};
@@ -200,10 +116,10 @@
use Gtk2;
use GCDialogs;
-diff -Nur ../gcfilms/lib/gcfilms/GCLang.pm ./lib/gcfilms/GCLang.pm
---- ../gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 11:25:21.000000000 +0200
-+++ ./lib/gcfilms/GCLang.pm 2005-08-08 11:23:49.000000000 +0200
-@@ -29,18 +29,9 @@
+diff -Nur gcfilms-pre/lib/gcfilms/GCLang.pm gcfilms/lib/gcfilms/GCLang.pm
+--- gcfilms-pre/lib/gcfilms/GCLang.pm 2005-06-11 14:18:36.000000000 +0200
++++ gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 11:40:26.000000000 +0200
+@@ -29,19 +29,10 @@
our @EXPORT = qw(%langs @langsNames);
use File::Basename;
@@ -218,11 +134,13 @@
- use Cwd;
- my $oldCwd = getcwd;
- chdir $baseDir;
-- use lib '/usr/share/gcfilms/lib/';
+- use lib '../lib/gcfilms/';
+- foreach (glob "../lib/gcfilms/GCLang/*.pm")
+ use lib '/usr/share/gcfilms/lib';
- foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm")
++ foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm")
{
my $lang = basename($_, '.pm');
+ eval "use GCLang::$lang";
@@ -49,7 +40,6 @@
eval "%tmpLang = %GCLang::${lang}::lang";
$langs{$lang} = \%tmpLang;
@@ -231,10 +149,37 @@
our @langsNames;
foreach (keys %langs)
{
-diff -Nur ../gcfilms/lib/gcfilms/GCPlugins.pm ./lib/gcfilms/GCPlugins.pm
---- ../gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 11:25:21.000000000 +0200
-+++ ./lib/gcfilms/GCPlugins.pm 2005-08-08 11:24:49.000000000 +0200
-@@ -26,17 +26,12 @@
+diff -Nur gcfilms-pre/lib/gcfilms/GCMainWindow.pm gcfilms/lib/gcfilms/GCMainWindow.pm
+--- gcfilms-pre/lib/gcfilms/GCMainWindow.pm 2005-07-20 19:46:17.000000000 +0200
++++ gcfilms/lib/gcfilms/GCMainWindow.pm 2005-08-08 11:40:26.000000000 +0200
+@@ -125,11 +125,6 @@
+ package GCFrame;
+ use base "Gtk2::Window";
+
+- if ($^O =~ /win32/i)
+- {
+- use File::DosGlob 'glob';
+- }
+-
+ use GCMoviesLists;
+ use GCPlugins;
+ use GCGraphicComponents;
+diff -Nur gcfilms-pre/lib/gcfilms/GCOptions.pm gcfilms/lib/gcfilms/GCOptions.pm
+--- gcfilms-pre/lib/gcfilms/GCOptions.pm 2005-07-14 16:39:08.000000000 +0200
++++ gcfilms/lib/gcfilms/GCOptions.pm 2005-08-08 11:40:26.000000000 +0200
+@@ -65,7 +65,7 @@
+ open OPTIONS, ">$file" or $self->{parent}->optionsError('create');
+ printf OPTIONS 'images='.$ENV{GCF_DATA_HOME}.'/images/
+ autosave=1
+-browser=firefox
++browser=mozilla-firefox
+ file='.$ENV{GCF_DATA_HOME}.'/films.gcf
+ order==0
+ split=300
+diff -Nur gcfilms-pre/lib/gcfilms/GCPlugins.pm gcfilms/lib/gcfilms/GCPlugins.pm
+--- gcfilms-pre/lib/gcfilms/GCPlugins.pm 2005-06-30 22:51:37.000000000 +0200
++++ gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 11:40:26.000000000 +0200
+@@ -26,18 +26,13 @@
use strict;
use File::Basename;
@@ -249,12 +194,12 @@
- my $oldCwd = getcwd;
- chdir $RealBin;
-
- foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm")
+- foreach (glob "../lib/gcfilms/GCPlugins/*.pm")
++ foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm")
{
my $plugin = basename($_, '.pm')."\n";
---- fcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 12:26:47.000000000 +0300
-+++ GCPlugins.pm 2005-08-08 12:30:04.062612904 +0300
-@@ -44,7 +44,6 @@
+ next if $plugin =~ /GCPluginsBase/;
+@@ -49,7 +44,6 @@
#push @pluginsArray, $obj;
$pluginsMap{$obj->getName} = $obj;
}
@@ -262,31 +207,37 @@
our @pluginsNameArray = sort keys %pluginsMap;
---- gcfilms/lib/gcfilms/GCMainWindow.pm 2005-07-20 20:46:17.000000000 +0300
-+++ GCMainWindow.pm 2005-08-08 12:34:15.674362104 +0300
-@@ -125,11 +125,6 @@
- package GCFrame;
- use base "Gtk2::Window";
+diff -Nur gcfilms-pre/lib/gcfilms/GCStyle.pm gcfilms/lib/gcfilms/GCStyle.pm
+--- gcfilms-pre/lib/gcfilms/GCStyle.pm 2005-04-04 23:08:15.000000000 +0200
++++ gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 11:40:26.000000000 +0200
+@@ -28,19 +28,15 @@
+ use base 'Exporter';
+ our @EXPORT = qw(%styles);
-- if ($^O =~ /win32/i)
-- {
-- use File::DosGlob 'glob';
-- }
--
- use GCMoviesLists;
- use GCPlugins;
- use GCGraphicComponents;
---- gcfilms/lib/gcfilms/GCExport/GCExportBase.pm 2005-07-22 16:29:09.000000000 +0300
-+++ GCExport/GCExportBase.pm 2005-08-08 12:35:51.802748368 +0300
-@@ -29,11 +29,6 @@
+- use FindBin qw($RealBin);
use File::Basename;
- use File::Copy;
-
-- if ($^O =~ /win32/i)
-- {
-- use File::DosGlob 'glob';
-- }
+ our %styles;
+
+- use Cwd;
+- my $oldCwd = getcwd;
+- chdir $RealBin;
+- foreach (glob "../share/gcfilms/style/*")
++ foreach (glob "/usr/share/gcfilms/*")
+ {
+ my $style = basename($_);
+ next if $style eq 'CVS';
+ my %tmpStyle;
+- $tmpStyle{dir} = $RealBin.'/'.$_;
++ $tmpStyle{dir} = $_;
+ $tmpStyle{rcFile} = $tmpStyle{dir}.'/gtkrc';
+ $tmpStyle{name} = $style;
+ $styles{$style} = \%tmpStyle;
+@@ -49,8 +45,6 @@
+ # $tmpStyle{dir} = '';
+ # $tmpStyle{name} = 'Gtk';
+ # $styles{Gtk} = \%tmpStyle;
-
- #Methods to be overriden in specific classes
-
- sub new
+- chdir $oldCwd;
+ }
+
+ 1;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/gcfilms-path.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list