[neon/qt/qtbase/Neon/release] debian: Replace -ffile-prefix-map in qmodule.pri.

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


Git commit cded778b39f8f413c1d11419da18bab7541072e7 by Dmitry Shachnev.
Committed on 13/02/2022 at 17:05.
Pushed by jriddell into branch 'Neon/release'.

Replace -ffile-prefix-map in qmodule.pri.

This is needed for fixfilepath setting, which is enabled by default
since dpkg 1.20.6.

Note: I don't want to use sed -E here, because with that I would need
to escape + signs in $(CURDIR).

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

https://invent.kde.org/neon/qt/qtbase/commit/cded778b39f8f413c1d11419da18bab7541072e7

diff --git a/debian/changelog b/debian/changelog
index 8621a32..28ce304 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.
+  * Replace -ffile-prefix-map in qmodule.pri.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 05 Dec 2021 17:23:13 +0300
 
diff --git a/debian/rules b/debian/rules
index b5391e4..51c3037 100755
--- a/debian/rules
+++ b/debian/rules
@@ -285,7 +285,7 @@ endif
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt5Core/Qt5CoreConfigExtras.cmake
 
 	# See https://bugs.debian.org/914019
-	sed -i 's,-fdebug-prefix-map=$(CURDIR)=. ,,' \
+	sed -i 's,-fdebug-prefix-map=$(CURDIR)=. ,,; s,-ffile-prefix-map=$(CURDIR)=. ,,' \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/qmodule.pri
 
 	# Policy ยง 10.4. Remove this if https://bugs.debian.org/904409 gets fixed.



More information about the Neon-commits mailing list