Date: Tuesday, November 5, 2019 @ 07:03:24
Author: arojas
Revision: 366779
Backport more python 3.8 fixes
Modified:
libreoffice-still/trunk/PKGBUILD
libreoffice-still/trunk/python-3.8.patch
------------------+
PKGBUILD | 2 +-
python-3.8.patch | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-05 00:34:03 UTC (rev 366778)
+++ PKGBUILD 2019-11-05 07:03:24 UTC (rev 366779)
@@ -95,7 +95,7 @@
'49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63'
'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
- '6b9452945dcabb349703aa694afb1446c93915ef7aed616dec5953f684229251'
+ '98f8ab4fba7b6a1c64f7e3cfe597083cafdd60e31bfd6b2da20456a2089d8581'
'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
'07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6')
Modified: python-3.8.patch
===================================================================
--- python-3.8.patch 2019-11-05 00:34:03 UTC (rev 366778)
+++ python-3.8.patch 2019-11-05 07:03:24 UTC (rev 366779)
@@ -183,3 +183,17 @@
#endif
};
+diff --git a/configure.ac b/configure.ac
+index 77cbacb109b6..39dd082b8366 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8574,6 +8574,9 @@ if test $enable_python = system; then
+ if test -z "$PKG_CONFIG"; then
+ PYTHON_CFLAGS="-I$python_include"
+ PYTHON_LIBS="-L$python_libdir -lpython$python_version
$python_libs"
++ elif $PKG_CONFIG --exists python-$python_version-embed; then
++ PYTHON_CFLAGS="`$PKG_CONFIG --cflags
python-$python_version-embed`"
++ PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version-embed`
$python_libs"
+ elif $PKG_CONFIG --exists python-$python_version; then
+ PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version`"
+ PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version`
$python_libs"
