Update for Qt6, force X11 in desktop file

2 files changed, 25 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a4c15df4838..6f05b12c6ecb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,36 @@
 pkgbase = mgba-git
-	pkgver = 0.11.0.r8129.58da73864
+	pkgver = 0.11.0.r8402.d1a6e6b74
 	pkgrel = 1
 	url = http://mgba.io/
 	arch = x86_64
-	license = custom:MPL2
+	license = MPL-2.0
 	makedepends = cmake
-	makedepends = qt5-multimedia
-	makedepends = sdl2
-	makedepends = zlib
+	makedepends = desktop-file-utils
+	makedepends = ffmpeg
+	makedepends = git
+	makedepends = libedit
+	makedepends = libepoxy
 	makedepends = libpng
 	makedepends = libzip
-	makedepends = libedit
 	makedepends = lua
-	makedepends = ffmpeg
-	makedepends = desktop-file-utils
-	makedepends = qt5-tools
-	makedepends = git
 	makedepends = ninja
+	makedepends = sdl2
+	makedepends = qt6-multimedia
+	makedepends = qt6-tools
+	makedepends = zlib
 	source = git+https://github.com/mgba-emu/mgba.git
 	sha1sums = SKIP
 
 pkgname = libmgba-git
 	pkgdesc = Shared library of mGBA (git build)
-	depends = zlib
+	depends = ffmpeg
+	depends = libedit
+	depends = libepoxy
 	depends = libpng
 	depends = libzip
-	depends = libedit
 	depends = lua
-	depends = ffmpeg
 	depends = sqlite
+	depends = zlib
 	provides = libmgba
 	conflicts = libmgba
 
@@ -42,7 +44,7 @@ pkgname = mgba-sdl-git
 pkgname = mgba-qt-git
 	pkgdesc = A Nintendo Gameboy Advance Emulator focusing on both speed and accuracy. Qt5 UI. (git build)
 	depends = libmgba-git
-	depends = qt5-multimedia
 	depends = sdl2
+	depends = qt6-multimedia
 	provides = mgba-qt
 	conflicts = mgba-qt
diff --git a/PKGBUILD b/PKGBUILD
index 171431642a57..73137932ad5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgbase=mgba-git
 pkgname=('libmgba-git' 'mgba-sdl-git' 'mgba-qt-git')
-pkgver=0.11.0.r8129.58da73864
+pkgver=0.11.0.r8402.d1a6e6b74
 pkgrel=1
 arch=('x86_64')
 url='http://mgba.io/'
-license=('custom:MPL2')
-makedepends=('cmake' 'qt5-multimedia' 'sdl2' 'zlib' 'libpng' 'libzip' 'libedit'
-             'lua' 'ffmpeg' 'desktop-file-utils' 'qt5-tools' 'git' 'ninja')
+license=('MPL-2.0')
+makedepends=('cmake' 'desktop-file-utils' 'ffmpeg' 'git' 'libedit' 'libepoxy' 'libpng'
+             'libzip' 'lua' 'ninja' 'sdl2' 'qt6-multimedia' 'qt6-tools' 'zlib')
 source=("git+https://github.com/mgba-emu/mgba.git")
 sha1sums=('SKIP')
 
@@ -41,7 +41,7 @@ build() {
 
 package_libmgba-git() {
   pkgdesc='Shared library of mGBA (git build)'
-  depends=('zlib' 'libpng' 'libzip' 'libedit' 'lua' 'ffmpeg' 'sqlite' )
+  depends=('ffmpeg' 'libedit' 'libepoxy' 'libpng' 'libzip' 'lua' 'sqlite' 'zlib')
   conflicts=('libmgba')
   provides=('libmgba')
 
@@ -69,7 +69,7 @@ package_mgba-sdl-git() {
 
 package_mgba-qt-git() {
   pkgdesc='A Nintendo Gameboy Advance Emulator focusing on both speed and accuracy. Qt5 UI. (git build)'
-  depends=('libmgba-git' 'qt5-multimedia' 'sdl2')
+  depends=('libmgba-git' 'sdl2' 'qt6-multimedia')
   conflicts=('mgba-qt')
   provides=('mgba-qt')
 
@@ -77,6 +77,9 @@ package_mgba-qt-git() {
     -P build/cmake_install.cmake
 
   desktop-file-install mgba/res/mgba-qt.desktop --dir "${pkgdir}"/usr/share/applications/
+  sed -i 's/Exec=/Exec=env QT_QPA_PLATFORM=xcb /g' "${pkgdir}"/usr/share/applications/mgba-qt.desktop
+  sed -i 's/Exec=/Exec=env QT_QPA_PLATFORM=xcb /g' "${pkgdir}"/usr/share/applications/io.mgba.mGBA.desktop
+
   install -Dm644 mgba/res/mgba-256.png "${pkgdir}"/usr/share/pixmaps/io.mgba.mGBA.png
 
   install -d "${pkgdir}"/usr/share/licenses/${pkgname%-git}