[neon/qt/qbs/Neon/release] debian/patches: debian/patches: Refresh patches for 1.21
Marius Gripsgard
null at kde.org
Thu May 5 12:48:32 BST 2022
Git commit e4d803f8cd4a0fb8293abeeff3395b612fe3d2dc by Marius Gripsgard.
Committed on 28/12/2021 at 17:05.
Pushed by jriddell into branch 'Neon/release'.
debian/patches: Refresh patches for 1.21
M +5 -3 debian/patches/disable_bad_assembly.diff
M +31 -21 debian/patches/no_nosys_specs.diff
M +9 -5 debian/patches/skip_test_concurrent.diff
https://invent.kde.org/neon/qt/qbs/commit/e4d803f8cd4a0fb8293abeeff3395b612fe3d2dc
diff --git a/debian/patches/disable_bad_assembly.diff b/debian/patches/disable_bad_assembly.diff
index 19048cf..e5063a4 100644
--- a/debian/patches/disable_bad_assembly.diff
+++ b/debian/patches/disable_bad_assembly.diff
@@ -5,9 +5,11 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
Forwarded: not-needed
Last-Update: 2020-09-20
---- a/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
-+++ b/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
-@@ -60,8 +60,6 @@ BareMetalApplication {
+Index: qbs-src-1.21.0/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
+===================================================================
+--- qbs-src-1.21.0.orig/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
++++ qbs-src-1.21.0/tests/auto/blackbox/testdata-baremetal/one-object-asm-application/one-object-asm-application.qbs
+@@ -71,8 +71,6 @@ BareMetalApplication {
if (qbs.architecture === "hcs8")
return true;
} else if (qbs.toolchainType === "gcc") {
diff --git a/debian/patches/no_nosys_specs.diff b/debian/patches/no_nosys_specs.diff
index f916992..6a2470e 100644
--- a/debian/patches/no_nosys_specs.diff
+++ b/debian/patches/no_nosys_specs.diff
@@ -4,9 +4,11 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
Forwarded: not-needed
Last-Update: 2021-01-05
---- a/examples/baremetal/pca10001/greenblink/greenblink.qbs
-+++ b/examples/baremetal/pca10001/greenblink/greenblink.qbs
-@@ -54,10 +54,7 @@ CppApplication {
+Index: qbs-src-1.21.0/examples/baremetal/pca10001/greenblink/greenblink.qbs
+===================================================================
+--- qbs-src-1.21.0.orig/examples/baremetal/pca10001/greenblink/greenblink.qbs
++++ qbs-src-1.21.0/examples/baremetal/pca10001/greenblink/greenblink.qbs
+@@ -52,10 +52,7 @@ CppApplication {
condition: {
if (!qbs.architecture.startsWith("arm"))
return false;
@@ -18,9 +20,11 @@ Last-Update: 2021-01-05
}
name: "pca10001-greenblink"
cpp.cLanguageVersion: "c99"
---- a/examples/baremetal/pca10040/greenblink/greenblink.qbs
-+++ b/examples/baremetal/pca10040/greenblink/greenblink.qbs
-@@ -54,10 +54,7 @@ CppApplication {
+Index: qbs-src-1.21.0/examples/baremetal/pca10040/greenblink/greenblink.qbs
+===================================================================
+--- qbs-src-1.21.0.orig/examples/baremetal/pca10040/greenblink/greenblink.qbs
++++ qbs-src-1.21.0/examples/baremetal/pca10040/greenblink/greenblink.qbs
+@@ -52,10 +52,7 @@ CppApplication {
condition: {
if (!qbs.architecture.startsWith("arm"))
return false;
@@ -32,9 +36,11 @@ Last-Update: 2021-01-05
}
name: "pca10040-greenblink"
cpp.cLanguageVersion: "c99"
---- a/examples/baremetal/stm32f103/greenblink/greenblink.qbs
-+++ b/examples/baremetal/stm32f103/greenblink/greenblink.qbs
-@@ -54,10 +54,7 @@ CppApplication {
+Index: qbs-src-1.21.0/examples/baremetal/stm32f103/greenblink/greenblink.qbs
+===================================================================
+--- qbs-src-1.21.0.orig/examples/baremetal/stm32f103/greenblink/greenblink.qbs
++++ qbs-src-1.21.0/examples/baremetal/stm32f103/greenblink/greenblink.qbs
+@@ -52,10 +52,7 @@ CppApplication {
condition: {
if (!qbs.architecture.startsWith("arm"))
return false;
@@ -46,9 +52,11 @@ Last-Update: 2021-01-05
}
name: "stm32f103-greenblink"
cpp.cLanguageVersion: "c99"
---- a/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
-+++ b/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
-@@ -54,10 +54,7 @@ CppApplication {
+Index: qbs-src-1.21.0/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
+===================================================================
+--- qbs-src-1.21.0.orig/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
++++ qbs-src-1.21.0/examples/baremetal/stm32f4discovery/blueblink/blueblink.qbs
+@@ -52,10 +52,7 @@ CppApplication {
condition: {
if (!qbs.architecture.startsWith("arm"))
return false;
@@ -60,17 +68,19 @@ Last-Update: 2021-01-05
}
name: "stm32f4discovery-blueblink"
cpp.cLanguageVersion: "c99"
---- a/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
-+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
-@@ -130,11 +130,6 @@ Product {
- cpp.assemblerFlags: ["--cpu", "cortex-m0"]
- cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
+Index: qbs-src-1.21.0/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
+===================================================================
+--- qbs-src-1.21.0.orig/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
++++ qbs-src-1.21.0/tests/auto/blackbox/testdata-baremetal/BareMetalProduct.qbs
+@@ -132,11 +132,6 @@ Product {
}
-- Properties {
-- condition: qbs.toolchain.contains("gcc")
+ Properties {
+ condition: qbs.toolchain.contains("gcc")
- && qbs.architecture.startsWith("arm")
- cpp.driverFlags: ["-specs=nosys.specs"]
- }
- Properties {
- condition: qbs.toolchain.contains("gcc")
+- Properties {
+- condition: qbs.toolchain.contains("gcc")
&& qbs.architecture === "xtensa"
+ cpp.driverFlags: ["-nostdlib"]
+ }
diff --git a/debian/patches/skip_test_concurrent.diff b/debian/patches/skip_test_concurrent.diff
index f825c5e..de76e06 100644
--- a/debian/patches/skip_test_concurrent.diff
+++ b/debian/patches/skip_test_concurrent.diff
@@ -3,9 +3,11 @@ Author: Dmitry Shachnev <mitya57 at debian.org>
Forwarded: no
Last-Update: 2021-01-23
---- a/tests/auto/blackbox/tst_blackbox.cpp
-+++ b/tests/auto/blackbox/tst_blackbox.cpp
-@@ -1729,6 +1729,7 @@ void TestBlackbox::clean()
+Index: qbs-src-1.21.0/tests/auto/blackbox/tst_blackbox.cpp
+===================================================================
+--- qbs-src-1.21.0.orig/tests/auto/blackbox/tst_blackbox.cpp
++++ qbs-src-1.21.0/tests/auto/blackbox/tst_blackbox.cpp
+@@ -1730,6 +1730,7 @@ void TestBlackbox::clean()
void TestBlackbox::concurrentExecutor()
{
@@ -13,8 +15,10 @@ Last-Update: 2021-01-23
QDir::setCurrent(testDataDir + "/concurrent-executor");
QCOMPARE(runQbs(QStringList() << "-j" << "2"), 0);
QVERIFY2(!m_qbsStderr.contains("ASSERT"), m_qbsStderr.constData());
---- a/tests/auto/blackbox/tst_blackboxjoblimits.cpp
-+++ b/tests/auto/blackbox/tst_blackboxjoblimits.cpp
+Index: qbs-src-1.21.0/tests/auto/blackbox/tst_blackboxjoblimits.cpp
+===================================================================
+--- qbs-src-1.21.0.orig/tests/auto/blackbox/tst_blackboxjoblimits.cpp
++++ qbs-src-1.21.0/tests/auto/blackbox/tst_blackboxjoblimits.cpp
@@ -143,6 +143,7 @@ void TestBlackboxJobLimits::jobLimits_da
void TestBlackboxJobLimits::jobLimits()
More information about the Neon-commits
mailing list