$ git diff --patch-with-stat --summary 201f223f6fd435ea343e117991ed4d8bc696a2a2..4cb07495b9bc7795a46ca9142dfffe254f906016
.abf.yml | 4 ++--
VirtualBox-6.1.12a-default-to-1024x768.patch | 26 ++++++++++++++++++++++++++
virtualbox.spec | 13 +++++++------
3 files changed, 35 insertions(+), 8 deletions(-)
create mode 100644 VirtualBox-6.1.12a-default-to-1024x768.patch
diff --git a/.abf.yml b/.abf.yml
index 188ff6a..a4fa8ce 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,5 +1,5 @@
sources:
os_openmandriva.png: 3c1c957c644369db0009773c895fbbb0617d5785
os_openmandriva_64.png: 80cce1aee0eea3e7aed9ee36d5829c0f0fa50fd4
- UserManual.pdf: 5e7231cef2eb3a51837bbf373cb20181d6f5b94f
- VirtualBox-6.1.12.tar.bz2: 3d69ed2b6125c7962794e0da7b210633566abbac
+ UserManual.pdf: 4e24e65106a3f6581139d809930ce416d18c41f6
+ VirtualBox-6.1.12a.tar.bz2: e987efb4b6f0b074b2aa5f61a471f0aacb5edf14
diff --git a/VirtualBox-6.1.12a-default-to-1024x768.patch b/VirtualBox-6.1.12a-default-to-1024x768.patch
new file mode 100644
index 0000000..d7d9d4f
--- /dev/null
+++ b/VirtualBox-6.1.12a-default-to-1024x768.patch
@@ -0,0 +1,26 @@
+diff -up VirtualBox-6.1.12/src/VBox/Additions/x11/vboxvideo/getmode.c.omv~ VirtualBox-6.1.12/src/VBox/Additions/x11/vboxvideo/getmode.c
+--- VirtualBox-6.1.12/src/VBox/Additions/x11/vboxvideo/getmode.c.omv~ 2020-07-18 02:05:37.579516322 +0200
++++ VirtualBox-6.1.12/src/VBox/Additions/x11/vboxvideo/getmode.c 2020-07-18 02:06:27.753962556 +0200
+@@ -143,9 +143,9 @@ void vboxAddModes(ScrnInfoPtr pScrn)
+ /* Add two dynamic mode entries. When we receive a new size hint we will
+ * update whichever of these is not current. */
+ pMode = vboxAddEmptyScreenMode(pScrn);
+- vboxFillDisplayMode(pScrn, pMode, NULL, 800, 600);
++ vboxFillDisplayMode(pScrn, pMode, NULL, 1024, 768);
+ pMode = vboxAddEmptyScreenMode(pScrn);
+- vboxFillDisplayMode(pScrn, pMode, NULL, 800, 600);
++ vboxFillDisplayMode(pScrn, pMode, NULL, 1024, 768);
+ /* Add any modes specified by the user. We assume here that the mode names
+ * reflect the mode sizes. */
+ for (i = 0; pScrn->display->modes && pScrn->display->modes[i]; i++)
+@@ -167,8 +167,8 @@ void VBoxInitialiseSizeHints(ScrnInfoPtr
+
+ for (i = 0; i < pVBox->cScreens; ++i)
+ {
+- pVBox->pScreens[i].aPreferredSize.cx = 800;
+- pVBox->pScreens[i].aPreferredSize.cy = 600;
++ pVBox->pScreens[i].aPreferredSize.cx = 1024;
++ pVBox->pScreens[i].aPreferredSize.cy = 768;
+ pVBox->pScreens[i].afConnected = true;
+ }
+ /* Set up the first mode correctly to match the requested initial mode. */
diff --git a/virtualbox.spec b/virtualbox.spec
index be34896..f057700 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -34,13 +34,13 @@ Name: virtualbox
# WARNING: WHEN UPDATING THIS PACKAGE, ALWAYS REBUILD THE
# kernel-release AND kernel-rc PACKAGES TO MAKE SURE MODULES
# AND USERSPACE ARE IN SYNC
-Version: 6.1.12
+Version: 6.1.12a
Release: 1
License: GPLv2
Group: Emulators
Url: http://www.virtualbox.org/
-Source0: http://download.virtualbox.org/virtualbox/%{version}/%{srcname}.tar.bz2
-Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+Source0: http://download.virtualbox.org/virtualbox/%(echo %{version} |sed -e 's,[a-z]*,,g')/%{srcname}.tar.bz2
+Source1: http://download.virtualbox.org/virtualbox/%(echo %{version} |sed -e 's,[a-z]*,,g')/UserManual.pdf
Source3: virtualbox-tmpfiles.conf
Source4: 60-vboxadd.perms
Source5: vboxadd.service
@@ -73,6 +73,8 @@ Patch8: 101-vboxsf-automount.patch
# - mkisofs: we're not going to build the additions .iso file
# - makeself: we're not going to create the stanalone .run installers
Patch9: VirtualBox-5.0.0_BETA3-dont-check-for-mkisofs-or-makeself.patch
+# Default to a reasonable size in guest additions
+Patch10: VirtualBox-6.1.12a-default-to-1024x768.patch
Patch11: vbox-6.1.10-compile.patch
Patch18: VirtualBox-5.1.8-gsoap-2.8.13.patch
@@ -234,8 +236,7 @@ This package contains the user manual PDF file for %{name}.
%endif
%prep
-%setup -qn %{distname}
-%autopatch -p1
+%autosetup -p1 -n %(echo %{distname} |sed -e 's,[a-z]*$,,')
%if %{with java}
. %{_sysconfdir}/profile.d/90java.sh
@@ -347,7 +348,6 @@ echo VBOX_GCC_OPT="$(echo %{optflags} $(pkg-config --cflags pixman-1) | sed -e '
echo VBOX_GCC_OPT="$(echo %{optflags} $(pkg-config --cflags pixman-1) | sed -e 's/-fPIC//' -e 's/-Werror=format-security//')" >> LocalConfig.kmk
%endif
echo TOOL_GCC_LDFLAGS="%{ldflags}" >> LocalConfig.kmk
-sed -i -e 's,^VBOX_WITH_CLOUD_NET,# VBOX_WITH_CLOUD_NET,g' Config.kmk
%if %{with additions}
echo XSERVER_VERSION=%{x11_server_majorver} >>LocalConfig.kmk
@@ -593,6 +593,7 @@ done
%{vboxlibdir}/VirtualBox
%{vboxlibdir}/vboxkeyboard.tar.bz2
%{vboxlibdir}/vboxshell.py
+%{vboxlibdir}/vboximg-mount
%if %{with java}
%{vboxlibdir}/vboxwebsrv
%{vboxlibdir}/webtest