Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] virtualbox-ose: update to 7.0.6.
@ 2023-02-04  5:47 sgn
  2023-02-04 16:32 ` [PR PATCH] [Updated] " sgn
  2023-02-05  1:14 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2023-02-04  5:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages virtualbox-ose
https://github.com/void-linux/void-packages/pull/42071

virtualbox-ose: update to 7.0.6.
Fix: #41681

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/42071.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-42071.patch --]
[-- Type: text/x-diff, Size: 4996 bytes --]

From 43dea66eceb79cccf7923a25461b76ac053e94df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 3 Feb 2023 23:49:08 +0700
Subject: [PATCH] virtualbox-ose: update to 7.0.6.

Fix: #41681
---
 srcpkgs/virtualbox-ose/template | 45 ++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 679dac249a25..4efc26f7da06 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=7.0.4
+version=7.0.6
 revision=1
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,20 +8,21 @@ 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=58951f7d1bcda836c5e50ca0a6b13f0e61a07a904f476526a831df3d9bfe5b17
+checksum=f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff
 
 nopie=yes
 lib32disabled=yes
 archs="x86_64"
 
 hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
- qt6-base"
+ vulkan-loader"
 makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-base-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
  libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel qt6-qt5compat-devel libtpms-devel
- qt6-scxml-devel qt6-tools-devel SDL2-devel SDL2_ttf-devel SDL2_gfx-devel
- SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel liblvm2app-devel
+ libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
 
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	makedepends+=" gcc-multilib"
@@ -43,7 +44,8 @@ do_build() {
 		-e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
 		-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/"
 	source ./env.sh
-	kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
+	kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT5=1 all
+	# kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
 }
 
 do_install() {
@@ -54,15 +56,20 @@ do_install() {
 	# virtualbox-ose.
 	#
 	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
-	mkdir -p ${DESTDIR}/usr/{bin,lib/virtualbox/components,share/virtualbox/nls}
 
-	install -m0755 VBox.sh ${DESTDIR}/usr/bin/VBox
+	vmkdir usr/lib/virtualbox
+	vmkdir usr/share/virtualbox
+	vbin VBox.sh VBox
 	for f in VirtualBox VBoxManage VBoxHeadless \
 		VBoxBalloonCtrl vboxwebsrv; do
 		ln -sf VBox ${DESTDIR}/usr/bin/${f}
 	done
+
 	# components
-	install -m0755 components/* -t ${DESTDIR}/usr/lib/virtualbox/components
+	vcopy components usr/lib/virtualbox
+	vcopy dtrace usr/lib/virtualbox
+	vcopy ExtensionPacks usr/lib/virtualbox
+	vcopy tools usr/lib/virtualbox
 
 	# libs
 	install -m0755 *.so ${DESTDIR}/usr/lib/virtualbox
@@ -73,24 +80,23 @@ do_install() {
 		VBoxNetNAT -t ${DESTDIR}/usr/lib/virtualbox
 
 	install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
+		VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
+		VBoxVolInfo xpidl \
 		VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
 		-t ${DESTDIR}/usr/lib/virtualbox
 
 	# locales
-	install -m0755 nls/*.qm -t ${DESTDIR}/usr/share/virtualbox/nls
+	vcopy nls usr/share/virtualbox
 
 	# scripts
 	install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh \
 		-t ${DESTDIR}/usr/share/virtualbox
 
 	# icons and desktop
-	install -D -m0644 VBox.png ${DESTDIR}/usr/share/pixmaps/VBox.png
-	install -D -m0644 virtualbox.desktop \
-		${DESTDIR}/usr/share/applications/virtualbox.desktop
-	sed -i -e "s|Icon=VBox|Icon=VBox.png|" \
-		${DESTDIR}/usr/share/applications/virtualbox.desktop
-	install -Dm644 virtualbox.xml \
-		${DESTDIR}/usr/share/mime/packages/virtualbox.xml
+	vinstall VBox.png 644 usr/share/pixmaps/
+	sed -i -e "s|Icon=VBox|Icon=VBox.png|" virtualbox.desktop
+	vinstall virtualbox.desktop 644 usr/share/applications/
+	vinstall virtualbox.xml 644 usr/share/mime/packages/
 	install -d ${DESTDIR}/usr/share/icons/hicolor
 	for i in icons/*; do
 		ldir=$(basename ${i})
@@ -102,7 +108,6 @@ do_install() {
 	mkdir -p ${DESTDIR}/etc/vbox
 	echo 'INSTALL_DIR=/usr/lib/virtualbox' > ${DESTDIR}/etc/vbox/vbox.cfg
 
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
 	install -d ${DESTDIR}/usr/share/licenses/${pkgname}
 	install -m0644 ${wrksrc}/COPYING* \
 		${DESTDIR}/usr/share/licenses/${pkgname}

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Updated] virtualbox-ose: update to 7.0.6.
  2023-02-04  5:47 [PR PATCH] virtualbox-ose: update to 7.0.6 sgn
@ 2023-02-04 16:32 ` sgn
  2023-02-05  1:14 ` [PR PATCH] [Merged]: " sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2023-02-04 16:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages virtualbox-ose
https://github.com/void-linux/void-packages/pull/42071

virtualbox-ose: update to 7.0.6.
Fix: #41681

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


A patch file from https://github.com/void-linux/void-packages/pull/42071.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-virtualbox-ose-42071.patch --]
[-- Type: text/x-diff, Size: 4996 bytes --]

From 83003c93654058a5d7b4aa2e22a774a1df67e706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 3 Feb 2023 23:49:08 +0700
Subject: [PATCH] virtualbox-ose: update to 7.0.6.

Fix: #41681
---
 srcpkgs/virtualbox-ose/template | 45 ++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index 679dac249a25..4efc26f7da06 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,6 +1,6 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
-version=7.0.4
+version=7.0.6
 revision=1
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -8,20 +8,21 @@ 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=58951f7d1bcda836c5e50ca0a6b13f0e61a07a904f476526a831df3d9bfe5b17
+checksum=f146d9a86a35af0abb010e628636fd800cb476cc2ce82f95b0c0ca876e1756ff
 
 nopie=yes
 lib32disabled=yes
 archs="x86_64"
 
 hostmakedepends="acpica-utils dev86 perl pkg-config qt5-tools tar yasm which glslang
- qt6-base"
+ vulkan-loader"
 makedepends="device-mapper-devel docbook-xsl gsoap-devel libcap-devel libcurl-devel
- libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt6-base-devel
+ libIDL-devel libvpx-devel libXcomposite-devel libXcursor-devel qt5-tools-devel
  libXinerama-devel libxslt-devel opus-devel pam-devel python3-devel qt5-x11extras-devel
- SDL-devel xorg-server-devel qt6-qt5compat-devel libtpms-devel
- qt6-scxml-devel qt6-tools-devel SDL2-devel SDL2_ttf-devel SDL2_gfx-devel
- SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
+ SDL-devel xorg-server-devel libtpms-devel libxml2-devel libvncserver-devel qt5-devel
+ openssl-devel libpng-devel zlib-devel dbus-devel device-mapper-devel liblvm2app-devel
+ libglvnd-devel libX11-devel libXt-devel libXcursor-devel pam-devel vde2-devel SDL2-devel
+ SDL2_ttf-devel SDL2_gfx-devel SDL2_image-devel SDL2_net-devel SDL2_mixer-devel"
 
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	makedepends+=" gcc-multilib"
@@ -43,7 +44,8 @@ do_build() {
 		-e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
 		-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/"
 	source ./env.sh
-	kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
+	kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT5=1 all
+	# kmk ${makejobs} KBUILD_VERBOSE=2 VBOX_WITH_QT6=1 all
 }
 
 do_install() {
@@ -54,15 +56,20 @@ do_install() {
 	# virtualbox-ose.
 	#
 	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
-	mkdir -p ${DESTDIR}/usr/{bin,lib/virtualbox/components,share/virtualbox/nls}
 
-	install -m0755 VBox.sh ${DESTDIR}/usr/bin/VBox
+	vmkdir usr/lib/virtualbox
+	vmkdir usr/share/virtualbox
+	vbin VBox.sh VBox
 	for f in VirtualBox VBoxManage VBoxHeadless \
 		VBoxBalloonCtrl vboxwebsrv; do
 		ln -sf VBox ${DESTDIR}/usr/bin/${f}
 	done
+
 	# components
-	install -m0755 components/* -t ${DESTDIR}/usr/lib/virtualbox/components
+	vcopy components usr/lib/virtualbox
+	vcopy dtrace usr/lib/virtualbox
+	vcopy ExtensionPacks usr/lib/virtualbox
+	vcopy tools usr/lib/virtualbox
 
 	# libs
 	install -m0755 *.so ${DESTDIR}/usr/lib/virtualbox
@@ -73,24 +80,23 @@ do_install() {
 		VBoxNetNAT -t ${DESTDIR}/usr/lib/virtualbox
 
 	install -m0755 VirtualBox VBoxManage VBoxSVC VBoxExtPackHelperApp \
+		VBoxBugReport VBoxCpuReport VBoxDTrace vboximg-mount \
+		VBoxVolInfo xpidl \
 		VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
 		-t ${DESTDIR}/usr/lib/virtualbox
 
 	# locales
-	install -m0755 nls/*.qm -t ${DESTDIR}/usr/share/virtualbox/nls
+	vcopy nls usr/share/virtualbox
 
 	# scripts
 	install -m0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh \
 		-t ${DESTDIR}/usr/share/virtualbox
 
 	# icons and desktop
-	install -D -m0644 VBox.png ${DESTDIR}/usr/share/pixmaps/VBox.png
-	install -D -m0644 virtualbox.desktop \
-		${DESTDIR}/usr/share/applications/virtualbox.desktop
-	sed -i -e "s|Icon=VBox|Icon=VBox.png|" \
-		${DESTDIR}/usr/share/applications/virtualbox.desktop
-	install -Dm644 virtualbox.xml \
-		${DESTDIR}/usr/share/mime/packages/virtualbox.xml
+	vinstall VBox.png 644 usr/share/pixmaps/
+	sed -i -e "s|Icon=VBox|Icon=VBox.png|" virtualbox.desktop
+	vinstall virtualbox.desktop 644 usr/share/applications/
+	vinstall virtualbox.xml 644 usr/share/mime/packages/
 	install -d ${DESTDIR}/usr/share/icons/hicolor
 	for i in icons/*; do
 		ldir=$(basename ${i})
@@ -102,7 +108,6 @@ do_install() {
 	mkdir -p ${DESTDIR}/etc/vbox
 	echo 'INSTALL_DIR=/usr/lib/virtualbox' > ${DESTDIR}/etc/vbox/vbox.cfg
 
-	cd ${wrksrc}/out/linux.$BUILD_PLATFORM_ARCH/release/bin
 	install -d ${DESTDIR}/usr/share/licenses/${pkgname}
 	install -m0644 ${wrksrc}/COPYING* \
 		${DESTDIR}/usr/share/licenses/${pkgname}

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PR PATCH] [Merged]: virtualbox-ose: update to 7.0.6.
  2023-02-04  5:47 [PR PATCH] virtualbox-ose: update to 7.0.6 sgn
  2023-02-04 16:32 ` [PR PATCH] [Updated] " sgn
@ 2023-02-05  1:14 ` sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2023-02-05  1:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1112 bytes --]

There's a merged pull request on the void-packages repository

virtualbox-ose: update to 7.0.6.
https://github.com/void-linux/void-packages/pull/42071

Description:
Fix: #41681

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-02-05  1:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-04  5:47 [PR PATCH] virtualbox-ose: update to 7.0.6 sgn
2023-02-04 16:32 ` [PR PATCH] [Updated] " sgn
2023-02-05  1:14 ` [PR PATCH] [Merged]: " sgn

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).