Date: Sunday, March 5, 2023 @ 23:38:49
Author: ffy00
Revision: 1415183
archrelease: copy trunk to community-x86_64
Added:
kicad/repos/community-x86_64/PKGBUILD
(from rev 1415182, kicad/trunk/PKGBUILD)
kicad/repos/community-x86_64/fix-archive-permissions.patch
(from rev 1415182, kicad/trunk/fix-archive-permissions.patch)
kicad/repos/community-x86_64/fix-version-string.patch
(from rev 1415182, 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, 105 insertions(+), 113 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-05 23:38:43 UTC (rev 1415182)
+++ PKGBUILD 2023-03-05 23:38:49 UTC (rev 1415183)
@@ -1,87 +0,0 @@
-# Maintainer: Kyle Keen <[email protected]>
-# Maintainer: George Rawlinson <[email protected]>
-# Maintainer: Filipe Laíns <[email protected]>
-# Contributor: Marq Schneider <[email protected]>
-# Contributor: Nick Østergaard
-# Contributor: Rachel Mant <[email protected]>
-
-pkgname=kicad
-pkgver=6.0.11
-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'
- 'wxwidgets-gtk3'
-)
-makedepends=(
- 'git'
- 'cmake'
- 'mesa'
- 'boost'
- 'swig'
-)
-optdepends=(
- 'kicad-library: for footprints, symbols and templates'
- 'kicad-library-3d: for 3D models of components'
-)
-_commit='cdf04d55821ea53f821678025b0fd85e9552fbac'
-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 \
- -D CMAKE_BUILD_TYPE=Release \
- -D CMAKE_INSTALL_PREFIX=/usr \
- -D KICAD_USE_OCC=ON \
- -D KICAD_USE_EGL=ON \
- -D KICAD_SCRIPTING_WXPYTHON=ON \
- -D KICAD_BUILD_I18N=ON \
- -D KICAD_I18N_UNIX_STRICT_PATH=ON \
- -D KICAD_BUILD_QA_TESTS=OFF \
- -W no-dev
-
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-
- local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
- strip "$STRIP_SHARED" "${pkgdir}${site_packages}/_pcbnew.so"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: kicad/repos/community-x86_64/PKGBUILD (from rev 1415182,
kicad/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-05 23:38:49 UTC (rev 1415183)
@@ -0,0 +1,79 @@
+# Maintainer: George Rawlinson <[email protected]>
+# Maintainer: Filipe Laíns <[email protected]>
+# Contributor: Marq Schneider <[email protected]>
+# Contributor: Nick Østergaard
+# Contributor: Rachel Mant <[email protected]>
+# Contributor: Kyle Keen <[email protected]>
+
+pkgname=kicad
+pkgver=7.0.0
+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'
+ 'wxwidgets-gtk3'
+ 'unixodbc'
+)
+makedepends=(
+ 'git'
+ 'cmake'
+ 'ninja'
+ 'mesa'
+ 'boost'
+ 'swig'
+)
+optdepends=(
+ 'kicad-library: for footprints, symbols and templates'
+ 'kicad-library-3d: for 3D models of components'
+)
+source=(
+ "$pkgname::git+https://gitlab.com/kicad/code/kicad.git#tag=$pkgver";
+
'relax-wxPython-ABI-check.patch::https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.patch'
+ 'fix-archive-permissions.patch'
+ 'fix-version-string.patch'
+)
+sha512sums=('SKIP'
+
'ca23f22e52b64f0b2d47ca20dc12668af9013aecd9d0022e333166768825590fd0f53e28c509528d2d14c70408ad11af9fabf715296c2d5315be1ae95e52dc41'
+
'e36912e4144c6debe33f1711ca7a2da020389a6e376282c70f534ce9e685d0b35b58d88b810327d8baeb3466e87eda246ebf181c18e134e80bc73b91dae4bf02'
+
'17100967610c85ce2e8a860dcf703a87dc0c20f52d3f056cdb5d16323160e8594698bd51e095aea63c00a75ce8b121be681e93cec1bab72a8d1d4eb8065a91f5')
+
+prepare() {
+ cd $pkgname
+
+ patch -p1 -i ../relax-wxPython-ABI-check.patch
+ patch -p1 -i ../fix-archive-permissions.patch
+ patch -p1 -i ../fix-version-string.patch
+}
+
+build() {
+ cmake -B build -S $pkgname \
+ -G Ninja \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -D KICAD_USE_OCE=ON \
+ -D KICAD_USE_EGL=ON \
+ -D KICAD_BUILD_I18N=ON \
+ -D KICAD_I18N_UNIX_STRICT_PATH=ON \
+ -D KICAD_BUILD_QA_TESTS=OFF \
+ -W no-dev
+
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+ strip "$STRIP_SHARED" "${pkgdir}"/usr/lib/python*/site-packages/_pcbnew.so
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: fix-archive-permissions.patch
===================================================================
--- fix-archive-permissions.patch 2023-03-05 23:38:43 UTC (rev 1415182)
+++ fix-archive-permissions.patch 2023-03-05 23:38:49 UTC (rev 1415183)
@@ -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
1415182, kicad/trunk/fix-archive-permissions.patch)
===================================================================
--- fix-archive-permissions.patch (rev 0)
+++ fix-archive-permissions.patch 2023-03-05 23:38:49 UTC (rev 1415183)
@@ -0,0 +1,11 @@
+--- a/resources/bitmaps_png/CMakeLists.txt
++++ b/resources/bitmaps_png/CMakeLists.txt
+@@ -837,7 +837,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 2023-03-05 23:38:43 UTC (rev 1415182)
+++ fix-version-string.patch 2023-03-05 23:38:49 UTC (rev 1415183)
@@ -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
1415182, kicad/trunk/fix-version-string.patch)
===================================================================
--- fix-version-string.patch (rev 0)
+++ fix-version-string.patch 2023-03-05 23:38:49 UTC (rev 1415183)
@@ -0,0 +1,15 @@
+--- a/cmake/CreateGitVersionHeader.cmake
++++ b/cmake/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_describe_error
