Skip to contentSkip to conversation

htop: Use python3

PATCH New Khem Raj 1 participant 3 messages Nov 26, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 htop: Use python3

Fixes

| ../htop-2.2.0/scripts/MakeHeader.py ../htop-2.2.0/CategoriesPanel.c
| ../htop-2.2.0/scripts/MakeHeader.py ../htop-2.2.0/MainPanel.c
| /usr/bin/env: ‘python’: No such file or directory
---
 .../0001-Ask-for-python3-specifically.patch   | 26 +++++++++++++++++++
 meta-oe/recipes-support/htop/htop_2.2.0.bb    |  4 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch
meta-oe/recipes-support/htop/files/0001-Ask-for-python3-specifically.patch new file +26 -0
new file mode 100644
index 0000000000..6153bdedbe
@@ -0,0 +1,26 @@
+From 08aca4816cc798fce58b6235c26585a0063fa8af Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 26 Nov 2019 10:43:49 -0800
+Subject: [PATCH] Ask for python3 specifically
+
+python2 is on its way out
+
+Upstream-Status: Submitted [https://github.com/hishamhm/htop/pull/968]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ scripts/MakeHeader.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/MakeHeader.py b/scripts/MakeHeader.py
+index 7c48fdd..7a7586d 100755
+--- a/scripts/MakeHeader.py
++++ b/scripts/MakeHeader.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ import os, sys, string, io
+ try:
+    from StringIO import StringIO
+-- 
+2.24.0
+
meta-oe/recipes-support/htop/htop_2.2.0.bb +3 -1
index 01c856d123..64eb0c571f 100644
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c312653532e8e669f30e5ec8bdc23be3"
 DEPENDS = "ncurses"
 
 SRC_URI = "http://hisham.hm/htop/releases/${PV}/${BP}.tar.gz \
-           file://0001-Use-pkg-config.patch"
+           file://0001-Use-pkg-config.patch \
+           file://0001-Ask-for-python3-specifically.patch \
+           "
 SRC_URI[md5sum] = "0d816b6beed31edc75babcfbf863ffa8"
 SRC_URI[sha256sum] = "d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57"
 
Signature · 1 line
2.24.0
author
#1 lore raw

PATCH 2/3 pidgin: Use python3

Fixes python-sipe build failures e.g. ../../../pidgin-sipe-1.25.0/src/purple/purple-dbus.h:33:10: fatal error: dbus-server.h: No such file or directory | #include "dbus-server.h"
| ^~~~~~~~~~~~~~~

---
 meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +2 -2
index b094ba25e4..b4944258fa 100644
@@ -2,9 +2,9 @@ SUMMARY = "multi-protocol instant messaging client"
 SECTION = "x11/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS = "python virtual/libintl intltool-native libxml2 gconf glib-2.0-native"
+DEPENDS = "python3 virtual/libintl intltool-native libxml2 gconf glib-2.0-native"
 
-inherit autotools gettext pkgconfig gconf perlnative
+inherit autotools gettext pkgconfig gconf perlnative python3native
 
 SRC_URI = "\
     ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
Signature · 1 line
2.24.0
author
#2 lore raw

PATCH 3/3 jack: Replace using python2 with python3 during build

In reply to Khem Raj
---
 ...waf-Use-Python-3-instead-of-Python-2.patch | 24 +++++++++++++++++++
 meta-oe/recipes-multimedia/jack/jack_git.bb   |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-multimedia/jack/jack/0001-waf-Use-Python-3-instead-of-Python-2.patch
meta-oe/recipes-multimedia/jack/jack/0001-waf-Use-Python-3-instead-of-Python-2.patch new file +24 -0
new file mode 100644
index 0000000000..9a2f07d3be
@@ -0,0 +1,24 @@
+From fac214660ba173043fc19a5e81f9312e0466c0e2 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 26 Nov 2019 11:44:50 -0800
+Subject: [PATCH] waf: Use Python 3 instead of Python 2
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ waf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/waf b/waf
+index a2efc852..037d20b1 100755
+--- a/waf
++++ b/waf
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # encoding: latin-1
+ # Thomas Nagy, 2005-2018
+ #
+-- 
+2.24.0
+
meta-oe/recipes-multimedia/jack/jack_git.bb +3 -1
index 9f7d5b0b61..dc30ceb461 100644
@@ -14,7 +14,9 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "libsamplerate0 libsndfile1 readline"
 
-SRC_URI = "git://github.com/jackaudio/jack2.git"
+SRC_URI = "git://github.com/jackaudio/jack2.git \
+           file://0001-waf-Use-Python-3-instead-of-Python-2.patch \
+"
 SRCREV = "37250ff470277f9947fbf3ba738f943053e30525"
 PV = "1.9.13"
 S = "${WORKDIR}/git"
Signature · 1 line
2.24.0