commit 4796a4c8b9ebdc8959e0c0d9cad302e2bb68cbf1
Author: Jan Rękorajski <[email protected]>
Date: Fri Sep 10 09:11:50 2021 +0200
- fix braindead qt5 includedir detection
VirtualBox.spec | 2 ++
qt-detect.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index d7ace19..934fe4a 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -87,6 +87,7 @@ 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: kernel-4.9.256.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
@@ -552,6 +553,7 @@ echo override vboxsf %{_kernel_ver} misc >>
kernel/installed/etc/depmod.d/%{_ker
%patch15 -p0
%patch16 -p0
%patch17 -p1
+%patch18 -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/qt-detect.patch b/qt-detect.patch
new file mode 100644
index 0000000..564e645
--- /dev/null
+++ b/qt-detect.patch
@@ -0,0 +1,11 @@
+--- VirtualBox-6.1.26/configure~ 2021-09-10 08:38:49.000000000 +0200
++++ VirtualBox-6.1.26/configure 2021-09-10 09:01:11.297646984 +0200
+@@ -1564,7 +1564,7 @@
+ FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
+ # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in
Config.kmk)
+ [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5
-std=c++11"
+- INCQT5=`strip_I "$FLGQT5"`
++ INCQT5=`pkg-config Qt5Core --variable=includedir`
+ LIBDIR5=`pkg-config Qt5Core --variable=libdir`
+ LIBQT5=`pkg-config Qt5Core Qt5Gui --libs`
+ LIBQT5="-L$LIBDIR5 $LIBQT5"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/4796a4c8b9ebdc8959e0c0d9cad302e2bb68cbf1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
