commit 60ff92fa4651107c68c47beb1f21a4af99bf6904
Author: Jan Palus <[email protected]>
Date: Thu Jul 22 10:42:12 2021 +0200
add__divmoddi4 patch no longer needed; rel 2
VirtualBox.spec | 4 +---
add__divmoddi4.patch | 36 ------------------------------------
2 files changed, 1 insertion(+), 39 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 9eef5ae..64d8ce8 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -47,7 +47,7 @@ exit 1
%define qtver 5.6.0
-%define rel 1
+%define rel 2
%define pname VirtualBox
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
@@ -88,7 +88,6 @@ Patch15: %{pname}-lightdm-1.19.2.patch
Patch16: %{pname}-no-vboxvideo.patch
Patch17: qt5-gl.patch
Patch19: kernel-4.9.256.patch
-Patch20: add__divmoddi4.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -549,7 +548,6 @@ echo override vboxsf %{_kernel_ver} misc >>
kernel/installed/etc/depmod.d/%{_ker
%patch15 -p0
%patch16 -p0
%patch17 -p1
-%patch20 -p1
%{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
-e 's/Categories=.*/Categories=Utility;Emulator;/'
src/VBox/Installer/common/virtualbox.desktop.in
diff --git a/add__divmoddi4.patch b/add__divmoddi4.patch
deleted file mode 100644
index 8dd30a2..0000000
--- a/add__divmoddi4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-add __divmoddi4 builtin
-
-GCC 11 will generate it in code
-
-void foo(unsigned char *u8Second, unsigned int *u32Nanosecond, long long
timeSpec)
-{
- long long i64Div;
- int i32Div;
- int i32Rem;
- i64Div = timeSpec;
- i32Rem = (int)(i64Div % 1000000000);
- i64Div /= 1000000000;
- *u32Nanosecond = i32Rem;
- i32Rem = (int)(i64Div % 60);
- *u8Second = i32Rem;
-}
-
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
---- a/src/VBox/Runtime/common/math/gcc/divdi3.c
-+++ b/src/VBox/Runtime/common/math/gcc/divdi3.c
-@@ -68,3 +68,12 @@ __divdi3(a, b)
- uq = - uq;
- return uq;
- }
-+
-+quad_t
-+__divmoddi4(quad_t a, quad_t b, quad_t* rem)
-+{
-+ quad_t d = __divdi3(a,b);
-+ *rem = a - (d*b);
-+ return d;
-+}
-+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/60ff92fa4651107c68c47beb1f21a4af99bf6904
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
