[neon/kde/spectacle/Neon/unstable_jammy] debian: take it back to where it came from
Carlos De Maine
null at kde.org
Fri Aug 23 15:14:30 BST 2024
Git commit 8ae8368fba9187cb826b091d8e2350235044f5f4 by Carlos De Maine.
Committed on 23/08/2024 at 14:14.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.
take it back to where it came from
M +0 -4 debian/control
M +3 -8 debian/rules
https://invent.kde.org/neon/kde/spectacle/-/commit/8ae8368fba9187cb826b091d8e2350235044f5f4
diff --git a/debian/control b/debian/control
index b050aed..d707eb7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ 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-15,
debhelper-compat (= 13),
gcc-12,
g++-12,
@@ -27,8 +26,6 @@ Build-Depends: cmake,
kf6-prison-dev,
kf6-purpose-dev,
kwayland-dev,
- libc++-dev,
- libc++abi-dev,
libkf6screen-dev,
libkpipewire-dev,
liblayershellqtinterface-dev,
@@ -41,7 +38,6 @@ Build-Depends: cmake,
libxcb-util0-dev,
libxcb-xfixes0-dev,
libzxing-dev,
- llvm-15-dev,
ninja-build,
pkg-config,
pkg-kde-tools-neon,
diff --git a/debian/rules b/debian/rules
index c8ac7af..e418414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,16 +2,11 @@
# SPDX-License-Identifier: LGPL-2.0-or-later
# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-export CC=/usr/bin/clang-15
-export CXX=/usr/bin/clang++-15
-export CXXFLAGS=-stdlib=libc++ -std=c++20
-export LDXX=/usr/bin/clang++-15
-export LDXXFLAGS=-stdlib=libc++ -std=c++20
-export CPLUS_INCLUDE_PATH=/usr/include/c++/v1:/usr/include/x86_64-linux-gnu/c++/15
-export gcc-install-dir=/usr/lib/gcc/x86_64-linux-gnu/15
-
%:
dh $@ --with kf6 --buildsystem kf6 --buildsystem=cmake+ninja
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_CXX_STANDARD=20
+
override_dh_install:
echo "skip dh_install"
More information about the Neon-commits
mailing list