update quilt patch.
authorPeter Michael Green <plugwash@raspbian.org>
Wed, 26 Jun 2024 00:45:27 +0000 (00:45 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Wed, 26 Jun 2024 00:55:08 +0000 (00:55 +0000)
debian/patches/link-with-libatomic.patch

index 57c9acce7c75e2d1353b001f1feb450d70601b7c..04de5982972a3e7208da51139adff48b7dd202ad 100644 (file)
@@ -1,75 +1,27 @@
 Description:  Link with libatomic.
 Author: Peter Michael Green <plugwash@raspbian.org>
 
-Index: tempdefuzz/kicad/CMakeLists.txt
-===================================================================
---- tempdefuzz.orig/kicad/CMakeLists.txt
-+++ tempdefuzz/kicad/CMakeLists.txt
-@@ -95,6 +95,7 @@ else()
-         common      #repeated due to a circular dependency between gal and common
-         ${wxWidgets_LIBRARIES}
-         ${GDI_PLUS_LIBRARIES}
-+        -latomic
-         )
- endif()
-Index: tempdefuzz/qa/gerbview/CMakeLists.txt
-===================================================================
---- tempdefuzz.orig/qa/gerbview/CMakeLists.txt
-+++ tempdefuzz/qa/gerbview/CMakeLists.txt
-@@ -62,6 +62,7 @@ target_link_libraries( qa_gerbview
-     ${PYTHON_LIBRARIES}
-     ${Boost_LIBRARIES}      # must follow GITHUB
-     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
-+    -latomic
- )
- kicad_add_boost_test( qa_gerbview qa_gerbview )
-Index: tempdefuzz/qa/pcbnew/CMakeLists.txt
-===================================================================
---- tempdefuzz.orig/qa/pcbnew/CMakeLists.txt
-+++ tempdefuzz/qa/pcbnew/CMakeLists.txt
-@@ -107,6 +107,7 @@ target_link_libraries( qa_pcbnew
-     ${PYTHON_LIBRARIES}
-     ${Boost_LIBRARIES}
-     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
-+    -latomic
- )
- if( WIN32 )
-Index: tempdefuzz/qa/eeschema/CMakeLists.txt
-===================================================================
---- tempdefuzz.orig/qa/eeschema/CMakeLists.txt
-+++ tempdefuzz/qa/eeschema/CMakeLists.txt
-@@ -95,6 +95,7 @@ target_link_libraries( qa_eeschema
-     markdown_lib
-     ${GDI_PLUS_LIBRARIES}
-     ${Boost_LIBRARIES}
-+    atomic
- )
- target_include_directories( qa_eeschema PUBLIC
-Index: tempdefuzz/qa/pcbnew_tools/CMakeLists.txt
-===================================================================
---- tempdefuzz.orig/qa/pcbnew_tools/CMakeLists.txt
-+++ tempdefuzz/qa/pcbnew_tools/CMakeLists.txt
-@@ -61,6 +61,7 @@ target_link_libraries( qa_pcbnew_tools
-     ${PYTHON_LIBRARIES}
-     ${Boost_LIBRARIES}
-     ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
-+    -latomic
- )
- kicad_add_utils_executable( qa_pcbnew_tools )
-Index: tempdefuzz/eeschema/CMakeLists.txt
-===================================================================
---- tempdefuzz.orig/eeschema/CMakeLists.txt
-+++ tempdefuzz/eeschema/CMakeLists.txt
-@@ -371,6 +371,7 @@ target_link_libraries( eeschema
-     gal
+diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
+index 4d9dd7d4..419fe66b 100644
+--- a/eeschema/CMakeLists.txt
++++ b/eeschema/CMakeLists.txt
+@@ -530,6 +530,7 @@ target_link_libraries( eeschema
      common
+     argparse::argparse
      ${wxWidgets_LIBRARIES}
 +    -latomic
      )
  
  # the main Eeschema program, in DSO form.
+diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
+index b64f2138..8d5dc07c 100644
+--- a/kicad/CMakeLists.txt
++++ b/kicad/CMakeLists.txt
+@@ -149,6 +149,7 @@ else()
+         common      #repeated due to a circular dependency between gal and common
+         core
+         ${wxWidgets_LIBRARIES}
++        -latomic
+         )
+     target_link_libraries( kicad-cli