diff -Nru kicad-6.0.4+dfsg/debian/changelog kicad-6.0.4+dfsg/debian/changelog --- kicad-6.0.4+dfsg/debian/changelog 2022-03-20 06:53:12.000000000 +0000 +++ kicad-6.0.4+dfsg/debian/changelog 2022-03-27 10:29:07.000000000 +0000 @@ -1,3 +1,11 @@ +kicad (6.0.4+dfsg-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 6.0.0+dfsg1-2+rpi1 by Peter Michael Green at Sun, 09 Jan 2022 17:43:33 +0000] + * Link with libatomic. + * Fix clean target. + + -- Raspbian forward porter Sun, 27 Mar 2022 10:29:07 +0000 + kicad (6.0.4+dfsg-1) unstable; urgency=medium * [5ca14e6] New upstream version 6.0.4+dfsg diff -Nru kicad-6.0.4+dfsg/debian/kicad.install kicad-6.0.4+dfsg/debian/kicad.install --- kicad-6.0.4+dfsg/debian/kicad.install 1970-01-01 00:00:00.000000000 +0000 +++ kicad-6.0.4+dfsg/debian/kicad.install 2022-03-27 10:29:07.000000000 +0000 @@ -0,0 +1,37 @@ +bitmaps_png/icons/kicad.xpm usr/share/pixmaps +usr/bin/_cvpcb.kiface usr/lib/kicad +usr/bin/_eeschema.kiface usr/lib/kicad +usr/bin/_gerbview.kiface usr/lib/kicad +usr/bin/_kipython.kiface usr/lib/kicad +usr/bin/_pcb_calculator.kiface usr/lib/kicad +usr/bin/_pcbnew.kiface usr/lib/kicad +usr/bin/_pl_editor.kiface usr/lib/kicad +usr/bin/bitmap2component +usr/bin/dxf2idf +usr/bin/eeschema +usr/bin/gerbview +usr/bin/idf2vrml +usr/bin/idfcyl +usr/bin/idfrect +usr/bin/kicad +usr/bin/kicad2step +usr/bin/pcb_calculator +usr/bin/pcbnew +usr/bin/pl_editor +usr/lib/arm-linux-gnueabihf/kicad/plugins/3d +usr/lib/arm-linux-gnueabihf/libkicad* +usr/lib/python3/dist-packages +usr/share/applications +usr/share/icons +usr/share/kicad/plugins +# installing the following file into the /u/s/d/kicad and symlink it to +# /u/s/k/plugins via kicad.links sequencer +usr/share/kicad/plugins/README-bom.txt usr/share/doc/kicad +usr/share/kicad/resources +usr/share/kicad/schemas +usr/share/kicad/scripting +usr/share/kicad/template +usr/share/locale +usr/share/metainfo +usr/share/mime +debian/man/* usr/share/man/man1 diff -Nru kicad-6.0.4+dfsg/debian/patches/link-with-libatomic.patch kicad-6.0.4+dfsg/debian/patches/link-with-libatomic.patch --- kicad-6.0.4+dfsg/debian/patches/link-with-libatomic.patch 1970-01-01 00:00:00.000000000 +0000 +++ kicad-6.0.4+dfsg/debian/patches/link-with-libatomic.patch 2022-03-27 10:29:07.000000000 +0000 @@ -0,0 +1,75 @@ +Description: Link with libatomic. +Author: Peter Michael Green + +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 + common + ${wxWidgets_LIBRARIES} ++ -latomic + ) + + # the main Eeschema program, in DSO form. diff -Nru kicad-6.0.4+dfsg/debian/patches/series kicad-6.0.4+dfsg/debian/patches/series --- kicad-6.0.4+dfsg/debian/patches/series 2022-03-20 06:51:39.000000000 +0000 +++ kicad-6.0.4+dfsg/debian/patches/series 2022-03-27 10:29:07.000000000 +0000 @@ -2,3 +2,4 @@ porting-kfreebsd-hurd/Fix-FTBFS-on-kFreeBSD-and-Hurd.patch reproducibility/add-field-revdate-to-asciidoc-files-of-documentation.patch fixes/Fix-dblatex-options-within-cmake-file.patch +link-with-libatomic.patch diff -Nru kicad-6.0.4+dfsg/debian/rules kicad-6.0.4+dfsg/debian/rules --- kicad-6.0.4+dfsg/debian/rules 2022-03-20 06:33:10.000000000 +0000 +++ kicad-6.0.4+dfsg/debian/rules 2022-03-27 10:29:07.000000000 +0000 @@ -77,6 +77,10 @@ # configuring KiCad documentation # ################################### dh_auto_configure --sourcedirectory=$(CURDIR)/doc --builddirectory=$(DEB_BUILD_DIR)/doc -- $(DEB_DOC_CMAKE_OPTS) + #hack, adding this though CMakeLists.txt doesn't seem to be working, add it manually + truncate -s -1 debian/build/qa/eeschema/CMakeFiles/qa_eeschema.dir/link.txt + echo ' -latomic' >> debian/build/qa/eeschema/CMakeFiles/qa_eeschema.dir/link.txt + override_dh_auto_build-arch: ############################## @@ -158,3 +162,13 @@ -Xlibs3d_plugin_oce \ -Xlibs3d_plugin_vrml \ -X_pcbnew.$(DEB_HOST_MULTIARCH) + +PLAIN_UPSTREAM_VERSION=$(word 1,$(subst +, ,$(DEB_VERSION))) + +override_dh_auto_clean: + dh_auto_clean + rm -rf $(DEB_BUILD_DIR) + sed -i 's/^set( KICAD_SEMANTIC_VERSION.*/set( KICAD_SEMANTIC_VERSION "$(PLAIN_UPSTREAM_VERSION)" )/g' CMakeModules/KiCadVersion.cmake + sed -i 's/^:revdate: .*/:revdate: @REVDATE@/g' `find . -name '*.adoc'` + rm -f eeschema/sch_text_help_md.h pcbnew/dialogs/panel_setup_rules_help_md.h + rm -f bitmaps_png/icons/kicad.xpm