* Re: virtualbox-ose: update to 6.1.26.
2021-08-05 1:14 [PR PATCH] virtualbox-ose: update to 6.1.26 ericonr
@ 2021-08-05 1:18 ` ericonr
2021-08-05 1:23 ` ericonr
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-08-05 1:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3458 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32328#issuecomment-893088922
Comment:
```
g++ -c -O2 -fPIC -g -pipe -Wall -Wextra -Wno-missing-field-initializers -Wno-trigraphs -fdiagnostics-show-option -Wlogical-op -Wno-variadic-macros -frtti -fno-exceptions -Wno-long-long -fshort-wchar -fno-strict-aliasing -fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN -DRT_USE_VISIBILITY_DEFAULT -fvisibility-inlines-hidden -Wno-multistatement-macros -Wno-ignored-qualifiers -std=c++11 -Wno-deprecated-declarations -fPIC -Wno-deprecated-copy -g -pipe -Wall -Wextra -Wno-missing-field-initializers -Wno-trigraphs -fdiagnostics-show-option -Wlogical-op -Wno-variadic-macros -frtti -fno-exceptions -Wno-long-long -fshort-wchar -fno-strict-aliasing -fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN -DRT_USE_VISIBILITY_DEFAULT -fvisibility-inlines-hidden -Wno-multistatement-macros -Wno-ignored-qualifiers -std=c++11 -Wno-deprecated-declarations -fPIC -m64 -I/builddir/VirtualBox-6.1.26/src/VBox/Frontends/VirtualBox/include -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release/bin/sdk/bindings/xpcom/include -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release/bin/sdk/bindings/xpcom/include/xpcom -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release/bin/sdk/bindings/xpcom/include/string -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release/bin/sdk/bindings/xpcom/include/xpcom -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release/bin/sdk/bindings/xpcom/include/nsprpub -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release/bin/sdk/bindings/xpcom/include/ipcd -I/usr/include/qt5/QtGui/QtOpenGL -I/usr/include/qt5/QtGui -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release/obj/VBoxOGL2D/qtmoc -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release/obj/VBoxOGL2D/qtuic -I/builddir/VirtualBox-6.1.26/include -I/builddir/VirtualBox-6.1.26/out/linux.amd64/release -DVBOX -DVBOX_OSE -DVBOX_WITH_64_BITS_GUESTS -DRT_OS_LINUX -D_FILE_OFFSET_BITS=64 -DRT_ARCH_AMD64 -D__AMD64__ -DVBOX_WITH_DEBUGGER -DVBOX_WITH_HARDENING -DRTPATH_APP_PRIVATE=\"/usr/share/virtualbox\" -DRTPATH_APP_PRIVATE_ARCH=\"/usr/lib/virtualbox\" -DRTPATH_SHARED_LIBS=\"/usr/lib/virtualbox\" -DRTPATH_APP_DOCS=\"\" -DPIC -DIN_RING3 -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DHAVE_CONFIG_H -DHC_ARCH_BITS=64 -DGC_ARCH_BITS=64 -DVBOX_WITH_XPCOM -DVBOX_WITH_XPCOM_NAMESPACE_CLEANUP -DPIC -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DHAVE_CONFIG_H -DVBOX_WITH_VIDEOHWACCEL -DVBOX_GUI_USE_QGL -DQT_OPENGL_LIB -D_REENTRANT -Wp,-MD,/builddir/VirtualBox-6.1.26/out/linux.amd64/release/obj/VBoxOGL2D/src/VBoxGLSupportInfo.o.dep -Wp,-MT,/builddir/VirtualBox-6.1.26/out/linux.amd64/release/obj/VBoxOGL2D/src/VBoxGLSupportInfo.o -Wp,-MP -o /builddir/VirtualBox-6.1.26/out/linux.amd64/release/obj/VBoxOGL2D/src/VBoxGLSupportInfo.o /builddir/VirtualBox-6.1.26/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp
/builddir/VirtualBox-6.1.26/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp:22:10: fatal error: QGLWidget: No such file or directory
22 | #include <QGLWidget>
| ^~~~~~~~~~~
compilation terminated.
kmk: *** [/builddir/VirtualBox-6.1.26/kBuild/footer-pass2-compiling-targets.kmk:277: /builddir/VirtualBox-6.1.26/out/linux.amd64/release/obj/VBoxOGL2D/src/VBoxGLSupportInfo.o] Error 1
kmk: *** Waiting for unfinished jobs....
```
I figure the include can be changed to `<qt5/QtOpenGL/QGLWidget>`.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: virtualbox-ose: update to 6.1.26.
2021-08-05 1:14 [PR PATCH] virtualbox-ose: update to 6.1.26 ericonr
2021-08-05 1:18 ` ericonr
@ 2021-08-05 1:23 ` ericonr
2021-08-05 1:31 ` amak79
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-08-05 1:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32328#issuecomment-893090748
Comment:
I might have a fix, let's see.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: virtualbox-ose: update to 6.1.26.
2021-08-05 1:14 [PR PATCH] virtualbox-ose: update to 6.1.26 ericonr
2021-08-05 1:18 ` ericonr
2021-08-05 1:23 ` ericonr
@ 2021-08-05 1:31 ` amak79
2021-08-05 1:37 ` ericonr
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: amak79 @ 2021-08-05 1:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by amak79 on void-packages repository
https://github.com/void-linux/void-packages/pull/32328#issuecomment-893093830
Comment:
> I can't find where that mistake happens.
Relevant? https://www.virtualbox.org/changeset/90377/vbox
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: virtualbox-ose: update to 6.1.26.
2021-08-05 1:14 [PR PATCH] virtualbox-ose: update to 6.1.26 ericonr
` (2 preceding siblings ...)
2021-08-05 1:31 ` amak79
@ 2021-08-05 1:37 ` ericonr
2021-08-05 1:43 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-08-05 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 700 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32328#issuecomment-893095516
Comment:
Don't think so, what I did was
```diff
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c..d283c39363 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
VBOX_WITH_UPDATE_REQUEST =
VBOX_USE_SYSTEM_XORG_HEADERS = 1
VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
# Enable it when vnc pkg is available.
#VBOX_WITH_VNC := 1
VBOX_GCC_WERR =
```
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] virtualbox-ose: update to 6.1.26.
2021-08-05 1:14 [PR PATCH] virtualbox-ose: update to 6.1.26 ericonr
` (3 preceding siblings ...)
2021-08-05 1:37 ` ericonr
@ 2021-08-05 1:43 ` ericonr
2021-08-05 1:44 ` ericonr
2021-08-06 6:33 ` [PR PATCH] [Merged]: " ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-08-05 1:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2032 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages vbox
https://github.com/void-linux/void-packages/pull/32328
virtualbox-ose: update to 6.1.26.
Remove vsed added in 13b1a5d83b4f3d03689a150c2ddf080ee91587c0 with no
justification; another configure step needed GCC version to have been
obtained.
It's broken: uses `-I/usr/include/qt5/QtGui/QtOpenGL` in flags instead of `-I/usr/include/qt5/QtOpenGL`, I can't find where that mistake happens. That can be fixed by fixing the `#include` in one of the files, because I can't find where these CXXFLAGS are set.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #32327
A patch file from https://github.com/void-linux/void-packages/pull/32328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vbox-32328.patch --]
[-- Type: text/x-diff, Size: 2127 bytes --]
From 5f379017ef3857c97c7b63f0e33373ab64aefb5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 4 Aug 2021 22:11:18 -0300
Subject: [PATCH] virtualbox-ose: update to 6.1.26.
Remove vsed added in 13b1a5d83b4f3d03689a150c2ddf080ee91587c0 with no
justification; another configure step needed GCC version to have been
obtained.
Fix build by setting the correct Qt5 base include path.
---
srcpkgs/virtualbox-ose/files/LocalConfig.kmk | 1 +
srcpkgs/virtualbox-ose/template | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
index 71ffd9876c09..d283c39363bb 100644
--- a/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
+++ b/srcpkgs/virtualbox-ose/files/LocalConfig.kmk
@@ -15,6 +15,7 @@ VBOX_WITH_REGISTRATION_REQUEST =
VBOX_WITH_UPDATE_REQUEST =
VBOX_USE_SYSTEM_XORG_HEADERS = 1
VBOX_NO_LEGACY_XORG_X11 = 1
+PATH_SDK_QT5_INC := /usr/include/qt5
# Enable it when vnc pkg is available.
#VBOX_WITH_VNC := 1
VBOX_GCC_WERR =
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index b686236e1b0e..d84944232a73 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
-version=6.1.20
+version=6.1.26
revision=1
wrksrc="VirtualBox-${version}"
short_desc="General-purpose full virtualizer for x86 hardware"
@@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"
-checksum=e690c91974a2e7a5aca2c0939ad514382f9a2136797a5e0b96aab778e42bc8a7
+checksum=0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195
nopie=yes
lib32disabled=yes
@@ -33,7 +33,6 @@ pre_configure() {
ln -s /bin/echo makeself
echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk
- vsed -i 's/^check_gcc$/#check_gcc/' configure
}
do_configure() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: virtualbox-ose: update to 6.1.26.
2021-08-05 1:14 [PR PATCH] virtualbox-ose: update to 6.1.26 ericonr
` (4 preceding siblings ...)
2021-08-05 1:43 ` [PR PATCH] [Updated] " ericonr
@ 2021-08-05 1:44 ` ericonr
2021-08-06 6:33 ` [PR PATCH] [Merged]: " ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-08-05 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32328#issuecomment-893097948
Comment:
Built successfully here, let's see.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: virtualbox-ose: update to 6.1.26.
2021-08-05 1:14 [PR PATCH] virtualbox-ose: update to 6.1.26 ericonr
` (5 preceding siblings ...)
2021-08-05 1:44 ` ericonr
@ 2021-08-06 6:33 ` ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-08-06 6:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1879 bytes --]
There's a merged pull request on the void-packages repository
virtualbox-ose: update to 6.1.26.
https://github.com/void-linux/void-packages/pull/32328
Description:
Remove vsed added in 13b1a5d83b4f3d03689a150c2ddf080ee91587c0 with no
justification; another configure step needed GCC version to have been
obtained.
It's broken: uses `-I/usr/include/qt5/QtGui/QtOpenGL` in flags instead of `-I/usr/include/qt5/QtOpenGL`, I can't find where that mistake happens. That can be fixed by fixing the `#include` in one of the files, because I can't find where these CXXFLAGS are set.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #32327
^ permalink raw reply [flat|nested] 8+ messages in thread