[neon/backports-jammy/signon-plugin-oauth2/Neon/unstable] debian: initial port for qt6 support

Carlos De Maine null at kde.org
Thu Dec 7 10:50:44 GMT 2023


Git commit 2c8adb434665f3de76ebf84085323e320b5d9252 by Carlos De Maine.
Committed on 07/12/2023 at 11:50.
Pushed by carlosdem into branch 'Neon/unstable'.

initial port for qt6 support

M  +9    -6    debian/control
M  +27   -6    debian/rules

https://invent.kde.org/neon/backports-jammy/signon-plugin-oauth2/-/commit/2c8adb434665f3de76ebf84085323e320b5d9252

diff --git a/debian/control b/debian/control
index 95786fd..2232909 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,15 @@ Section: utils
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Diane Trout <diane at debian.org>
-Build-Depends: debhelper-compat (= 13), qt5-qmake,
- pkg-kde-tools (>= 0.12),
- pkg-config,
- signon-plugins-dev,
- qtbase5-dev,
-Standards-Version: 4.5.1
+Build-Depends: debhelper-compat (= 13),
+               qt5-qmake,
+               pkg-kde-tools (>= 0.12),
+               pkg-config,
+               pkg-kde-tools-neon,
+               signon-plugins-dev,
+               qtbase5-dev,
+               qt6-base-dev
+Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Homepage: https://gitlab.com/accounts-sso/signon-plugin-oauth2
 Vcs-Git: https://salsa.debian.org/qt-kde-team/3rdparty/signon-plugin-oauth2.git
diff --git a/debian/rules b/debian/rules
index a8c1b90..9403d8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,37 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE = 1
 
-include /usr/share/dpkg/architecture.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# 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 $@ --buildsystem qmake
+	dh $@ --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	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:
-	dh_auto_install
-	rm debian/tmp/usr/bin/signon-oauth2plugin-tests
-	rm debian/tmp/usr/share/signon-oauth2plugin-tests/tests.xml
+	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
+
+#	rm debian/tmp/usr/bin/signon-oauth2plugin-tests
+#	rm debian/tmp/usr/share/signon-oauth2plugin-tests/tests.xml


More information about the Neon-commits mailing list