From e2abceca35f10da35aa6711162768d389e554987 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Wed, 15 Jul 2009 01:13:04 +0000 Subject: Undo rev 14242, 14243, 14256, 14257: apparently our Perl for windows doesn't support the open pragma. (OOPS: commited more than I wanted to. Also added files from the generic package 'shade'. This package was 'added' in r14213.) git-svn-id: svn://tug.org/texlive/trunk@14264 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLMedia.pm | 2 -- Master/tlpkg/TeXLive/TLPDB.pm | 2 -- Master/tlpkg/TeXLive/TLPOBJ.pm | 2 -- Master/tlpkg/TeXLive/TLPSRC.pm | 2 -- Master/tlpkg/TeXLive/TLPaper.pm | 2 -- Master/tlpkg/TeXLive/TLPostActions.pm | 2 -- Master/tlpkg/TeXLive/TLTREE.pm | 2 -- Master/tlpkg/TeXLive/TLUtils.pm | 2 -- Master/tlpkg/TeXLive/TLWinGoo.pm | 2 -- Master/tlpkg/TeXLive/TeXCatalogue.pm | 6 +++--- Master/tlpkg/bin/tl-update-nsis | 2 -- Master/tlpkg/bin/tlpfiles | 2 -- 12 files changed, 3 insertions(+), 25 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm index f57454df618..bb8638a765d 100644 --- a/Master/tlpkg/TeXLive/TLMedia.pm +++ b/Master/tlpkg/TeXLive/TLMedia.pm @@ -13,8 +13,6 @@ use TeXLive::TLUtils qw(copy win32 dirname mkdirhier basename download_file use TeXLive::TLPDB; use TeXLive::TLWinGoo; -use open qw(:utf8 :std); - sub new { my ($class, @args) = @_; diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index ea6dd80f4ce..5c65d57f726 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -71,8 +71,6 @@ use TeXLive::TLPOBJ; use Cwd 'abs_path'; -use open qw(:utf8 :std); - my $_listdir; =pod diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 2c46736c60d..87a19e70377 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -12,8 +12,6 @@ use TeXLive::TLConfig qw($DefaultCategory $CategoriesRegexp use TeXLive::TLUtils; use TeXLive::TLTREE; -use open qw(:utf8 :std); - our $_tmp; my $_containerdir; diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 8807e16ea6f..4a099bc9c41 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -13,8 +13,6 @@ use TeXLive::TLUtils; use TeXLive::TLPOBJ; use TeXLive::TLTREE; -use open qw(:utf8 :std); - my $_tmp; my %autopatterns; # computed once internally diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm index 478184cbb7e..66e39adeb07 100644 --- a/Master/tlpkg/TeXLive/TLPaper.pm +++ b/Master/tlpkg/TeXLive/TLPaper.pm @@ -31,8 +31,6 @@ C -- paper size setting use TeXLive::TLUtils qw(:DEFAULT dirname merge_into mkdirhier); -use open qw(:utf8 :std); - my %paper_sub = ( "xdvi" => \&paper_xdvi, "pdftex" => \&paper_pdftex, diff --git a/Master/tlpkg/TeXLive/TLPostActions.pm b/Master/tlpkg/TeXLive/TLPostActions.pm index 531daeefd21..f1e1f2da76c 100644 --- a/Master/tlpkg/TeXLive/TLPostActions.pm +++ b/Master/tlpkg/TeXLive/TLPostActions.pm @@ -21,8 +21,6 @@ use TeXLive::TLUtils qw(win32 mkdirhier copy conv_to_w32_path log debug info touch tlwarn); use TeXLive::TLWinGoo; -use open qw(:utf8 :std); - my $mainmenu = "TeX Live 2008"; our %PostInstall; diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm index 550a163ba3f..d0897d20885 100644 --- a/Master/tlpkg/TeXLive/TLTREE.pm +++ b/Master/tlpkg/TeXLive/TLTREE.pm @@ -9,8 +9,6 @@ package TeXLive::TLTREE; use TeXLive::TLUtils; -use open qw(:utf8 :std); - sub new { my $class = shift; my %params = @_; diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 297eddd4118..3482df218d8 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -139,8 +139,6 @@ BEGIN { win32 xchdir xsystem run_cmd); } -use open qw(:utf8 :std); - use Cwd; use Digest::MD5; use Getopt::Long; diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index d895a4580cc..d1f773f87d6 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -132,8 +132,6 @@ BEGIN { use TeXLive::TLUtils; TeXLive::TLUtils->import( qw( mkdirhier ) ); -use open qw(:utf8 :std); - my $is_win = $^O=~/^MSWin(32|64)$/i; =pod diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm index 7322278da9f..b35bbeba8e1 100644 --- a/Master/tlpkg/TeXLive/TeXCatalogue.pm +++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm @@ -10,8 +10,7 @@ use XML::Parser; use XML::XPath; use XML::XPath::XMLParser; - -use open qw(:utf8 :std); +use Encode; package TeXLive::TeXCatalogue::Entry; @@ -81,7 +80,8 @@ sub beautify{ $txt =~ s/\n/ /g; $txt =~ s/^[[:space:]]*//g; $txt =~ s/[[:space:]][[:space:]]*/ /g; - return $txt; + # turn of the utf8 flag by encoding it to utf8 + return(Encode::encode("utf-8", $txt)); } sub name { diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis index 6a928bf2a7a..78ef875db99 100755 --- a/Master/tlpkg/bin/tl-update-nsis +++ b/Master/tlpkg/bin/tl-update-nsis @@ -16,8 +16,6 @@ our $mydir; use strict; -use open qw(:utf8 :std); - use TeXLive::TLConfig; use TeXLive::TLUtils; use TeXLive::TLPOBJ; diff --git a/Master/tlpkg/bin/tlpfiles b/Master/tlpkg/bin/tlpfiles index d2f54841d68..d5407b45aab 100755 --- a/Master/tlpkg/bin/tlpfiles +++ b/Master/tlpkg/bin/tlpfiles @@ -17,8 +17,6 @@ BEGIN { use strict; -use open qw(:utf8 :std); - use TeXLive::TLConfig qw/$RelocPrefix $RelocTree/; use TeXLive::TLPDB; use Pod::Usage; -- cgit v1.2.3