Package: webkit2gtk
Version: 2.26.2-1
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch

The webkit2gtk build fails on Ubuntu focal because the unversioned
'python' interpreter has been removed. The attached patch fixes the
issue and is also used by fedora
https://src.fedoraproject.org/rpms/webkit2gtk3/blob/master/f/no-env-shebang.patch

Debian doesn't need it yet but it's doesn't hurt and it's better to use
python3 rather than python2 anyway


diff -Nru webkit2gtk-2.26.2/debian/changelog webkit2gtk-2.26.2/debian/changelog
--- webkit2gtk-2.26.2/debian/changelog	2019-11-06 13:29:56.000000000 +0100
+++ webkit2gtk-2.26.2/debian/changelog	2020-01-13 22:18:32.000000000 +0100
@@ -1,3 +1,11 @@
+webkit2gtk (2.26.2-2) unstable; urgency=medium
+
+  * debian/patches/build_python_fix.patch:
+    - replace a gtk-doc call to python by python3, fixes the build
+      on Ubuntu where the 'python' binary has been removed
+
+ -- Sebastien Bacher <seb...@ubuntu.com>  Mon, 13 Jan 2020 15:37:23 +0100
+
 webkit2gtk (2.26.2-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru webkit2gtk-2.26.2/debian/patches/build_python_fix.patch webkit2gtk-2.26.2/debian/patches/build_python_fix.patch
--- webkit2gtk-2.26.2/debian/patches/build_python_fix.patch	1970-01-01 01:00:00.000000000 +0100
+++ webkit2gtk-2.26.2/debian/patches/build_python_fix.patch	2020-01-13 15:41:04.000000000 +0100
@@ -0,0 +1,23 @@
+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.23.3/Tools/gtkdoc/generate-gtkdoc
+/usr/bin/env: 'python': No such file or directory
+---
+ Tools/gtk/generate-gtkdoc                                      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc
+index 45c23dfb..a3f82984 100755
+--- a/Tools/gtkdoc/generate-gtkdoc
++++ b/Tools/gtkdoc/generate-gtkdoc
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # Copyright (C) 2011 Igalia S.L.
+ #
+ # This library is free software; you can redistribute it and/or
+-- 
+2.17.1
diff -Nru webkit2gtk-2.26.2/debian/patches/series webkit2gtk-2.26.2/debian/patches/series
--- webkit2gtk-2.26.2/debian/patches/series	2019-11-06 13:29:56.000000000 +0100
+++ webkit2gtk-2.26.2/debian/patches/series	2020-01-13 15:41:15.000000000 +0100
@@ -7,3 +7,4 @@
 user-agent-branding.patch
 prefer-pthread.patch
 dont-detect-sse2.patch
+build_python_fix.patch

Reply via email to