[neon/qt6/qt6-shadertools/Neon/release] debian: update to salsa/experimental 6.4.1 and qt_sixy again
Jonathan Esk-Riddell
null at kde.org
Tue Dec 6 11:14:42 GMT 2022
Git commit 4127eae708bededec2f877839398f87b3660375d by Jonathan Esk-Riddell.
Committed on 06/12/2022 at 11:14.
Pushed by jriddell into branch 'Neon/release'.
update to salsa/experimental 6.4.1 and qt_sixy again
A +1 -0 debian/.gitattributes
A +1 -0 debian/.gitignore
M +109 -4 debian/changelog
M +24 -14 debian/control
M +26 -6 debian/qt6-shadertools-dev.install
M +12 -2 debian/rules
https://invent.kde.org/neon/qt6/qt6-shadertools/commit/4127eae708bededec2f877839398f87b3660375d
diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..027271b
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+files
diff --git a/debian/changelog b/debian/changelog
index 41a360c..e2f89ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,114 @@
-qt6-shadertools (6.4.0-0neon) UNRELEASED; urgency=medium
+qt6-shadertools (6.4.1-2) experimental; urgency=medium
- * New release
- * New release
+ [ Patrick Franz ]
+ * Rename libqt6shadertools6-dev to qt6-shadertools-dev.
+ * Enable link time optimization.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 30 Nov 2022 19:56:11 +0100
+
+qt6-shadertools (6.4.1-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.4.1).
+ * Bump Qt B-Ds to 6.4.1.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Nov 2022 22:27:54 +0100
+
+qt6-shadertools (6.4.0-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Fix FTCBFS, thx to Helmut Grohne: (Closes: #1023157).
+ + Pass QT_HOST_PATH and QT_HOST_PATH_CMAKE_DIR.
+ + New cross build dependency on native qsb.
+ + Do build tools when cross compiling.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 12 Nov 2022 14:26:56 +0100
+
+qt6-shadertools (6.4.0-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.4.0).
+ * Bump Qt B-Ds to 6.4.0.
+ * Remove patches as they have been applied upstream.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 02 Oct 2022 12:20:55 +0200
+
+qt6-shadertools (6.3.1-3) unstable; urgency=medium
+
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Bump CMake minimum version in order to ensure that .pc files are being
+ generated.
+
+ [ Patrick Franz ]
+ * Increase CMake verbosity level.
+ * Update symbols from buildlogs.
+
+ -- Patrick Franz <deltaone at debian.org> Sat, 01 Oct 2022 21:27:40 +0200
+
+qt6-shadertools (6.3.1-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 15 Aug 2022 19:23:54 +0200
+
+qt6-shadertools (6.3.1-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.1).
+ * Bump Qt B-Ds to 6.3.1.
+ * Update list of installed files.
+ * Bump Standards-Version to 4.6.1 (no changes needed).
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 15 Jul 2022 20:16:37 +0200
+
+qt6-shadertools (6.3.0-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.3.0).
+ * Bump Qt B-Ds to 6.3.0.
+ * Update list of installed files.
+
+ -- Patrick Franz <deltaone at debian.org> Wed, 25 May 2022 22:15:19 +0200
+
+qt6-shadertools (6.2.4-3) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Fri, 22 Apr 2022 20:07:30 +0200
+
+qt6-shadertools (6.2.4-2) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * Add patches to fix big endian issues.
+
+ -- Patrick Franz <deltaone at debian.org> Mon, 11 Apr 2022 23:28:24 +0200
+
+qt6-shadertools (6.2.4-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.2.4).
+ * Bump Qt B-Ds to 6.2.4.
+
+ -- Patrick Franz <deltaone at debian.org> Sun, 27 Mar 2022 17:32:52 +0200
+
+qt6-shadertools (6.2.2-2) unstable; urgency=medium
+
+ [ Patrick Franz ]
+ * Upload to unstable.
+
+ -- Patrick Franz <deltaone at debian.org> Tue, 15 Feb 2022 21:52:25 +0100
+
+qt6-shadertools (6.2.2-1) experimental; urgency=medium
+
+ [ Patrick Franz ]
+ * New upstream release (6.2.2).
+ * Bump Qt B-Ds to 6.2.2.
+ * Update installed files.
- -- Jonathan Riddell <jr at jriddell.org> Wed, 02 Feb 2022 15:13:51 +0000
+ -- Patrick Franz <deltaone at debian.org> Thu, 02 Dec 2021 04:05:53 +0100
qt6-shadertools (6.2.1-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 70cecff..1722102 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,17 @@ Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Patrick Franz <deltaone at debian.org>
-Build-Depends: cmake (>= 3.18~),
+Build-Depends: cmake (>= 3.24~),
debhelper-compat (= 13),
libgl1-mesa-dev,
libvulkan-dev [linux-any],
ninja-build,
pkg-config,
pkg-kde-tools,
- qt6-base-dev (>= 6.4.0)
-Standards-Version: 4.6.0
+ qt6-base-dev (>= 6.4.1+dfsg~),
+ qt6-shader-baker <cross>,
+ qt6-shadertools-dev:native <cross>
+Standards-Version: 4.6.1
Homepage: https://www.qt.io/developers/
Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-shadertools.git
@@ -20,9 +22,7 @@ Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-shadertools
Package: qt6-shadertools
Architecture: any
Section: kde
-Provides: libqt6shadertools6, qt6-shader-baker
-Breaks: libqt6shadertools6 (<< 6.4), qt6-shader-baker (<< 6.4)
-Replaces: libqt6shadertools6 (<< 6.4), qt6-shader-baker (<< 6.4)
+X-Neon-MergedPackage: true
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Qt 6 shader tools module
Qt is a cross-platform C++ application framework. Qt's primary feature
@@ -34,15 +34,25 @@ Description: Qt 6 shader tools module
Package: qt6-shadertools-dev
Architecture: any
Section: kde
-Provides: libqt6shadertools6-dev
-Breaks: libqt6shadertools6-dev (<< 6.4)
-Replaces: libqt6shadertools6-dev (<< 6.4)
+X-Neon-MergedPackage: true
Depends: qt6-shadertools (= ${binary:Version}), ${misc:Depends}
-Description: Qt 6 shader tools module
+Breaks: libqt6shadertools6-dev (<< 6.4.1-1~)
+Replaces: libqt6shadertools6-dev (<< 6.4.1-1~)
+Description: Qt 6 shader tools module - development files
Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality.
.
- The QTShaderTools module contains APIs and tools to provide functionality
- for the shader pipeline used by QtQuick.
- .
- Development Files.
+ This package contains the development files needed to build Qt 6 applications
+ using the QtShaderTools library.
+
+Package: libqt6shadertools6
+Architecture: all
+Depends: qt6-shadertools
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: qt6-shader-baker
+Architecture: all
+Depends: qt6-shadertools
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/qt6-shadertools-dev.install b/debian/qt6-shadertools-dev.install
index 7baa28c..15d16c1 100644
--- a/debian/qt6-shadertools-dev.install
+++ b/debian/qt6-shadertools-dev.install
@@ -1,12 +1,32 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt6/QtShaderTools/
usr/include/${DEB_HOST_MULTIARCH}/qt6/QtShaderTools/6.*/QtShaderTools/private/*.h
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtShaderTools/QtShaderTools
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtShaderTools/QtShaderToolsDepends
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtShaderTools/QtShaderToolsVersion
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtShaderTools/qtshadertoolsexports.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtShaderTools/qtshadertoolsglobal.h
+usr/include/${DEB_HOST_MULTIARCH}/qt6/QtShaderTools/qtshadertoolsversion.h
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6BuildInternals/StandaloneTests/QtShaderToolsTestsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/Qt6ShaderToolsAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/Qt6ShaderToolsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/Qt6ShaderToolsConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/Qt6ShaderToolsConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/Qt6ShaderToolsDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/Qt6ShaderToolsTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/Qt6ShaderToolsTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderTools/Qt6ShaderToolsVersionlessTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsMacros.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsAdditionalTargetInfo.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsConfigVersionImpl.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsDependencies.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsTargets-*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsTargets.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsVersionlessTargets.cmake
usr/lib/${DEB_HOST_MULTIARCH}/libQt6ShaderTools.prl
usr/lib/${DEB_HOST_MULTIARCH}/libQt6ShaderTools.so
-usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6shadertools_*_metatypes.json
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6*.pc
+usr/lib/${DEB_HOST_MULTIARCH}/metatypes/qt6shadertools_none_metatypes.json
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt6ShaderTools.pc
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_shadertools.pri
usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/modules/qt_lib_shadertools_private.pri
usr/share/qt6/modules/ShaderTools.json
diff --git a/debian/rules b/debian/rules
index 07ac2b3..9617d83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,24 @@
# Use already defined DEB_HOST_* variables.
include /usr/share/dpkg/architecture.mk
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+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))
+ cmake_extra_args += \
+ -DQT_HOST_PATH=/usr \
+ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib/$(DEB_BUILD_MULTIARCH)/cmake \
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON
+endif
%:
dh $@ --with pkgkde_symbolshelper --buildsystem=cmake+ninja
override_dh_auto_configure:
dh_auto_configure -- \
- -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+ --log-level=STATUS \
+ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \
+ $(cmake_extra_args)
execute_after_dh_auto_install:
# Reproducible builds: remove build paths from .prl files
More information about the Neon-commits
mailing list