update quilt patch. trixie-staging archive/raspbian/9.0.2+dfsg-1+rpi1 raspbian/9.0.2+dfsg-1+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Thu, 31 Jul 2025 12:00:56 +0000 (12:00 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Thu, 31 Jul 2025 12:00:56 +0000 (12:00 +0000)
debian/patches/link-with-libatomic.patch

index d6a3030f8d2ae1b34b58c3c7c430896fd2fdef70..9c8878c3a19ac259bf733443b8aa998cb1d230ce 100644 (file)
@@ -2,23 +2,23 @@ Description:  Link with libatomic.
 Author: Peter Michael Green <plugwash@raspbian.org>
 
 diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
-index 4d9dd7d4..419fe66b 100644
+index 8b38c7e2..776fd8fe 100644
 --- a/eeschema/CMakeLists.txt
 +++ b/eeschema/CMakeLists.txt
-@@ -530,6 +530,7 @@ target_link_libraries( eeschema
-     common
-     argparse::argparse
+@@ -566,6 +566,7 @@ set_source_files_properties( ${CMAKE_SOURCE_DIR}/common/single_top.cpp PROPERTIE
+ target_link_libraries( eeschema
+     kicommon
      ${wxWidgets_LIBRARIES}
 +    -latomic
      )
  
  # the main Eeschema program, in DSO form.
 diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
-index b64f2138..8d5dc07c 100644
+index 9d001ef2..10f8b22f 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
+@@ -172,6 +172,7 @@ else()
+         kicommon
          core
          ${wxWidgets_LIBRARIES}
 +        -latomic
@@ -26,11 +26,11 @@ index b64f2138..8d5dc07c 100644
  
      target_link_libraries( kicad-cli
 diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt
-index 4c33940d..c0743e97 100644
+index 40d927df..99446cf9 100644
 --- a/bitmap2component/CMakeLists.txt
 +++ b/bitmap2component/CMakeLists.txt
-@@ -54,6 +54,7 @@ target_link_libraries( bitmap2component
-     common
+@@ -55,6 +55,7 @@ target_link_libraries( bitmap2component
+     kicommon
      ${wxWidgets_LIBRARIES}
      potrace
 +    atomic
@@ -38,10 +38,10 @@ index 4c33940d..c0743e97 100644
  
  if( APPLE )
 diff --git a/qa/tests/eeschema/CMakeLists.txt b/qa/tests/eeschema/CMakeLists.txt
-index 0a752bd3..d17543d6 100644
+index fa4c3e14..da33781e 100644
 --- a/qa/tests/eeschema/CMakeLists.txt
 +++ b/qa/tests/eeschema/CMakeLists.txt
-@@ -106,6 +106,7 @@ PRIVATE
+@@ -116,6 +116,7 @@ PRIVATE
      ${GDI_PLUS_LIBRARIES}
      Boost::headers
      Boost::unit_test_framework
@@ -50,10 +50,10 @@ index 0a752bd3..d17543d6 100644
  
  # Eeschema tests, so pretend to be eeschema (for units, etc)
 diff --git a/qa/tests/gerbview/CMakeLists.txt b/qa/tests/gerbview/CMakeLists.txt
-index 635c8911..2d21624e 100644
+index 004b3d43..61767182 100644
 --- a/qa/tests/gerbview/CMakeLists.txt
 +++ b/qa/tests/gerbview/CMakeLists.txt
-@@ -71,6 +71,7 @@ target_link_libraries( qa_gerbview
+@@ -72,6 +72,7 @@ target_link_libraries( qa_gerbview
      Boost::headers
      Boost::unit_test_framework
      ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
@@ -62,10 +62,10 @@ index 635c8911..2d21624e 100644
  
  kicad_add_boost_test( qa_gerbview qa_gerbview )
 diff --git a/qa/tests/pcbnew/CMakeLists.txt b/qa/tests/pcbnew/CMakeLists.txt
-index 8e854e3e..dec4b64f 100644
+index cbb521ca..7d7f0c0d 100644
 --- a/qa/tests/pcbnew/CMakeLists.txt
 +++ b/qa/tests/pcbnew/CMakeLists.txt
-@@ -132,6 +132,7 @@ target_link_libraries( qa_pcbnew
+@@ -143,6 +143,7 @@ target_link_libraries( qa_pcbnew
      Boost::headers
      Boost::unit_test_framework
      ${PCBNEW_EXTRA_LIBS}    # -lrt must follow Boost
@@ -74,10 +74,10 @@ index 8e854e3e..dec4b64f 100644
  
  if( WIN32 )
 diff --git a/qa/tests/spice/CMakeLists.txt b/qa/tests/spice/CMakeLists.txt
-index 26733ec6..0d78ef56 100644
+index 4bdd4ead..5396df21 100644
 --- a/qa/tests/spice/CMakeLists.txt
 +++ b/qa/tests/spice/CMakeLists.txt
-@@ -93,6 +93,7 @@ PRIVATE
+@@ -96,6 +96,7 @@ PRIVATE
      ${GDI_PLUS_LIBRARIES}
      Boost::headers
      Boost::unit_test_framework