updated dependencies and Omoptim

2 files changed, 12 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cdb4d57e118f..552b0254c71a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openmodelica-git
 	pkgdesc = The Open Source Modelica Suite
-	pkgver = 1.16.0.dev.r65.g236638037
-	pkgrel = 1
+	pkgver = 1.16.0.dev.r66.gd7cc1e91f
+	pkgrel = 2
 	url = https://openmodelica.org
 	arch = i686
 	arch = x86_64
@@ -22,20 +22,15 @@ pkgbase = openmodelica-git
 	makedepends = lib32-readline
 	depends = java-environment
 	depends = lpsolve
-	depends = hdf5-openmpi
-	depends = omniorb
 	depends = openscenegraph
-	depends = libatomic_ops
 	depends = python
-	depends = gtkglext
 	depends = ruby
-	depends = qjson
 	depends = suitesparse
 	depends = boost-libs
 	depends = qt5-webkit
+	depends = qt5-xmlpatterns
 	depends = qt5-svg
-	depends = qt5-tools
-	depends = gnuplot
+	depends = fmilib
 	provides = openmodelica
 	conflicts = openmodelica
 	conflicts = openmodelica-svn
diff --git a/PKGBUILD b/PKGBUILD
index cb78c0afd913..e8786a686533 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 # Contributor: Xwang <xwaang1976@gmail.com>
 
 pkgname=openmodelica-git
-pkgver=1.16.0.dev.r65.g236638037
-pkgrel=1
+pkgver=1.16.0.dev.r66.gd7cc1e91f
+pkgrel=2
 pkgdesc="The Open Source Modelica Suite"
 arch=('i686' 'x86_64')
 url="https://openmodelica.org"
 license=('OSMC-PL')
-depends=('java-environment' 'lpsolve' 'hdf5-openmpi' 'omniorb' 'openscenegraph' 'libatomic_ops' 'python' 'gtkglext' 'ruby' 'qjson' 'suitesparse' 'boost-libs' 'qt5-webkit' 'qt5-svg' 'qt5-tools' 'gnuplot')
+depends=('java-environment' 'lpsolve' 'openscenegraph' 'python' 'ruby' 'suitesparse' 'boost-libs' 'qt5-webkit' 'qt5-xmlpatterns' 'qt5-svg' 'fmilib')
 makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'gcc-fortran-multilib' 'boost' 'clang' 'cmake' 'jre7-openjdk' 'antlr2' 'subversion' 'lib32-expat' 'lib32-ncurses' 'lib32-readline')
 provides=('openmodelica')
 conflicts=('openmodelica' 'openmodelica-svn' 'openmodelica-dev')
@@ -36,8 +36,12 @@ build() {
 cd "$srcdir/$pkgname"
     autoconf
     export CPPFLAGS="$CPPFLAGS -DH5_USE_18_API"
-    ./configure --prefix=/usr/ CC=clang CXX=clang++
+	./configure --prefix=/usr/ CC=clang CXX=clang++ --with-UMFPACK 
     make
+    # from there compiles OMOptim
+    cd OMOptim
+    autoconf
+    ./configure --prefix=/usr/ CXX=g++
 }
  
 package() {