fix build and bump version

2 files changed, 32 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e0e1c279db2..80b8b96f82cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kicad-rc
 	pkgdesc = Official KiCad release candidates and dev snapshots
-	pkgver = 5.1.10
+	pkgver = 6.0.2
 	pkgrel = 1
 	url = http://kicad.org/
 	arch = x86_64
@@ -16,8 +16,9 @@ pkgbase = kicad-rc
 	makedepends = mesa
 	makedepends = boost
 	makedepends = swig
+	makedepends = ninja
 	depends = glew
-	depends = wxgtk3-dev
+	depends = wxgtk3
 	depends = desktop-file-utils
 	depends = boost-libs
 	depends = python
@@ -28,15 +29,14 @@ pkgbase = kicad-rc
 	depends = opencascade
 	depends = ngspice
 	depends = libcloudproviders
-	optdepends = kicad-library
-	optdepends = kicad-library3d
+	depends = kicad-library
+	optdepends = kicad-library-3d
 	provides = kicad
 	conflicts = kicad
 	conflicts = kicad-git
 	conflicts = kicad-scripting-git
 	conflicts = kicad-bzr
-	source = kicad-rc:5.1.10.tar.gz::https://gitlab.com/kicad/code/kicad/-/archive/5.1.10/kicad-5.1.10.tar.gz
-	sha256sums = 296341f30ada2c7f4a1c54720eab425835a93349527d4bf08f73f280d19695ed
+	source = kicad-rc:6.0.2.tar.gz::https://gitlab.com/kicad/code/kicad/-/archive/6.0.2/kicad-6.0.2.tar.gz
+	sha256sums = 65870877d27379bee6362d0b0a1dd635cd989687e0b473a0cc3421a4fae612c3
 
 pkgname = kicad-rc
-
diff --git a/PKGBUILD b/PKGBUILD
index c379776332f8..7431050990ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Grey Christoforo <first name at last name dot net>
 
 pkgname=kicad-rc
-_pkgver="5.1.10"
+_pkgver="6.0.2"
 pkgver=${_pkgver//-/_}
 pkgrel=1
 pkgdesc="Official KiCad release candidates and dev snapshots"
@@ -9,35 +9,36 @@ arch=(x86_64)
 url="http://kicad.org/"
 license=(GPL3 AGPL3 BOOST ISC MIT CC-BY-SA)
 depends=(
-  glew
-  wxgtk3-dev
-  desktop-file-utils
-  boost-libs
-  python
-  glm
-  curl
-  swig
-  python-wxpython
-  opencascade
-  ngspice
-  libcloudproviders
+glew
+wxgtk3
+desktop-file-utils
+boost-libs
+python
+glm
+curl
+swig
+python-wxpython
+opencascade
+ngspice
+libcloudproviders
+kicad-library
 )
 makedepends=(
-  cmake
-  git
-  zlib
-  mesa
-  boost
-  swig
+cmake
+git
+zlib
+mesa
+boost
+swig
+ninja  
 )
 optdepends=(
-  kicad-library
-  kicad-library3d
+  kicad-library-3d
 )
 conflicts=('kicad' 'kicad-git' 'kicad-scripting-git' 'kicad-bzr')
 provides=('kicad')
 source=("${pkgname}:${pkgver}.tar.gz::https://gitlab.com/kicad/code/kicad/-/archive/${_pkgver}/kicad-${_pkgver}.tar.gz")
-sha256sums=('296341f30ada2c7f4a1c54720eab425835a93349527d4bf08f73f280d19695ed')
+sha256sums=('65870877d27379bee6362d0b0a1dd635cd989687e0b473a0cc3421a4fae612c3')
 
 prepare() {
   cd kicad-${_pkgver}
@@ -45,17 +46,12 @@ prepare() {
 
 build() {
   cd kicad-${_pkgver}
-  cmake \
-    -W no-dev \
+  cmake -W no-dev \
     -D CMAKE_BUILD_TYPE=None \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D KICAD_USE_OCC=ON \
-    -D KICAD_USE_OCE=OFF \
-    -D KICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
-    -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 build_dir \
     -S .
@@ -66,5 +62,5 @@ build() {
 package() {
   cd kicad-${_pkgver}
   DESTDIR="${pkgdir}" cmake --build build_dir -- install 
-  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICENSE.{AGPLv3,GPLv3,README,BOOSTv1_0,ISC,CC-BY-SA-4.0,MIT}
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICENSE.*
 }