forked from pool/virtualbox
Accepting request 754102 from Virtualization
OBS-URL: https://build.opensuse.org/request/show/754102 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=187
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
0c435e7bd1
@ -19,7 +19,7 @@ Index: VirtualBox-6.0.14/configure
|
|||||||
EOF
|
EOF
|
||||||
found=
|
found=
|
||||||
- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m"
|
- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m python3.6 python3.6m"
|
||||||
+ SUPPYTHONLIBS="python3.4 python3.4m python3.5 python3.5m python3.6m python3.6 python3.7m python3.7"
|
+ SUPPYTHONLIBS="python3.4 python3.4m python3.5 python3.5m python3.6m python3.6 python3.7m python3.7 python3.8m python3.8"
|
||||||
for p in $PYTHONDIR; do
|
for p in $PYTHONDIR; do
|
||||||
for d in $SUPPYTHONLIBS; do
|
for d in $SUPPYTHONLIBS; do
|
||||||
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
|
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
|
||||||
@ -176,3 +176,82 @@ Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/src/PyGBase.cpp
|
|||||||
if (iid.Equals(NS_GET_IID(nsISupports)))
|
if (iid.Equals(NS_GET_IID(nsISupports)))
|
||||||
return (nsISupports *)(nsIInternalPython *)this;
|
return (nsISupports *)(nsIInternalPython *)this;
|
||||||
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
|
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
|
||||||
|
Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/Makefile.kmk
|
||||||
|
===================================================================
|
||||||
|
--- VirtualBox-6.0.14.orig/src/libs/xpcom18a4/python/Makefile.kmk
|
||||||
|
+++ VirtualBox-6.0.14/src/libs/xpcom18a4/python/Makefile.kmk
|
||||||
|
@@ -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|DEF]_[INC|LIB] variables
|
||||||
|
+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|DEF]_[INC|LIB] variables
|
||||||
|
# which get picked up below.
|
||||||
|
#
|
||||||
|
ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
|
||||||
|
@@ -486,6 +486,52 @@ VBoxPython3_7m_x86_LIBS = $(VBOX_P
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
+
|
||||||
|
+ifdef VBOX_PYTHON38_INC
|
||||||
|
+#
|
||||||
|
+# Python 3.8 version
|
||||||
|
+#
|
||||||
|
+DLLS += VBoxPython3_8
|
||||||
|
+VBoxPython3_8_EXTENDS = VBoxPythonBase
|
||||||
|
+VBoxPython3_8_EXTENDS_BY = appending
|
||||||
|
+VBoxPython3_8_TEMPLATE = XPCOM
|
||||||
|
+VBoxPython3_8_INCS = $(VBOX_PYTHON38_INC)
|
||||||
|
+VBoxPython3_8_LIBS = $(VBOX_PYTHON38_LIB)
|
||||||
|
+
|
||||||
|
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
|
||||||
|
+ ifdef VBOX_PYTHON38_LIB_X86
|
||||||
|
+DLLS += VBoxPython3_8_x86
|
||||||
|
+VBoxPython3_8_x86_EXTENDS = VBoxPythonBase_x86
|
||||||
|
+VBoxPython3_8_x86_EXTENDS_BY = appending
|
||||||
|
+VBoxPython3_8_x86_TEMPLATE = XPCOM
|
||||||
|
+VBoxPython3_8_x86_INCS = $(VBOX_PYTHON38_INC)
|
||||||
|
+VBoxPython3_8_x86_LIBS = $(VBOX_PYTHON38_LIB_X86)
|
||||||
|
+ endif
|
||||||
|
+ endif
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
+ifdef VBOX_PYTHON38M_INC
|
||||||
|
+#
|
||||||
|
+# Python 3.8 version with pymalloc
|
||||||
|
+#
|
||||||
|
+DLLS += VBoxPython3_8m
|
||||||
|
+VBoxPython3_8m_EXTENDS = VBoxPythonBase_m
|
||||||
|
+VBoxPython3_8m_EXTENDS_BY = appending
|
||||||
|
+VBoxPython3_8m_TEMPLATE = XPCOM
|
||||||
|
+VBoxPython3_8m_INCS = $(VBOX_PYTHON38M_INC)
|
||||||
|
+VBoxPython3_8m_LIBS = $(VBOX_PYTHON38M_LIB)
|
||||||
|
+
|
||||||
|
+ ifdef VBOX_WITH_32_ON_64_MAIN_API
|
||||||
|
+ ifdef VBOX_PYTHON38M_LIB_X86
|
||||||
|
+DLLS += VBoxPython3_8m_x86
|
||||||
|
+VBoxPython3_8m_x86_EXTENDS = VBoxPythonBase_x86_m
|
||||||
|
+VBoxPython3_8m_x86_EXTENDS_BY = appending
|
||||||
|
+VBoxPython3_8m_x86_TEMPLATE_ = XPCOM
|
||||||
|
+VBoxPython3_8m_x86_INCS = $(VBOX_PYTHON38M_INC)
|
||||||
|
+VBoxPython3_8m_x86_LIBS = $(VBOX_PYTHON38M_LIB_X86)
|
||||||
|
+ endif
|
||||||
|
+ endif
|
||||||
|
+endif
|
||||||
|
|
||||||
|
ifdef VBOX_PYTHONDEF_INC
|
||||||
|
#
|
||||||
|
Index: VirtualBox-6.0.14/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||||
|
===================================================================
|
||||||
|
--- VirtualBox-6.0.14.orig/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||||
|
+++ VirtualBox-6.0.14/src/libs/xpcom18a4/python/gen_python_deps.py
|
||||||
|
@@ -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"]
|
||||||
|
+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"]
|
||||||
|
prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
|
||||||
|
known = {}
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 4 16:33:09 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||||
|
|
||||||
|
- Update file "switch_to_python3.4+.patch" to handle Python 3.8. (bsc#1158288)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 5 14:44:08 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
Tue Nov 5 14:44:08 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package virtualbox
|
# spec file for package virtualbox
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -52,7 +52,7 @@ Release: 0
|
|||||||
Summary: VirtualBox is an Emulator
|
Summary: VirtualBox is an Emulator
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: System/Emulators/PC
|
Group: System/Emulators/PC
|
||||||
Url: http://www.virtualbox.org/
|
URL: http://www.virtualbox.org/
|
||||||
#
|
#
|
||||||
# so you don't need to repack virtualbox by hand, just add new release of VirtualBox-x.x.x.tar.bz2 and line below with
|
# so you don't need to repack virtualbox by hand, just add new release of VirtualBox-x.x.x.tar.bz2 and line below with
|
||||||
# script virtualbox-patch-source.sh will do the job :)
|
# script virtualbox-patch-source.sh will do the job :)
|
||||||
@ -154,6 +154,7 @@ Patch132: fixes_for_qt5.13.patch
|
|||||||
Patch133: fixes_for_5.4.patch
|
Patch133: fixes_for_5.4.patch
|
||||||
Patch999: virtualbox-fix-ui-background-color.patch
|
Patch999: virtualbox-fix-ui-background-color.patch
|
||||||
#
|
#
|
||||||
|
BuildRequires: %{python_module devel}
|
||||||
BuildRequires: LibVNCServer-devel
|
BuildRequires: LibVNCServer-devel
|
||||||
BuildRequires: SDL-devel
|
BuildRequires: SDL-devel
|
||||||
BuildRequires: acpica
|
BuildRequires: acpica
|
||||||
@ -460,6 +461,7 @@ echo "sle_version " %{?sle_version}", is_opensuse " %{?is_opensuse}", suse_versi
|
|||||||
|
|
||||||
# make VB UI background colors look sane again
|
# make VB UI background colors look sane again
|
||||||
%patch999 -p1
|
%patch999 -p1
|
||||||
|
echo "sle_version $(0%{?sle_version})"
|
||||||
|
|
||||||
#copy user manual
|
#copy user manual
|
||||||
cp %{SOURCE1} UserManual.pdf
|
cp %{SOURCE1} UserManual.pdf
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user