pidgin: Use python3 during build
PATCH 1/1 pidgin: Use python3 during build
--- .../pidgin/pidgin/use_py3.patch | 20 +++++++++++++++++++ .../recipes-support/pidgin/pidgin_2.13.0.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 meta-oe/recipes-support/pidgin/pidgin/use_py3.patch
meta-oe/recipes-support/pidgin/pidgin/use_py3.patch new file +20 -0
@@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1488,7 +1488,7 @@ AC_ARG_WITH([python], + + if test "x$enable_dbus" = "xyes" || test "x$enable_consoleui" = "xyes" ; then + if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then +- AC_PATH_PROG([PYTHON], [python], [no]) ++ AC_PATH_PROG([PYTHON], [python3], [no]) + fi + + if test x"$PYTHON" = x"no" ; then +@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently + dnl (Thanks to XChat) + if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; then + AC_MSG_CHECKING(for Python compile flags) +- PKG_CHECK_MODULES(PY, python, [ ++ PKG_CHECK_MODULES(PY, python3, [ + AC_SUBST(PY_CFLAGS) + AC_SUBST(PY_LIBS) + ], [
meta-oe/recipes-support/pidgin/pidgin_2.13.0.bb +1 -0
@@ -11,6 +11,7 @@ SRC_URI = "\ file://sanitize-configure.ac.patch \ file://purple-OE-branding-25.patch \ file://pidgin-cross-python-265.patch \ + file://use_py3.patch \ " SRC_URI[md5sum] = "423403494fe1951e47cc75231f743bb0"
Signature · 1 line
2.24.0
meta-oe/recipes-support/pidgin/pidgin/use_py3.patch line 20
Quoted 11 lines · Khem Raj
...
+@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently
+ dnl (Thanks to XChat)
+ if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; thenmeta-oe/recipes-support/pidgin/pidgin/use_py3.patch new file +6
-0+ AC_MSG_CHECKING(for Python compile flags) +- PKG_CHECK_MODULES(PY, python, [ ++ PKG_CHECK_MODULES(PY, python3, [ + AC_SUBST(PY_CFLAGS) + AC_SUBST(PY_LIBS) + ], [
This one also wants
https://bitbucket.org/pidgin/main/pull-requests/357/gnt-fix-use-after-free-memory-violation/diff
Not sure whether there are more fixes that need backporting for Python3.
cu
Adrian
Quoted 14 lines · Adrian Bunk
meta-oe/recipes-support/pidgin/pidgin/use_py3.patch line 20
Quoted 11 lines · Khem Raj
...
+@@ -1568,7 +1568,7 @@ dnl Check for Python headers (currently
+ dnl (Thanks to XChat)
+ if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON" -a x"$PYTHON" != x"no" ; thenmeta-oe/recipes-support/pidgin/pidgin/use_py3.patch new file +6
-0+ AC_MSG_CHECKING(for Python compile flags) +- PKG_CHECK_MODULES(PY, python, [ ++ PKG_CHECK_MODULES(PY, python3, [ + AC_SUBST(PY_CFLAGS) + AC_SUBST(PY_LIBS) + ], [
Quoted 5 lines
This one also wants
https://bitbucket.org/pidgin/main/pull-requests/357/gnt-fix-use-after-free-memory-violation/diffNot sure whether there are more fixes that need backporting for Python3.
Good question. So I checked the plugins which generate .c files using these python scripts for dbus bindingsdbus-bindings.c dbus-signals.c dbus-types.c purple-client-bindings.c
and I regenerated manually using py2 and compared with py3 generated ones. They are identical.
Quoted 2 lines
cu
Adrian