still trying to fix libpng related trouble

PerlGameDev · Aug 17, 2013 · ed418e3 · ed418e3
1 parent 8a89846
commit ed418e3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/inc/My/Builder.pm b/inc/My/Builder.pm
@@ -425,10 +425,15 @@ sub apply_patch {
     $k = catfile($dir_to_be_patched, $k);
     print STDERR "- gonna patch '$k'\n";
 
-    open(SRC, "<", $k) or die "###ERROR### Cannot open file: '$k'\n";
-    $src  = <SRC>;
-    close(SRC);
-    $src =~ s/\r\n/\n/g; #normalise newlines
+    if (-f $k) {
+      open(SRC, "<", $k) or die "###ERROR### Cannot open file: '$k'\n";
+      $src  = <SRC>;
+      close(SRC);
+      $src =~ s/\r\n/\n/g; #normalise newlines
+    }
+    else {
+      $src = "";
+    }
 
     my $out = eval { Text::Patch::patch( $src, $p, { STYLE => "Unified" } ) };
     if ($out) {

diff --git a/patches/libpng-1.6.3-hack.patch b/patches/libpng-1.6.3-hack.patch
@@ -1,6 +1,5 @@
-diff -ru libpng-1.6.3/pnglibconf.dfn libpng-1.6.3.patched/pnglibconf.dfn
 --- libpng-1.6.3/pnglibconf.dfn	2013-08-17 21:36:54.489625300 +0200
-+++ libpng-1.6.3.patched/pnglibconf.dfn	2013-08-09 20:26:03.377019200 +0200
++++ libpng-1.6.3/pnglibconf.dfn	2013-08-09 20:26:03.377019200 +0200
 @@ -0,0 +1,6623 @@
 +/*- pnglibconf.dfn intermediate file
 + * generated from scripts/pnglibconf.dfa