[neon/qt6/qbs/Neon/unstable] debian: add fedora patch

[Carlos De Maine]

Git commit 8accb2dc5f9fc49729020e3366d8c9f41caaeac4 by Carlos De Maine.
Committed on 30/08/2025 at 03:54.
Pushed by carlosdem into branch 'Neon/unstable'.

add fedora patch

A  +51   -0    debian/patches/qbs_qmake.patch
M  +2    -1    debian/patches/series
M  +1    -3    debian/rules

https://invent.kde.org/neon/qt6/qbs/-/commit/8accb2dc5f9fc49729020e3366d8c9f41caaeac4

diff --git a/debian/patches/qbs_qmake.patch b/debian/patches/qbs_qmake.patch
new file mode 100644
index 0000000..9a767d3
--- /dev/null
+++ b/debian/patches/qbs_qmake.patch
@@ -0,0 +1,51 @@
+diff -rupN --no-dereference qbs-src-2.5.1/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js qbs-src-2.5.1-new/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js
+--- qbs-src-2.5.1/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js	2025-01-23 12:33:17.000000000 +0100
++++ qbs-src-2.5.1-new/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js	2025-01-28 13:10:15.274434927 +0100
+@@ -54,7 +54,13 @@ function getQmakePaths(pkg) {
+                 return;
+             }
+         }
+-        var suffix = FileInfo.executableSuffix();
++        var qtsuffix = "";
++        if (packageName === "Qt5Core") {
++            qtsuffix = "-qt5";
++        } else if (packageName === "Qt6Core") {
++            qtsuffix = "-qt6";
++        }
++        var suffix = qtsuffix + FileInfo.executableSuffix();
+         return [FileInfo.joinPaths(binDir, "qmake" + suffix)];
+     }
+ }
+diff -rupN --no-dereference qbs-src-2.5.1/share/qbs/imports/qbs/Probes/qmake-probe.js qbs-src-2.5.1-new/share/qbs/imports/qbs/Probes/qmake-probe.js
+--- qbs-src-2.5.1/share/qbs/imports/qbs/Probes/qmake-probe.js	2025-01-23 12:33:17.000000000 +0100
++++ qbs-src-2.5.1-new/share/qbs/imports/qbs/Probes/qmake-probe.js	2025-01-28 13:10:15.274905258 +0100
+@@ -56,16 +56,19 @@ function getQmakeFilePaths(qmakeFilePath
+     var pathValue = Environment.getEnv("PATH");
+     if (pathValue) {
+         var dirs = splitNonEmpty(pathValue, FileInfo.pathListSeparator());
+-        for (var i = 0; i < dirs.length; ++i) {
+-            var candidate = FileInfo.joinPaths(dirs[i], "qmake" + FileInfo.executableSuffix());
+-            var canonicalCandidate = FileInfo.canonicalPath(candidate);
+-            if (!canonicalCandidate || !File.exists(canonicalCandidate))
+-                continue;
+-            if (FileInfo.completeBaseName(canonicalCandidate) !== "qtchooser")
+-                candidate = canonicalCandidate;
+-            if (!filePaths.contains(candidate)) {
+-                console.info("Found Qt at '" + FileInfo.toNativeSeparators(candidate) + "'.");
+-                filePaths.push(candidate);
++        var qtvers = ["-qt6", "-qt5", ""];
++        for (var j = 0; j < qtvers.length; ++j) {
++            for (var i = 0; i < dirs.length; ++i) {
++                var candidate = FileInfo.joinPaths(dirs[i], "qmake" + qtvers[j] + FileInfo.executableSuffix());
++                var canonicalCandidate = FileInfo.canonicalPath(candidate);
++                if (!canonicalCandidate || !File.exists(canonicalCandidate))
++                    continue;
++                if (FileInfo.completeBaseName(canonicalCandidate) !== "qtchooser")
++                    candidate = canonicalCandidate;
++                if (!filePaths.contains(candidate)) {
++                    console.info("Found Qt at '" + FileInfo.toNativeSeparators(candidate) + "'.");
++                    filePaths.push(candidate);
++                }
+             }
+         }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 3e04274..cfc5065 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@ skip_test_concurrent.diff
 test_sanitizers_only_on_amd64.diff
 no_nosys_specs.diff
 disable_bad_assembly.diff
-asan_atomic.diff
\ No newline at end of file
+asan_atomic.diff
+qbs_qmake.patch
diff --git a/debian/rules b/debian/rules
index 239125a..e55285e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,10 @@ override_dh_auto_configure:
 		-GNinja
 
 override_dh_auto_build:
-	dh_auto_build
-	dh_auto_build -- docs
+	dh_auto_build --qbs
 
 override_dh_auto_install:
 	dh_auto_install
-	dh_auto_install -- docs
 
 execute_after_dh_auto_install:
 	find debian/tmp -type f -name .gitignore -print -delete