[neon/extras/clazy/Neon/release] debian: 2nd update of patches

Pino Toscano null at kde.org
Wed Sep 7 22:14:02 BST 2022


Git commit 601cdc7c540db2b03676ad3c2d3dfe43446083b6 by Pino Toscano.
Committed on 23/11/2020 at 16:50.
Pushed by jriddell into branch 'Neon/release'.

2nd update of patches

- debian-tests-link-atomic.diff: refresh
- select-clangpp.diff: refresh

M  +2    -0    debian/changelog
M  +1    -1    debian/patches/debian-tests-link-atomic.diff
M  +2    -2    debian/patches/select-clangpp.diff

https://invent.kde.org/neon/extras/clazy/commit/601cdc7c540db2b03676ad3c2d3dfe43446083b6

diff --git a/debian/changelog b/debian/changelog
index c6d7c31..57983d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ clazy (1.8-0r1) UNRELEASED; urgency=medium
       upstream
     - upstream_updated-for-compatibility-with-LLVM-10-clazy-standal.patch:
       drop, backported from upstream
+    - debian-tests-link-atomic.diff: refresh
+    - select-clangpp.diff: refresh
   * Bump Standards-Version to 4.5.1, no changes required.
   * Update the build dependencies according to the upstream build system:
     - bump clang & LLVM to 7.0
diff --git a/debian/patches/debian-tests-link-atomic.diff b/debian/patches/debian-tests-link-atomic.diff
index 10c09cd..73c0801 100644
--- a/debian/patches/debian-tests-link-atomic.diff
+++ b/debian/patches/debian-tests-link-atomic.diff
@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- a/tests/run_tests.py
 +++ b/tests/run_tests.py
-@@ -281,6 +281,9 @@ def link_flags():
+@@ -296,6 +296,9 @@ def link_flags():
      flags = "-lQt5Core -lQt5Gui -lQt5Widgets"
      if _platform.startswith('linux'):
          flags += " -lstdc++"
diff --git a/debian/patches/select-clangpp.diff b/debian/patches/select-clangpp.diff
index be2dca2..041ce00 100644
--- a/debian/patches/select-clangpp.diff
+++ b/debian/patches/select-clangpp.diff
@@ -7,7 +7,7 @@ Last-Update: 2019-02-01
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -49,6 +49,10 @@ if(NOT CLAZY_BUILD_WITH_CLANG AND MSVC A
+@@ -56,6 +56,10 @@ if(NOT CLAZY_BUILD_WITH_CLANG AND MSVC A
    message(FATAL_ERROR "\nOn MSVC you need to pass -DCLANG_LIBRARY_IMPORT=C:/path/to/llvm-build/lib/clang.lib to cmake when building Clazy.\nAlso make sure you've built LLVM with -DLLVM_EXPORT_SYMBOLS_FOR_PLUGINS=ON")
  endif()
  
@@ -29,7 +29,7 @@ Last-Update: 2019-02-01
  }
  
  PRLIST() {
-@@ -150,5 +150,5 @@ then
+@@ -151,5 +151,5 @@ then
      $(dirname $0)/bin/clazy-standalone "$@"
    fi
  else



More information about the Neon-commits mailing list