From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/
Date: Fri, 4 Jun 2021 11:23:55 +0000 (UTC) [thread overview]
Message-ID: <1622805824.7efabb81f9bbfc7ea149285949a27400ea6db736.marecki@gentoo> (raw)
commit: 7efabb81f9bbfc7ea149285949a27400ea6db736
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 4 11:21:30 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 4 11:23:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efabb81
media-gfx/zbar: fix python3_9 compilation failure
Backported upstream fix. Tested against python3_8 and python3_9,
compiles fine against both.
Reported-by: PhobosK <phobosk <AT> fastmail.fm>
Closes: https://bugs.gentoo.org/788703
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../zbar/files/zbar-0.23.1_python_tp_print.patch | 55 ++++++++++++++++++++++
media-gfx/zbar/zbar-0.23.1.ebuild | 1 +
2 files changed, 56 insertions(+)
diff --git a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
new file mode 100644
index 00000000000..8d4d821426d
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
@@ -0,0 +1,55 @@
+From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Date: Tue, 28 Jul 2020 10:27:30 +0200
+Subject: [PATCH] python: enum: make it compatible with Python 3.9
+
+As reported by:
+ https://github.com/mchehab/zbar/issues/92
+
+python bindings don't build with Python 3.9, because it is
+using tp_print, which has been silently ignored since Python
+3.0, according with[1]:
+
+ "The tp_print slot of PyTypeObject has been removed.
+ It was used for printing objects to files in Python 2.7
+ and before.
+ Since Python 3.0, it has been ignored and unused."
+
+[1] https://docs.python.org/3.9/whatsnew/3.9.html#id3
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+---
+ python/enum.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/python/enum.c b/python/enum.c
+index a1135531..dfe1b1ef 100644
+--- a/python/enum.c
++++ b/python/enum.c
+@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self)
+ return(self->name);
+ }
+
++#if PY_MAJOR_VERSION < 3
++/* tp_print was dropped on Python 3.9 */
+ static int
+ enumitem_print (zbarEnumItem *self,
+ FILE *fp,
+@@ -83,6 +85,7 @@ enumitem_print (zbarEnumItem *self,
+ {
+ return(self->name->ob_type->tp_print(self->name, fp, flags));
+ }
++#endif
+
+ static PyObject*
+ enumitem_repr (zbarEnumItem *self)
+@@ -115,7 +118,9 @@ PyTypeObject zbarEnumItem_Type = {
+ .tp_new = (newfunc)enumitem_new,
+ .tp_dealloc = (destructor)enumitem_dealloc,
+ .tp_str = (reprfunc)enumitem_str,
++#if PY_MAJOR_VERSION < 3
+ .tp_print = (printfunc)enumitem_print,
++#endif
+ .tp_repr = (reprfunc)enumitem_repr,
+ };
+
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index d74a878a969..7b07b269b68 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -87,6 +87,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
"${FILESDIR}/${P}-autoconf-2.70.patch"
+ "${FILESDIR}/${PN}-0.23.1_python_tp_print.patch"
)
DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
next reply other threads:[~2021-06-04 11:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 11:23 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-03-09 8:53 [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/ Sam James
2022-05-08 23:29 Andreas Sturmlechner
2021-06-04 11:23 Marek Szuba
2020-02-03 17:37 Andreas Sturmlechner
2018-11-25 17:36 Andreas Sturmlechner
2017-05-23 9:20 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1622805824.7efabb81f9bbfc7ea149285949a27400ea6db736.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox