X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=meta-agl-core%2Frecipes-graphics%2Fwayland%2Fwaltham%2F0001-Use-python3-instead-of-2.patch;fp=meta-agl-core%2Frecipes-graphics%2Fwayland%2Fwaltham%2F0001-Use-python3-instead-of-2.patch;h=0000000000000000000000000000000000000000;hb=a5a4b4b50e0d0e1ea1151e6a54017037327db377;hp=32c2df3c46e9835ebef60cd2dfdcac68161eb10f;hpb=3dac145f4645e18ad551d6c44c0bcc46b5c9205d;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-core/recipes-graphics/wayland/waltham/0001-Use-python3-instead-of-2.patch b/meta-agl-core/recipes-graphics/wayland/waltham/0001-Use-python3-instead-of-2.patch
deleted file mode 100644
index 32c2df3c4..000000000
--- a/meta-agl-core/recipes-graphics/wayland/waltham/0001-Use-python3-instead-of-2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6ecdf10a10929164f3cbdb754ae91d27576e5036 Mon Sep 17 00:00:00 2001
-From: Marius Vlad <marius.vlad@collabora.com>
-Date: Fri, 16 Oct 2020 18:57:38 +0300
-Subject: [PATCH] Use python3 instead of 2
-
-Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
----
- configure.ac | 2 +-
- tools/gen.py | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5f65a6b..94b8644 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ AC_SUBST(VERSION_INFO)
- # Check for programs
- AC_PROG_CC
- AC_PROG_CC_STDC
--AC_CHECK_PROGS([PYTHON2], [python2 python])
-+AC_CHECK_PROGS([PYTHON3], [python3 python])
- PKG_PROG_PKG_CONFIG()
- 
- AC_ARG_ENABLE(gprof,
-diff --git a/tools/gen.py b/tools/gen.py
-index 19e8baa..64c5870 100755
---- a/tools/gen.py
-+++ b/tools/gen.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- # Copyright © 2013-2014 Collabora, Ltd.
-@@ -562,11 +562,11 @@ try:
-     opts, args = getopt.getopt(sys.argv[1:], "hp:i:o:t:m:",
-                                ["preamble=", "input=", "output=", "type=", "mode="])
- except getopt.GetoptError:
--    print 'gen.py -p <preamblefile> -i <inputfile> -o <outputfile> -t <type> -m <mode>'
-+    print('gen.py -p <preamblefile> -i <inputfile> -o <outputfile> -t <type> -m <mode>')
-     sys.exit(2)
- for opt, arg in opts:
-     if opt == '-h':
--        print 'gen.py -p <preamblefile> -i <inputfile> -o <outputfile> -t <type> -m <mode>'
-+        print('gen.py -p <preamblefile> -i <inputfile> -o <outputfile> -t <type> -m <mode>')
-         sys.exit()
-     elif opt in ("-p", "--preamble"):
-         preamble_files.append(arg)
--- 
-2.28.0
-