Date: Wednesday, October 19, 2022 @ 19:01:29
  Author: eworm
Revision: 1332895

upgpkg: virtualbox 7.0.0-2: cleanups and dependency updates

Thanks a lot for nullablevoidptr for suggestions and patch!

Added:
  virtualbox/trunk/019-fix-liblzf-linkage.patch
Modified:
  virtualbox/trunk/PKGBUILD

------------------------------+
 019-fix-liblzf-linkage.patch |   13 +++++++++++++
 PKGBUILD                     |   21 ++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

Added: 019-fix-liblzf-linkage.patch
===================================================================
--- 019-fix-liblzf-linkage.patch                                (rev 0)
+++ 019-fix-liblzf-linkage.patch        2022-10-19 19:01:29 UTC (rev 1332895)
@@ -0,0 +1,13 @@
+Fix compiling with shared liblzf library by not mangling the needed symbols
+--- a/src/VBox/Runtime/common/zip/zip.cpp      2022-10-07 01:11:55.000000000 
+0800
++++ b/src/VBox/Runtime/common/zip/zip.cpp      2022-10-19 22:35:37.996450458 
+0800
+@@ -61,7 +61,9 @@
+ # include <zlib.h>
+ #endif
+ #ifdef RTZIP_USE_LZF
++extern "C" {
+ # include <lzf.h>
++}
+ # include <iprt/crc.h>
+ #endif
+ #ifdef RTZIP_USE_LZJB

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-19 17:20:28 UTC (rev 1332894)
+++ PKGBUILD    2022-10-19 19:01:29 UTC (rev 1332895)
@@ -11,15 +11,13 @@
          'virtualbox-ext-vnc')
 pkgver=7.0.0
 _tarver=${pkgver}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://virtualbox.org/'
 license=('GPL' 'custom:CDDL')
 makedepends=('alsa-lib'
-             'bin86'
              'cdrkit'
              'curl'
-             'dev86'
              'device-mapper'
              'git'
              'glu'
@@ -28,7 +26,9 @@
              'iasl'
              'jdk8-openjdk'
              'libidl2'
+             'liblzf'
              'libpulse'
+             'libtpms'
              'libvncserver'
              'libvpx'
              'libxcomposite'
@@ -41,7 +41,6 @@
              'libxtst'
              'linux-headers'
              'mesa'
-             'opus'
              'python'
              'qt5-base'
              'qt5-tools'
@@ -49,7 +48,6 @@
              'sdl'
              'sdl_ttf'
              'vde2'
-             'xalan-c'
              'xorgproto'
              'xorg-server-devel'
              'yasm')
@@ -73,7 +71,8 @@
         '009-properly-handle-i3wm.patch'
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         '013-support-building-from-dkms.patch'
-        '018-upate-xclient-script.patch')
+        '018-upate-xclient-script.patch'
+        '019-fix-liblzf-linkage.patch')
 sha256sums=('1e5b321bf20eec03154e2b3e16331f827a472d6e8e5b1e04c27041978975a97a'
             '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
             '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
@@ -94,7 +93,8 @@
             'c74a5daca598c12d375026fddc557b487d213fe46bb1c8ef1f7b6d1c44500eb4'
             '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
             '00f68b86d32a1fada900c2da8dad2ab4215106cd58004f049bded99727cda2ff'
-            '87dddfd9047480e4c2b73367facf5dd3702148418c2efcd606af17c07da90fe0')
+            '87dddfd9047480e4c2b73367facf5dd3702148418c2efcd606af17c07da90fe0'
+            'df9cc091d577935ea56d86d07be6abf519ab119a3558ded566507083f9d3fea5')
 
 prepare() {
     cd "VirtualBox-${pkgver}"
@@ -138,10 +138,9 @@
 
 package_virtualbox() {
     pkgdesc='Powerful x86 virtualization for enterprise as well as home use'
-    depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python' 'sdl'
-             'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib'
-             'libxcursor' 'libxinerama' 'libx11' 'libxext' 'libxmu' 'libxt'
-             'opus' 'qt5-base' 'qt5-tools' 'qt5-x11extras'
+    depends=('curl' 'gcc-libs' 'glibc' 'liblzf' 'libpng' 'libtpms' 'libvpx' 
'libx11' 'libxcursor'
+             'libxext' 'libxinerama' 'libxml2' 'libxmu' 'libxt' 'openssl' 
'procps-ng' 'python'
+             'qt5-base' 'qt5-tools' 'qt5-x11extras' 'sdl' 'shared-mime-info' 
'zlib'
              'VIRTUALBOX-HOST-MODULES')
     optdepends=('vde2: Virtual Distributed Ethernet support'
                 'virtualbox-guest-iso: Guest Additions CD image'

Reply via email to