Add qt6 to debian build dir

QubesOS · Sep 25, 2024 · f297823 · f297823
1 parent da92ea9
commit f297823
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.qubesbuilder b/.qubesbuilder
@@ -9,3 +9,6 @@ vm:
   deb:
     build:
     - debian
+vm-jammy:
+  deb:
+    build: []
diff --git a/Makefile b/Makefile
@@ -2,14 +2,15 @@ VERSION := $(shell cat version)
 
 PYTHON ?= python3
 
-LRELEASE_QT6 ?= $(if $(wildcard /etc/debian_version),lrelease,lrelease-qt6)
-RCC ?= /usr/lib64/qt6/libexec/rcc
+LRELEASE_QT6 ?= $(if $(wildcard /etc/debian_version),/usr/lib/qt6/bin/lrelease,lrelease-qt6)
+RCC ?= $(if $(wildcard /etc/debian_version),/usr/lib/qt6/libexec/rcc,/usr/lib64/qt6/libexec/rcc)
 
 SETUPTOOLS_OPTS =
 SETUPTOOLS_OPTS += $(if $(wildcard /etc/debian_version),--install-layout=deb,)
 
 export QT_HASH_SEED=0
 export PYTHONHASHSEED=0
+export QT_SELECT=qt6
 
 qubesmanager/ui_%.py: ui/%.ui
 	pyuic6 -o $@ $<

diff --git a/debian/control b/debian/control
@@ -7,9 +7,12 @@ Build-Depends:
   dh-python,
   python3-all,
   python3-setuptools,
-  qtbase5-dev,
-  qttools5-dev-tools,
-  pyqt5-dev-tools
+  qt6-base-dev,
+  qt6-base-dev-tools,
+  qt6-tools-dev-tools,
+  qt6-l10n-tools,
+  pyqt6-dev,
+  pyqt6-dev-tools,
 Standards-Version: 4.3.0
 Homepage: https://www.qubes-os.org/
 #Vcs-Git: git://github.com/QubesOS/qubes-manager.git
@@ -20,7 +23,7 @@ Package: qubes-manager
 Architecture: any
 Depends:
   python3-qubesadmin (>= 4.3.0),
-  python3-pyqt5,
+  python3-pyqt6,
   python3-pyinotify,
   python3-qasync,
   qubes-desktop-linux-common,