[neon/qt/qbs/Neon/testing] debian: Update to 1.19.0, rebase patches.

Dmitry Shachnev null at kde.org
Thu May 20 10:00:35 BST 2021


Git commit a43bd9a7bf62b66d379f02cc51c70f6dd98bba1b by Dmitry Shachnev.
Committed on 11/05/2021 at 18:09.
Pushed by sitter into branch 'Neon/testing'.

Update to 1.19.0, rebase patches.

M  +1    -1    debian/changelog
M  +2    -2    debian/patches/disable_bad_assembly.diff
M  +3    -17   debian/patches/no_nosys_specs.diff

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

diff --git a/debian/changelog b/debian/changelog
index 3a27502..e1ffb30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qbs (1.18.2-1) UNRELEASED; urgency=medium
+qbs (1.19.0-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
diff --git a/debian/patches/disable_bad_assembly.diff b/debian/patches/disable_bad_assembly.diff
index 33a13f5..19048cf 100644
--- a/debian/patches/disable_bad_assembly.diff
+++ b/debian/patches/disable_bad_assembly.diff
@@ -7,8 +7,8 @@ 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
-@@ -46,8 +46,6 @@ BareMetalApplication {
-             if (qbs.architecture === "stm8")
+@@ -60,8 +60,6 @@ BareMetalApplication {
+             if (qbs.architecture === "hcs8")
                  return true;
          } else if (qbs.toolchainType === "gcc") {
 -            if (qbs.architecture.startsWith("arm"))
diff --git a/debian/patches/no_nosys_specs.diff b/debian/patches/no_nosys_specs.diff
index 7422c67..f916992 100644
--- a/debian/patches/no_nosys_specs.diff
+++ b/debian/patches/no_nosys_specs.diff
@@ -60,23 +60,9 @@ Last-Update: 2021-01-05
      }
      name: "stm32f4discovery-blueblink"
      cpp.cLanguageVersion: "c99"
---- a/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
-+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalApplication.qbs
-@@ -81,11 +81,6 @@ CppApplication {
-         cpp.assemblerFlags: ["--cpu", "cortex-m0"]
-         cpp.driverFlags: ["-mcpu=cortex-m0", "--target=arm-arm-none-eabi"]
-     }
--    Properties {
--        condition: qbs.toolchain.contains("gcc")
--            && qbs.architecture.startsWith("arm")
--        cpp.driverFlags: ["-specs=nosys.specs"]
--    }
-     Properties {
-         condition: qbs.toolchain.contains("gcc")
-             && qbs.architecture === "xtensa"
---- a/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
-+++ b/tests/auto/blackbox/testdata-baremetal/BareMetalStaticLibrary.qbs
-@@ -81,11 +81,6 @@ StaticLibrary {
+--- 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"]
      }



More information about the Neon-commits mailing list