Date: Wednesday, March 16, 2022 @ 07:55:38 Author: grawlinson Revision: 1155307
archrelease: copy trunk to community-x86_64 Added: kicad/repos/community-x86_64/PKGBUILD (from rev 1155306, kicad/trunk/PKGBUILD) kicad/repos/community-x86_64/fix-archive-permissions.patch (from rev 1155306, kicad/trunk/fix-archive-permissions.patch) kicad/repos/community-x86_64/fix-version-string.patch (from rev 1155306, kicad/trunk/fix-version-string.patch) Deleted: kicad/repos/community-x86_64/PKGBUILD kicad/repos/community-x86_64/fix-archive-permissions.patch kicad/repos/community-x86_64/fix-version-string.patch -------------------------------+ PKGBUILD | 166 ++++++++++++++++++++-------------------- fix-archive-permissions.patch | 22 ++--- fix-version-string.patch | 30 +++---- 3 files changed, 109 insertions(+), 109 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-03-16 07:52:05 UTC (rev 1155306) +++ PKGBUILD 2022-03-16 07:55:38 UTC (rev 1155307) @@ -1,83 +0,0 @@ -# Maintainer: Kyle Keen <keen...@gmail.com> -# Maintainer: George Rawlinson <grawlin...@archlinux.org> -# Maintainer: Filipe Laíns <la...@archlinux.org> -# Contributor: Marq Schneider <queue...@gmail.com> -# Contributor: Nick Østergaard -# Contributor: Rachel Mant <aur@dragonmux.network> - -pkgname=kicad -pkgver=6.0.2 -pkgrel=1 -pkgdesc='Electronic schematic and printed circuit board (PCB) design tools' -arch=('x86_64') -url='http://kicad.org/' -license=('GPL') -depends=( - 'boost-libs' - 'curl' - 'glew' - 'glm' - 'ngspice' - 'opencascade' - 'python' - 'python-wxpython' - 'wxgtk3' -) -makedepends=( - 'git' - 'cmake' - 'mesa' - 'boost' - 'swig' -) -optdepends=( - 'kicad-library: for footprints, symbols and templates' - 'kicad-library-3d: for 3D models of components' -) -_commit='702e8b891515a401f380e5f60b9840793352442a' -source=( - "$pkgname::git+https://gitlab.com/kicad/code/kicad.git#commit=$_commit" - 'fix-archive-permissions.patch' - 'fix-version-string.patch' -) -sha512sums=('SKIP' - 'e655d37f743e131e60ea8143b78c195ea5233b1336a0cd73c3388bf27848240622843e31c895467fcb8af5d74e351676b353c524c835b9dde49e1e6bc85e0dce' - '229559222b96f7ff4334e69142934b1ac74cfdb01b76dd16f1d56fcf70dfe06fa928de4bb9ffb46e023f4a3918bceb04fa39758e2673f51354304ebd2ef6d8b0') -b2sums=('SKIP' - 'fd1312d6adc0a9d00734a95a76fd0ed82824cfae0e626bfa2e0a24a710dd7a9f30d8d9d8b80a278d94aab8dd6d06bfe5edb41f03bb3bb8d4c3b5e9f066d49a84' - 'bad6ad3b0278e24717cf8b1c5a30989cb9a329aa7e0fd36c9b2197c2031783c4873b1e0fb5ad9827c15cf93271fb910afddac2c853153e9f7f98bd703725732b') - -pkgver() { - cd "$pkgname" - git describe --tags | sed "s/^v//" -} - -prepare() { - cd "$pkgname" - patch -p1 -i ../fix-archive-permissions.patch - patch -p1 -i ../fix-version-string.patch -} - -build() { - cmake \ - -S "$pkgname" \ - -B build \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DKICAD_USE_OCC=ON \ - -DKICAD_SCRIPTING_WXPYTHON=ON \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \ - -DKICAD_BUILD_I18N=ON \ - -DKICAD_I18N_UNIX_STRICT_PATH=ON \ - -DKICAD_BUILD_QA_TESTS=OFF \ - -Wno-dev - - cmake --build build -} - -package() { - DESTDIR="$pkgdir" cmake --install build -} - -# vim:set ts=2 sw=2 et: Copied: kicad/repos/community-x86_64/PKGBUILD (from rev 1155306, kicad/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-03-16 07:55:38 UTC (rev 1155307) @@ -0,0 +1,83 @@ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Maintainer: George Rawlinson <grawlin...@archlinux.org> +# Maintainer: Filipe Laíns <la...@archlinux.org> +# Contributor: Marq Schneider <queue...@gmail.com> +# Contributor: Nick Østergaard +# Contributor: Rachel Mant <aur@dragonmux.network> + +pkgname=kicad +pkgver=6.0.3 +pkgrel=1 +pkgdesc='Electronic schematic and printed circuit board (PCB) design tools' +arch=('x86_64') +url='http://kicad.org/' +license=('GPL') +depends=( + 'boost-libs' + 'curl' + 'glew' + 'glm' + 'ngspice' + 'opencascade' + 'python' + 'python-wxpython' + 'wxgtk3' +) +makedepends=( + 'git' + 'cmake' + 'mesa' + 'boost' + 'swig' +) +optdepends=( + 'kicad-library: for footprints, symbols and templates' + 'kicad-library-3d: for 3D models of components' +) +_commit='9dc35b575cf0562b2ecd2ddde9e8a9016aa397b9' +source=( + "$pkgname::git+https://gitlab.com/kicad/code/kicad.git#commit=$_commit" + 'fix-archive-permissions.patch' + 'fix-version-string.patch' +) +sha512sums=('SKIP' + 'e655d37f743e131e60ea8143b78c195ea5233b1336a0cd73c3388bf27848240622843e31c895467fcb8af5d74e351676b353c524c835b9dde49e1e6bc85e0dce' + '229559222b96f7ff4334e69142934b1ac74cfdb01b76dd16f1d56fcf70dfe06fa928de4bb9ffb46e023f4a3918bceb04fa39758e2673f51354304ebd2ef6d8b0') +b2sums=('SKIP' + 'fd1312d6adc0a9d00734a95a76fd0ed82824cfae0e626bfa2e0a24a710dd7a9f30d8d9d8b80a278d94aab8dd6d06bfe5edb41f03bb3bb8d4c3b5e9f066d49a84' + 'bad6ad3b0278e24717cf8b1c5a30989cb9a329aa7e0fd36c9b2197c2031783c4873b1e0fb5ad9827c15cf93271fb910afddac2c853153e9f7f98bd703725732b') + +pkgver() { + cd "$pkgname" + git describe --tags | sed "s/^v//" +} + +prepare() { + cd "$pkgname" + patch -p1 -i ../fix-archive-permissions.patch + patch -p1 -i ../fix-version-string.patch +} + +build() { + cmake \ + -S "$pkgname" \ + -B build \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DKICAD_USE_OCC=ON \ + -DKICAD_SCRIPTING_WXPYTHON=ON \ + -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \ + -DKICAD_BUILD_I18N=ON \ + -DKICAD_I18N_UNIX_STRICT_PATH=ON \ + -DKICAD_BUILD_QA_TESTS=OFF \ + -Wno-dev + + cmake --build build +} + +package() { + DESTDIR="$pkgdir" cmake --install build +} + +# vim:set ts=2 sw=2 et: Deleted: fix-archive-permissions.patch =================================================================== --- fix-archive-permissions.patch 2022-03-16 07:52:05 UTC (rev 1155306) +++ fix-archive-permissions.patch 2022-03-16 07:55:38 UTC (rev 1155307) @@ -1,11 +0,0 @@ ---- a/bitmaps_png/CMakeLists.txt -+++ b/bitmaps_png/CMakeLists.txt -@@ -782,7 +782,7 @@ else() - endif() - - add_custom_target( bitmap_archive ALL -- COMMAND ${TAR} cfz "${TAR_OUTPUT_FILE}" . -+ COMMAND ${TAR} --create --file "${TAR_OUTPUT_FILE}" --gzip --numeric-owner --owner=0 --group=0 . - DEPENDS ${ALL_PNGS} - BYPRODUCTS ${BITMAP_ARCHIVE_PATH} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/png Copied: kicad/repos/community-x86_64/fix-archive-permissions.patch (from rev 1155306, kicad/trunk/fix-archive-permissions.patch) =================================================================== --- fix-archive-permissions.patch (rev 0) +++ fix-archive-permissions.patch 2022-03-16 07:55:38 UTC (rev 1155307) @@ -0,0 +1,11 @@ +--- a/bitmaps_png/CMakeLists.txt ++++ b/bitmaps_png/CMakeLists.txt +@@ -782,7 +782,7 @@ else() + endif() + + add_custom_target( bitmap_archive ALL +- COMMAND ${TAR} cfz "${TAR_OUTPUT_FILE}" . ++ COMMAND ${TAR} --create --file "${TAR_OUTPUT_FILE}" --gzip --numeric-owner --owner=0 --group=0 . + DEPENDS ${ALL_PNGS} + BYPRODUCTS ${BITMAP_ARCHIVE_PATH} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/png Deleted: fix-version-string.patch =================================================================== --- fix-version-string.patch 2022-03-16 07:52:05 UTC (rev 1155306) +++ fix-version-string.patch 2022-03-16 07:55:38 UTC (rev 1155307) @@ -1,15 +0,0 @@ ---- a/CMakeModules/CreateGitVersionHeader.cmake -+++ b/CMakeModules/CreateGitVersionHeader.cmake -@@ -32,10 +32,10 @@ macro( create_git_version_header _git_src_path ) - set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" ) - set( ENV{LC_ALL} C ) - -- # Use `git describe --dirty` to create the KiCad version string. -+ # Use `git describe` to create the KiCad version string. - execute_process( - COMMAND -- ${GIT_EXECUTABLE} describe --dirty -+ ${GIT_EXECUTABLE} describe - WORKING_DIRECTORY ${_git_src_path} - OUTPUT_VARIABLE _git_DESCRIBE - ERROR_VARIABLE _git_log_error Copied: kicad/repos/community-x86_64/fix-version-string.patch (from rev 1155306, kicad/trunk/fix-version-string.patch) =================================================================== --- fix-version-string.patch (rev 0) +++ fix-version-string.patch 2022-03-16 07:55:38 UTC (rev 1155307) @@ -0,0 +1,15 @@ +--- a/CMakeModules/CreateGitVersionHeader.cmake ++++ b/CMakeModules/CreateGitVersionHeader.cmake +@@ -32,10 +32,10 @@ macro( create_git_version_header _git_src_path ) + set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" ) + set( ENV{LC_ALL} C ) + +- # Use `git describe --dirty` to create the KiCad version string. ++ # Use `git describe` to create the KiCad version string. + execute_process( + COMMAND +- ${GIT_EXECUTABLE} describe --dirty ++ ${GIT_EXECUTABLE} describe + WORKING_DIRECTORY ${_git_src_path} + OUTPUT_VARIABLE _git_DESCRIBE + ERROR_VARIABLE _git_log_error