From 48cc6e06c7b52a6392a09a71677199eb62dd3fc9 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 5 Jun 2021 02:05:19 +0800 Subject: [PATCH] sci-electronics/dsview: fix build problem with python 3.9 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Huang Rui --- .../{dsview-1.12.ebuild => dsview-1.12-r1.ebuild} | 1 + .../dsview/files/dsview-1.12-fix-python3.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) rename sci-electronics/dsview/{dsview-1.12.ebuild => dsview-1.12-r1.ebuild} (98%) create mode 100644 sci-electronics/dsview/files/dsview-1.12-fix-python3.patch diff --git a/sci-electronics/dsview/dsview-1.12.ebuild b/sci-electronics/dsview/dsview-1.12-r1.ebuild similarity index 98% rename from sci-electronics/dsview/dsview-1.12.ebuild rename to sci-electronics/dsview/dsview-1.12-r1.ebuild index dbcb96bbc3..f2fffbf416 100644 --- a/sci-electronics/dsview/dsview-1.12.ebuild +++ b/sci-electronics/dsview/dsview-1.12-r1.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-qt.patch "${FILESDIR}"/${P}-fix-segfault.patch "${FILESDIR}"/${P}-fix-extern-c.patch + "${FILESDIR}"/${P}-fix-python3.patch ) src_prepare() { diff --git a/sci-electronics/dsview/files/dsview-1.12-fix-python3.patch b/sci-electronics/dsview/files/dsview-1.12-fix-python3.patch new file mode 100644 index 0000000000..252eb8d497 --- /dev/null +++ b/sci-electronics/dsview/files/dsview-1.12-fix-python3.patch @@ -0,0 +1,11 @@ +--- a/libsigrokdecode4DSL/configure.ac 2020-05-11 21:07:38.000000000 +0800 ++++ b/libsigrokdecode4DSL/configure.ac 2021-06-05 01:54:35.937525565 +0800 +@@ -90,7 +90,7 @@ + + # Python 3 is always needed. + SR_PKG_CHECK([python3], [SRD_PKGLIBS], +- [python3 >= 3.2], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2]) ++ [python3 >= 3.2], [python-3.10 >= 3.10], [python-3.9 >= 3.9], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2]) + AS_IF([test "x$sr_have_python3" = xno], + [AC_MSG_ERROR([Cannot find Python 3 development headers.])]) +