[neon/kde/spectacle/Neon/release_jammy] debian: use clang 15 like in qt6-tools

Carlos De Maine null at kde.org
Wed Jun 5 12:53:40 BST 2024


Git commit 3ca14bc638d5365d76ee9d3b11cd4663a4cfbd58 by Carlos De Maine.
Committed on 05/06/2024 at 11:53.
Pushed by carlosdem into branch 'Neon/release_jammy'.

use clang 15 like in qt6-tools

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

https://invent.kde.org/neon/kde/spectacle/-/commit/3ca14bc638d5365d76ee9d3b11cd4663a4cfbd58

diff --git a/debian/control b/debian/control
index 17542c9..74f3cd1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
-               clang-14,
+               clang-15,
                debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kcolorscheme-dev,
@@ -24,7 +24,7 @@ Build-Depends: cmake,
                kf6-kxmlgui-dev,
                kf6-purpose-dev,
                kwayland-dev,
-               libc++-14-dev,
+               libc++-15-dev,
                libkf6screen-dev,
                libkpipewire-dev,
                liblayershellqtinterface-dev,
@@ -37,7 +37,7 @@ Build-Depends: cmake,
                libxcb-util0-dev,
                libxcb-xfixes0-dev,
                libzxing-dev,
-               llvm-14-dev,
+               llvm-15-dev,
                ninja-build,
                pkg-config,
                pkg-kde-tools-neon,
diff --git a/debian/rules b/debian/rules
index 5e871ac..b096ab3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,11 @@
 # SPDX-License-Identifier: LGPL-2.0-or-later
 # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
+export CMAKE_C_COMPILER=clang-15
+export CMAKE_CXX_COMPILER=clang++-15
+
 %:
-	dh $@ --with kf6 --buildsystem kf6
+	dh $@ --with kf6 --buildsystem kf6 --buildsystem=cmake+ninja
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/


More information about the Neon-commits mailing list