From 77476b094688c0f0b688eaa3a43845ecc8f3fd39 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 20 Dec 2018 09:23:54 +0300
Subject: [PATCH] kicad: Fix packages. Replace git package

---
 mingw-w64-kicad/PKGBUILD | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/mingw-w64-kicad/PKGBUILD b/mingw-w64-kicad/PKGBUILD
index 156a586098..5c1b6d481f 100644
--- a/mingw-w64-kicad/PKGBUILD
+++ b/mingw-w64-kicad/PKGBUILD
@@ -18,7 +18,7 @@ license=("GPLv3+")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-doxygen"
              "${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-glm<0.9.9.3"
+             "${MINGW_PACKAGE_PREFIX}-glm"
              "${MINGW_PACKAGE_PREFIX}-python2"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-swig")
@@ -97,16 +97,17 @@ for _s in ${_sub[@]}; do _sub_pkg+=("${MINGW_PACKAGE_PREFIX}-${_realname}-${_s}"
 
 eval "package_${MINGW_PACKAGE_PREFIX}-${_realname}() {
   depends=("${MINGW_PACKAGE_PREFIX}-boost"
-         "${MINGW_PACKAGE_PREFIX}-cairo"
-         "${MINGW_PACKAGE_PREFIX}-curl"
-         "${MINGW_PACKAGE_PREFIX}-glew"
-         "${MINGW_PACKAGE_PREFIX}-ngspice"
-         "${MINGW_PACKAGE_PREFIX}-oce"
-         "${MINGW_PACKAGE_PREFIX}-openssl"
-         "${MINGW_PACKAGE_PREFIX}-wxPython"
-         "${MINGW_PACKAGE_PREFIX}-wxWidgets")
+           "${MINGW_PACKAGE_PREFIX}-cairo"
+           "${MINGW_PACKAGE_PREFIX}-curl"
+           "${MINGW_PACKAGE_PREFIX}-glew"
+           "${MINGW_PACKAGE_PREFIX}-ngspice"
+           "${MINGW_PACKAGE_PREFIX}-oce"
+           "${MINGW_PACKAGE_PREFIX}-openssl"
+           "${MINGW_PACKAGE_PREFIX}-wxPython"
+           "${MINGW_PACKAGE_PREFIX}-wxWidgets")
   optdepends+=("${_doc_pkg[@]}" "\${_sub_pkg[@]}")
   conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
+  replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
   
   build_kicad
   
@@ -119,13 +120,14 @@ eval "package_${MINGW_PACKAGE_PREFIX}-${_realname}() {
 
 eval "package_${MINGW_PACKAGE_PREFIX}-${_realname}-meta() {
   depends=("${MINGW_PACKAGE_PREFIX}-${_realname}"
-	     "${_sub_pkg[@]}")
+           "${_sub_pkg[@]}")
 }"
 
 for _s in ${_sub[@]}; do
   eval "package_${MINGW_PACKAGE_PREFIX}-${_realname}-${_s}() {
-	options=('!strip')
+    options=('!strip')
     conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-${_s}-git")
+    replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-${_s}-git")
     build_sub ${_s}
     cd "\"\${srcdir}\"/build-${_s}"
     make DESTDIR="\"\${pkgdir}\"" install