commit 6929594b5d2cadc3105ef76cd67322e39bb4a013
Author: Jan Rękorajski <[email protected]>
Date: Fri Oct 14 10:56:15 2022 +0200
- up to 6.1.40
VirtualBox.spec | 11 ++++-------
pld-guest.patch | 4 ++--
x32.patch | 2 +-
3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 5776d53..2775fb9 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -52,14 +52,14 @@ exit 1
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.34
+Version: 6.1.40
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: 5ee5e141a7bd6251420e7d7a2cc76206
+# Source0-md5: 19439dbfbd13bb8b9f1151052a432d8b
Source1:
https://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 16cfa062d19f4578f6bd24648b99eca4
+# Source1-md5: 5299c1371e7ba61150a60954a4453149
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -88,8 +88,6 @@ Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
Patch17: qt5-gl.patch
Patch18: qt-detect.patch
-Patch19: kernel-4.9.256.patch
-Patch20: kernel-5.18.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -574,8 +572,6 @@ tar -zxf guest-modules.tar.gz -C GuestDrivers
../src/VBox/HostDrivers/linux/export_modules.sh --file host-modules.tar.gz
--without-hardening
tar -zxf host-modules.tar.gz -C HostDrivers
cd -
-%patch19 -p1
-%patch20 -p1
%endif
# using system kBuild package
@@ -1071,6 +1067,7 @@ dkms remove -m vboxhost -v %{version}-%{rel}
--rpm_safe_upgrade --all || :
%lang(id) %{_datadir}/%{pname}/nls/*_id.qm
%lang(it) %{_datadir}/%{pname}/nls/*_it.qm
%lang(ja) %{_datadir}/%{pname}/nls/*_ja.qm
+%lang(ka) %{_datadir}/%{pname}/nls/*_ka.qm
%lang(km_KH) %{_datadir}/%{pname}/nls/*_km_KH.qm
%lang(ko) %{_datadir}/%{pname}/nls/*_ko.qm
%lang(lt) %{_datadir}/%{pname}/nls/*_lt.qm
diff --git a/pld-guest.patch b/pld-guest.patch
index 42e9152..32ed610 100644
--- a/pld-guest.patch
+++ b/pld-guest.patch
@@ -98,8 +98,8 @@
+++
VirtualBox-4.3.8/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.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("((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" },
diff --git a/x32.patch b/x32.patch
index 7e4e95f..d48082d 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,7 +1,7 @@
--- VirtualBox-4.3.26/configure~ 2015-03-28 22:23:14.000000000 +0200
+++ VirtualBox-4.3.26/configure 2015-03-28 22:26:31.627419402 +0200
@@ -1943,7 +1943,7 @@
- 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.8m python3.9 python3.9m"
+ 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.8m python3.9 python3.9m python3.10 python3.10m"
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/6929594b5d2cadc3105ef76cd67322e39bb4a013
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
