[neon/qt6/qt6-lottie/Neon/release] debian: sync to debian

Carlos De Maine null at kde.org
Tue Oct 24 04:06:28 BST 2023


Git commit 8c886fd547d42fac86a62e7cb31dcc39666bbc98 by Carlos De Maine.
Committed on 24/10/2023 at 05:06.
Pushed by carlosdem into branch 'Neon/release'.

sync to debian

M  +1    -1    debian/control
M  +7    -1    debian/rules

https://invent.kde.org/neon/qt6/qt6-lottie/-/commit/8c886fd547d42fac86a62e7cb31dcc39666bbc98

diff --git a/debian/control b/debian/control
index 42ea3f5..7b6605f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: cmake,
                pkg-kde-tools,
                qt6-base-dev (>= 6.4.2+dfsg~),
                qt6-declarative-dev (>= 6.4.2+dfsg~)
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-lottie
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-lottie.git
diff --git a/debian/rules b/debian/rules
index 93dfa08..dc8ca3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,19 @@ include /usr/share/dpkg/architecture.mk
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 
+# QT_HOST_PATH isn't passed in cross-builds
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+	extra_cmake_args += -DQT_HOST_PATH=/usr
+endif
+
 %:
 	dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--log-level=STATUS \
-		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+		-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+		$(extra_cmake_args)
 
 execute_after_dh_auto_install:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list