From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 7 Sep 2023 15:02:47 +0000 (+0200)
Subject: - try harder to build with python3
X-Git-Tag: auto/th/VirtualBox-7.0.10-2~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=058bd731248f2aba5f91db433b94460b5b275801;p=packages%2FVirtualBox.git

- try harder to build with python3
---

diff --git a/VirtualBox.spec b/VirtualBox.spec
index e51d91c..5eef2a5 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -617,6 +617,8 @@ VBOX_GCC_OPT=%{rpmcxxflags}
 
 TOOL_YASM_AS := /usr/bin/yasm
 
+VBOX_BLD_PYTHON := %{__python3}
+
 VBOX_PATH_APP_PRIVATE_ARCH := %{_libdir}/%{pname}
 VBOX_PATH_APP_PRIVATE := %{_datadir}/%{pname}
 VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
diff --git a/python3.patch b/python3.patch
index fd037f7..3e96dd7 100644
--- a/python3.patch
+++ b/python3.patch
@@ -9,3 +9,20 @@
    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
+--- VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py~	2023-07-12 18:42:54.000000000 +0200
++++ VirtualBox-7.0.10/src/libs/xpcom18a4/python/gen_python_deps.py	2023-09-07 16:25:51.601179500 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ """
+ Copyright (C) 2009-2023 Oracle and/or its affiliates.
+@@ -26,7 +26,7 @@
+ 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.9", "3.10", "3.11", "3.12" ]
++versions = ["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.9", "3.10", "3.11", "3.12" ]
+ prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
+ known = {}
+