Date: Tuesday, November 10, 2020 @ 10:10:15 Author: felixonmars Revision: 749462
add python3.9 patch from rpmfusion Added: virtualbox/trunk/019-python3.9.patch Modified: virtualbox/trunk/PKGBUILD ---------------------+ 019-python3.9.patch | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 9 +--- 2 files changed, 105 insertions(+), 5 deletions(-) Added: 019-python3.9.patch =================================================================== --- 019-python3.9.patch (rev 0) +++ 019-python3.9.patch 2020-11-10 10:10:15 UTC (rev 749462) @@ -0,0 +1,101 @@ +--- ./src/libs/xpcom18a4/python/gen_python_deps.py.orig 2020-06-01 05:15:00.905907651 +0100 ++++ ./src/libs/xpcom18a4/python/gen_python_deps.py 2020-06-01 05:15:48.161226499 +0100 +@@ -16,7 +16,7 @@ from __future__ import print_function + import os,sys + from distutils.version import StrictVersion + +-versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m" ] ++versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m" ] + prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"] + known = {} + +--- ./configure.orig 2020-06-01 01:15:53.880747364 +0100 ++++ ./configure 2020-06-01 01:17:42.231478707 +0100 +@@ -1992,7 +1992,7 @@ extern "C" int main(void) + } + EOF + found= +- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m" ++ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m python3.8 python3.8m python3.9 python3.9m" + for p in $PYTHONDIR; do + for d in $SUPPYTHONLIBS; do + for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do +--- ./src/libs/xpcom18a4/python/Makefile.kmk.orig 2020-06-01 05:16:07.610357728 +0100 ++++ ./src/libs/xpcom18a4/python/Makefile.kmk 2020-06-01 05:22:44.735037239 +0100 +@@ -26,7 +26,7 @@ endif + + # + # List of supported Python versions, defining a number of +-# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|DEF]_[INC|LIB] variables ++# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|DEF]_[INC|LIB] variables + # which get picked up below. + # + ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. +@@ -532,6 +532,52 @@ VBoxPython3_8m_x86_LIBS = $(VBOX_P + endif + endif + endif ++ ++ifdef VBOX_PYTHON39_INC ++# ++# Python 3.9 version ++# ++DLLS += VBoxPython3_9 ++VBoxPython3_9_EXTENDS = VBoxPythonBase ++VBoxPython3_9_EXTENDS_BY = appending ++VBoxPython3_9_TEMPLATE = XPCOM ++VBoxPython3_9_INCS = $(VBOX_PYTHON39_INC) ++VBoxPython3_9_LIBS = $(VBOX_PYTHON39_LIB) ++ ++ ifdef VBOX_WITH_32_ON_64_MAIN_API ++ ifdef VBOX_PYTHON39_LIB_X86 ++DLLS += VBoxPython3_9_x86 ++VBoxPython3_9_x86_EXTENDS = VBoxPythonBase_x86 ++VBoxPython3_9_x86_EXTENDS_BY = appending ++VBoxPython3_9_x86_TEMPLATE = XPCOM ++VBoxPython3_9_x86_INCS = $(VBOX_PYTHON39_INC) ++VBoxPython3_9_x86_LIBS = $(VBOX_PYTHON39_LIB_X86) ++ endif ++ endif ++endif ++ ++ifdef VBOX_PYTHON39M_INC ++# ++# Python 3.9 version with pymalloc ++# ++DLLS += VBoxPython3_9m ++VBoxPython3_9m_EXTENDS = VBoxPythonBase_m ++VBoxPython3_9m_EXTENDS_BY = appending ++VBoxPython3_9m_TEMPLATE = XPCOM ++VBoxPython3_9m_INCS = $(VBOX_PYTHON39M_INC) ++VBoxPython3_9m_LIBS = $(VBOX_PYTHON39M_LIB) ++ ++ ifdef VBOX_WITH_32_ON_64_MAIN_API ++ ifdef VBOX_PYTHON39M_LIB_X86 ++DLLS += VBoxPython3_9m_x86 ++VBoxPython3_9m_x86_EXTENDS = VBoxPythonBase_x86_m ++VBoxPython3_9m_x86_EXTENDS_BY = appending ++VBoxPython3_9m_x86_TEMPLATE_ = XPCOM ++VBoxPython3_9m_x86_INCS = $(VBOX_PYTHON39M_INC) ++VBoxPython3_9m_x86_LIBS = $(VBOX_PYTHON39M_LIB_X86) ++ endif ++ endif ++endif + + ifdef VBOX_PYTHONDEF_INC + # +--- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig 2020-06-01 06:01:12.923522302 +0100 ++++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2020-06-01 06:02:25.704013030 +0100 +@@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter + # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX) + # endif + # ifdef VBOX_PYXPCOM_VERSIONED +-# if PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000 ++# if PY_VERSION_HEX >= 0x03090000 && PY_VERSION_HEX < 0x03100000 ++# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_9") ++# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_9) ++ ++# elif PY_VERSION_HEX >= 0x03080000 && PY_VERSION_HEX < 0x03090000 + # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_8") + # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_8) + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-11-10 09:47:16 UTC (rev 749461) +++ PKGBUILD 2020-11-10 10:10:15 UTC (rev 749462) @@ -78,7 +78,8 @@ '013-Makefile.patch' '016-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch' '017-fix-narrowing-conversion.patch' - '018-xclient.patch') + '018-xclient.patch' + '019-python3.9.patch') sha256sums=('49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1' 'SKIP' '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db' @@ -102,7 +103,8 @@ 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9' '100c9e14e9cfb12ae65364e830153d2481cf272ceeb39d11c6b203bc6e35bf0c' '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99' - 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3') + 'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3' + '039c7b520ae589bc52dc6c0e658f7ec28ca8defb12ccbc32ad9834361d23162c') prepare() { cd "VirtualBox-$pkgver" @@ -121,9 +123,6 @@ echo 'Use our CFLAGS' echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk - - # Fix Python 3.9 detection - sed -i 's/python3.8 python3.8m/python3.8 python3.8m python3.9 python3.9m/' configure } build() {