components/desktop/gnumeric/patches/tests_zcat_to_gzip.patch

   1 --- gnumeric-1.12.43/test/GnumericTest.pm.~1~   Wed May 30 22:31:13 2018
   2 +++ gnumeric-1.12.43/test/GnumericTest.pm       Mon Aug 20 14:56:19 2018
   3 @@ -421,7 +421,7 @@
   4      my $code = system ("$ssconvert '$file' '$tmp' 2>&1 | sed -e 's/^/| /'");
   5      &system_failure ($ssconvert, $code) if $code;
   6
   7 -    my $htxt = `zcat -f '$tmp' | $normalize_gnumeric | sha1sum`;
   8 +    my $htxt = `gzip -dcf '$tmp' | $normalize_gnumeric | sha1sum`;
   9      my $newsha1 = lc substr ($htxt, 0, 40);
  10      die "SHA-1 failure\n" unless $newsha1 =~ /^[0-9a-f]{40}$/;
  11
  12 @@ -442,13 +442,13 @@
  13
  14         my $tmp1 = "$tmp-old";
  15         &junkfile ($tmp1);
  16 -       my $code1 = system ("zcat -f '$saved' >'$tmp1'");
  17 -       &system_failure ('zcat', $code1) if $code1;
  18 +       my $code1 = system ("gzip -dcf '$saved' >'$tmp1'");
  19 +       &system_failure ('gzip', $code1) if $code1;
  20
  21         my $tmp2 = "$tmp-new";
  22         &junkfile ($tmp2);
  23 -       my $code2 = system ("zcat -f '$tmp' >'$tmp2'");
  24 -       &system_failure ('zcat', $code2) if $code2;
  25 +       my $code2 = system ("gzip -dcf '$tmp' >'$tmp2'");
  26 +       &system_failure ('gzip', $code2) if $code2;
  27
  28         my $code3 = system ('diff', @ARGV, $tmp1, $tmp2);
  29
  30 @@ -512,13 +512,13 @@
  31
  32      my $tmp4 = "$tmp.xml";
  33      &junkfile ($tmp4) unless $keep;
  34 -    $code = system (&quotearg ("zcat", "-f", $tmp1) . "| $normalize_gnumeric >" . &quotearg ($tmp4));
  35 -    &system_failure ('zcat', $code) if $code;
  36 +    $code = system (&quotearg ("gzip", "-dcf", $tmp1) . "| $normalize_gnumeric >" . &quotearg ($tmp4));
  37 +    &system_failure ('gzip', $code) if $code;
  38
  39      my $tmp5 = "$tmp-new.xml";
  40      &junkfile ($tmp5) unless $keep;
  41 -    $code = system (&quotearg ("zcat" , "-f", $tmp3) . " | $normalize_gnumeric >" . &quotearg ($tmp5));
  42 -    &system_failure ('zcat', $code) if $code;
  43 +    $code = system (&quotearg ("gzip" , "-dcf", $tmp3) . " | $normalize_gnumeric >" . &quotearg ($tmp5));
  44 +    &system_failure ('gzip', $code) if $code;
  45
  46      $code = system ('diff', '-u', $tmp4, $tmp5);
  47      &system_failure ('diff', $code) if $code;
  48 @@ -673,7 +673,7 @@
  49         $file_filtered =~ s{^.*/}{};
  50         $file_filtered =~ s/(\.gnumeric)$/-filter$1/;
  51         unlink $file_filtered;
  52 -       my $cmd = "zcat " . &quotearg ($file_resized) . " | $filter0 >" . &quotearg ($file_filtered);
  53 +       my $cmd = "gzip -dcf " . &quotearg ($file_resized) . " | $filter0 >" . &quotearg ($file_filtered);
  54         print STDERR "# $cmd\n" if $verbose;
  55         $code = system ("($cmd) 2>&1 | sed -e 's/^/| /'");
  56         &system_failure ($ssconvert, $code) if $code;
  57 @@ -706,15 +706,15 @@
  58      my $tmp_xml = "$tmp.xml";
  59      unlink $tmp_xml;
  60      &junkfile ($tmp_xml) unless $keep;
  61 -    $code = system ("zcat -f '$file_filtered' | $normalize_gnumeric | $filter1 >'$tmp_xml'");
  62 -    &system_failure ('zcat', $code) if $code;
  63 +    $code = system ("gzip -dcf '$file_filtered' | $normalize_gnumeric | $filter1 >'$tmp_xml'");
  64 +    &system_failure ('gzip', $code) if $code;
  65
  66      my $tmp2_xml = "$tmp-new.xml";
  67      unlink $tmp2_xml;
  68      &junkfile ($tmp2_xml) unless $keep;
  69 -    # print STDERR "zcat -f '$tmp2' | $normalize_gnumeric | $filter2 >'$tmp2_xml'\n";
  70 -    $code = system ("zcat -f '$tmp2' | $normalize_gnumeric | $filter2 >'$tmp2_xml'");
  71 -    &system_failure ('zcat', $code) if $code;
  72 +    # print STDERR "gzip -dcf '$tmp2' | $normalize_gnumeric | $filter2 >'$tmp2_xml'\n";
  73 +    $code = system ("gzip -dcf '$tmp2' | $normalize_gnumeric | $filter2 >'$tmp2_xml'");
  74 +    &system_failure ('gzip', $code) if $code;
  75
  76      $code = system ('diff', '-u', $tmp_xml, $tmp2_xml);
  77      &system_failure ('diff', $code) if $code && !$ignore_failure;