[neon/qt/qbs/Neon/release] debian: Drop tests_Make_sure_we_handle_prefix_cases_where_libPath.diff.

[Dmitry Shachnev]

Git commit d40a9d99a7bf16ed9e73ad10469748cd212fc868 by Dmitry Shachnev.
Committed on 02/04/2022 at 13:47.
Pushed by jriddell into branch 'Neon/release'.

Drop tests_Make_sure_we_handle_prefix_cases_where_libPath.diff.

Included in the new release.

M  +2    -0    debian/changelog
M  +0    -1    debian/patches/series
D  +0    -34   debian/patches/tests_Make_sure_we_handle_prefix_cases_where_libPath.diff

https://invent.kde.org/neon/qt/qbs/commit/d40a9d99a7bf16ed9e73ad10469748cd212fc868

diff --git a/debian/changelog b/debian/changelog
index 5b1652d..9535cc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ qbs (1.22.0-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release (1.22.0).
+  * Drop tests_Make_sure_we_handle_prefix_cases_where_libPath.diff,
+    included in the new release.
 
  -- Marius Gripsgard <marius at ubports.com>  Tue, 28 Dec 2021 17:30:52 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 81994be..32dc11a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@ processlauncher_destdir.diff
 test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
-tests_Make_sure_we_handle_prefix_cases_where_libPath.diff
 doc_Install_man_pages_with_cmake.diff
diff --git a/debian/patches/tests_Make_sure_we_handle_prefix_cases_where_libPath.diff b/debian/patches/tests_Make_sure_we_handle_prefix_cases_where_libPath.diff
deleted file mode 100644
index 96a3829..0000000
--- a/debian/patches/tests_Make_sure_we_handle_prefix_cases_where_libPath.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 99cad8df71a4a3fc85348e79891a9047fc6fcde7 Mon Sep 17 00:00:00 2001
-From: Marius Gripsgard <marius at ubports.com>
-Date: Tue, 28 Dec 2021 21:51:22 +0100
-Subject: [PATCH] tests: Make sure we handle prefix cases where libPath have
- arch triplet
-
-Example for this case is on debian where libPath is equal to
-/usr/lib/[arch]/ this would then end up with a prefix of /usr/lib, this
-is wrong as it should be /usr.
-
-This also adds an additional check to see if its starts with /lib as
-this might be a correct path on some systems, so we ignore this case.
----
- tests/auto/blackbox/tst_blackboxqt.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp
-index 5d825f8ec..620cd2fa7 100644
---- a/tests/auto/blackbox/tst_blackboxqt.cpp
-+++ b/tests/auto/blackbox/tst_blackboxqt.cpp
-@@ -365,7 +365,9 @@ void TestBlackboxQt::pkgconfigQt()
-             lines, [&needle](const auto &line) { return !line.startsWith(needle); });
-     QCOMPARE(lines.size(), 1);
-     const auto libPath = lines[0].mid(needle.size());
--    const auto prefix = QFileInfo(libPath).path();
-+    auto prefix = QFileInfo(libPath).path();
-+    if (prefix.endsWith("/lib") && !prefix.startsWith("/lib"))
-+       prefix = QFileInfo(prefix).path();
-     const auto pkgConfigPath = libPath + "/pkgconfig/";
-     if (!QFileInfo(pkgConfigPath).exists())
-         QSKIP("No *.pc files found");
--- 
-2.34.1
-