[gnome-sdk-images] Attempt to fix WebKit patch
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sdk-images] Attempt to fix WebKit patch
- Date: Tue, 12 Dec 2017 21:09:24 +0000 (UTC)
commit 751a1b91a1ff16ef56620f8c7bbb3032257f2ed9
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Tue Dec 12 15:08:17 2017 -0600
Attempt to fix WebKit patch
Manually editing patches... what can go wrong.
https://bugs.webkit.org/show_bug.cgi?id=180479
webkitgtk-avoid-perl-file-copy-recursive.patch | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/webkitgtk-avoid-perl-file-copy-recursive.patch b/webkitgtk-avoid-perl-file-copy-recursive.patch
index af47ef7..441b451 100644
--- a/webkitgtk-avoid-perl-file-copy-recursive.patch
+++ b/webkitgtk-avoid-perl-file-copy-recursive.patch
@@ -2,15 +2,16 @@ Index: /Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
===================================================================
--- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
-@@ -47,4 +47,13 @@
+@@ -47,4 +47,14 @@
} elsif ($^O eq 'darwin') {
system('ditto', $source, $destination);
+ } elsif ($^O ne 'MSWin32') {
+ # Ditto copies the *contents* of the source directory, not the directory itself.
+ opendir(my $dh, $source) or die "Can't open $source: $!";
++ make_path($destination);
+ while (readdir $dh) {
+ if ($_ ne '..' and $_ ne '.') {
-+ system('cp', '-R', "${source}/$_", $destination) or die "Failed to copy ${source}/$_ to
$destination: $!";
++ system('cp', '-R', "${source}/$_", $destination) and die "Failed to copy ${source}/$_ to
$destination: $!";
+ }
+ }
+ closedir $dh;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]