commit e67a1ae670a3d87d2213fb48ea98d67fc473efe8 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Mon Feb 21 01:26:18 2022 +0000 Re-enable python on Fedora > 34 0002-no_ifndef.patch | 15 +++++++++++++++ VirtualBox.spec | 12 +++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) --- diff --git a/0002-no_ifndef.patch b/0002-no_ifndef.patch new file mode 100644 index 0000000..d43b37c --- /dev/null +++ b/0002-no_ifndef.patch @@ -0,0 +1,15 @@ +--- ./src/libs/xpcom18a4/python/src/PyXPCOM.h 2022-02-21 00:41:31.557209100 +0000 ++++ ./src/libs/xpcom18a4/python/src/PyXPCOM.h.new 2022-02-21 00:41:58.393102484 +0000 +@@ -137,12 +137,6 @@ inline PyObject *PyBool_FromLong(long ok + # define PyInt_Check(o) PyLong_Check(o) + # define PyInt_AsLong(o) PyLong_AsLong(o) + # define PyNumber_Int(o) PyNumber_Long(o) +-# ifndef PyUnicode_AsUTF8 +-# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) +-# endif +-# ifndef PyUnicode_AsUTF8AndSize +-# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s) +-# endif + typedef struct PyMethodChain + { + PyMethodDef *methods; diff --git a/VirtualBox.spec b/VirtualBox.spec index ff79534..53b1935 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -16,11 +16,11 @@ #global prerel RC1 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} -#%%if 0%%{?fedora} > 34 -# %%bcond_with webservice -#%%else +%if 0%{?fedora} > 35 + %bcond_with webservice +%else %bcond_without webservice -#%%endif +%endif # Now we use upstream pdf %bcond_with docs %bcond_without vnc @@ -94,6 +94,7 @@ Patch73: vb-6.1.16-modal-dialog-parent.patch Patch80: VirtualBox-6.1.4-gcc10.patch Patch88: VirtualBox-lzf.patch Patch90: 0001-libs-xpcom-Added-support-for-running-with-Python-3.1.patch +Patch91: 0002-no_ifndef.patch BuildRequires: gcc-c++ BuildRequires: kBuild >= 0.1.9998.r3093 @@ -123,7 +124,7 @@ BuildRequires: gsoap-devel %endif BuildRequires: pam-devel BuildRequires: genisoimage -BuildRequires: java-1.8.0-devel +BuildRequires: java-11-devel %if %{with docs} BuildRequires: /usr/bin/pdflatex BuildRequires: docbook-dtds @@ -342,6 +343,7 @@ rm -r src/libs/zlib-1.2.*/ %patch80 -p1 -b .gcc10 %patch88 -p1 -b .lzf %patch90 -p2 -b .python3.10 +%patch91 -p1 -b .python3.10 %build