[neon/qt/qtbase/Neon/release] debian: Don't hardcode libssl version in Depends, fill it dynamically.

Dmitry Shachnev null at kde.org
Thu May 5 10:59:25 BST 2022


Git commit 531c31ae58aefc7c5046636d2d168f3c91404ae3 by Dmitry Shachnev.
Committed on 21/02/2022 at 17:28.
Pushed by jriddell into branch 'Neon/release'.

Don't hardcode libssl version in Depends, fill it dynamically.

M  +1    -0    debian/changelog
M  +1    -1    debian/control
M  +4    -0    debian/rules

https://invent.kde.org/neon/qt/qtbase/commit/531c31ae58aefc7c5046636d2d168f3c91404ae3

diff --git a/debian/changelog b/debian/changelog
index e470095..15d3c1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.15.2+dfsg-15) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Backport upstream changes to improve support for OpenSSL 3.0.
+    - Don't hardcode libssl version in Depends, fill it dynamically.
   * Replace -ffile-prefix-map in qmodule.pri.
   * Backport upstream patch to make QProcess not search for executables in
     CWD unless explicitly told so (CVE-2022-25255).
diff --git a/debian/control b/debian/control
index f4804da..48fc429 100644
--- a/debian/control
+++ b/debian/control
@@ -157,7 +157,7 @@ Package: libqt5network5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libssl1.1, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${libssl:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 network module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/rules b/debian/rules
index 51c3037..8c68d3e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags -
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) $(shell getconf LFS_CFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export PKG_CONFIG := /usr/bin/$(DEB_HOST_GNU_TYPE)-pkg-config
+sslpkgname := $(shell dpkg-query --show '--showformat=$${Depends}' libssl-dev | cut -d ' ' -f1)
 
 # Upstream changelog
 upstream_changes := dist/changes-$(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/+dfsg//' | sed -e 's/+git.*//')
@@ -313,3 +314,6 @@ override_dh_auto_test:
 
 override_dh_strip_nondeterminism:
 	dh_strip_nondeterminism --verbose -X.png
+
+execute_after_dh_shlibdeps-arch:
+	echo libssl:Depends=$(sslpkgname) >> debian/libqt5network5.substvars



More information about the Neon-commits mailing list