Page MenuHomeSolus
Files F11049932

D4852.diff
No OneTemporary
Actions

D4852.diff
View Options

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -12,7 +12,6 @@
libXdamage.so.1
libXext.so.6
libXfixes.so.3
-libXinerama.so.1
libXmu.so.6
libXrandr.so.2
libXt.so.6
@@ -20,16 +19,19 @@
libcrypt.so.1
libcrypto.so.1.0.0
libcurl.so.4
+libdevmapper.so.1.02
libdl.so.2
libgcc_s.so.1
libm.so.6
+libopus.so.0
libpam.so.0
libpng16.so.16
libpthread.so.0
-libpython2.7.so.1.0
+libpython3.6m.so.1.0
librt.so.1
libssl.so.1.0.0
libstdc++.so.6
+libvpx.so.5
libxcb.so.1
libxml2.so.2
libz.so.1
diff --git a/files/0001-Fix-rdesktop-vrdp-keymaps-path.patch b/files/0001-Fix-rdesktop-vrdp-keymaps-path.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Fix-rdesktop-vrdp-keymaps-path.patch
@@ -0,0 +1,26 @@
+From 7226f00a0e34d75de95ea5f82990282fa52fe62c Mon Sep 17 00:00:00 2001
+From: Pierre-Yves <pyu@riseup.net>
+Date: Thu, 27 Dec 2018 12:42:48 +0100
+Subject: [PATCH] Fix rdesktop-vrdp-keymaps path
+
+Signed-off-by: Pierre-Yves <pyu@riseup.net>
+---
+ src/VBox/RDP/client-1.8.3/Makefile.kmk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/VBox/RDP/client-1.8.3/Makefile.kmk b/src/VBox/RDP/client-1.8.3/Makefile.kmk
+index 1d5659a9..934e4ff7 100644
+--- a/src/VBox/RDP/client-1.8.3/Makefile.kmk
++++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk
+@@ -41,7 +41,7 @@ rdesktop-vrdp_DEFS = \
+ EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
+ HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
+ HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
+- KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
++ KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
+ RDESKTOP=1
+ ifdef WITH_BIRD_VD_HACKS
+ rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS
+--
+2.20.1
+
diff --git a/files/Disable-automatic-check-for-updates.patch b/files/Disable-automatic-check-for-updates.patch
new file mode 100644
--- /dev/null
+++ b/files/Disable-automatic-check-for-updates.patch
@@ -0,0 +1,26 @@
+From 323f22681799a8ab2b22ad337af7a7c011c87a68 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves <pyu@riseup.net>
+Date: Thu, 27 Dec 2018 22:31:49 +0100
+Subject: [PATCH] Disable automatic check for updates
+
+Signed-off-by: Pierre-Yves <pyu@riseup.net>
+---
+ src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp
+index bded5677..4667aa02 100644
+--- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp
+@@ -164,7 +164,7 @@ void VBoxUpdateData::decode()
+ if (m_dayList.isEmpty())
+ populate();
+ PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0]));
+- m_enmPeriodIndex = index == PeriodUndefined ? Period1Day : index;
++ m_enmPeriodIndex = index == PeriodUndefined ? PeriodNever : index;
+ }
+
+ /* Parse 'date' value: */
+--
+2.20.1
+
diff --git a/files/LocalConfig.kmk b/files/LocalConfig.kmk
--- a/files/LocalConfig.kmk
+++ b/files/LocalConfig.kmk
@@ -11,6 +11,10 @@
VBOX_WITH_UPDATE_REQUEST :=
VBOX_BUILD_PUBLISHER := _Solus
+VBOX_GUI_WITH_SHARED_LIBRARY := 1
VBOX_USE_SYSTEM_GL_HEADERS := 1
VBOX_USE_SYSTEM_XORG_HEADERS := 1
VBOX_NO_LEGACY_XORG_X11 := 1
+
+VBOX_BLD_PYTHON := python3
+VBOX_WITH_MULTIVERSION_PYTHON :=
diff --git a/files/series b/files/series
--- a/files/series
+++ b/files/series
@@ -1,2 +1,4 @@
010-qt-5.11.patch
012-vboxsf-automount.patch
+0001-Fix-rdesktop-vrdp-keymaps-path.patch
+Disable-automatic-check-for-updates.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : virtualbox
-version : 5.2.22
-release : 88
+version : 6.0.0
+release : 89
source :
- - https://download.virtualbox.org/virtualbox/5.2.22/VirtualBox-5.2.22.tar.bz2 : 5580e875349341a1aabc6d5d2f697d242f277487316faaf1fbe68d9014f788d4
+ - https://download.virtualbox.org/virtualbox/6.0.0/VirtualBox-6.0.0.tar.bz2 : de47ce3ba599e0c5ef24eb44728fcf4abdecb0f0bb60e8560d03cfbf41283bfb
- git|https://github.com/jwrdegoede/vboxsf.git : 0e8d9459e500d2a465c0074db6f7f8fdad6de1a7
license : GPL-2.0-only
component :
@@ -25,6 +25,9 @@
Installation Guide: https://getsol.us/articles/software/virtualbox/en/
builddeps :
+ - pkgconfig(Qt5UiTools)
+ - pkgconfig(Qt5X11Extras)
+ - pkgconfig(SDL_ttf)
- pkgconfig(alsa)
- pkgconfig(devmapper)
- pkgconfig(glu)
@@ -36,9 +39,7 @@
- pkgconfig(libpulse)
- pkgconfig(libxslt)
- pkgconfig(opus)
- - pkgconfig(Qt5UiTools)
- - pkgconfig(Qt5X11Extras)
- - pkgconfig(SDL_ttf)
+ - pkgconfig(python3)
- pkgconfig(vpx)
- pkgconfig(xcomposite)
- pkgconfig(xcursor)
@@ -89,7 +90,7 @@
patterns :
- common : /usr
- devel :
- - /usr/lib/python2.7
+ - /usr/lib/python*
- /usr/lib64/virtualbox/sdk
- current : /lib/modules/*.current/extra
- guest :
@@ -150,7 +151,7 @@
install -d -m 00755 $installdir/usr/bin
install -m 00755 VBox.sh $installdir/usr/bin/VBox.sh
- for i in VirtualBox VBoxManage VBoxSDL VBoxHeadless VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxDTrace; do
+ for i in VirtualBox VBoxManage VBoxSDL VBoxHeadless VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxDTrace VBoxVRDP; do
ln -s VBox.sh $installdir/usr/bin/$i
done
install -m 00755 VBoxTunctl $installdir/usr/bin
@@ -160,10 +161,14 @@
install -d -m 00755 $installdir/%libdir%/virtualbox
install -m 00755 *.so -t $installdir/%libdir%/virtualbox
install -m 00644 *.rc *.r0 VBoxEFI*.fd -t $installdir/%libdir%/virtualbox
- install -m 00755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl -t $installdir/%libdir%/virtualbox
+
+ # binaries & scripts
+ install -m 00755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl -t $installdir/%libdir%/virtualbox
+ install -m 00755 VBoxAutostart VBoxCpuReport VBoxBugReport VBoxVMMPreload iPxeBaseBin -t $installdir/%libdir%/virtualbox
install -m 00755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t $installdir/%libdir%/virtualbox
+
# setuid root binaries
- install -m 04755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t $installdir/%libdir%/virtualbox
+ install -m 04755 VBoxSDL VBoxVolInfo VirtualBoxVM VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxNetNAT -t $installdir/%libdir%/virtualbox
# components
install -d -m 00755 $installdir/%libdir%/virtualbox/components
@@ -201,7 +206,7 @@
# devel
install -D -m 00755 vboxshell.py $installdir/%libdir%/virtualbox/vboxshell.py
pushd sdk/installer
- VBOX_INSTALL_PATH="%libdir%/virtualbox" python vboxapisetup.py install --root=$installdir
+ VBOX_INSTALL_PATH="%libdir%/virtualbox" python3 vboxapisetup.py install --root=$installdir
popd
install -d -m 00755 $installdir/%libdir%/virtualbox/sdk/bindings
cp -r sdk/bindings/{VirtualBox.xidl,auth,xpcom} $installdir/%libdir%/virtualbox/sdk/bindings
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>virtualbox</Name>
<Packager>
- <Name>Bryan T. Meyers</Name>
- <Email>bmeyers@datadrake.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>GPL-2.0-only</License>
<PartOf>virt</PartOf>
@@ -23,7 +23,7 @@
</Description>
<PartOf>virt</PartOf>
<RuntimeDependencies>
- <Dependency releaseFrom="88">virtualbox-common</Dependency>
+ <Dependency releaseFrom="89">virtualbox-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/modules/4.9.147-121.lts/extra/vboxdrv.ko</Path>
@@ -50,6 +50,7 @@
<Path fileType="executable">/usr/bin/VBoxManage</Path>
<Path fileType="executable">/usr/bin/VBoxSDL</Path>
<Path fileType="executable">/usr/bin/VBoxTunctl</Path>
+ <Path fileType="executable">/usr/bin/VBoxVRDP</Path>
<Path fileType="executable">/usr/bin/VirtualBox</Path>
<Path fileType="executable">/usr/bin/rdesktop-vrdp</Path>
<Path fileType="library">/usr/lib64/systemd/system/multi-user.target.wants/vboxdrv.service</Path>
@@ -59,12 +60,13 @@
<Path fileType="library">/usr/lib64/virtualbox/DbgPlugInDiggers.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxAuth.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxAuthSimple.so</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VBoxAutostart</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxBalloonCtrl</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VBoxBugReport</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VBoxCpuReport</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxCreateUSBNode.sh</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxDD.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxDD2.so</Path>
- <Path fileType="library">/usr/lib64/virtualbox/VBoxDD2R0.r0</Path>
- <Path fileType="library">/usr/lib64/virtualbox/VBoxDD2RC.rc</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxDDR0.r0</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxDDRC.rc</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxDDU.so</Path>
@@ -73,6 +75,7 @@
<Path fileType="library">/usr/lib64/virtualbox/VBoxEFI32.fd</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxEFI64.fd</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxExtPackHelperApp</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VBoxGlobal.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxGuestControlSvc.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxGuestPropSvc.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxHeadless</Path>
@@ -89,26 +92,30 @@
<Path fileType="library">/usr/lib64/virtualbox/VBoxOGLhosterrorspu.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxOGLrenderspu.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxPython.so</Path>
- <Path fileType="library">/usr/lib64/virtualbox/VBoxPython2_7.so</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VBoxPython3_6m.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxREM.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxRT.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxSDL</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxSDL.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxSVC</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VBoxSVGA3D.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxSharedClipboard.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxSharedCrOpenGL.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxSharedFolders.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxSysInfo.sh</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxTestOGL</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxVMM.so</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VBoxVMMPreload</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxVMMPreload.so</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VBoxVolInfo</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxXPCOM.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxXPCOMC.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/VBoxXPCOMIPCD</Path>
<Path fileType="library">/usr/lib64/virtualbox/VMMR0.r0</Path>
<Path fileType="library">/usr/lib64/virtualbox/VMMRC.rc</Path>
<Path fileType="library">/usr/lib64/virtualbox/VirtualBox</Path>
- <Path fileType="library">/usr/lib64/virtualbox/VirtualBox.so</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VirtualBoxVM</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/VirtualBoxVM.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/components/VBoxC.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/components/VBoxDDU.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/components/VBoxREM.so</Path>
@@ -119,6 +126,7 @@
<Path fileType="library">/usr/lib64/virtualbox/components/VBoxXPCOMBase.xpt</Path>
<Path fileType="library">/usr/lib64/virtualbox/components/VBoxXPCOMIPCC.so</Path>
<Path fileType="library">/usr/lib64/virtualbox/components/VirtualBox_XPCOM.xpt</Path>
+ <Path fileType="library">/usr/lib64/virtualbox/iPxeBaseBin</Path>
<Path fileType="library">/usr/lib64/virtualbox/vboxdrv.sh</Path>
<Path fileType="library">/usr/lib64/virtualbox/vboxshell.py</Path>
<Path fileType="data">/usr/share/applications/virtualbox.desktop</Path>
@@ -340,7 +348,7 @@
</Description>
<PartOf>virt</PartOf>
<RuntimeDependencies>
- <Dependency releaseFrom="88">virtualbox-common</Dependency>
+ <Dependency releaseFrom="89">virtualbox-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/modules/4.19.12-106.current/extra/vboxdrv.ko</Path>
@@ -358,15 +366,15 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="88">virtualbox</Dependency>
- <Dependency releaseFrom="88">virtualbox-common</Dependency>
+ <Dependency release="89">virtualbox</Dependency>
+ <Dependency releaseFrom="89">virtualbox-common</Dependency>
</RuntimeDependencies>
<Files>
- <Path fileType="library">/usr/lib/python2.7/site-packages/vboxapi-1.0-py2.7.egg-info</Path>
- <Path fileType="library">/usr/lib/python2.7/site-packages/vboxapi/VirtualBox_constants.py</Path>
- <Path fileType="library">/usr/lib/python2.7/site-packages/vboxapi/VirtualBox_constants.pyc</Path>
- <Path fileType="library">/usr/lib/python2.7/site-packages/vboxapi/__init__.py</Path>
- <Path fileType="library">/usr/lib/python2.7/site-packages/vboxapi/__init__.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/vboxapi-1.0-py3.6.egg-info</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/vboxapi/VirtualBox_constants.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/vboxapi/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/vboxapi/__pycache__/VirtualBox_constants.cpython-36.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/vboxapi/__pycache__/__init__.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib64/virtualbox/sdk/bindings/VirtualBox.xidl</Path>
<Path fileType="library">/usr/lib64/virtualbox/sdk/bindings/auth/VBoxAuthPAM.c</Path>
<Path fileType="library">/usr/lib64/virtualbox/sdk/bindings/auth/VBoxAuthSimple.cpp</Path>
@@ -811,7 +819,7 @@
</Description>
<PartOf>virt</PartOf>
<RuntimeDependencies>
- <Dependency releaseFrom="88">virtualbox-guest-common</Dependency>
+ <Dependency releaseFrom="89">virtualbox-guest-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/modules/4.9.147-121.lts/misc/vboxguest.ko</Path>
@@ -858,19 +866,19 @@
</Description>
<PartOf>virt</PartOf>
<RuntimeDependencies>
- <Dependency releaseFrom="88">virtualbox-guest-common</Dependency>
+ <Dependency releaseFrom="89">virtualbox-guest-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/modules/4.19.12-106.current/misc/vboxsf.ko</Path>
</Files>
</Package>
<History>
- <Update release="88">
- <Date>2018-12-27</Date>
- <Version>5.2.22</Version>
+ <Update release="89">
+ <Date>2018-12-28</Date>
+ <Version>6.0.0</Version>
<Comment>Packaging update</Comment>
- <Name>Bryan T. Meyers</Name>
- <Email>bmeyers@datadrake.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 6:35 PM (2 h, 26 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5790012
Default Alt Text
D4852.diff (17 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.