diff -Nru weechat-2.6/debian/changelog weechat-2.6/debian/changelog --- weechat-2.6/debian/changelog 2020-03-03 12:39:30.000000000 +0000 +++ weechat-2.6/debian/changelog 2020-04-13 09:17:32.000000000 +0100 @@ -1,3 +1,9 @@ +weechat (2.6-2ubuntu2) UNRELEASED; urgency=medium + + * Correctly find and link against libpython3.8 (LP: #1866065) + + -- Tj Mon, 13 Apr 2020 09:17:32 +0100 + weechat (2.6-2ubuntu1) focal; urgency=medium * Add ruby2.7 support (LP: #1865873) diff -Nru weechat-2.6/debian/patches/lp1866065-python3-linking.patch weechat-2.6/debian/patches/lp1866065-python3-linking.patch --- weechat-2.6/debian/patches/lp1866065-python3-linking.patch 1970-01-01 01:00:00.000000000 +0100 +++ weechat-2.6/debian/patches/lp1866065-python3-linking.patch 2020-04-13 09:17:03.000000000 +0100 @@ -0,0 +1,36 @@ +commit 3da688a8f8ba75a9f3cb411011e24398d65497ad +Author: Tj +Date: Mon Apr 13 09:09:33 2020 +0100 + + python: find and correctly link against libpython3.8 + +diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake +index 2e71e4c57..4fa6d24e7 100644 +--- a/cmake/FindPython.cmake ++++ b/cmake/FindPython.cmake +@@ -33,5 +33,8 @@ include(FindPkgConfig) + if(ENABLE_PYTHON2) + pkg_check_modules(PYTHON python2) + else() +- pkg_check_modules(PYTHON python3) ++ pkg_check_modules(PYTHON python3-embed) ++ if(NOT PYTHON_FOUND) ++ pkg_check_modules(PYTHON python3) ++ endif() + endif() +diff --git a/configure.ac b/configure.ac +index ea014a988..e026789c3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -477,7 +477,10 @@ if test "x$enable_python" = "xyes" ; then + if test "x$enable_python2" = "xyes" ; then + PKG_CHECK_MODULES(PYTHON, [python2], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python2`], [PYTHON_FOUND=no]) + else +- PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no]) ++ PKG_CHECK_MODULES(PYTHON, [python3-embed], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3-embed`], [PYTHON_FOUND=no]) ++ if test "x$PYTHON_FOUND" != "xyes"; then ++ PKG_CHECK_MODULES(PYTHON, [python3], [PYTHON_FOUND=yes; PYTHON_VERSION=`$PKGCONFIG --modversion python3`], [PYTHON_FOUND=no]) ++ fi + fi + if test "x$PYTHON_FOUND" != "xyes" ; then + AC_MSG_WARN([ diff -Nru weechat-2.6/debian/patches/series weechat-2.6/debian/patches/series --- weechat-2.6/debian/patches/series 2020-03-03 12:39:30.000000000 +0000 +++ weechat-2.6/debian/patches/series 2020-04-13 09:17:20.000000000 +0100 @@ -1,3 +1,4 @@ 01_fix_asciidoctor_options.patch guile_2.2-support.patch ruby27-support.patch +lp1866065-python3-linking.patch