[neon/backports-jammy/signon-ui/Neon/unstable] debian: initial qt6 support

Carlos De Maine null at kde.org
Thu Dec 7 11:00:16 GMT 2023


Git commit 485f443089e466ac492b32481924ff40ea7f9e82 by Carlos De Maine.
Committed on 07/12/2023 at 12:00.
Pushed by carlosdem into branch 'Neon/unstable'.

initial qt6 support

M  +4    -1    debian/control
M  +24   -4    debian/rules

https://invent.kde.org/neon/backports-jammy/signon-ui/-/commit/485f443089e466ac492b32481924ff40ea7f9e82

diff --git a/debian/control b/debian/control
index fd66d7f..77d7506 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,10 @@ Build-Depends: dbus-test-runner,
                libqt5sensors5-dev,
                signon-plugins-dev,
                xvfb,
-               qtwebengine5-dev
+               qtwebengine5-dev,
+               qt6-base-dev,
+               qt6-declarative-dev,
+               qt6-webengine-dev,
 Standards-Version: 4.6.2
 Homepage: https://launchpad.net/signon-ui
 # If you aren't a member of ~online-accounts but need to upload packaging changes,
diff --git a/debian/rules b/debian/rules
index 09c51d5..abb52a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,31 @@
 #export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
-LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+export QMAKE_LIBDIR=/usr/lib
+export QT_SELECT=qt5
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+include /usr/share/dpkg/architecture.mk
 
 %:
-	dh $@
+	dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- "LIBDIR=$(LIBDIR)" \
-		"LIBEXECDIR=$(LIBDIR)"
+	mkdir -p build6 && cd build6 && QT_SELECT=6 qmake6 ../ LIBDIR+=/usr/lib/$(DEB_HOST_MULTIARCH) \
+	CONFIG+=enable-p2p \
+	DEFINES+=QT_NO_DEBUG_OUTPUT
+	mkdir -p build && cd build && QT_SELECT=5 qmake ../ LIBDIR+=/usr/lib/$(DEB_HOST_MULTIARCH) \
+	CONFIG+=enable-p2p \
+	DEFINES+=QT_NO_DEBUG_OUTPUT
+
+override_dh_auto_build:
+	cd build6 &&  make
+	cd build && make
+
+override_dh_auto_install:
+	cd build6 && make install INSTALL_ROOT=$(CURDIR)/debian/tmp
+	cd build && make install INSTALL_ROOT=$(CURDIR)/debian/tmp
+
+override_dh_install:
+	cd /workspace/build && dh_install


More information about the Neon-commits mailing list