[neon/3rdparty/libaccounts-qt/Neon/unstable] debian: try to build qt6 as well

Carlos De Maine null at kde.org
Fri Jun 23 11:36:40 BST 2023


Git commit 320474755cce0d1dacb9bfc1b97d09af84cfa6fb by Carlos De Maine.
Committed on 23/06/2023 at 10:36.
Pushed by carlosdem into branch 'Neon/unstable'.

try to build qt6 as well

M  +25   -1    debian/control
A  +2    -0    debian/libaccounts-qt6-1.install
A  +4    -0    debian/libaccounts-qt6-dev.install
M  +11   -4    debian/rules

https://invent.kde.org/neon/3rdparty/libaccounts-qt/-/commit/320474755cce0d1dacb9bfc1b97d09af84cfa6fb

diff --git a/debian/control b/debian/control
index d63f464..5886ada 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper-compat (= 13),
                pkg-config,
                qt5-qmake,
                qtbase5-dev,
-               qtchooser
+               qtchooser,
+               qt6-base-dev,
 Build-Depends-Indep: doxygen, graphviz, qttools5-dev-tools
 Standards-Version: 4.5.1
 Rules-Requires-Root: no
@@ -40,6 +41,29 @@ Description: Accounts database access Qt version - Qt5 shared library
  .
  This package contains shared libraries to be used by Qt5 applications.
 
+Package: libaccounts-qt6-dev
+Section: libdevel
+Architecture: any
+Depends: libaccounts-qt6-1 (= ${binary:Version}),
+         ${misc:Depends},
+Description: Accounts database access Qt version - Qt6 development files
+ Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
+ platforms.
+ .
+ This package contains files the development files of the accounts database
+ access Qt6 API.
+
+Package: libaccounts-qt6-1
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Accounts database access Qt version - Qt6 shared library
+ Accounts and SSO (Single Sign-On) framework for Linux and POSIX based
+ platforms.
+ .
+ This package contains shared libraries to be used by Qt5 applications.
+
 Package: libaccounts-qt-doc
 Section: doc
 Architecture: all
diff --git a/debian/libaccounts-qt6-1.install b/debian/libaccounts-qt6-1.install
new file mode 100644
index 0000000..0dd637c
--- /dev/null
+++ b/debian/libaccounts-qt6-1.install
@@ -0,0 +1,2 @@
+usr/lib/*/libaccounts-qt6.so.1
+usr/lib/*/libaccounts-qt6.so.1.*
diff --git a/debian/libaccounts-qt6-dev.install b/debian/libaccounts-qt6-dev.install
new file mode 100644
index 0000000..04aa8dc
--- /dev/null
+++ b/debian/libaccounts-qt6-dev.install
@@ -0,0 +1,4 @@
+usr/include/accounts-qt6/
+usr/lib/*/cmake/AccountsQt6/
+usr/lib/*/libaccounts-qt6.so
+usr/lib/*/pkgconfig/accounts-qt6.pc
diff --git a/debian/rules b/debian/rules
index d7463cb..9efddba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,23 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-export QT_SELECT=5
+
+execute_after_dh_auto_clean:
+	rm -rf build-Qt6
 
 override_dh_auto_configure:
-	dh_auto_configure -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	QT_SELECT=qt5 dh_auto_configure -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	QT_SELECT=qt6 dh_auto_configure --builddirectory=build-qt6 -- -DBUILD_WITH_QT6=True LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-qt6
+
 
 override_dh_auto_install:
 	dh_auto_install
 	find debian/tmp -name jquery.js -exec ln -sfv /usr/share/javascript/jquery/jquery.js {} \;
-	# test stuff
-	rm debian/tmp/usr/bin/accountstest
+	
 
 override_dh_auto_test:
 	# Disable unittests


More information about the Neon-commits mailing list