From f31297b8991fdc5e977549364e3f16d59aba6e15 Mon Sep 17 00:00:00 2001
From: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
Date: Fri, 15 Mar 2019 20:13:11 +0100
Subject: [PATCH] Fix dependencies

---
 .SRCINFO | 23 ++++++++++++-----------
 PKGBUILD | 25 ++++++++++++-------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index f9e7375..b524d82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = freecad-git
 	pkgdesc = A general purpose 3D CAD modeler - git checkout
-	pkgver = 0.17.r1484.g1e6818b6f
+	pkgver = 0.18.r26.g51fcdd2c0
 	pkgrel = 1
 	epoch = 1
-	url = http://www.freecadweb.org/
-	arch = i686
+	url = https://www.freecadweb.org/
 	arch = x86_64
 	license = LGPL
 	makedepends = git
 	makedepends = boost
 	makedepends = cmake
-	makedepends = coin
-	makedepends = python2-pyside-tools
+	makedepends = desktop-file-utils
+	makedepends = pyside2-tools
 	makedepends = desktop-file-utils
 	makedepends = eigen
 	makedepends = gcc-fortran
@@ -21,14 +20,16 @@ pkgbase = freecad-git
 	depends = hicolor-icon-theme
 	depends = libspnav
 	depends = opencascade
-	depends = med
-	depends = xerces-c
-	depends = python2-pivy
-	depends = python2-pyside
-	depends = qtwebkit
+	depends = coin
 	depends = libtheora
-	depends = shared-mime-info
+	depends = med
 	depends = jsoncpp
+	depends = xerces-c
+	depends = python2-netcdf4
+	depends = python2-pivy
+	depends = python2-pyside2
+	depends = qt5-svg
+	depends = qt5-webkit
 	optdepends = python2-matplotlib
 	optdepends = pycollada-git: Create, edit and load COLLADA documents.
 	provides = freecad
diff --git a/PKGBUILD b/PKGBUILD
index a8726ce..1e4ca15 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,18 @@
 
 _appname=freecad
 pkgname="${_appname}-git"
-pkgver=0.17.r1484.g1e6818b6f
-pkgrel=1
+pkgver=0.18.r26.g51fcdd2c0
+pkgrel=2
 epoch=1
 pkgdesc='A general purpose 3D CAD modeler - git checkout'
-arch=('i686' 'x86_64')
-url='http://www.freecadweb.org/'
+arch=('x86_64')
+url='https://www.freecadweb.org/'
 license=('LGPL')
 depends=('boost-libs' 'curl' 'hicolor-icon-theme' 'libspnav' 'opencascade'
-         'med' 'xerces-c' 'python2-pivy' 'python2-pyside' 'qtwebkit'
-         'libtheora' 'shared-mime-info' 'jsoncpp' )
-makedepends=('git' 'boost' 'cmake' 'coin' 'python2-pyside-tools'
+         'coin' 'libtheora' 'med' 'jsoncpp' 'xerces-c'
+         'python2-netcdf4' 'python2-pivy' 'python2-pyside2'
+         'qt5-svg' 'qt5-webkit')
+makedepends=('git' 'boost' 'cmake' 'desktop-file-utils' 'pyside2-tools'
              'desktop-file-utils' 'eigen' 'gcc-fortran' 'swig')
 optdepends=('python2-matplotlib'
             'pycollada-git: Create, edit and load COLLADA documents.')
@@ -33,14 +34,12 @@ pkgver() {
 build() {
     cd "${srcdir}/${pkgname}"
 
-    cmake -DCMAKE_BUILD_TYPE=Release \
+    cmake . \
+          -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX="/opt/${_appname}" \
-	  -DFREECAD_USE_OCC_VARIANT="Official Version" \
-          -DFREECAD_USE_EXTERNAL_PIVY=ON \
-          -DBUILD_QT5=ON \
-          -DBUILD_QT5_WEBKIT=OFF \
+          -DFREECAD_USE_OCC_VARIANT="Official Version" \
           -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-          -DBUILD_WEB=OFF
+          -DBUILD_QT5=ON
 
     make
 }