Building with QT6

1 files changed, 10 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8f1677acda35..77f1b6c411d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=mozillavpn
 pkgver=2.7.0
 _debian_series=impish1
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast, secure and easy to use VPN. Built by the makers of Firefox."
 arch=('i686' 'x86_64')
 url="https://vpn.mozilla.org/"
@@ -18,19 +18,17 @@ depends=('polkit'
          'libxdmcp'
          'dbus'
          'freetype2'
-         'qt5-charts'
-         'qt5-declarative'
-         'qt5-websockets'
-         'qt5-graphicaleffects'
-         'qt5-imageformats'
-         'qt5-networkauth'
-         'qt5-quickcontrols2'
-         'qt5-svg'
+         'qt6-charts'
+         'qt6-declarative'
+         'qt6-websockets'
+         'qt6-imageformats'
+         'qt6-networkauth'
+         'qt6-svg'
          'hicolor-icon-theme'
          'wireguard-tools'
          'WIREGUARD-MODULE'
          'openresolv')
-makedepends=('qt5-tools' 'go' 'flex' 'python-yaml')
+makedepends=('qt6-tools' 'go' 'flex' 'python-yaml')
 # https://launchpad.net/~mozillacorp/+archive/ubuntu/mozillavpn/+packages
 source=(
     "https://launchpad.net/~mozillacorp/+archive/ubuntu/mozillavpn/+sourcefiles/mozillavpn/${pkgver}-${_debian_series}/mozillavpn_${pkgver}.orig.tar.gz"
@@ -41,11 +39,8 @@ sha256sums=('0aca5cc0752d30b7b120d8cf277cac6ef4e085db5f9d68fec3450030b0b1215b'
 build() {
     cd "${pkgname}-${pkgver}"
     python scripts/importLanguages.py
-    qmake PREFIX=/usr CONFIG+=debug \
-        QMAKE_LFLAGS='-Wl,--sort-common,--as-needed,-z,relro,-z,now -pipe -march=x86-64 -mtune=generic -pipe -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection -fcf-protection -Wp,-D_GLIBCXX_ASSERTIONS -std=gnu++1z -pthread -flto=4 -fno-fat-lto-objects -fuse-linker-plugin -fPIC' \
-        QMAKE_CFLAGS='-pipe -march=x86-64 -mtune=generic -fno-plt -fexceptions -Wformat -Werror=format-security -fstack-clash-protection -fcf-protection -pthread -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)' \
-        QMAKE_CXXFLAGS='-pipe -march=x86-64 -mtune=generic -fno-plt -fexceptions -Wformat -Werror=format-security -fstack-clash-protection -fcf-protection -Wp,-D_GLIBCXX_ASSERTIONS -std=gnu++1z -pthread -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)'
-    make all
+    qmake6 PREFIX=/usr CONFIG-=debug CONFIG+=release CONFIG-=debug_and_release CONFIG+=webextension
+    make
 }
 
 package() {