reduce_dependency_hell.diff 5.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156
  1. diff -Naur mobiperl-0.0.43/html2mobi mobiperl-0.0.43.patched/html2mobi
  2. --- mobiperl-0.0.43/html2mobi 2009-07-18 17:52:02.000000000 -0400
  3. +++ mobiperl-0.0.43.patched/html2mobi 2017-04-10 01:51:43.440363698 -0400
  4. @@ -24,7 +24,7 @@
  5. use MobiPerl::LinksInfo;
  6. use HTML::TreeBuilder;
  7. -use Getopt::Mixed;
  8. +use Getopt::Long;
  9. use strict;
  10. @@ -34,12 +34,12 @@
  11. $opt_imagerescale $opt_removejavascript $opt_scaleallimages
  12. $opt_imagemaxbytes);
  13. -Getopt::Mixed::getOptions ("title=s author=s htmlfile=s mobifile=s gentoc
  14. +Getopt::Long::GetOptions (qw/title=s author=s htmlfile=s mobifile=s gentoc
  15. coverimage=s addthumbnail=s noimages addcoverlink
  16. prefixtitle=s fixhtml fixhtmlbr keepbr
  17. removejavascript
  18. scaleallimages=s
  19. - imagerescale=s imagemaxbytes=s");
  20. + imagerescale=s imagemaxbytes=s/);
  21. #
  22. # expand html document with links...
  23. diff -Naur mobiperl-0.0.43/lit2mobi mobiperl-0.0.43.patched/lit2mobi
  24. --- mobiperl-0.0.43/lit2mobi 2009-07-18 17:52:02.000000000 -0400
  25. +++ mobiperl-0.0.43.patched/lit2mobi 2017-04-10 01:51:53.602363787 -0400
  26. @@ -27,7 +27,7 @@
  27. use MobiPerl::Config;
  28. use MobiPerl::LinksInfo;
  29. -use Getopt::Mixed;
  30. +use Getopt::Long;
  31. use File::Copy;
  32. use vars qw ($opt_title $opt_author $opt_htmlfile $opt_mobifile
  33. @@ -35,10 +35,10 @@
  34. $opt_tocfirst $opt_addcoverlink
  35. $opt_prefixtitle $opt_fixhtml $opt_fixhtmlbr $opt_imagerescale);
  36. -Getopt::Mixed::getOptions ("title=s author=s htmlfile=s mobifile=s
  37. +Getopt::Long::GetOptions (qw/title=s author=s htmlfile=s mobifile=s
  38. coverimage=s addthumbnail=s
  39. noimages tocfirst addcoverlink
  40. - prefixtitle=s fixhtml fixhtmlbr imagerescale=s");
  41. + prefixtitle=s fixhtml fixhtmlbr imagerescale=s/);
  42. diff -Naur mobiperl-0.0.43/mobi2html mobiperl-0.0.43.patched/mobi2html
  43. --- mobiperl-0.0.43/mobi2html 2009-07-18 17:52:02.000000000 -0400
  44. +++ mobiperl-0.0.43.patched/mobi2html 2017-04-10 01:52:02.969363870 -0400
  45. @@ -28,9 +28,8 @@
  46. use Palm::PDB;
  47. use Palm::Doc;
  48. use Image::Size;
  49. -use Date::Parse;
  50. -use Date::Format;
  51. -use Getopt::Mixed;
  52. +use POSIX q/ctime/;
  53. +use Getopt::Long;
  54. use MobiPerl::EXTH;
  55. @@ -38,7 +37,7 @@
  56. use vars qw ($opt_rawhtml $opt_record0 $opt_saveallrecords $opt_mobihtml);
  57. -Getopt::Mixed::getOptions ("rawhtml record0 saveallrecords mobihtml");
  58. +Getopt::Long::GetOptions (qw/rawhtml record0 saveallrecords mobihtml/);
  59. my $globalcodepage = 0;
  60. my $fullpathfilename = shift;
  61. diff -Naur mobiperl-0.0.43/mobi2mobi mobiperl-0.0.43.patched/mobi2mobi
  62. --- mobiperl-0.0.43/mobi2mobi 2009-07-18 17:52:02.000000000 -0400
  63. +++ mobiperl-0.0.43.patched/mobi2mobi 2017-04-10 01:52:15.693363982 -0400
  64. @@ -36,8 +36,8 @@
  65. use Palm::PDB;
  66. use Palm::Doc;
  67. -use Date::Format; # for ctime call
  68. -use Getopt::Mixed;
  69. +use POSIX q/ctime/;
  70. +use Getopt::Long;
  71. use Image::Size; # Used to recognize the first record that is an image
  72. #
  73. @@ -67,7 +67,7 @@
  74. $opt_imagerescale
  75. $opt_allowtts $opt_deleteclippinglimit $opt_imagemaxbytes);
  76. -Getopt::Mixed::getOptions ("outfile=s title=s updatedtitle=s
  77. +Getopt::Long::GetOptions (qw/outfile=s title=s updatedtitle=s
  78. prefixtitle=s author=s addauthor=s
  79. description=s language=s subject=s
  80. publisher=s databasename=s patch fiximagesizes
  81. @@ -78,7 +78,7 @@
  82. mbpfile=s savecover=s savethumb=s imagerescale=s
  83. allowtts deleteclippinglimit
  84. imagemaxbytes=s
  85. - ");
  86. + /);
  87. if (not defined $opt_outfile) {
  88. if (defined $opt_title or defined $opt_updatedtitle or
  89. diff -Naur mobiperl-0.0.43/mobils mobiperl-0.0.43.patched/mobils
  90. --- mobiperl-0.0.43/mobils 2009-07-18 17:52:02.000000000 -0400
  91. +++ mobiperl-0.0.43.patched/mobils 2017-04-10 01:43:39.062359426 -0400
  92. @@ -23,8 +23,8 @@
  93. use Palm::PDB;
  94. use Palm::Doc;
  95. -use Date::Format; # for ctime call
  96. -use Getopt::Mixed;
  97. +use POSIX q/ctime/;
  98. +use Getopt::Long;
  99. use MobiPerl::MobiHeader; # The MobiHeader package file is in the distribution
  100. use MobiPerl::Util;
  101. @@ -33,7 +33,7 @@
  102. use vars qw ($opt_R);
  103. -Getopt::Mixed::getOptions ("R");
  104. +Getopt::Long::GetOptions ("R");
  105. my $author = "";
  106. my $publisher = "";
  107. diff -Naur mobiperl-0.0.43/opf2mobi mobiperl-0.0.43.patched/opf2mobi
  108. --- mobiperl-0.0.43/opf2mobi 2009-07-18 17:52:02.000000000 -0400
  109. +++ mobiperl-0.0.43.patched/opf2mobi 2017-04-10 01:52:30.947364117 -0400
  110. @@ -27,7 +27,7 @@
  111. use MobiPerl::Config;
  112. use MobiPerl::LinksInfo;
  113. -use Getopt::Mixed;
  114. +use Getopt::Long;
  115. use File::Copy;
  116. use File::Spec;
  117. @@ -39,9 +39,9 @@
  118. $opt_tocfirst $opt_addcoverlink
  119. $opt_prefixtitle $opt_imagerescale $opt_imagemaxbytes);
  120. -Getopt::Mixed::getOptions ("title=s author=s htmlfile=s mobifile=s
  121. +Getopt::Long::GetOptions (qw/title=s author=s htmlfile=s mobifile=s
  122. coverimage=s noimages tocfirst addcoverlink
  123. - prefixtitle=s imagerescale=s imagemaxbytes=s");
  124. + prefixtitle=s imagerescale=s imagemaxbytes=s/);