update deps, optdeps, pkgver and turn off JTREADER
This commit is contained in:
parent
5da9e301d5
commit
b634531f66
2 changed files with 11 additions and 7 deletions
6
.SRCINFO
6
.SRCINFO
|
@ -16,7 +16,6 @@ pkgbase = freecad-git
|
||||||
makedepends = gendesk
|
makedepends = gendesk
|
||||||
makedepends = git
|
makedepends = git
|
||||||
makedepends = ninja
|
makedepends = ninja
|
||||||
makedepends = pyside2
|
|
||||||
makedepends = python-shiboken2
|
makedepends = python-shiboken2
|
||||||
makedepends = shiboken2
|
makedepends = shiboken2
|
||||||
makedepends = swig
|
makedepends = swig
|
||||||
|
@ -27,12 +26,12 @@ pkgbase = freecad-git
|
||||||
depends = netcdf
|
depends = netcdf
|
||||||
depends = opencascade
|
depends = opencascade
|
||||||
depends = openmpi
|
depends = openmpi
|
||||||
|
depends = pyside2
|
||||||
depends = pyside2-tools
|
depends = pyside2-tools
|
||||||
depends = python-yaml
|
depends = python-yaml
|
||||||
depends = python-matplotlib
|
depends = python-matplotlib
|
||||||
depends = python-pivy
|
depends = python-pivy
|
||||||
depends = python-ply
|
depends = python-ply
|
||||||
depends = python-pyside2
|
|
||||||
depends = qt5-svg
|
depends = qt5-svg
|
||||||
depends = qt5-tools
|
depends = qt5-tools
|
||||||
depends = qt5-webkit
|
depends = qt5-webkit
|
||||||
|
@ -46,6 +45,9 @@ pkgbase = freecad-git
|
||||||
optdepends = luxcorerender: ray tracing support
|
optdepends = luxcorerender: ray tracing support
|
||||||
optdepends = libspnav: 3d mouse support
|
optdepends = libspnav: 3d mouse support
|
||||||
optdepends = openscad: OpenSCAD 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
|
provides = freecad
|
||||||
conflicts = freecad
|
conflicts = freecad
|
||||||
conflicts = freecad-appimage
|
conflicts = freecad-appimage
|
||||||
|
|
12
PKGBUILD
12
PKGBUILD
|
@ -16,12 +16,12 @@ med
|
||||||
netcdf
|
netcdf
|
||||||
opencascade
|
opencascade
|
||||||
openmpi
|
openmpi
|
||||||
|
pyside2
|
||||||
pyside2-tools
|
pyside2-tools
|
||||||
python-yaml
|
python-yaml
|
||||||
python-matplotlib
|
python-matplotlib
|
||||||
python-pivy
|
python-pivy
|
||||||
python-ply
|
python-ply
|
||||||
python-pyside2
|
|
||||||
qt5-svg
|
qt5-svg
|
||||||
qt5-tools
|
qt5-tools
|
||||||
qt5-webkit
|
qt5-webkit
|
||||||
|
@ -41,7 +41,6 @@ gcc-fortran
|
||||||
gendesk
|
gendesk
|
||||||
git
|
git
|
||||||
ninja
|
ninja
|
||||||
pyside2
|
|
||||||
python-shiboken2
|
python-shiboken2
|
||||||
shiboken2
|
shiboken2
|
||||||
swig
|
swig
|
||||||
|
@ -55,6 +54,9 @@ optdepends=(
|
||||||
'luxcorerender: ray tracing support'
|
'luxcorerender: ray tracing support'
|
||||||
'libspnav: 3d mouse support'
|
'libspnav: 3d mouse support'
|
||||||
'openscad: OpenSCAD support'
|
'openscad: OpenSCAD support'
|
||||||
|
'graphviz: dependency graph support'
|
||||||
|
'python-markdown: markdown support in addon manager'
|
||||||
|
'python-gitpython: support downloading addons with git'
|
||||||
)
|
)
|
||||||
provides=('freecad')
|
provides=('freecad')
|
||||||
conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git')
|
conflicts=('freecad' 'freecad-appimage' 'freecad-appimage-git')
|
||||||
|
@ -64,9 +66,9 @@ md5sums=('SKIP')
|
||||||
pkgver() {
|
pkgver() {
|
||||||
cd FreeCAD
|
cd FreeCAD
|
||||||
read -d$'/n' -r major minor patch < <(grep -Po "set\(PACKAGE_VERSION_(MAJOR|MINOR|PATCH) \"\K[0-9]*" CMakeLists.txt) || true
|
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)
|
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() {
|
prepare() {
|
||||||
|
@ -94,7 +96,7 @@ build() {
|
||||||
-D BUILD_SHIP=ON \
|
-D BUILD_SHIP=ON \
|
||||||
-D BUILD_ASSEMBLY=OFF \
|
-D BUILD_ASSEMBLY=OFF \
|
||||||
-D BUILD_COMPLETE=ON \
|
-D BUILD_COMPLETE=ON \
|
||||||
-D BUILD_JTREADER=ON \
|
-D BUILD_JTREADER=OFF \
|
||||||
-D BUILD_PLOT=ON \
|
-D BUILD_PLOT=ON \
|
||||||
-D CMAKE_BUILD_TYPE=None \
|
-D CMAKE_BUILD_TYPE=None \
|
||||||
-D CMAKE_C_FLAGS="${CFLAGS} -fPIC -w" \
|
-D CMAKE_C_FLAGS="${CFLAGS} -fPIC -w" \
|
||||||
|
|
Loading…
Reference in a new issue