Do not hardcode the libssl version as a dependency for libqt6network6.

ci/unstable
Patrick Franz 3 years ago
parent dd71bb4bd6
commit 200e26d609
No known key found for this signature in database
GPG Key ID: 9E9F7A603077FE56

2
debian/changelog vendored

@ -12,6 +12,8 @@ qt6-base (6.2.4+dfsg-1) UNRELEASED; urgency=medium
[ Patrick Franz ] [ Patrick Franz ]
* Add patch to prevent embedding the build path, thx to Vagrant * Add patch to prevent embedding the build path, thx to Vagrant
Cascadian (Closes: #1006407). Cascadian (Closes: #1006407).
* Do not hardcode the libssl version as a dependency for
libqt6network6, thx to Dan Bungert (Closes: #1006954).
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 20 Mar 2022 10:13:27 +0000 -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 20 Mar 2022 10:13:27 +0000

2
debian/control vendored

@ -203,7 +203,7 @@ Package: libqt6network6
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Depends: libssl1.1, ${misc:Depends}, ${shlibs:Depends} Depends: ${libssl:Depends}, ${misc:Depends}, ${shlibs:Depends}
Description: Qt 6 network module Description: Qt 6 network module
Qt is a cross-platform C++ application framework. Qt's primary feature Qt is a cross-platform C++ application framework. Qt's primary feature
is its rich set of widgets that provide standard GUI functionality. is its rich set of widgets that provide standard GUI functionality.

4
debian/rules vendored

@ -5,6 +5,7 @@
include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/architecture.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_BUILD_MAINT_OPTIONS = hardening=+all
sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
ifneq (,$(filter libqt6sql6-ibase,$(shell dh_listpackages))) ifneq (,$(filter libqt6sql6-ibase,$(shell dh_listpackages)))
extra_cmake_args += -DFEATURE_sql_ibase=ON extra_cmake_args += -DFEATURE_sql_ibase=ON
@ -88,3 +89,6 @@ execute_after_dh_auto_install:
override_dh_makeshlibs: override_dh_makeshlibs:
dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa dh_makeshlibs -XlibQt6EglFSDeviceIntegration -XlibQt6EglFsKmsGbmSupport -XlibQt6EglFsKmsSupport -XlibQt6XcbQpa
execute_after_dh_shlibdeps-arch:
echo libssl:Depends=$(sslpkgname) >> debian/libqt6network6.substvars

Loading…
Cancel
Save