bump version

2 files changed, 58 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d44b17e00f2..18714eb148d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,15 @@
 pkgbase = kicad-rc
 	pkgdesc = Official KiCad release candidates and dev snapshots
-	pkgver = 5.1.8
+	pkgver = 5.1.9
 	pkgrel = 1
-	epoch = 0
 	url = http://kicad-pcb.org/
-	arch = any
+	arch = x86_64
 	license = GPL3
+	license = AGPL3
+	license = BOOST
+	license = ISC
+	license = MIT
+	license = CC-BY-SA
 	makedepends = clang
 	depends = glew
 	depends = wxgtk3
@@ -27,8 +31,8 @@ pkgbase = kicad-rc
 	conflicts = kicad-git
 	conflicts = kicad-scripting-git
 	conflicts = kicad-bzr
-	source = https://gitlab.com/kicad/code/kicad/-/archive/5.1.8/kicad-5.1.8.tar.gz
-	md5sums = c573140e521e29441d71f1a39b79752f
+	source = kicad-rc:5.1.9.tar.gz::https://gitlab.com/kicad/code/kicad/-/archive/5.1.9/kicad-5.1.9.tar.gz
+	sha256sums = 841be864b9dc5c761193c3ee9cbdbed6729952d7b38451aa8e1977bdfdb6081b
 
 pkgname = kicad-rc
 
diff --git a/PKGBUILD b/PKGBUILD
index d0b6c31f05f6..e18e564857a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,44 @@
 # Maintainer: Grey Christoforo <first name at last name dot net>
 
 pkgname=kicad-rc
-_pkgver="5.1.8"
+_pkgver="5.1.9"
 pkgver=${_pkgver//-/_}
 pkgrel=1
-epoch=0
 pkgdesc="Official KiCad release candidates and dev snapshots"
-arch=('any')
+arch=(x86_64)
 url="http://kicad-pcb.org/"
-license=('GPL3')
-depends=('glew' 'wxgtk3' 'desktop-file-utils' 'boost-libs' 'python' 'glm' 'curl' 'swig' 'python-wxpython' 'opencascade' 'ngspice')
-makedepends=('cmake' 'git' 'zlib' 'mesa' 'boost')
-optdepends=('kicad-symbols' 'kicad-packages3d' 'kicad-footprints' 'kicad-templates')
+license=(GPL3 AGPL3 BOOST ISC MIT CC-BY-SA)
+depends=(
+glew
+wxgtk3
+desktop-file-utils
+boost-libs
+python
+glm
+curl
+swig
+python-wxpython
+opencascade
+ngspice
+)
+makedepends=(
+cmake
+git
+zlib
+mesa
+boost
+)
+optdepends=(
+kicad-symbols
+kicad-packages3d
+kicad-footprints
+kicad-templates
+)
 conflicts=('kicad' 'kicad-git' 'kicad-scripting-git' 'kicad-bzr')
 provides=('kicad')
 makedepends=('clang')
-source=("https://gitlab.com/kicad/code/kicad/-/archive/${_pkgver}/kicad-${_pkgver}.tar.gz")
-md5sums=('c573140e521e29441d71f1a39b79752f')
+source=("${pkgname}:${pkgver}.tar.gz::https://gitlab.com/kicad/code/kicad/-/archive/${_pkgver}/kicad-${_pkgver}.tar.gz")
+sha256sums=('841be864b9dc5c761193c3ee9cbdbed6729952d7b38451aa8e1977bdfdb6081b')
 
 prepare() {
   cd "${srcdir}/kicad-${_pkgver}"
@@ -25,25 +47,26 @@ prepare() {
 
 build() {
   cd "${srcdir}/kicad-${_pkgver}"
-  mkdir -p build
-  cd build
-  cmake .. -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DKICAD_USE_OCC=ON \
-    -DKICAD_USE_OCE=OFF \
-    -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
-    -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \
-    -DKICAD_SCRIPTING_PYTHON3=ON \
-    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
-    -DUSE_WX_GRAPHICS_CONTEXT=ON \
-    -DUSE_WX_OVERLAY=ON 
-
-  make
+  cmake \
+    -D CMAKE_BUILD_TYPE=None \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D CMAKE_INSTALL_LIBDIR=lib \
+    -D KICAD_USE_OCC=ON \
+    -D KICAD_USE_OCE=OFF \
+    -D KICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
+    -D PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python \
+    -D KICAD_SCRIPTING_PYTHON3=ON \
+    -D wxWidgets_CONFIG_EXECUTABLE="$(which wx-config-gtk3)" \
+    -D USE_WX_GRAPHICS_CONTEXT=ON \
+    -D USE_WX_OVERLAY=ON \
+    -G Ninja \
+    -B "${srcdir}"/build_dir \
+    -S .
+  ninja -C "${srcdir}"/build_dir
 }
 
 package() {
   cd "${srcdir}/kicad-${_pkgver}"
-  cd build
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C "${srcdir}/build_dir" install
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICENSE.{AGPLv3,GPLv3,README,BOOSTv1_0,ISC,CC-BY-SA-4.0,MIT}
 }