From: Raspbian automatic forward porter Date: Wed, 12 Jun 2024 09:14:53 +0000 (+0100) Subject: Manual merge of version 6.0.11+dfsg-1+rpi1 and 8.0.3+dfsg-1 to produce 8.0.3+dfsg... X-Git-Tag: archive/raspbian/8.0.3+dfsg-1+rpi1~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1ceedfb2583b585c4ad37aa917daeb683d177600;p=kicad.git Manual merge of version 6.0.11+dfsg-1+rpi1 and 8.0.3+dfsg-1 to produce 8.0.3+dfsg-1+rpi1 --- 1ceedfb2583b585c4ad37aa917daeb683d177600 diff --cc debian/changelog index 878aefcb,08fbd5d1..2bca973f --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,160 +1,168 @@@ - kicad (6.0.11+dfsg-1+rpi1) bookworm-staging; urgency=medium ++kicad (8.0.3+dfsg-1+rpi1) trixie-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 Mon, 30 Jan 2023 07:26:12 +0000 ++ -- Peter Michael Green Tue, 25 Jun 2024 23:49:30 +0000 ++ + kicad (8.0.3+dfsg-1) unstable; urgency=medium + + * [f7d4143] New upstream version 8.0.3+dfsg + * [cf2b4b4] Rebuild patch queue from patch-queue branch + + Added patch: + fixes/demos-Adjust-MIME-encoding-to-UTF8-of-some-libraries.patch + * [67536f2] d/copyright: Update content due added folder by upstream + * [d1377f8] Revert "Adding ldconfig triggering file" + + -- Carsten Schoenert Wed, 05 Jun 2024 20:29:30 +0200 + + kicad (8.0.2+dfsg-1) unstable; urgency=medium + + [ zhangdandan ] + * [0ae6094] d/control: Add loongarch64 architecture + (Closes: #1059016) + + [ Carsten Schoenert ] + * [4568d39] d/copyright: Updating due upstream modifications + * [db730d5] New upstream version 8.0.2+dfsg + * [b2841ed] d/control: Increase Standards-Version to 4.7.0 + + No further changes needed. + * [d788d27] d/k.lintian-overrides: Ignore ships-undeclared-shared-library + * [5a6d93d] d/copyright: Small adjustment on filtered content + + -- Carsten Schoenert Wed, 01 May 2024 11:47:38 +0200 + + kicad (8.0.1+dfsg-1) unstable; urgency=medium + + * [ed981e2] d/gbp.conf: Add more content to filter out + * [585ff35] New upstream version 8.0.1+dfsg + (Closes: #1064546) + * [b679e37] d/control: Bump Bre/Sug/Rec versions to >=/<< 8.0.1~ + * [aa552a3] Rebuild patch queue from patch-queue branch + + Dropped patch: + porting-kfreebsd-hurd/Fix-FTBFS-on-kFreeBSD-and-Hurd.patch + * [32d5f0e] d/control: Add new build dependencies + The build requires now libgit2-dev and libsecret-1-dev. + * [2e4fe8c] d/kicad.install.in: Add libki{common,gal} to sequencer + * [fc20fca] d/kicad-demos.install: Adjust sequencer data to install + * [a2ca39d] d/control: Adjust obsolet pkg-config => pkgconf + * [064d10c] d/kicad.lintian-overrides: Adjust some overrides + + -- Carsten Schoenert Sun, 17 Mar 2024 14:58:18 +0100 + + kicad (7.0.11+dfsg-1) unstable; urgency=medium + + * [4cd41de] New upstream version 7.0.11+dfsg + * [ec30213] d/copyright: Update year data + + -- Carsten Schoenert Fri, 23 Feb 2024 18:59:55 +0100 + + kicad (7.0.10+dfsg-1) unstable; urgency=medium + + * [c5309bc] New upstream version 7.0.10+dfsg + + -- Carsten Schoenert Sat, 30 Dec 2023 17:02:59 +0100 + + kicad (7.0.9+dfsg-1) unstable; urgency=medium + + * [2daca8b] New upstream version 7.0.9+dfsg + + -- Carsten Schoenert Thu, 16 Nov 2023 20:22:14 +0100 + + kicad (7.0.8+dfsg-1) unstable; urgency=medium + + * [139e7f5] New upstream version 7.0.8+dfsg + * [b5ed954] Rebuild patch queue from patch-queue branch + + Just refreshed existing patches. + * [0572553] d/control: Bump kicad-* versions to >= 7.0.0~ + (Closes: #1050882) + * [195174f] d/kicad.lintian-overrides: Small adjustment about wTH/wtH + * [ba72234] d/kicad.lintian-overrides: be more lazy on arch paths + * [7ee9704] d/copyright: File common/lockfile.cpp was removed + + -- Carsten Schoenert Sun, 08 Oct 2023 10:54:42 +0200 + + kicad (7.0.7+dfsg-1) unstable; urgency=medium + + * [5ab605a] New upstream version 7.0.7+dfsg + * [3a7f4d5] Rebuild patch queue from patch-queue branch + + added patch: + debian-hacks/KiCadFullVersion-Drop-hyphen-in-the-string.patch + + dropped patch (applied upstream): + fixes/Fix-dblatex-options-within-cmake-file.patch + + modified/renamed patch: + reproducibility/add-field-revdate-to-asciidoc-files-of-documentation.patchi + -> debian/patches/reproducibility/doc-Add-field-revdate-to-asciidoc-files.patch + * [b4306e8] d/rules: Add KICAD_VERSION_EXTRA to DEB_KICAD_CMAKE_OPTS + Use the option to set a suffix to the by CMake provided version string + through a configure option, by this we don't need to modify source code + file before start the package build. This would break calling + dpkg-buildpackage twice as dpkg-source will detect modification within + the source if called after the first build. + * [e571530] d/rules: Add target override_dh_clean + Clean out debian/build if exists, would also break dpkg-source. + (Closes: #1047477) + * [ff93a8a] d/rules: Resize the icon in the package data + Do not modify the XPM based icon within the source, same again, dpkg-source + will detect modified source then. + * [81bb2e8] d/rules: Don't modify Asciidoc files for now + Adding a unique timestamp to the Asciidoc files will need more effort, + the build isn't reproducible anyway, so drop that modification while build + for now. + * [1bc5733] d/rules: Drop non existing options from DEB_KICAD_CMAKE_OPTS + Some of previous used and needed CMake options are now no longer + provided or required any longer. + + -- Carsten Schoenert Wed, 16 Aug 2023 17:25:09 +0200 + + kicad (7.0.6+dfsg-1) unstable; urgency=medium + + * [6fce285] New upstream version 7.0.6+dfsg + + -- Carsten Schoenert Sun, 09 Jul 2023 08:35:31 +0200 + + kicad (7.0.5+dfsg-2) unstable; urgency=medium + + * Upload to unstable + + -- Carsten Schoenert Mon, 12 Jun 2023 17:51:34 +0200 + + kicad (7.0.5+dfsg-1) experimental; urgency=medium + + * [6d70960] New upstream version 7.0.5+dfsg + + -- Carsten Schoenert Wed, 31 May 2023 07:55:56 +0200 + + kicad (7.0.3+dfsg-1) experimental; urgency=medium + + * [8a432b5] New upstream version 7.0.3+dfsg + + -- Carsten Schoenert Sun, 14 May 2023 08:48:02 +0200 + + kicad (7.0.2+dfsg-1) experimental; urgency=medium + + * [dbbb7ab] New upstream version 7.0.2+dfsg + + -- Carsten Schoenert Tue, 18 Apr 2023 19:13:34 +0200 + + kicad (7.0.1+dfsg-1) experimental; urgency=medium + + * [1632fc8] d/t/control: Remove not used package from Depends + (Closes: #1018386) + * [4e67a4b] d/gbp.conf: Exclude thirdparty/sentry-native on import + * [01c253a] New upstream version 7.0.1+dfsg + (Closes: #1031345) + * [71f9595] d/control: Add new required B-D on unixodbc-dev + * [32e4562] d/rules: Adjust targets due changed upstream source + * [c074c04] d/kicad.install.in: Adjustments due changes by upstream + * []861d40] d/copyright: Updating due upstream modifications + * [5421020] d/kicad.lintian-overrides: Update entries due changes + * [d2d2e6c] Lintian: Add overrides for the source + * [4143571] d/README.vendorded-stuff: Some notes about vendored stuff + * [64481a3] d/control: Bump suggested/recommended versions to >= 7.0.1~ + + -- Carsten Schoenert Sun, 12 Mar 2023 17:40:58 +0100 kicad (6.0.11+dfsg-1) unstable; urgency=medium diff --cc debian/patches/series index 17c4a723,2c7c144c..24b1ce32 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,5 -1,4 +1,5 @@@ fixes/Adjusting-content-in-the-desktop-files.patch - 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 + reproducibility/doc-Add-field-revdate-to-asciidoc-files.patch + debian-hacks/KiCadFullVersion-Drop-hyphen-in-the-string.patch + fixes/demos-Adjust-MIME-encoding-to-UTF8-of-some-libraries.patch +link-with-libatomic.patch diff --cc eeschema/CMakeLists.txt index af191284,4d9dd7d4..419fe66b --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@@ -370,8 -528,8 +528,9 @@@ target_link_libraries( eeschem # There's way too much crap coming in from common yet. gal common + argparse::argparse ${wxWidgets_LIBRARIES} + -latomic ) # the main Eeschema program, in DSO form. diff --cc kicad/CMakeLists.txt index a52b472d,b64f2138..8d5dc07c --- a/kicad/CMakeLists.txt +++ b/kicad/CMakeLists.txt @@@ -93,16 -147,23 +147,24 @@@ else( common gal common #repeated due to a circular dependency between gal and common + core ${wxWidgets_LIBRARIES} - ${GDI_PLUS_LIBRARIES} + -latomic ) - endif() - if( KICAD_PCM ) - target_link_libraries( kicad pcm ) + target_link_libraries( kicad-cli + nlohmann_json + common + gal + common #repeated due to a circular dependency between gal and common + core + ${wxWidgets_LIBRARIES} + ) endif() + target_link_libraries( kicad pcm ) + target_link_libraries( kicad-cli pcm ) + install( TARGETS kicad DESTINATION ${KICAD_BIN} COMPONENT binary