[neon/extras/clazy/Neon/release] debian: sync to debian
Carlos De Maine
null at kde.org
Wed May 28 10:38:00 BST 2025
Git commit ebc4451a82b2aee057116a964b9580deffbab4e6 by Carlos De Maine.
Committed on 28/05/2025 at 09:37.
Pushed by carlosdem into branch 'Neon/release'.
sync to debian
M +8 -0 debian/changelog
M +10 -1 debian/control
A +19 -0 debian/patches/debian-tests-extra-libs.diff
M +3 -3 debian/patches/select-clangpp.diff
M +1 -0 debian/patches/series
M +17 -3 debian/rules
M +1 -1 debian/tests/control
M +7 -8 debian/tests/run-tests
https://invent.kde.org/neon/extras/clazy/-/commit/ebc4451a82b2aee057116a964b9580deffbab4e6
diff --git a/debian/changelog b/debian/changelog
index d30f9d5..ae6f351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+clazy (1.14-1) noble; urgency=medium
+
+ * New upstream release:
+ - supports building with LLVM 20
+ * Bump Standards-Version to 4.7.2, no changes required.
+
+ -- Pino Toscano <pino at debian.org> Tue, 29 Apr 2025 08:37:54 +0200
+
clazy (1.14-0neon) noble; urgency=medium
* New release
diff --git a/debian/control b/debian/control
index 6f0d657..1987488 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,18 @@ Build-Depends: chrpath,
libclang-19-dev,
llvm-19-dev,
python3:any <!nocheck>,
+ libqt5networkauth5-dev <!nocheck>,
+ qtbase5-dev <!nocheck>,
+ libqt5svg5-dev <!nocheck>,
+ qtdeclarative5-dev <!nocheck>,
+ qtmultimedia5-dev <!nocheck>,
qt6-base-dev <!nocheck>,
qt6-declarative-dev <!nocheck>,
-Standards-Version: 4.6.2
+ qt6-multimedia-dev <!nocheck>,
+ qt6-networkauth-dev <!nocheck>,
+ qt6-scxml-dev <!nocheck>,
+ qt6-svg-dev <!nocheck>,
+Standards-Version: 4.7.2
Rules-Requires-Root: no
Homepage: https://www.kdab.com/clazy-video/
Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/clazy.git
diff --git a/debian/patches/debian-tests-extra-libs.diff b/debian/patches/debian-tests-extra-libs.diff
new file mode 100644
index 0000000..d6f94ab
--- /dev/null
+++ b/debian/patches/debian-tests-extra-libs.diff
@@ -0,0 +1,19 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Add environment variable for extra link flags
+ Enable the usage of an environment variable to pass extra flags to linking
+ steps.
+Last-Update: 2024-07-05
+Forwarded: not-needed
+
+--- a/tests/run_tests.py
++++ b/tests/run_tests.py
+@@ -358,6 +358,9 @@ def link_flags(qt:QtInstallation):
+ flags += " -lstdc++"
+ if is_qt6:
+ flags += " -lQt6StateMachine"
++ debian_extra_libs = os.getenv("DEBIAN_EXTRA_LIBS")
++ if debian_extra_libs:
++ flags += " " + debian_extra_libs
+ return flags
+
+
diff --git a/debian/patches/select-clangpp.diff b/debian/patches/select-clangpp.diff
index f9741de..fb8fc4e 100644
--- a/debian/patches/select-clangpp.diff
+++ b/debian/patches/select-clangpp.diff
@@ -7,7 +7,7 @@ Last-Update: 2019-02-01
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -65,6 +65,10 @@
+@@ -56,6 +56,10 @@ if(NOT CLAZY_BUILD_WITH_CLANG AND MSVC A
message(FATAL_ERROR "\nOn MSVC you need to pass -DCLANG_LIBRARY_IMPORT=C:/path/to/llvm-build/lib/clang.lib to cmake when building Clazy.\nAlso make sure you've built LLVM with -DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
endif()
@@ -20,7 +20,7 @@ Last-Update: 2019-02-01
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4291 /wd4800 /wd4141 /wd4146 /wd4251")
--- a/clazy.cmake
+++ b/clazy.cmake
-@@ -36,7 +36,7 @@
+@@ -34,7 +34,7 @@ HELP() {
VERSION() {
echo "clazy version: @CLAZY_PRINT_VERSION@"
@@ -29,7 +29,7 @@ Last-Update: 2019-02-01
}
PRLIST() {
-@@ -154,5 +154,5 @@
+@@ -147,5 +147,5 @@ then
$(dirname $0)/bin/clazy-standalone "$@"
fi
else
diff --git a/debian/patches/series b/debian/patches/series
index 036ded6..395fdad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+debian-tests-extra-libs.diff
select-clangpp.diff
diff --git a/debian/rules b/debian/rules
index 290ac5d..2b7b11d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,11 @@
#!/usr/bin/make -f
+EMPTY :=
+SPACE := $(EMPTY) $(EMPTY)
+COMMA := ,
+
include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildopts.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -10,11 +15,12 @@ export DEB_CXXFLAGS_MAINT_APPEND = -Wno-class-memaccess
archs_that_need_atomic = armel
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(archs_that_need_atomic)))
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -latomic -Wl,--as-needed
+TESTS_EXTRA_LIBS += -latomic
endif
# on armel & armhf there are OpenGL ES headers
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armel armhf))
-RUN_TESTS_ARGS += --exclude qt6-header-fixes
+TESTS_EXCLUDED += qt6-header-fixes
endif
# keep the "++" at the end, to make sure the tool used is the C++ frontend
@@ -26,6 +32,10 @@ DPKG_ARCHITECTURE = $(shell dpkg --print-architecture)
%:
dh $@
+execute_after_dh_auto_clean:
+ # cleanup the artifacts of the tests
+ find tests/ \( -name '*.o' -o -name '*.out' -o -name '*.result' -o -name '*.gch' \) -delete
+
override_dh_auto_configure:
dh_auto_configure -- -DCLANGPP_EXECUTABLE="$(CLANGPP)" -DREADLINK_CMD:FILEPATH=/bin/readlink
@@ -34,17 +44,21 @@ override_dh_auto_install:
# drop RPATH pointing to the private libdir of LLVM libraries,
# i.e. /usr/lib/llvm-$VERSION/lib
chrpath -d $(CURDIR)/debian/clazy/usr/bin/clazy-standalone $(CURDIR)/debian/clazy/usr/lib/*/*.so
- # create a local shell environment file with the various paths
+ # drop extra license file
+ rm $(CURDIR)/debian/clazy/usr/share/doc/clazy/LGPL-2.0-or-later.txt
+ # create a local shell environment file with the various paths & configurations
:> $(CURDIR)/debian/debian.sh
echo 'export CLANG="$(CLANGPP)"' >> $(CURDIR)/debian/debian.sh
echo 'export CLANG_APPLY_REPLACEMENTS="$(CLANG_APPLY_REPLACEMENTS)"' >> $(CURDIR)/debian/debian.sh
+ echo 'export TESTS_EXCLUDED="$(TESTS_EXCLUDED)"' >> $(CURDIR)/debian/debian.sh
+ echo 'export TESTS_EXTRA_LIBS="$(TESTS_EXTRA_LIBS)"' >> $(CURDIR)/debian/debian.sh
mkdir -p $(CURDIR)/debian/clazy-tests/usr/share/clazy
mv $(CURDIR)/debian/debian.sh $(CURDIR)/debian/clazy-tests/usr/share/clazy/debian-$(DPKG_ARCHITECTURE).sh
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
chmod +x $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/clazy
- cd tests && env PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE):$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/bin:$(PATH) LD_LIBRARY_PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/lib DEB_HOST_ARCH=$(DEB_HOST_ARCH) CCACHE_DISABLE=1 ./run_tests.py --verbose $(RUN_TESTS_ARGS)
+ cd tests && env PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE):$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/bin:$(PATH) LD_LIBRARY_PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/lib DEBIAN_EXTRA_LIBS="$(TESTS_EXTRA_LIBS)" CCACHE_DISABLE=1 ./run_tests.py --verbose --jobs $(or $(DEB_BUILD_OPTION_PARALLEL),$(DEB_BUILD_OPTION_PARALLEL),1) $(and $(TESTS_EXCLUDED),--exclude $(subst $(SPACE),$(COMMA),$(TESTS_EXCLUDED)))
endif
override_dh_compress:
diff --git a/debian/tests/control b/debian/tests/control
index 6dfbad9..0be71a8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
Tests: run-tests
-Depends: @, clazy-tests, python3, qtbase5-dev, qtdeclarative5-dev
+Depends: @, clazy-tests, python3, qtbase5-dev, libqt5networkauth5-dev, libqt5svg5-dev, qtdeclarative5-dev, qtmultimedia5-dev, qt6-base-dev, qt6-declarative-dev, qt6-multimedia-dev, qt6-networkauth-dev, qt6-scxml-dev, qt6-svg-dev
Restrictions: rw-build-tree, allow-stderr
diff --git a/debian/tests/run-tests b/debian/tests/run-tests
index 3a28f1a..8f6644b 100755
--- a/debian/tests/run-tests
+++ b/debian/tests/run-tests
@@ -1,21 +1,20 @@
-#!/bin/sh
+#!/bin/bash
set -e
. /usr/share/clazy/debian-$(dpkg --print-architecture).sh
export CLANGXX="${CLANG}"
export CLAZY_CLANG_APPLY_REPLACEMENTS="${CLANG_APPLY_REPLACEMENTS}"
+export DEBIAN_EXTRA_LIBS="${TESTS_EXTRA_LIBS}"
-case "$(dpkg --print-architecture)" in
-armel|armhf)
- # on armel & armhf there are OpenGL ES headers
- RUN_TESTS_ARGS="${RUN_TESTS_ARGS} --exclude qt6-header-fixes"
- ;;
-esac
+RUN_TESTS_ARGS=()
+if [ -n "$TESTS_EXCLUDED" ]; then
+ RUN_TESTS_ARGS+=(--exclude $(echo $TESTS_EXCLUDED | sed -e "s/ /,/g"))
+fi
# show some facts about clang/clang++, so it is easier to debug issues
${CLANGXX} -E -x c - -v < /dev/null
${CLANGXX} -E -x c++ - -v < /dev/null
cd tests
-./run_tests.py --verbose ${RUN_TESTS_ARGS}
+./run_tests.py --verbose --jobs 1 ${RUN_TESTS_ARGS[@]}
More information about the Neon-commits
mailing list