[packages/VirtualBox] - up to 7.0.10, switch to python 3
baggins
baggins at pld-linux.org
Wed Sep 6 17:58:02 CEST 2023
commit ef3354183a5237e95f1743463adf9472cbdd749b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Sep 6 17:25:56 2023 +0200
- up to 7.0.10, switch to python 3
16-no-update.patch | 180 ++++++++++++++++++++++-------------------
VirtualBox-multipython.patch | 11 ---
VirtualBox-no-vboxvideo.patch | 2 +-
VirtualBox.spec | 37 ++++-----
gcc-13.patch | 12 +++
hardening-shared.patch | 8 +-
lightdm-greeter-makefile.patch | 4 +-
pld-guest.patch | 58 ++++++-------
python3.patch | 11 +++
xsl-style-dir.patch | 11 +++
10 files changed, 184 insertions(+), 150 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index ae31aae..649780d 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,19 +47,19 @@ exit 1
%define qtver 5.6.0
-%define rel 2
+%define rel 0.1
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 6.1.46
+Version: 7.0.10
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Applications/Emulators
Source0: https://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 43a729bd9e0e3a9559188abd16df2a38
+# Source0-md5: dea0dbd1aa2012b4a35c0d416f8155c8
Source1: https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 640a09d26d46ae72268d6bdc7f4669bb
+# Source1-md5: 536e5176026317c9e3b364ecb558fd02
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -83,11 +83,13 @@ Patch9: pld-guest.patch
Patch10: 16-no-update.patch
Patch11: %{pname}-all-translations.patch
Patch13: %{pname}-no-scrextend.patch
-Patch14: %{pname}-multipython.patch
Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
Patch17: qt5-gl.patch
Patch18: qt-detect.patch
+Patch19: python3.patch
+Patch20: gcc-13.patch
+Patch21: xsl-style-dir.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -116,6 +118,7 @@ BuildRequires: OpenGL-devel
BuildRequires: Qt5Core-devel >= %{qtver}
BuildRequires: Qt5DBus-devel >= %{qtver}
BuildRequires: Qt5Gui-devel >= %{qtver}
+BuildRequires: Qt5Help-devel >= %{qtver}
BuildRequires: Qt5Network-devel >= %{qtver}
BuildRequires: Qt5OpenGL-devel >= %{qtver}
BuildRequires: Qt5PrintSupport-devel >= %{qtver}
@@ -130,13 +133,16 @@ BuildRequires: bcc
BuildRequires: bin86
BuildRequires: curl-devel >= 7.19.1
BuildRequires: device-mapper-devel >= 1.02
-%{?with_doc:BuildRequires: docbook-dtd44-xml}
+%if %{with doc}
+BuildRequires: docbook-dtd45-xml
+BuildRequires: docbook-style-xsl
+%endif
BuildRequires: fakeroot
%{?with_lightdm:BuildRequires: fltk-devel}
BuildRequires: gcc >= 5:3.2.3
%{?with_webservice:BuildRequires: gsoap-devel}
BuildRequires: issue
-BuildRequires: kBuild >= 0.1.9998.3093
+BuildRequires: kBuild >= 0.1.9998.3598
BuildRequires: libIDL-devel
BuildRequires: libcap-static
BuildRequires: libdrm-devel
@@ -157,8 +163,9 @@ BuildRequires: pam-devel
BuildRequires: pixman-devel
BuildRequires: pkgconfig
BuildRequires: pulseaudio-devel >= 0.9.0
-BuildRequires: python-devel >= 2.3
-BuildRequires: python-modules
+BuildRequires: python3-devel >= 1:3.6
+BuildRequires: python3-modules
+BuildRequires: qt5-assistant
BuildRequires: qt5-build
BuildRequires: qt5-linguist
BuildRequires: rpmbuild(macros) >= 1.752
@@ -548,11 +555,13 @@ echo override vboxsf %{_kernel_ver} misc >> kernel/installed/etc/depmod.d/%{_ker
%patch11 -p0
%endif
%patch13 -p1
-%patch14 -p0
%patch15 -p0
%patch16 -p0
%patch17 -p1
%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
%{__sed} -i -e 's, at VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -734,7 +743,6 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{pname}/VBoxGuestAdditions.iso
# manual installation steps based on src/VBox/Installer/linux/install.sh
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VirtualBox
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxManage
-ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
ln -sf %{_libdir}/%{pname}/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
@@ -922,7 +930,6 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%attr(755,root,root) %{_bindir}/VBoxDTrace
%attr(755,root,root) %{_bindir}/VBoxHeadless
%attr(755,root,root) %{_bindir}/VBoxManage
-%attr(755,root,root) %{_bindir}/VBoxSDL
%attr(755,root,root) %{_bindir}/VBoxVRDP
%attr(755,root,root) %{_bindir}/vbox-img
%dir %{_libdir}/%{pname}
@@ -962,9 +969,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetAdpCtl
%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetDHCP
%attr(755,root,root) %{_libdir}/%{pname}/VBoxNetNAT
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxSDL
%attr(755,root,root) %{_libdir}/%{pname}/VBoxSVC
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxTunctl
%attr(755,root,root) %{_libdir}/%{pname}/VBoxVMMPreload
%attr(755,root,root) %{_libdir}/%{pname}/VBoxVolInfo
%attr(755,root,root) %{_libdir}/%{pname}/VBoxXPCOMIPCD
@@ -972,16 +977,12 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%attr(755,root,root) %{_libdir}/%{pname}/bldRTLdrCheckImports
%attr(755,root,root) %{_libdir}/%{pname}/iPxeBaseBin
%attr(755,root,root) %{_libdir}/%{pname}/vboximg-mount
-%if %{with doc}
-%attr(755,root,root) %{_libdir}/%{pname}/VBoxManageHelp
-%endif
%dir %{_libdir}/%{pname}/tools
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCat
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTChMod
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCp
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiFatExtract
-%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFTPServer
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzClient
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
diff --git a/16-no-update.patch b/16-no-update.patch
index e914773..9e0f025 100644
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -1,92 +1,110 @@
+
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
-Author: Daniel Hahler <ubuntu at thequod.de>, Felix Geyer <fgeyer at debian.org>
+Author: Daniel Hahler <ubuntu at thequod.de>, Felix Geyer <fgeyer at debian.org>, Gianfranco Costamagna <locutusofborg at debian.org>
-diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
---- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
-
- void UIUpdateManager::sltForceCheck()
+Index: virtualbox/doc/manual/en_US/user_Introduction.xml
+===================================================================
+--- virtualbox.orig/doc/manual/en_US/user_Introduction.xml
++++ virtualbox/doc/manual/en_US/user_Introduction.xml
+@@ -6090,14 +6090,14 @@
+ <xref linkend="specialcharacters"/>.
+ </para>
+ </listitem>
+-
++ <!--
+ <listitem>
+ <para>
+ <emphasis role="bold">Update.</emphasis> Enables you to
+ specify various settings for Automatic Updates.
+ </para>
+ </listitem>
+-
++ -->
+ <listitem>
+ <para>
+ <emphasis role="bold">Language.</emphasis> Enables you to
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
+@@ -2421,7 +2421,7 @@
+ bool UIExtraDataManager::applicationUpdateEnabled()
{
-+ return;
-+
- /* Force call for new version check: */
- sltCheckIfUpdateIsNecessary(true /* force call */);
+ /* 'True' unless 'restriction' feature allowed: */
+- return !isFeatureAllowed(GUI_PreventApplicationUpdate);
++ return false;
}
---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp.orig 2015-07-09 20:11:53.129742315 +0200
-+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp 2015-07-09 20:12:02.136424394 +0200
-@@ -991,7 +991,6 @@
- m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
+
+ QString UIExtraDataManager::applicationUpdateData()
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -47,10 +47,10 @@
+ #ifdef VBOX_WS_WIN
+ # include "UIGlobalSettingsInterface.h"
+ #endif
+-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+-# include "UIGlobalSettingsProxy.h"
+-# include "UIGlobalSettingsUpdate.h"
+-#endif
++//#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
++//# include "UIGlobalSettingsProxy.h"
++//# include "UIGlobalSettingsUpdate.h"
++//#endif
+
+ /* GUI includes: Machine Settings: */
+ #include "UIMachineSettingsAudio.h"
+@@ -99,7 +99,7 @@
+
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
-- m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+ /* Update page: */
+- m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
++ //m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
#endif
- m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
- m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
-@@ -1033,8 +1033,6 @@
+
+ /* Language page: */
+@@ -110,7 +110,7 @@
+
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered,
- gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection);
-- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered,
-- gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection);
+ /* Proxy page: */
+- m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
++ //m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
#endif
- connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered,
- &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection);
---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig 2015-07-09 20:13:36.439757556 +0200
-+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h 2015-07-09 20:13:40.446396985 +0200
-@@ -62,7 +62,6 @@
- UIActionIndex_M_Application_S_Preferences,
+
+ #ifdef VBOX_WS_WIN
+@@ -226,14 +226,14 @@
+ }
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- UIActionIndex_M_Application_S_NetworkAccessManager,
-- UIActionIndex_M_Application_S_CheckForUpdates,
+ /* Update page: */
+- case GlobalSettingsPageType_Update:
++ /*case GlobalSettingsPageType_Update:
+ {
+ pSettingsPage = new UIGlobalSettingsUpdate;
+ addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png",
+ iPageIndex, "#update", pSettingsPage);
+ addPageHelpKeyword(iPageIndex, "preferences");
+ break;
+- }
++ }*/
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- UIActionIndex_M_Application_S_ResetWarnings,
- UIActionIndex_M_Application_S_Close,
---- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp.orig 2015-07-09 20:09:22.239478146 +0200
-+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp 2015-07-09 20:17:20.635207663 +0200
-@@ -1211,9 +1211,6 @@
- /* 'About' action goes to Application menu: */
- pMenu->addAction(action(UIActionIndex_M_Application_S_About));
- # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-- /* 'Check for Updates' action goes to Application menu: */
-- if (gEDataManager->applicationUpdateEnabled())
-- pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates));
- /* 'Network Access Manager' action goes to Application menu: */
- pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager));
- # endif
-@@ -1368,9 +1365,6 @@
- # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- /* 'Network Access Manager' action goes to 'File' menu: */
- pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager));
-- /* 'Check for Updates' action goes to 'File' menu: */
-- if (gEDataManager->applicationUpdateEnabled())
-- pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates));
- # endif
- /* Separator after tool actions of the 'File' menu: */
- pMenu->addSeparator();
-diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
---- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
- #endif
- break;
- }
-+ case GlobalSettingsPageType_Update:
-+ {
-+ return false;
-+ }
- default:
- break;
- }
---- VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp.orig 2018-12-19 19:53:33.019049148 +0100
-+++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp 2018-12-19 19:53:56.902224273 +0100
-@@ -1366,8 +1366,6 @@
- m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager));
- # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
-- if (gEDataManager->applicationUpdateEnabled())
-- m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
- # endif
- #endif /* !VBOX_WS_MAC */
- }
+ /* Language page: */
+ case GlobalSettingsPageType_Language:
+@@ -255,14 +255,14 @@
+ }
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ /* Proxy page: */
+- case GlobalSettingsPageType_Proxy:
++ /*case GlobalSettingsPageType_Proxy:
+ {
+ pSettingsPage = new UIGlobalSettingsProxy;
+ addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png",
+ iPageIndex, "#proxy", pSettingsPage);
+ addPageHelpKeyword(iPageIndex, "preferences");
+ break;
+- }
++ }*/
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #ifdef VBOX_WS_WIN
+ /* Interface page: */
diff --git a/VirtualBox-multipython.patch b/VirtualBox-multipython.patch
deleted file mode 100644
index 61df17d..0000000
--- a/VirtualBox-multipython.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/libs/xpcom18a4/python/Makefile.kmk.orig 2016-09-13 20:04:08.869585445 +0200
-+++ ./src/libs/xpcom18a4/python/Makefile.kmk 2016-09-13 20:04:29.852832898 +0200
-@@ -19,7 +19,7 @@
- include $(KBUILD_PATH)/subheader.kmk
-
- ifdef VBOX_WITH_MULTIVERSION_PYTHON
-- VBOX_MULTIPYTHON = 1
-+ VBOX_MULTIPYTHON = $(VBOX_WITH_MULTIVERSION_PYTHON)
- else
- VBOX_MULTIPYTHON = 0
- endif
diff --git a/VirtualBox-no-vboxvideo.patch b/VirtualBox-no-vboxvideo.patch
index 60b721a..b4be740 100644
--- a/VirtualBox-no-vboxvideo.patch
+++ b/VirtualBox-no-vboxvideo.patch
@@ -8,5 +8,5 @@ Fix FTBFS by not compile X.org-1.19 drv, we don't use it, just need in el <= 7
- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
+ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
- vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_system_TEMPLATE = VBoxGuestR3XOrgMod
vboxvideo_drv_system_CFLAGS := \
diff --git a/gcc-13.patch b/gcc-13.patch
new file mode 100644
index 0000000..e1234cc
--- /dev/null
+++ b/gcc-13.patch
@@ -0,0 +1,12 @@
+diff --git a/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h b/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
+index 3c65c70df..d283792f2 100644
+--- a/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
++++ b/src/libs/dxvk-native-1.9.2a/src/util/util_bit.h
+@@ -16,6 +16,7 @@
+ #include "util_likely.h"
+ #include "util_math.h"
+
++#include <cstdint>
+ #include <cstring>
+ #include <iterator>
+ #include <type_traits>
diff --git a/hardening-shared.patch b/hardening-shared.patch
index a85fe06..dee77a8 100644
--- a/hardening-shared.patch
+++ b/hardening-shared.patch
@@ -5,9 +5,9 @@ VBOX_PATH_APP_PRIVATE & VBOX_PATH_APP_PRIVATE_ARCH
@@ -1079,7 +1079,7 @@
#
ifdef VBOX_WITHOUT_HARDENING
- VBOX_WITH_HARDENING=
+ VBOX_WITH_HARDENING =
- ifeq ($(VBOX_WITH_HARDENING),)
+ ifeq ($(VBOX_WITH_HARDENING),0)
- VBOX_PATH_APP_PRIVATE=
- VBOX_PATH_APP_PRIVATE_ARCH=
- VBOX_PATH_APP_PRIVATE_ARCH_TOP=
+ VBOX_PATH_APP_PRIVATE =
+ VBOX_PATH_APP_PRIVATE_ARCH =
+ VBOX_PATH_APP_PRIVATE_ARCH_TOP =
diff --git a/lightdm-greeter-makefile.patch b/lightdm-greeter-makefile.patch
index 25c4ab5..1659155 100644
--- a/lightdm-greeter-makefile.patch
+++ b/lightdm-greeter-makefile.patch
@@ -11,10 +11,10 @@
## to the INCS, however lightdm.h is missing and will be taken from the system.
@@ -59,7 +59,7 @@
/usr/include/glib-2.0 \
- $(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \
+ $(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \
/usr/include/lightdm-gobject-1 \
- $(if $(VBOX_OSE),$(patsubst -I%,%,%(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),)
+ $(if $(VBOX_OSE),$(patsubst -I%,%,$(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),)
ifndef VBOX_WITH_FLTK
vbox-greeter_INCS += \
- /usr/include/glib-2.0 \
+ /usr/include/glib-2.0 \
diff --git a/pld-guest.patch b/pld-guest.patch
index 32ed610..70fd40e 100644
--- a/pld-guest.patch
+++ b/pld-guest.patch
@@ -12,13 +12,13 @@
+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2013-05-13 15:51:14.323890458 +0300
@@ -26,6 +26,8 @@
<file alias="os_netware.png">images/os_netware.png</file>
- <file alias="os_openbsd.png">images/os_openbsd.png</file>
<file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
-+ <file alias="os_pld.png">images/os_pld.png</file>
+ <file alias="os_openbsd.png">images/os_openbsd.png</file>
+ <file alias="os_pld_64.png">images/os_pld_64.png</file>
- <file alias="os_opensuse.png">images/os_opensuse.png</file>
++ <file alias="os_pld.png">images/os_pld.png</file>
<file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
- <file alias="os_oracle.png">images/os_oracle.png</file>
+ <file alias="os_opensuse.png">images/os_opensuse.png</file>
+ <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
--- VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc~ 2013-04-12 13:37:50.000000000 +0300
+++ VirtualBox-4.2.12/./src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2013-05-13 15:51:14.323890458 +0300
@@ -26,6 +26,8 @@
@@ -54,24 +54,16 @@
<file alias="os_oracle_64_x4.png">images/x4/os_oracle_64_x4.png</file>
--- VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp.orig 2016-07-29 19:25:16.731328887 +0200
+++ VirtualBox-5.1.2/src/VBox/Main/src-all/Global.cpp 2016-07-29 19:31:59.252427682 +0200
-@@ -321,6 +321,17 @@
- 1, 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 },
+@@ -321,6 +321,9 @@
+ VBOX_LINUX_SUBTYPE_A_32(SUSE_LE, "SUSE Linux Enterprise (32-bit)", 2048, 16, 8),
+ VBOX_LINUX_SUBTYPE_A_64(SUSE_LE, "SUSE Linux Enterprise (64-bit)", 2048, 16, 8),
-+ { "Linux", "Linux", "PLD", "PLD Linux (32-bit)",
-+ VBOXOSTYPE_PLD, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC,
-+ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
++ VBOX_LINUX_SUBTYPE_A_32(PLD, "PLD Linux (32-bit)", 1024, 16, 8),
++ VBOX_LINUX_SUBTYPE_A_64(PLD, "PLD Linux (64-bit)", 1024, 16, 8),
+
-+ { "Linux", "Linux", "PLD_64", "PLD Linux (64-bit)",
-+ VBOXOSTYPE_PLD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
-+ | VBOXOSHINT_X2APIC,
-+ 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
-+
- { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)",
- VBOXOSTYPE_Solaris, VBOXOSHINT_NONE,
- 1, 1024, 16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ VBOX_LINUX_SUBTYPE_A_32(Turbolinux, "Turbolinux (32-bit)", 384, 16, 8),
+ VBOX_LINUX_SUBTYPE_A_64(Turbolinux, "Turbolinux (64-bit)", 384, 16, 8),
+
--- VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp~ 2014-02-25 19:09:15.000000000 +0200
+++ VirtualBox-4.3.8/src/VBox/Main/src-server/ApplianceImpl.cpp 2014-02-28 09:52:48.663191185 +0200
@@ -141,6 +141,8 @@
@@ -86,25 +78,25 @@
--- VirtualBox-4.3.8/include/VBox/ostypes.h~ 2014-02-25 18:59:48.000000000 +0200
+++ VirtualBox-4.3.8/include/VBox/ostypes.h 2014-02-28 09:56:34.440314457 +0200
@@ -103,6 +103,8 @@
- VBOXOSTYPE_Xandros_x64 = 0x5D100,
- VBOXOSTYPE_Oracle = 0x5E000,
- VBOXOSTYPE_Oracle_x64 = 0x5E100,
+ VBOXOSTYPE_Oracle8_x64 = 0x5E105, // 64-bit only
+ VBOXOSTYPE_Oracle9_x64 = 0x5E106, // 64-bit only
+ VBOXOSTYPE_Oracle_latest_x64 = VBOXOSTYPE_Oracle9_x64,
+ VBOXOSTYPE_PLD = 0x5F000,
+ VBOXOSTYPE_PLD_x64 = 0x5F100,
VBOXOSTYPE_FreeBSD = 0x60000,
VBOXOSTYPE_FreeBSD_x64 = 0x60100,
VBOXOSTYPE_OpenBSD = 0x61000,
---- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp~ 2014-02-25 19:09:00.000000000 +0200
-+++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2014-02-28 09:58:59.493698505 +0200
+--- VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp~ 2014-02-25 19:09:00.000000000 +0200
++++ VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp 2014-02-28 09:58:59.493698505 +0200
@@ -133,6 +133,8 @@
- { QRegExp("Xa.*32", Qt::CaseInsensitive), "Xandros" },
- { QRegExp("((Or)|(oel)|(^ol)).*64", Qt::CaseInsensitive), "Oracle_64" },
- { QRegExp("((Or)|(oel)|(^ol)).*32", Qt::CaseInsensitive), "Oracle" },
-+ { QRegExp("PLD.*64", Qt::CaseInsensitive), "PLD_64" },
-+ { QRegExp("PLD.*32", Qt::CaseInsensitive), "PLD" },
- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
- { QRegExp("((Lin)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+ { QRegularExpression("Xa.*32", QRegularExpression::CaseInsensitiveOption), "Xandros" },
+ { QRegularExpression("((Or)|(oel)|(^ol)).*64", QRegularExpression::CaseInsensitiveOption), "Oracle_64" },
+ { QRegularExpression("((Or)|(oel)|(^ol)).*32", QRegularExpression::CaseInsensitiveOption), "Oracle" },
++ { QRegularExpression("PLD.*64", QRegularExpression::CaseInsensitiveOption), "PLD_64" },
++ { QRegularExpression("PLD.*32", QRegularExpression::CaseInsensitiveOption), "PLD" },
+ { QRegularExpression("Knoppix", QRegularExpression::CaseInsensitiveOption), "Linux26" },
+ { QRegularExpression("Dsl", QRegularExpression::CaseInsensitiveOption), "Linux24" },
+ { QRegularExpression("((Lin)|(lnx)).*2.?2", QRegularExpression::CaseInsensitiveOption), "Linux22" },
--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp.orig 2015-07-09 20:00:01.339965485 +0200
+++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIIconPool.cpp 2015-07-09 20:00:40.670058835 +0200
@@ -332,6 +332,8 @@
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 0000000..fd037f7
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-7.0.10/configure~ 2023-09-06 15:45:03.000000000 +0200
++++ VirtualBox-7.0.10/configure 2023-09-06 15:48:44.766964239 +0200
+@@ -2173,7 +2173,7 @@
+ }
+ 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.9 python3.10 python3.11 python3.12"
++ SUPPYTHONLIBS="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.9 python3.10 python3.11 python3.12"
+ 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
diff --git a/xsl-style-dir.patch b/xsl-style-dir.patch
new file mode 100644
index 0000000..b561f0b
--- /dev/null
+++ b/xsl-style-dir.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-7.0.10/doc/manual/Config.kmk.orig 2023-07-12 18:25:05.000000000 +0200
++++ VirtualBox-7.0.10/doc/manual/Config.kmk 2023-09-06 16:49:17.062393789 +0200
+@@ -135,7 +135,7 @@
+ VBOX_PATH_DOCBOOK_DTD ?= $(KBUILD_DEVTOOLS)/common/docbook-xml/v4.5
+ else
+ # use docbook of the build host
+- VBOX_PATH_DOCBOOK ?= /usr/share/xml/docbook/stylesheet/docbook-xsl
++ VBOX_PATH_DOCBOOK ?= /usr/share/sgml/docbook/xsl-stylesheets
+ VBOX_PATH_DOCBOOK_DTD ?= /usr/share/xml/docbook/schema/dtd/4.5
+ endif
+ VBOX_XML_CATALOG ?= $(VBOX_PATH_MANUAL_OUTBASE)/vbox-doc.cat
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/ef3354183a5237e95f1743463adf9472cbdd749b
More information about the pld-cvs-commit
mailing list