From b634531f6600b41b86d31445f40703d10a80185d Mon Sep 17 00:00:00 2001
From: Greyson Christoforo <grey@christoforo.net>
Date: Tue, 22 Mar 2022 17:01:18 +0000
Subject: [PATCH] update deps, optdeps, pkgver and turn off JTREADER

---
 .SRCINFO |  6 ++++--
 PKGBUILD | 12 +++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 728514b..ad8f476 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,7 +16,6 @@ pkgbase = freecad-git
 	makedepends = gendesk
 	makedepends = git
 	makedepends = ninja
-	makedepends = pyside2
 	makedepends = python-shiboken2
 	makedepends = shiboken2
 	makedepends = swig
@@ -27,12 +26,12 @@ pkgbase = freecad-git
 	depends = netcdf
 	depends = opencascade
 	depends = openmpi
+	depends = pyside2
 	depends = pyside2-tools
 	depends = python-yaml
 	depends = python-matplotlib
 	depends = python-pivy
 	depends = python-ply
-	depends = python-pyside2
 	depends = qt5-svg
 	depends = qt5-tools
 	depends = qt5-webkit
@@ -46,6 +45,9 @@ pkgbase = freecad-git
 	optdepends = luxcorerender: ray tracing support
 	optdepends = libspnav: 3d mouse support
 	optdepends = openscad: OpenSCAD support
+	optdepends = graphviz: dependency graph support
+	optdepends = python-markdown: markdown support in addon manager
+	optdepends = python-gitpython: support downloading addons with git
 	provides = freecad
 	conflicts = freecad
 	conflicts = freecad-appimage
diff --git a/PKGBUILD b/PKGBUILD
index 32f9632..c8c2bf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,12 +16,12 @@ med
 netcdf
 opencascade
 openmpi
+pyside2
 pyside2-tools
 python-yaml
 python-matplotlib
 python-pivy
 python-ply
-python-pyside2
 qt5-svg
 qt5-tools
 qt5-webkit
@@ -41,7 +41,6 @@ gcc-fortran
 gendesk
 git
 ninja
-pyside2
 python-shiboken2
 shiboken2
 swig
@@ -55,6 +54,9 @@ optdepends=(
 'luxcorerender: ray tracing support'
 'libspnav: 3d mouse support'
 'openscad: OpenSCAD support'
+'graphviz: dependency graph support'
+'python-markdown: markdown support in addon manager'
+'python-gitpython: support downloading addons with git'
 )
 provides=('freecad')
 conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git')
@@ -64,9 +66,9 @@ md5sums=('SKIP')
 pkgver() {
   cd FreeCAD
   read -d$'/n' -r major minor patch < <(grep -Po "set\(PACKAGE_VERSION_(MAJOR|MINOR|PATCH) \"\K[0-9]*" CMakeLists.txt) || true
-  count=$(git rev-list --count $(git tag --sort=-creatordate|head -1)..HEAD)
+  count=$((24266 + $(git rev-list --count d29fd7d..HEAD) ))
   hash=$(git rev-parse --short HEAD)
-  printf "%d.%d.%d.r%d.g%s" "$major" "$minor" "$patch" "$count" "$hash"
+  printf "%d.%d.%d.%d.g%s" "$major" "$minor" "$patch" "$count" "$hash"
 }
 
 prepare() {
@@ -94,7 +96,7 @@ build() {
     -D BUILD_SHIP=ON \
     -D BUILD_ASSEMBLY=OFF \
     -D BUILD_COMPLETE=ON \
-    -D BUILD_JTREADER=ON \
+    -D BUILD_JTREADER=OFF \
     -D BUILD_PLOT=ON \
     -D CMAKE_BUILD_TYPE=None \
     -D CMAKE_C_FLAGS="${CFLAGS} -fPIC -w" \