Github messages for voidlinux
 help / color / mirror / Atom feed
From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] virtualbox-ose: update to 6.1.26.
Date: Thu, 05 Aug 2021 03:43:47 +0200	[thread overview]
Message-ID: <20210805014347.sh_xCsorAXcqTAvXqbzzMUl--tRXP7xHZO6R1pTvHFo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32328@inbox.vuxu.org>

[-- 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() {

  parent reply	other threads:[~2021-08-05  1:43 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-05  1:14 [PR PATCH] " 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
2021-08-05  1:43 ` ericonr [this message]
2021-08-05  1:44 ` ericonr
2021-08-06  6:33 ` [PR PATCH] [Merged]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210805014347.sh_xCsorAXcqTAvXqbzzMUl--tRXP7xHZO6R1pTvHFo@z \
    --to=ericonr@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).