Title: [293164] releases/WebKitGTK/webkit-2.36/Tools
- Revision
- 293164
- Author
- carlo...@webkit.org
- Date
- 2022-04-21 04:41:17 -0700 (Thu, 21 Apr 2022)
Log Message
Merge r293163 - [GTK][WPE] Make make-dist script python3 only
https://bugs.webkit.org/show_bug.cgi?id=239596
Reviewed by Adrian Perez de Castro.
It fails with python2 since r291934.
* Scripts/make-dist:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.36/Tools/ChangeLog (293163 => 293164)
--- releases/WebKitGTK/webkit-2.36/Tools/ChangeLog 2022-04-21 11:40:05 UTC (rev 293163)
+++ releases/WebKitGTK/webkit-2.36/Tools/ChangeLog 2022-04-21 11:41:17 UTC (rev 293164)
@@ -1,3 +1,14 @@
+2022-04-21 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK][WPE] Make make-dist script python3 only
+ https://bugs.webkit.org/show_bug.cgi?id=239596
+
+ Reviewed by Adrian Perez de Castro.
+
+ It fails with python2 since r291934.
+
+ * Scripts/make-dist:
+
2022-03-25 Adrian Perez de Castro <ape...@igalia.com>
[WPE][GTK] Dist/distcheck targets fail due to Python error
Modified: releases/WebKitGTK/webkit-2.36/Tools/Scripts/make-dist (293163 => 293164)
--- releases/WebKitGTK/webkit-2.36/Tools/Scripts/make-dist 2022-04-21 11:40:05 UTC (rev 293163)
+++ releases/WebKitGTK/webkit-2.36/Tools/Scripts/make-dist 2022-04-21 11:41:17 UTC (rev 293164)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2014 Igalia S.L.
#
# This library is free software; you can redistribute it and/or
@@ -297,7 +297,7 @@
pkgconfig_file = os.path.join(arguments.build_dir, "Source/WebKit/webkit2gtk-4.1.pc")
if os.path.isfile(pkgconfig_file):
- p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE)
+ p = subprocess.Popen(['pkg-config', '--modversion', pkgconfig_file], stdout=subprocess.PIPE, text="ascii")
version = p.communicate()[0]
if version:
arguments.version = version.rstrip('\n')
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes