[arch-commits] Commit in kicad/trunk (PKGBUILD)

[George Rawlinson]

    Date: Tuesday, December 28, 2021 @ 22:38:22
  Author: grawlinson
Revision: 1086449

upgpkg: kicad 6.0.0-1

New upstream release.

Modified:
  kicad/trunk/PKGBUILD

----------+
 PKGBUILD |   71 ++++++++++++++++++++++---------------------------------------
 1 file changed, 26 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-28 22:09:47 UTC (rev 1086448)
+++ PKGBUILD	2021-12-28 22:38:22 UTC (rev 1086449)
@@ -1,14 +1,14 @@
 # Maintainer: Kyle Keen <keenerd at gmail.com>
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
 # Contributor: Marq Schneider <queueRAM at gmail.com>
 # Contributor: Nick Østergaard
 
 pkgname=kicad
-pkgver=5.1.10
-pkgrel=4
+pkgver=6.0.0
+pkgrel=1
 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
 arch=('x86_64')
-#url="http://iut-tice.ujf-grenoble.fr/kicad/"
-url="http://kicad-pcb.org/"
+url="https://www.kicad.org"
 license=('GPL')
 depends=('wxgtk3' 'python' 'boost-libs' 'glew' 'curl' 'glm' 'ngspice' 'opencascade' 'python-wxpython' 'libcloudproviders')
 # can ngspice/opencascade be an optdep?
@@ -16,51 +16,32 @@
 makedepends=('cmake' 'zlib' 'mesa' 'boost' 'swig')
 optdepends=('kicad-library: for footprints and symbols'
             'kicad-library-3d: for 3d models of components')
-source=("https://gitlab.com/kicad/code/kicad/-/archive/$pkgver/kicad-$pkgver.tar.gz"
-        "https://gitlab.com/kicad/code/kicad-i18n/-/archive/$pkgver/kicad-i18n-$pkgver.tar.gz")
-sha512sums=('41db79cd314528e6d23e7eaaa8f816e16230f02f5892b4729bd200cda01d009cb1c68d3f3e9fc98d04c4d9bc22a165252573666888468d93009b342f4d8b8e97'
-            '6cdef52d03f6937001f1bb18519975f367915587e4d091574702cd576f099c8014f696cdb7c7b3349e5fc99ca049fae073a4eddbd26ada203fdd80118f1a2a24')
+source=("https://gitlab.com/kicad/code/kicad/-/archive/$pkgver/kicad-$pkgver.tar.gz")
+sha512sums=('1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50')
+b2sums=('4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37')
 
-prepare() {
-  cd "$srcdir/kicad-$pkgver"
-  #find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
-}
-
 build() {
-  cd "$srcdir/kicad-$pkgver"
+  cmake \
+    -B build \
+    -S "$pkgname-$pkgver" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DKICAD_USE_OCE=OFF \
+    -DKICAD_USE_OCC=ON \
+    -DKICAD_SCRIPTING=ON \
+    -DKICAD_SCRIPTING_PYTHON3=ON \
+    -DKICAD_SCRIPTING_MODULES=ON \
+    -DKICAD_SCRIPTING_WXPYTHON=ON \
+    -DKICAD_SCRIPTING_ACTION_MENU=ON \
+    -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DBUILD_GITHUB_PLUGIN=ON
 
-  mkdir -p build/Release
-  cd build/Release
-  cmake ../.. -DCMAKE_BUILD_TYPE=Release    \
-              -DCMAKE_INSTALL_PREFIX=/usr   \
-              -DCMAKE_INSTALL_LIBDIR=lib    \
-              -DKICAD_USE_OCE=OFF           \
-              -DKICAD_USE_OCC=ON            \
-              -DKICAD_SCRIPTING=ON          \
-              -DKICAD_SCRIPTING_PYTHON3=ON  \
-              -DKICAD_SCRIPTING_MODULES=ON  \
-              -DKICAD_SCRIPTING_WXPYTHON=ON \
-              -DKICAD_SCRIPTING_ACTION_MENU=ON \
-              -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
-              -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
-              -DBUILD_GITHUB_PLUGIN=ON
-  make
-
-  cd "$srcdir/kicad-i18n-$pkgver"
-  mkdir -p build/Release
-  cd build/Release
-  cmake ../.. -DCMAKE_INSTALL_PREFIX=/usr
-  make
+  cmake --build build
 }
 
 package() {
-  cd "$srcdir/kicad-$pkgver/build/Release"
-
-  make DESTDIR="$pkgdir" install
-
-  # copy updated linux icons
-  #cp -r -n "$srcdir/$pkgname-icons/resources/linux/mime/icons" "$pkgdir/usr/share/"
-
-  cd "$srcdir/kicad-i18n-$pkgver/build/Release"
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }