[gnome-build-meta/jjardon/wenkitgtk_python3] elements/sdk/WebKitGTK+.bst: Build against python3
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/jjardon/wenkitgtk_python3] elements/sdk/WebKitGTK+.bst: Build against python3
- Date: Mon, 3 Dec 2018 20:07:39 +0000 (UTC)
commit c413ad8ec77fc3d7cfe2b75010cf4fa7e4a11202
Author: Javier Jardón <jjardon gnome org>
Date: Mon Dec 3 01:08:04 2018 +0000
elements/sdk/WebKitGTK+.bst: Build against python3
elements/sdk/WebKitGTK+.bst | 5 ++---
files/webkitgtk/python2.patch | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 3 deletions(-)
---
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index f75334b..6396595 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -8,6 +8,8 @@ sources:
path: files/webkitgtk/toolchain.i386
- kind: local
path: files/webkitgtk/toolchain.arm
+- kind: local
+ path: files/webkitgtk/python2.patch
depends:
- sdk/at-spi2-core.bst
- sdk/brotli.bst
@@ -33,9 +35,6 @@ depends:
- filename: base/gperf.bst
junction: freedesktop-sdk.bst
type: build
-- filename: base/python2.bst
- junction: freedesktop-sdk.bst
- type: build
- filename: base/ruby.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/files/webkitgtk/python2.patch b/files/webkitgtk/python2.patch
new file mode 100644
index 0000000..2a04ca3
--- /dev/null
+++ b/files/webkitgtk/python2.patch
@@ -0,0 +1,38 @@
+From 494e4abb7a5130376d3cdb41a5e3963650b8659f Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 16 Jul 2018 06:34:53 +0200
+Subject: [PATCH] Fix the broken build due to python2
+
+/builddir/build/BUILD/webkitgtk-2.21.4/Tools/gtk/generate-gtkdoc
+/usr/bin/env: 'python': No such file or directory
+---
+ Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl | 2 +-
+ Tools/gtk/generate-gtkdoc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+index 4bb7037d..3071b45f 100755
+--- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
++++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+@@ -155,7 +155,7 @@ my $inspectorLicense = <<'EOF';
+ EOF
+
+ my $perl = $^X;
+-my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python" : "python";
++my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python2" : "python2";
+ my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
+ my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
+ my $sharedScriptsRoot = File::Spec->catdir($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'});
+diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc
+index 45c23dfb..a3f82984 100755
+--- a/Tools/gtk/generate-gtkdoc
++++ b/Tools/gtk/generate-gtkdoc
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.7
+ # Copyright (C) 2011 Igalia S.L.
+ #
+ # This library is free software; you can redistribute it and/or
+--
+2.17.1
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]