[gnome-continuous/wip/webkit] Try updating WebKitGTK+ to 2.19.2 again
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous/wip/webkit] Try updating WebKitGTK+ to 2.19.2 again
- Date: Fri, 8 Dec 2017 16:37:02 +0000 (UTC)
commit ef4876d988d60c776b79f9858494eb6fed25353a
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Fri Dec 8 10:29:03 2017 -0600
Try updating WebKitGTK+ to 2.19.2 again
This time, with a patch to avoid the new Perl dependency.
manifest.json | 6 +++---
.../webkitgtk-avoid-perl-file-copy-recursive.patch | 20 ++++++++++++++++++++
2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 8c05510..4a821a1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -848,10 +848,10 @@
"tag-reason": "v1.0.2",
"patches": ["woff2-cmake-build-api.patch"]},
- {"src": "tarball:http://www.webkitgtk.org/releases/webkitgtk-2.18.2.tar.xz",
+ {"src": "tarball:https://www.webkitgtk.org/releases/webkitgtk-2.19.2.tar.xz",
"name": "webkitgtk",
- "checksum": "b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7",
- "patches": ["webkitgtk-cmake-buildapi.patch"]},
+ "checksum": "439e88894accd4849d218b29a0755d25aa6c79224fc700206c860108d223d4c3",
+ "patches": ["webkitgtk-cmake-buildapi.patch",
"webkitgtk-avoid-perl-file-copy-recursive.patch"]},
{"src": "gnome:libgee",
"patches": ["gee-builddir.patch"]},
diff --git a/patches/webkitgtk-avoid-perl-file-copy-recursive.patch
b/patches/webkitgtk-avoid-perl-file-copy-recursive.patch
new file mode 100644
index 0000000..83d334b
--- /dev/null
+++ b/patches/webkitgtk-avoid-perl-file-copy-recursive.patch
@@ -0,0 +1,20 @@
+diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+index ee23a39006f1ed1f9e1701c2b41cc929f322c584..3398597efe447ea99af12eb9461479b5631214e2 100755
+--- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
++++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+@@ -46,6 +46,15 @@ sub ditto($$)
+ File::Copy::Recursive::dircopy($source, $destination) or die "Unable to copy directory $source to
$destination: $!";
+ } 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: $!";
++ while (readdir $dh) {
++ if ($_ ne '..' and $_ ne '.') {
++ system('cp', '-a', "${source}/$_", $destination);
++ }
++ }
++ closedir $dh;
+ } else {
+ die "Please install the PEP module File::Copy::Recursive";
+ }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]